diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
index 4b56ce8aadea..c871e40d9b8f 100644
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -4,3 +4,4 @@ DIST monit-5.5.1.tar.gz 1260093 SHA256 dbe4b4744a7100e2d5f4eac353dfb2df0549848e2
DIST monit-5.5.tar.gz 1197459 SHA256 8276b060b3f0e6453c9748d421dec044ddae09d3e4c4666e13472aab294d7c53 SHA512 ae5391428417d450d061f4c80f4995f1ea4b83238cd4c1d9813b55cae9e7d6a7b5df22fd97cd73d8a501b3e2e5df7f21caee27aeaf15cadee7bb579c036754b3 WHIRLPOOL 7c7e10b1b9899c8241e0d931cedede2fa302216e691d9523b12bd196f9e1c23d8fd5ad6ec318df9ab75d62c049dc9a078454d7ad40c487b371f69c31c1507d3f
DIST monit-5.6.tar.gz 1263370 SHA256 38e09bd8b39abc59e6b9a9bb7a78f7eac2b02a92f4de1f3a6dc24e84dfedae0d SHA512 36933b6560860eac39421a56726c8748e2ce0f16ee51149828e6ffcb77edf3ce73394c2b58e208f6614712e7c6e0e114bc92e911794503b89793b225199193b8 WHIRLPOOL 9aba45ad39d9e47c964250ad6ef56ff81b1015c2c7878fa16d7e0484592a799e3574b8cbf1d137d02b09f02ecee8b2f3df81633ce1630f1e8add665bbdbe2a1b
DIST monit-5.7.tar.gz 1266763 SHA256 bb250ab011d805b5693972afdf95509e79bb3b390caa763275c9501f74b598a2 SHA512 e76ee9d32b661f603fd24071f00d1ac26e64eed61a2246dcf4b1c6dc6654ab1304b1e6e4d18a100ad3802a1bb1adb2f4d8105e952ef1ae1049d5e6b0b0965368 WHIRLPOOL 2bc4acf1af1d51604cfa07f1b70424c2be22112ba49006b163ec9c8fdf16303465b3ba7e12e973b1940d3374e1e750f7523421cc0d48bcb8e12f31de1fbc066b
+DIST monit-5.8.tar.gz 1237958 SHA256 0c00573ebc0156c534a5952f392c2a7bedde194f8261c05497322055938847f5 SHA512 61f2cb4a6b2da8617adfd16ace4d9b246957385109fee9a3312272ac271003cd89a12872ac3a07b0148ad7bdbe544e447745033d2a9fab19908ef19b7a106dda WHIRLPOOL 0eb1f5b778264d7881281f7139037fa07c225a5c7ece7cae2149460036a58c008e16a3d883e1876a2dc08f092900e05d164e37714ec5fc19960d4127e13c6eeb
diff --git a/app-admin/monit/monit-5.8.ebuild b/app-admin/monit/monit-5.8.ebuild
new file mode 100644
index 000000000000..bb713dfa1993
--- /dev/null
+++ b/app-admin/monit/monit-5.8.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/monit-5.8.ebuild,v 1.1 2014/04/02 02:32:01 patrick Exp $
+
+EAPI="2"
+inherit systemd
+
+DESCRIPTION="a utility for monitoring and managing daemons or similar programs running on a Unix system."
+HOMEPAGE="http://mmonit.com/monit/"
+SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+IUSE="pam ssl"
+
+RDEPEND="ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+ sys-devel/flex
+ sys-devel/bison
+ pam? ( virtual/pam )"
+
+src_prepare() {
+ sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
+}
+
+src_configure() {
+ econf $(use_with ssl) $(use_with pam) || die "econf failed"
+}
+
+src_compile() {
+ emake || die "emake failed"
+}
+
+src_install() {
+ make DESTDIR="${D}" install || die "make install failed"
+
+ dodoc README*
+ dohtml -r doc/*
+
+ insinto /etc; insopts -m600; doins monitrc || die "doins monitrc failed"
+ newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit || die "newinitd failed"
+ systemd_dounit "${FILESDIR}"/${PN}.service || die
+}
+
+pkg_postinst() {
+ elog "Sample configurations are available at:"
+ elog "http://mmonit.com/monit/documentation/"
+}
diff --git a/app-admin/syslog-ng/syslog-ng-3.4.7.ebuild b/app-admin/syslog-ng/syslog-ng-3.4.7.ebuild
index cd7f420dd894..52f7f6480aef 100644
--- a/app-admin/syslog-ng/syslog-ng-3.4.7.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.4.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.4.7.ebuild,v 1.4 2014/03/26 21:50:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.4.7.ebuild,v 1.5 2014/04/02 10:02:45 nimiux Exp $
EAPI=5
inherit eutils multilib systemd
@@ -12,7 +12,7 @@ SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${MY_PV}/sourc
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="caps dbi geoip ipv6 json mongodb +pcre smtp spoof-source ssl systemd tcpd"
RESTRICT="test"
diff --git a/app-arch/gtk-splitter/files/gtk-splitter-2.2.1-r1-desktop-QA-fixes.patch b/app-arch/gtk-splitter/files/gtk-splitter-2.2.1-r1-desktop-QA-fixes.patch
new file mode 100644
index 000000000000..32fd447c9019
--- /dev/null
+++ b/app-arch/gtk-splitter/files/gtk-splitter-2.2.1-r1-desktop-QA-fixes.patch
@@ -0,0 +1,13 @@
+--- a/gtk-splitter.desktop
++++ b/gtk-splitter.desktop
+@@ -3,8 +3,8 @@
+ Name=File Splitter
+ Comment=GTK+ File Splitter
+ Exec=gtk-splitter %F
+-Icon=gtk-splitter.png
++Icon=/usr/share/pixmaps/gtk-splitter.png
+ Terminal=false
+ Type=Application
+-Categories=GNOME;Application;Utility;
++Categories=GNOME;Utility;
+ StartupNotify=true
diff --git a/app-arch/gtk-splitter/gtk-splitter-2.2.1-r1.ebuild b/app-arch/gtk-splitter/gtk-splitter-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..d2ff34dde38f
--- /dev/null
+++ b/app-arch/gtk-splitter/gtk-splitter-2.2.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/gtk-splitter/gtk-splitter-2.2.1-r1.ebuild,v 1.1 2014/04/02 09:49:55 tomwij Exp $
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Split files into smaller pieces and combine them back together."
+HOMEPAGE="http://gtk-splitter.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="crypt"
+
+RDEPEND="x11-libs/gtk+:2
+ virtual/libintl:0
+ crypt? ( >=app-crypt/mhash-0.8:0 )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig:*"
+
+src_prepare() {
+ epatch "${FILESDIR}/"${P}-r1-desktop-QA-fixes.patch
+}
+
+src_compile() {
+ default
+
+ if ! use crypt ; then
+ # configure script only autodetects
+ sed -i -e 's:-lmhash::' -e 's:-DHAVE_LIBMHASH=1::' src/Makefile || die
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install
+}
diff --git a/app-backup/obnam/Manifest b/app-backup/obnam/Manifest
index ca9768ca258b..2ddf758fb11c 100644
--- a/app-backup/obnam/Manifest
+++ b/app-backup/obnam/Manifest
@@ -1,2 +1,2 @@
DIST obnam_1.6.1.orig.tar.gz 177104 SHA256 69bca2d17d7b4ebc0f2ca15a4d0777e266aa5214a8de1537ecc35f1cadb42510 SHA512 5223dabae927a91825041d755c0c410c9579c946210653b25a8d84dcf8f3c754d3dd460bb097d88a488bd2fb88c7edc8550d74130841e6caf13113ceefe5fffb WHIRLPOOL 6f1fa2be34bead5f2887b505708c9e1ed05dddd457b59362dd166f5be5ef7302a74746a9bfde17eaee142ebdb8389ef8b73281f936a1e80ea161c9b04dc8c0d1
-DIST obnam_1.7.2.orig.tar.gz 257675 SHA256 f7431e9d7d2aba7e1dfdc831f796177fb8944725f77c0c2a5558d6ef7733a17c SHA512 f05ca3bc8b8acabf0592353e0e95c742af7e7544e6d91236c54c1f74adb290d969d9afb16d2951c1f522e75e42c7044f30c4932391d29f0f3efb6be2999909f7 WHIRLPOOL 3b891afdc3fd70a96d82e1a84b8b92a68cce5a1410b725444e0c3796a21f6afbc1216d0ea18e0e8ff55e5a6bdee901b2856c5e8c4ac68f7f238a2a98a6600512
+DIST obnam_1.7.4.orig.tar.gz 264769 SHA256 9c3ca22f08a3639ec2d5a2cd6291c4c6ac6ec31cdb63c9bd22b379c3cf0af4d4 SHA512 b08bc5256dc5d2fe61920db1dc210e78a46c4baa0ac0ccb3931a15118f147820ed782607af790c7053dcc6a5cbe6f8338b952ee41fe6382fe6429bfe22963717 WHIRLPOOL 65d0f9e539ad208b68e155cd552b4ba8a1f89bd06c10c1fd32caf896082cc0ab781d4200308afd55c38d88dbf45325ec1a710ab07fb7de01e0295d9886fc2d46
diff --git a/app-backup/obnam/obnam-1.7.2.ebuild b/app-backup/obnam/obnam-1.7.4.ebuild
similarity index 91%
rename from app-backup/obnam/obnam-1.7.2.ebuild
rename to app-backup/obnam/obnam-1.7.4.ebuild
index 47cfba3d5608..ca9ce6c2fffd 100644
--- a/app-backup/obnam/obnam-1.7.2.ebuild
+++ b/app-backup/obnam/obnam-1.7.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/obnam-1.7.2.ebuild,v 1.2 2014/03/28 20:24:09 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/obnam-1.7.4.ebuild,v 1.1 2014/04/01 20:06:10 mschiff Exp $
EAPI=5
diff --git a/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild b/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild
new file mode 100644
index 000000000000..37cba26592d3
--- /dev/null
+++ b/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild,v 1.1 2014/04/02 10:00:36 tomwij Exp $
+
+EAPI="5"
+
+inherit eutils gnome2
+
+DESCRIPTION="Graphical frontend for cdrecord, mkisofs, readcd and sox using GTK+2"
+HOMEPAGE="http://graveman.tuxfamily.org/"
+SRC_URI="http://graveman.tuxfamily.org/sources/${PN}-${PV/_p/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug dvdr flac mp3 nls vorbis"
+
+RDEPEND="app-cdr/cdrdao
+ >=dev-libs/glib-2.4:2
+ >=gnome-base/libglade-2.4:2.0
+ media-libs/libmng
+ virtual/cdrtools
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.4:2
+ dvdr? ( app-cdr/dvd+rw-tools )
+ flac? ( media-libs/flac )
+ mp3? ( media-libs/libid3tag
+ media-libs/libmad
+ media-sound/sox )
+ nls? ( virtual/libintl )
+ vorbis? (
+ media-libs/libogg
+ media-libs/libvorbis
+ media-sound/sox )"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${P/_p/-}
+
+DOCS="AUTHORS ChangeLog NEWS README* THANKS"
+
+src_prepare() {
+ epatch "${FILESDIR}"/joliet-long.patch \
+ "${FILESDIR}"/rename.patch \
+ "${FILESDIR}"/desktop-entry.patch
+
+ if use mp3 || use vorbis; then
+ epatch "${FILESDIR}"/sox.patch
+ fi
+}
+
+src_configure() {
+ gnome2_src_configure \
+ $(use_enable debug) \
+ $(use_enable flac) \
+ $(use_enable mp3) \
+ $(use_enable vorbis ogg)
+}
diff --git a/app-crypt/ccid/ccid-1.4.15.ebuild b/app-crypt/ccid/ccid-1.4.15.ebuild
index ff876ef643ea..c38e3b9eed9a 100644
--- a/app-crypt/ccid/ccid-1.4.15.ebuild
+++ b/app-crypt/ccid/ccid-1.4.15.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.4.15.ebuild,v 1.1 2014/02/14 22:41:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.4.15.ebuild,v 1.2 2014/04/01 19:04:15 maekke Exp $
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://alioth.debian.org/frs/download.php/file/${STUPID_NUM}/${P}.tar.b
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="twinserial +usb"
RDEPEND=">=sys-apps/pcsc-lite-1.8.3
diff --git a/app-crypt/ophcrack-tables/ophcrack-tables-1.0-r1.ebuild b/app-crypt/ophcrack-tables/ophcrack-tables-1.0-r2.ebuild
similarity index 80%
rename from app-crypt/ophcrack-tables/ophcrack-tables-1.0-r1.ebuild
rename to app-crypt/ophcrack-tables/ophcrack-tables-1.0-r2.ebuild
index ddc7930c6bda..7494bd4b47a4 100644
--- a/app-crypt/ophcrack-tables/ophcrack-tables-1.0-r1.ebuild
+++ b/app-crypt/ophcrack-tables/ophcrack-tables-1.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ophcrack-tables/ophcrack-tables-1.0-r1.ebuild,v 1.2 2009/10/31 00:38:46 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ophcrack-tables/ophcrack-tables-1.0-r2.ebuild,v 1.1 2014/04/02 10:41:16 tomwij Exp $
-EAPI="1"
+EAPI="5"
DESCRIPTION="Tables available for ophcrack"
HOMEPAGE="http://ophcrack.sourceforge.net/"
@@ -26,12 +26,12 @@ src_unpack() {
table=${i#tables_}
table=${table%.zip}
mkdir "${S}/${table}"
- cd "${S}/${table}"
+ cd $_ || die
unpack "${i}"
done
}
src_install() {
dodir /usr/share/ophcrack/
- cp -r "${S}"/* "${D}/usr/share/ophcrack"
+ cp -r "${S}"/* "${ED}"/usr/share/ophcrack/ || die
}
diff --git a/app-crypt/ophcrack-tables/ophcrack-tables-1.0.ebuild b/app-crypt/ophcrack-tables/ophcrack-tables-1.0.ebuild
deleted file mode 100644
index 8cff13a2ae89..000000000000
--- a/app-crypt/ophcrack-tables/ophcrack-tables-1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ophcrack-tables/ophcrack-tables-1.0.ebuild,v 1.2 2009/10/31 00:38:46 ikelos Exp $
-
-EAPI="1"
-
-DESCRIPTION="Tables available for ophcrack"
-HOMEPAGE="http://ophcrack.sourceforge.net/"
-SRC_URI="xpfast? ( mirror://sourceforge/ophcrack/tables_xp_free_fast.zip )
- xpsmall? ( mirror://sourceforge/ophcrack/tables_xp_free_small.zip )
- vistafree? ( mirror://sourceforge/ophcrack/tables_vista_free.zip )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="+xpfast xpsmall +vistafree"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_unpack() {
- for i in ${A};
- do
- table=${i#tables_}
- table=${table%.zip}
- mkdir "${S}/${table}"
- cd "${S}/${table}"
- unpack "${i}"
- done
-}
-
-src_install() {
- dodir /usr/share/ophcrack/
- cp -r "${S}/*" "${D}/usr/share/ophcrack"
-}
diff --git a/app-dicts/kasumi/files/kasumi-2.5-r1-fix-desktop-QA.patch b/app-dicts/kasumi/files/kasumi-2.5-r1-fix-desktop-QA.patch
new file mode 100644
index 000000000000..a61dc0e11d51
--- /dev/null
+++ b/app-dicts/kasumi/files/kasumi-2.5-r1-fix-desktop-QA.patch
@@ -0,0 +1,13 @@
+--- a/kasumi.desktop.in
++++ b/kasumi.desktop.in
+@@ -8,8 +8,8 @@
+ Comment=Edit Anthy dictionary.
+ Comment[ja]=Anthy の個人辞書に単語を登録、削除、編集するツールです。
+ Exec=kasumi
+-Icon=kasumi.png
++Icon=/usr/share/pixmaps/kasumi.png
+ StartupNotify=true
+ Terminal=false
+ Type=Application
+-Categories=Applications;Settings;
++Categories=Settings;
diff --git a/app-dicts/kasumi/kasumi-2.5-r1.ebuild b/app-dicts/kasumi/kasumi-2.5-r1.ebuild
new file mode 100644
index 000000000000..d7296dcd3261
--- /dev/null
+++ b/app-dicts/kasumi/kasumi-2.5-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/kasumi/kasumi-2.5-r1.ebuild,v 1.1 2014/04/02 10:52:21 tomwij Exp $
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Anthy dictionary maintenance tool"
+HOMEPAGE="http://kasumi.sourceforge.jp/"
+SRC_URI="mirror://sourceforge.jp/${PN}/41436/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="nls"
+
+RDEPEND=">=x11-libs/gtk+-2.6:2
+ nls? ( virtual/libintl )
+ virtual/libiconv
+ >=app-i18n/anthy-6131"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-r1-fix-desktop-QA.patch
+}
+
+src_configure() {
+ econf $(use_enable nls)
+}
diff --git a/app-emacs/prime-el/Manifest b/app-emacs/prime-el/Manifest
deleted file mode 100644
index 1f2b30e041fb..000000000000
--- a/app-emacs/prime-el/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST prime-el-1.5.1.3.tar.gz 145403 SHA256 5dbc817c58926419da462a58e65086465317411c22f1fe9160c383023f285291 SHA512 12c50f7976df6912ab75026bd2268dcf6640f44f7225f73fb1abbc9487d1e8493777d14798aaa98a31de6aed5e01732ab790161c010192ac05033ab5fa65ebb5 WHIRLPOOL 6bc78c0b50a3e0ec1f6a1153f72b54f73227cca737a67bdb38e7a7e02019db0d4aab9095f9896378098c931264eb9a4dbec18babb5cef861fabeb3db48332199
diff --git a/app-emacs/prime-el/files/50prime-el-gentoo.el b/app-emacs/prime-el/files/50prime-el-gentoo.el
deleted file mode 100644
index 208ab36e1c16..000000000000
--- a/app-emacs/prime-el/files/50prime-el-gentoo.el
+++ /dev/null
@@ -1 +0,0 @@
-(require 'init-prime)
diff --git a/app-emacs/prime-el/metadata.xml b/app-emacs/prime-el/metadata.xml
deleted file mode 100644
index df397ea3014c..000000000000
--- a/app-emacs/prime-el/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-cjk
-emacs
-
diff --git a/app-emacs/prime-el/prime-el-1.5.1.3.ebuild b/app-emacs/prime-el/prime-el-1.5.1.3.ebuild
deleted file mode 100644
index cf03c1ebe3ef..000000000000
--- a/app-emacs/prime-el/prime-el-1.5.1.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/prime-el/prime-el-1.5.1.3.ebuild,v 1.9 2012/10/07 16:11:25 armin76 Exp $
-
-EAPI=4
-
-inherit elisp
-
-MY_P="${P/_p/.}"
-DESCRIPTION="PRIME Client for Emacs"
-HOMEPAGE="http://taiyaki.org/prime/"
-SRC_URI="http://prime.sourceforge.jp/src/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-SITEFILE="50${PN}-gentoo.el"
-
-DEPEND="app-emacs/apel
- app-emacs/mell
- dev-libs/suikyo"
-RDEPEND="${DEPEND}
- >=app-i18n/prime-0.8.6"
-
-src_configure() {
- econf --with-prime-initdir=/usr/share/emacs/site-lisp \
- --with-prime-docdir=/usr/share/doc/${PF}
-}
-
-src_compile() {
- default
-}
-
-src_install() {
- emake DESTDIR="${D}" install install-etc
-
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-
- dodoc AUTHORS ChangeLog README
- mv "${D}"/usr/share/doc/${PF}/{emacs,html} || die
-}
diff --git a/app-emulation/uae/uae-0.8.29-r1.ebuild b/app-emulation/uae/uae-0.8.29-r2.ebuild
similarity index 70%
rename from app-emulation/uae/uae-0.8.29-r1.ebuild
rename to app-emulation/uae/uae-0.8.29-r2.ebuild
index f7cb14784d08..8f0c3b0c758c 100644
--- a/app-emulation/uae/uae-0.8.29-r1.ebuild
+++ b/app-emulation/uae/uae-0.8.29-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/uae-0.8.29-r1.ebuild,v 1.3 2011/03/27 10:31:29 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/uae-0.8.29-r2.ebuild,v 1.1 2014/04/02 11:55:44 tomwij Exp $
-EAPI="1"
+EAPI="5"
inherit eutils
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.amigaemulator.org/pub/uae/sources/develop/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE="sdl alsa scsi"
DEPEND="sdl? ( media-libs/libsdl
@@ -27,17 +27,15 @@ DEPEND="sdl? ( media-libs/libsdl
scsi? ( app-cdr/cdrtools )"
RDEPEND="${DEPEND}"
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}"/uae-0.8.25-allow_spaces_in_zip_filenames.diff
- epatch "${FILESDIR}"/uae-0.8.25-struct_uae_wrong_fields_name.diff
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.8.25-allow_spaces_in_zip_filenames.diff
+ epatch "${FILESDIR}"/${PN}-0.8.25-struct_uae_wrong_fields_name.diff
epatch "${FILESDIR}"/${PN}-0.8.26-uae_reset_args.diff
- cp "${FILESDIR}"/sdlgfx.h "${S}"/src
+
+ cp "${FILESDIR}"/sdlgfx.h "${S}"/src || die
}
-src_compile() {
+src_configure() {
# disabling lots of options, cause many code-paths are broken, these should compile,
# if you want/need other options, please test if they work with other combinations
# before opening a bug
@@ -45,15 +43,17 @@ src_compile() {
--without-asciiart --without-sdl-sound --enable-threads \
$(use_with sdl) $(use_with sdl sdl-gfx) \
$(use_with alsa) \
- $(use_enable scsi scsi-device) || die "econf failed"
+ $(use_enable scsi scsi-device)
+}
- emake -j1 || die "emake failed"
+src_compile() {
+ emake -j1
}
src_install() {
- dobin uae readdisk || die
- cp docs/unix/README docs/README.unix
- rm -r docs/{AmigaOS,BeOS,pOS,translated,unix}
+ dobin uae readdisk
+ cp docs/unix/README docs/README.unix || die
+ rm -r docs/{AmigaOS,BeOS,pOS,translated,unix} || die
dodoc docs/*
insinto /usr/share/uae/amiga-tools
diff --git a/app-i18n/gtkimprime/Manifest b/app-i18n/gtkimprime/Manifest
deleted file mode 100644
index 77467857a289..000000000000
--- a/app-i18n/gtkimprime/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gtkimprime-0.1.tar.gz 325873 SHA256 cdb992798b8a2ec0dac45f4f7486a14eedea813625bee73b2e50d98217e53202 SHA512 0c5cbbb63d8dd50c1612801cdbb7bb62aab41003dca6328c7d771f112622efa1abc08dd7dc137b449727aed1e9bfb64ce8bd2f8e3ae4717102c3e837fd1d1673 WHIRLPOOL d2288533c2b8073fac7b3fb1b2a4ea720431e1251479a8b00b48b62d1b3d0b69caaae2b4079ecb7285c712de6fe138a68119bc3657e2c0911c0b02dabf8fa964
diff --git a/app-i18n/gtkimprime/gtkimprime-0.1.ebuild b/app-i18n/gtkimprime/gtkimprime-0.1.ebuild
deleted file mode 100644
index 679e1718688c..000000000000
--- a/app-i18n/gtkimprime/gtkimprime-0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/gtkimprime/gtkimprime-0.1.ebuild,v 1.7 2013/04/21 10:10:12 lxnay Exp $
-
-EAPI="1"
-
-inherit gnome2-utils
-
-DESCRIPTION="Yet another PRIME client for GTK+2"
-HOMEPAGE="http://gtkimprime.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/gtkimprime/12368/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=">=x11-libs/gtk+-2.4:2
- >=app-i18n/prime-0.9.2-r1"
-
-get_gtk_confdir() {
- if use amd64 || ( [ "${CONF_LIBDIR}" == "lib32" ] && use x86 ) ; then
- echo "/etc/gtk-2.0/${CHOST}"
- else
- echo "/etc/gtk-2.0"
- fi
-}
-
-src_install() {
- make DESTDIR="${D}" install || die "make install failed"
-
- dodoc AUTHORS ChangeLog README
-}
-
-pkg_postinst() {
- gnome2_query_immodules_gtk2
-}
-
-pkg_postrm() {
- gnome2_query_immodules_gtk2
-}
diff --git a/app-i18n/prime/Manifest b/app-i18n/prime/Manifest
deleted file mode 100644
index 2ec1483e1c88..000000000000
--- a/app-i18n/prime/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST prime-1.0.0.1.tar.gz 300251 SHA256 3f647c98e09146e41d7c387b395788649534c8c8831c406ec3de5d1436ade4b4 SHA512 6cade85ff23ea4e1b7cb089d932de5d6190ec73b3bf4a13a0a5930dd54d66c9abaeb46e41e5e87f39b0bddbc350aacbdafe21279091693fffe32263369e9ce8a WHIRLPOOL ef25a999ee107a6ed88443cdd9ac75d998c47e682765a7b7f93aca2dbf05b7f423c0d4f8c32500e293a11bfd50439ea4a83f4389d81a2b7230d9108a136f00f6
diff --git a/app-i18n/prime/files/prime-1.0.0.1-libdir.patch b/app-i18n/prime/files/prime-1.0.0.1-libdir.patch
deleted file mode 100644
index efa521969237..000000000000
--- a/app-i18n/prime/files/prime-1.0.0.1-libdir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- prime-1.0.0.1.orig/src/prime.src 2005-03-07 16:51:34.000000000 +0900
-+++ prime-1.0.0.1/src/prime.src 2010-05-27 18:44:37.000000000 +0900
-@@ -12,8 +12,10 @@
- # the GNU General Public License version 2.
- #
-
-+require 'rbconfig'
-+
- PRIME_BINDIR = '%bindir%'
--PRIME_LIBDIR = '%rubydir%'
-+PRIME_LIBDIR = Config::CONFIG["sitelibdir"]
- $LOAD_PATH.unshift(PRIME_LIBDIR) unless $LOAD_PATH.member?(PRIME_LIBDIR)
-
- require 'getoptlong'
diff --git a/app-i18n/prime/files/prime-1.0.0.1-parallel.patch b/app-i18n/prime/files/prime-1.0.0.1-parallel.patch
deleted file mode 100644
index 46d87fb94649..000000000000
--- a/app-i18n/prime/files/prime-1.0.0.1-parallel.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur prime-1.0.0.1.orig//src/Makefile.am prime-1.0.0.1//src/Makefile.am
---- prime-1.0.0.1.orig//src/Makefile.am 2004-03-26 02:19:51.000000000 +0900
-+++ prime-1.0.0.1//src/Makefile.am 2010-05-27 18:29:20.000000000 +0900
-@@ -23,7 +23,7 @@
-
- ## FIXME: Consider other commands.
- ## FIXME: (2004-02-05)
--@PRIME_COMMAND@: $(script_sources) Makefile
-+$(primelib_SCRIPTS): $(script_sources) Makefile
- ruby -e " \
- command_suffixes = ['', \
- '-userdict-update', '-userdict-convert', \
diff --git a/app-i18n/prime/files/prime-1.0.0.1-require.patch b/app-i18n/prime/files/prime-1.0.0.1-require.patch
deleted file mode 100644
index 6da1c3300842..000000000000
--- a/app-i18n/prime/files/prime-1.0.0.1-require.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lib/taiyaki.rb b/lib/taiyaki.rb
-index 3c2ca04..83632e4 100644
---- a/lib/taiyaki.rb
-+++ b/lib/taiyaki.rb
-@@ -12,7 +12,7 @@ $KCODE = 'e'
- require 'jcode'
-
- begin
-- Kernel::require('progressbar')
-+ require('progressbar')
- rescue LoadError
- $stderr.puts "WARNING:"
- $stderr.puts(" The required Ruby library 'progressbar' is not found.")
diff --git a/app-i18n/prime/metadata.xml b/app-i18n/prime/metadata.xml
deleted file mode 100644
index 2d5852c16c60..000000000000
--- a/app-i18n/prime/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-cjk
-
diff --git a/app-i18n/prime/prime-1.0.0.1-r2.ebuild b/app-i18n/prime/prime-1.0.0.1-r2.ebuild
deleted file mode 100644
index 1a85f5c13bf7..000000000000
--- a/app-i18n/prime/prime-1.0.0.1-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/prime/prime-1.0.0.1-r2.ebuild,v 1.7 2013/03/30 18:21:58 jer Exp $
-
-EAPI="3"
-# don't work with ruby19
-# jruby: sary-ruby issue
-# rbx: sary-ruby issue
-USE_RUBY="ruby18 ree18"
-inherit autotools eutils ruby-ng
-
-DESCRIPTION="Japanese PRedictive Input Method Editor"
-HOMEPAGE="http://taiyaki.org/prime/"
-SRC_URI="http://prime.sourceforge.jp/src/${P/_/-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86"
-IUSE=""
-
-ruby_add_bdepend "virtual/rubygems"
-ruby_add_rdepend ">=app-dicts/prime-dict-1.0.0
- >=dev-libs/suikyo-2.1.0
- dev-ruby/ruby-progressbar
- dev-ruby/sary-ruby"
-
-S="${WORKDIR}/${P/_/-}"
-
-all_ruby_prepare() {
- epatch \
- "${FILESDIR}/${P}-parallel.patch" \
- "${FILESDIR}/${P}-libdir.patch" \
- "${FILESDIR}/${P}-require.patch"
- # eautoreconf
-}
-
-each_ruby_prepare() {
- sed -i -e "s:ruby -r:${RUBY} -r:" acinclude.m4 || die
- sed -i -e "s:ruby -e:${RUBY} -e:" src/Makefile.am || die
- eautoreconf
-}
-
-each_ruby_configure() {
- econf \
- --with-prime-docdir=/usr/share/doc/${PF}/html \
- --with-rubydir=$(ruby_rbconfig_value 'sitelibdir') || die
-}
-
-each_ruby_compile() {
- emake || die
-}
-
-each_ruby_install() {
- emake DESTDIR="${D}" install install-etc || die
-}
-
-all_ruby_install() {
- dodoc AUTHORS ChangeLog NEWS README TODO || die
- dohtml -r doc/* || die
-}
diff --git a/app-i18n/scim-prime/Manifest b/app-i18n/scim-prime/Manifest
deleted file mode 100644
index fb1f4fec2a97..000000000000
--- a/app-i18n/scim-prime/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST scim-prime-1.0.1.tar.gz 556999 SHA256 8ebdebb92d27d161af71621cae9650f839600824bcf41662ad36056f8901626b SHA512 d85ec514d80bdb9fcfe1661e00eb9aaa5487e5e28faeeed0834bee74932330e021062b2dd327099880c9cfe07ee2fd222f2d34af6718c9ade109a9ade5bef9d7 WHIRLPOOL 44d0244f20dc5242394bb9e32d044a2b3aab10adeb4c771431ca1b4c74976f5f2ca82eb7dc2a39cb6c63dc21f1b3cd44d18754910c6f7ba8d875e4646a99d1f0
diff --git a/app-i18n/scim-prime/metadata.xml b/app-i18n/scim-prime/metadata.xml
deleted file mode 100644
index 2d5852c16c60..000000000000
--- a/app-i18n/scim-prime/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-cjk
-
diff --git a/app-i18n/scim-prime/scim-prime-1.0.1-r1.ebuild b/app-i18n/scim-prime/scim-prime-1.0.1-r1.ebuild
deleted file mode 100644
index 9d8573b1e3b7..000000000000
--- a/app-i18n/scim-prime/scim-prime-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-prime/scim-prime-1.0.1-r1.ebuild,v 1.6 2013/06/18 04:07:38 mr_bones_ Exp $
-
-EAPI=4
-
-inherit eutils autotools-utils
-
-DESCRIPTION="Japanese input method PRIME IMEngine for SCIM"
-HOMEPAGE="http://scim-imengine.sourceforge.jp/index.cgi?cmd=view;name=SCIMPRIME"
-SRC_URI="mirror://sourceforge.jp/scim-imengine/29156/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="static-libs"
-
-RDEPEND=">=app-i18n/scim-1.0
- >=app-i18n/prime-1.0.0
- dev-libs/atk
- dev-libs/glib
- media-libs/fontconfig
- media-libs/freetype
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:2
- x11-libs/pango"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-pkg_postinst() {
- elog
- elog "To use SCIM, you should use the following in your user startup scripts"
- elog "such as .gnomerc or .xinitrc:"
- elog
- elog "LANG='your_language' scim -d"
- elog "export XMODIFIERS=@im=SCIM"
- elog "export GTK_IM_MODULE=scim"
- elog "export QT_IM_MODULE=scim"
- elog
-}
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index d42ef6942ec4..9daa803e6a25 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1 +1,2 @@
DIST mc-4.8.11.tar.xz 2211144 SHA256 1877ea844f9d71e133b9e03ca3bebcd7b10b9ba5b419b8d268e255816fe1993a SHA512 5afb9e0704b8c0e98cd4787f03baf40131a0ab40027103e42f44b2ebd5b6c33b8702d7f534ca8175f3b8efbb25a04f08f0f51a1eb3a1783a99e6117472344fbc WHIRLPOOL bbe6dbad549f45b9d4aab0985ce9a2c35e42017d2f2020972d27d8d43c66473c49fea8754fd6635195b72e6a531625a28327c0f2aa65f5e79cea0db0d54ea7e6
+DIST mc-4.8.12.tar.xz 2237892 SHA256 5f2fd570a798dc0cc06374adffef8ca403588c4e73dfdf908e9a4311718153fe SHA512 f482177fd2a457b75d96b953922f473ad669ae4d83910c0c3d5445dd459fff38c9abdc0b39e531b58692e00beb6cae2ca4858d79f55204105a62889784b1fbd3 WHIRLPOOL 79fa8fef9f1a076588093360a1f1b5f31ad6e88c2de285408c118492f9d1e9d37ab8d36d3d96b3dae29e3d547a5ecca601cf5ef0a49e7d3e6f5c81a8172536ba
diff --git a/app-misc/mc/mc-4.8.12.ebuild b/app-misc/mc/mc-4.8.12.ebuild
new file mode 100644
index 000000000000..1712f84a1f9e
--- /dev/null
+++ b/app-misc/mc/mc-4.8.12.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.12.ebuild,v 1.1 2014/04/01 18:43:05 slyfox Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="http://www.midnight-commander.org"
+SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
+
+REQUIRED_USE="spell? ( edit )"
+
+RDEPEND=">=dev-libs/glib-2.8:2
+ gpm? ( sys-libs/gpm )
+ kernel_linux? ( sys-fs/e2fsprogs )
+ samba? ( net-fs/samba )
+ sftp? ( net-libs/libssh2 )
+ slang? ( >=sys-libs/slang-2 )
+ !slang? ( sys-libs/ncurses )
+ spell? ( app-text/aspell )
+ X? ( x11-libs/libX11
+ x11-libs/libICE
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ x11-libs/libSM )"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ test? ( dev-libs/check )
+ "
+
+[[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for SCM source tree (autopoint uses cvs)
+
+src_prepare() {
+ [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
+}
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+ local myscreen=ncurses
+ use slang && myscreen=slang
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+ local homedir=".mc"
+ use xdg && homedir="XDG"
+
+ econf \
+ --disable-silent-rules \
+ --disable-dependency-tracking \
+ $(use_enable nls) \
+ --enable-vfs \
+ $(use_enable kernel_linux vfs-undelfs) \
+ --enable-charset \
+ $(use_with X x) \
+ $(use_enable samba vfs-smb) \
+ $(use_enable sftp vfs-sftp) \
+ $(use_enable spell aspell) \
+ $(use_with gpm gpm-mouse) \
+ --with-screen=${myscreen} \
+ $(use_with edit internal-edit) \
+ $(use_enable mclib) \
+ $(use_enable test tests) \
+ --with-homedir=${homedir}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS README NEWS
+
+ # fix bug #334383
+ if use kernel_linux && [[ ${EUID} == 0 ]] ; then
+ fowners root:tty /usr/libexec/mc/cons.saver
+ fperms g+s /usr/libexec/mc/cons.saver
+ fi
+
+ if ! use xdg ; then
+ sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
+ -i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
+ fi
+}
+
+pkg_postinst() {
+ elog "To enable exiting to latest working directory,"
+ elog "put this into your ~/.bashrc:"
+ elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 2f45164a599d..2f80c2c9fac1 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -4,3 +4,4 @@ DIST sphinx-2.0.10-release.tar.gz 2016687 SHA256 efc9e90d1edec4f159846c8d4ca8839
DIST sphinx-2.0.9-release.tar.gz 1996939 SHA256 c4fb5d7951bc0831e46f102d17b5f32bbde11434ce3b00b20531dfe9e646869d SHA512 92fc7e3808f4b2fcdc47b510951cd6111e235e8cefa9f4046cd1943fe7161421495a858125c2f1416e893698d78dc83aeb57ea590dca6e4f9e95b6baaaa5f06d WHIRLPOOL 360c884205b8d78024bd8713c33bb4ad6773a5c15253121cfd093149b544162f5fbf02a0698476035d831f915317841acd871622a69692a9c1f212f4d7b492a9
DIST sphinx-2.1.5-release.tar.gz 2414784 SHA256 a69ed011c0ae993582d5c4cb902469fb4797c26e3143abbad63827f054a19f72 SHA512 eea56c60b84c78cece16b61fd48f7e950ab057b978353fc4ff3df835c9ccc8cbab1764ecd0f2567ea34a4bd9e7762107830e1fcb169cfeb042a7323835fe538a WHIRLPOOL f8b35f411c121233baf99272ba03c9c94a785f930421ac7455c3960b0ed3d833f9642b2d80cb96cfe4ce7779a3072b9dff353ef48253da5cbf14c9be4187ea36
DIST sphinx-2.1.6-release.tar.gz 2429835 SHA256 f59e5e07ce91ed6010b98b1d841def14648a6cc6983a1ddb68b5f8059b380c35 SHA512 d2ecdff0dc4f384e64c00f2f5f11a3e6953e794e4c923ead52bdc2ea2c33d58bbee937b0472127637f297326ea4904a264ac5068c1d6b3f108d14d26d4fcb53c WHIRLPOOL 75167ece6f64d76c7acb9364e241e730c9acb980a05091efd1f70fee24eaf30928969e392e7cb1f7b55490fd40aaca83411a5252f05a9837806dcdf0a1041e0c
+DIST sphinx-2.1.7-release.tar.gz 2439971 SHA256 3662f29ba74ec048d2031b4034af4c879b66fd10f082aa6d3dd85b0a49d95fa2 SHA512 6ce1f9ab78572ef6d9209ead27e949558018f954ac363c078061949b71bdc3a1d380046d9534e67653719966a8146c647fc2ecf823babf8a22f22a1e25671634 WHIRLPOOL 45d28f2c42b365f7fda6ae2e4f4c6654edcc059dfdb336181e5ae93ccc2fa484029168cb63dd3d3f0a1ddbc5a954f754f0e0511d391920daab85e00833bbf229
diff --git a/app-misc/sphinx/sphinx-2.1.7.ebuild b/app-misc/sphinx/sphinx-2.1.7.ebuild
new file mode 100644
index 000000000000..f5e063004da7
--- /dev/null
+++ b/app-misc/sphinx/sphinx-2.1.7.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-2.1.7.ebuild,v 1.1 2014/04/02 05:53:11 graaff Exp $
+
+EAPI=5
+inherit eutils autotools toolchain-funcs
+
+#MY_P=${P/_/-}
+MY_P=${P}-release
+
+DESCRIPTION="Full-text search engine with support for MySQL and PostgreSQL"
+HOMEPAGE="http://www.sphinxsearch.com/"
+SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="debug id64 mysql odbc postgres stemmer syslog test xml"
+
+RDEPEND="mysql? ( virtual/mysql )
+ postgres? ( dev-db/postgresql-base )
+ odbc? ( dev-db/unixODBC )
+ stemmer? ( dev-libs/snowball-stemmer )
+ xml? ( dev-libs/expat )
+ virtual/libiconv"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
+
+ # drop nasty hardcoded search path breaking Prefix
+ # We patch configure directly since otherwise we need to run
+ # eautoreconf twice and that causes problems, bug 425380
+ sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure || die
+
+ # Fix QA compilation warnings.
+ sed -i -e '19i#include ' api/libsphinxclient/test.c || die
+
+ pushd api/libsphinxclient || die
+ eautoreconf
+ popd || die
+}
+
+src_configure() {
+ # fix libiconv detection
+ use !elibc_glibc && export ac_cv_search_iconv=-liconv
+
+ econf \
+ --sysconfdir="${EPREFIX}/etc/${PN}" \
+ $(use_enable id64) \
+ $(use_with debug) \
+ $(use_with mysql) \
+ $(use_with odbc unixodbc) \
+ $(use_with postgres pgsql) \
+ $(use_with stemmer libstemmer) \
+ $(use_with syslog syslog) \
+ $(use_with xml libexpat )
+
+ cd api/libsphinxclient || die
+ econf STRIP=:
+}
+
+src_compile() {
+ emake AR="$(tc-getAR)" || die "emake failed"
+
+ emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed"
+}
+
+src_test() {
+ elog "Tests require access to a live MySQL database and may require configuration."
+ elog "You will find them in /usr/share/${PN}/test and they require dev-lang/php"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "install failed"
+ emake DESTDIR="${D}" -C api/libsphinxclient install || die "install libsphinxclient failed"
+
+ dodoc doc/*
+
+ dodir /var/lib/sphinx
+ dodir /var/log/sphinx
+
+ newinitd "${FILESDIR}"/searchd.rc searchd
+
+ if use test; then
+ insinto /usr/share/${PN}
+ doins -r test
+ fi
+}
diff --git a/app-portage/esearch/esearch-1.3-r1.ebuild b/app-portage/esearch/esearch-1.3-r1.ebuild
index c8bf0e8f259a..3bf5fd37dcb3 100644
--- a/app-portage/esearch/esearch-1.3-r1.ebuild
+++ b/app-portage/esearch/esearch-1.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-1.3-r1.ebuild,v 1.3 2014/03/29 20:54:41 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-1.3-r1.ebuild,v 1.4 2014/04/01 18:57:31 maekke Exp $
EAPI="5"
PYTHON_COMPAT=(python{2_6,2_7,3_2,3_3})
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="linguas_fr linguas_it"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
DEPEND="sys-apps/portage"
RDEPEND="${DEPEND}"
diff --git a/app-shells/bash/bash-4.2_p46.ebuild b/app-shells/bash/bash-4.2_p46-r1.ebuild
similarity index 87%
rename from app-shells/bash/bash-4.2_p46.ebuild
rename to app-shells/bash/bash-4.2_p46-r1.ebuild
index 4c2967f2abcb..997a4e524261 100644
--- a/app-shells/bash/bash-4.2_p46.ebuild
+++ b/app-shells/bash/bash-4.2_p46-r1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p46.ebuild,v 1.1 2014/04/01 06:47:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p46-r1.ebuild,v 1.2 2014/04/02 11:38:52 tomwij Exp $
-EAPI="1"
+EAPI="4"
inherit eutils flag-o-matic toolchain-funcs multilib
@@ -41,8 +41,8 @@ DEPEND=">=sys-libs/ncurses-5.2-r2
readline? ( >=sys-libs/readline-6.2 )
nls? ( virtual/libintl )"
RDEPEND="${DEPEND}
- !=virtual/jre-1.5
+ ${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.5
+ dev-java/jnlp-api:0
+ app-arch/unzip:0
+ ${COMMON_DEP}
+ test?
+ (
+ dev-java/junit:0
+ dev-java/ant-junit:0
+ )"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="test"
+
+EANT_GENTOO_CLASSPATH="swing-worker"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
+
+java_prepare() {
+ rm -v lib/*.jar || die
+
+ java-ant_rewrite-classpath
+ java-ant_rewrite-classpath nbproject/build-impl.xml
+}
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only jnlp-api)"
+ java-pkg-2_src_compile
+}
+
+src_install() {
+ java-pkg_newjar "${S}/dist/AppFramework.jar" "${PN}.jar"
+
+ use doc && java-pkg_dojavadoc dist/javadoc
+ use source && java-pkg_dosrc src/org
+ use examples && java-pkg_doexamples src/examples/*
+}
+
+src_test() {
+ local cp=$(java-pkg_getjars --build-only junit):$(java-pkg_getjars swing-worker)
+ ANT_TASKS="ant-junit" eant \
+ -Duser.home="${T}" \
+ -Drun.test.classpath="${cp}:dist/${MY_PN}.jar:build/test/classes" \
+ -Dgentoo.classpath="${cp}" test
+}
diff --git a/dev-java/rome/rome-0.9.ebuild b/dev-java/rome/rome-0.9.ebuild
index 8e2e5bfc2659..1824c3ba98b9 100644
--- a/dev-java/rome/rome-0.9.ebuild
+++ b/dev-java/rome/rome-0.9.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rome/rome-0.9.ebuild,v 1.6 2007/08/03 16:56:53 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rome/rome-0.9.ebuild,v 1.7 2014/04/01 15:54:09 tomwij Exp $
JAVA_PKG_IUSE="doc source test"
inherit java-pkg-2 java-ant-2
-DESCRIPTION="An open source set of Atom/RSS Java utilities that make it easy to work in Java with most syndication formats"
-HOMEPAGE="https://rome.dev.java.net/"
+DESCRIPTION="Open source Atom/RSS Java utilities that make it easy to work in Java with most syndication formats"
+HOMEPAGE="https://java.net/projects/rome"
SRC_URI="https://rome.dev.java.net/source/browse/*checkout*/rome/www/dist/${P}-src.zip"
LICENSE="Apache-2.0"
diff --git a/dev-java/sax/sax-2.2.1-r2.ebuild b/dev-java/sax/sax-2.2.1-r2.ebuild
index a8f9cbee79a5..fd0674bfc475 100644
--- a/dev-java/sax/sax-2.2.1-r2.ebuild
+++ b/dev-java/sax/sax-2.2.1-r2.ebuild
@@ -1,21 +1,24 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sax/sax-2.2.1-r2.ebuild,v 1.7 2010/01/03 21:32:36 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sax/sax-2.2.1-r2.ebuild,v 1.8 2014/04/01 15:56:25 tomwij Exp $
JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-ant-2
-DESCRIPTION="SAX is the Simple API for XML, originally a Java-only API. SAX was the first widely adopted API for XML in Java."
+DESCRIPTION="Simple API for XML, originally a Java-only API. It was the first widely adopted API for XML in Java."
HOMEPAGE="http://sax.sourceforge.net/"
SRC_URI="mirror://sourceforge/sax/sax2r3.zip"
LICENSE="public-domain"
+
SLOT="0"
KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
+
DEPEND=">=virtual/jdk-1.4
app-arch/unzip"
+
RDEPEND=">=virtual/jre-1.4"
S="${WORKDIR}/sax2r3"
@@ -31,5 +34,5 @@ src_install() {
dodoc ChangeLog CHANGES README || die
use doc && java-pkg_dojavadoc docs/javadoc
- use source && java-pkg_dosrc ${S}/src/*
+ use source && java-pkg_dosrc "${S}"/src/*
}
diff --git a/dev-java/tapestry/tapestry-3.0.4-r1.ebuild b/dev-java/tapestry/tapestry-3.0.4-r1.ebuild
index 7fb363319998..8c55908694dc 100644
--- a/dev-java/tapestry/tapestry-3.0.4-r1.ebuild
+++ b/dev-java/tapestry/tapestry-3.0.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tapestry/tapestry-3.0.4-r1.ebuild,v 1.1 2014/03/08 17:55:22 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tapestry/tapestry-3.0.4-r1.ebuild,v 1.2 2014/04/01 15:57:40 tomwij Exp $
EAPI="5"
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-ant-2
-DESCRIPTION="Tapestry is an open-source framework for creating dynamic, robust, highly scalable web applications in Java."
+DESCRIPTION="An open-source framework for creating dynamic, robust, highly scalable web applications in Java."
HOMEPAGE="http://tapestry.apache.org/"
SRC_URI="mirror://apache/${PN}/Tapestry-${PV}-src.zip"
diff --git a/dev-java/xsom/xsom-20060901.ebuild b/dev-java/xsom/xsom-20060901.ebuild
index 078d277e5eb5..3feb07f1ce76 100644
--- a/dev-java/xsom/xsom-20060901.ebuild
+++ b/dev-java/xsom/xsom-20060901.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xsom/xsom-20060901.ebuild,v 1.7 2008/03/28 18:05:03 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xsom/xsom-20060901.ebuild,v 1.8 2014/04/01 16:00:59 tomwij Exp $
JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-ant-2
-DESCRIPTION="XML Schema Object Model (XSOM) is a Java library that allows applications to easily parse XML Schema documents and inspect information in them."
+DESCRIPTION="XML Schema Object Model (XSOM) allows Java apps to easy parse and inspect XML Schema docs."
HOMEPAGE="https://xsom.dev.java.net/"
# Upstream does not have versioned source bundles :|
SRC_URI="mirror://gentoo/xsom-src-${PV}.tar.bz2"
diff --git a/dev-lang/moarvm/moarvm-2013.10.1.ebuild b/dev-lang/moarvm/moarvm-2013.10.1.ebuild
index 379e2ff028eb..ae5db1a0f673 100644
--- a/dev-lang/moarvm/moarvm-2013.10.1.ebuild
+++ b/dev-lang/moarvm/moarvm-2013.10.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/moarvm/moarvm-2013.10.1.ebuild,v 1.3 2014/01/09 07:55:34 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/moarvm/moarvm-2013.10.1.ebuild,v 1.4 2014/04/02 04:50:32 patrick Exp $
EAPI=5
@@ -18,7 +18,8 @@ KEYWORDS="~amd64 ~x86"
IUSE="doc"
RDEPEND=""
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ dev-lang/perl"
S="${WORKDIR}"
diff --git a/dev-lang/moarvm/moarvm-2013.10.ebuild b/dev-lang/moarvm/moarvm-2013.10.ebuild
index e22f4228fea0..7fd9a129e2a4 100644
--- a/dev-lang/moarvm/moarvm-2013.10.ebuild
+++ b/dev-lang/moarvm/moarvm-2013.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/moarvm/moarvm-2013.10.ebuild,v 1.3 2014/01/15 03:09:47 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/moarvm/moarvm-2013.10.ebuild,v 1.4 2014/04/02 04:50:32 patrick Exp $
EAPI=5
@@ -18,7 +18,8 @@ KEYWORDS="~amd64 ~x86"
IUSE="doc"
RDEPEND=""
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ dev-lang/perl"
S="${WORKDIR}"
diff --git a/dev-lang/moarvm/moarvm-2014.01.ebuild b/dev-lang/moarvm/moarvm-2014.01.ebuild
index b35607725d1f..6b217f79dcd3 100644
--- a/dev-lang/moarvm/moarvm-2014.01.ebuild
+++ b/dev-lang/moarvm/moarvm-2014.01.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/moarvm/moarvm-2014.01.ebuild,v 1.1 2014/02/18 08:36:53 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/moarvm/moarvm-2014.01.ebuild,v 1.2 2014/04/02 04:50:32 patrick Exp $
EAPI=5
@@ -17,7 +17,8 @@ KEYWORDS="~amd64 ~x86"
IUSE="doc"
RDEPEND="dev-libs/libuv"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ dev-lang/perl"
S="${WORKDIR}/MoarVM-${PV}"
diff --git a/dev-lang/moarvm/moarvm-2014.02-r1.ebuild b/dev-lang/moarvm/moarvm-2014.02-r1.ebuild
index 2274d64cf81a..372c4b2f60d7 100644
--- a/dev-lang/moarvm/moarvm-2014.02-r1.ebuild
+++ b/dev-lang/moarvm/moarvm-2014.02-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/moarvm/moarvm-2014.02-r1.ebuild,v 1.1 2014/03/17 04:06:02 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/moarvm/moarvm-2014.02-r1.ebuild,v 1.2 2014/04/02 04:50:32 patrick Exp $
EAPI=5
@@ -17,7 +17,8 @@ KEYWORDS="~amd64 ~x86"
IUSE="doc"
RDEPEND="dev-libs/libuv"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ dev-lang/perl"
S="${WORKDIR}/MoarVM-${PV}"
diff --git a/dev-lang/moarvm/moarvm-2014.02.ebuild b/dev-lang/moarvm/moarvm-2014.02.ebuild
index 7ec1284928f4..76d86b71f429 100644
--- a/dev-lang/moarvm/moarvm-2014.02.ebuild
+++ b/dev-lang/moarvm/moarvm-2014.02.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/moarvm/moarvm-2014.02.ebuild,v 1.1 2014/02/26 08:26:46 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/moarvm/moarvm-2014.02.ebuild,v 1.2 2014/04/02 04:50:32 patrick Exp $
EAPI=5
@@ -17,7 +17,8 @@ KEYWORDS="~amd64 ~x86"
IUSE="doc"
RDEPEND="dev-libs/libuv"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ dev-lang/perl"
S="${WORKDIR}/MoarVM-${PV}"
diff --git a/dev-lang/moarvm/moarvm-2014.03.ebuild b/dev-lang/moarvm/moarvm-2014.03.ebuild
index ec4f9108ec06..4c1107c1a5b1 100644
--- a/dev-lang/moarvm/moarvm-2014.03.ebuild
+++ b/dev-lang/moarvm/moarvm-2014.03.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/moarvm/moarvm-2014.03.ebuild,v 1.1 2014/03/31 05:18:30 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/moarvm/moarvm-2014.03.ebuild,v 1.2 2014/04/02 04:50:32 patrick Exp $
EAPI=5
@@ -17,7 +17,8 @@ KEYWORDS="~amd64 ~x86"
IUSE="doc"
RDEPEND="dev-libs/libuv"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ dev-lang/perl"
S="${WORKDIR}/MoarVM-${PV}"
diff --git a/dev-lang/moarvm/moarvm-9999.ebuild b/dev-lang/moarvm/moarvm-9999.ebuild
index c538d10fa5aa..ae8642575f69 100644
--- a/dev-lang/moarvm/moarvm-9999.ebuild
+++ b/dev-lang/moarvm/moarvm-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/moarvm/moarvm-9999.ebuild,v 1.3 2014/01/15 03:09:47 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/moarvm/moarvm-9999.ebuild,v 1.4 2014/04/02 04:50:32 patrick Exp $
EAPI=5
@@ -18,7 +18,8 @@ KEYWORDS=""
IUSE="doc"
RDEPEND=""
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ dev-lang/perl"
src_prepare() {
epatch "${FILESDIR}/Configure-9999.patch" || die
diff --git a/dev-lang/python/python-2.7.6.ebuild b/dev-lang/python/python-2.7.6.ebuild
index 51f192bc3e57..655bd725728f 100644
--- a/dev-lang/python/python-2.7.6.ebuild
+++ b/dev-lang/python/python-2.7.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.6.ebuild,v 1.8 2014/03/20 14:13:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.6.ebuild,v 1.9 2014/04/01 19:08:28 maekke Exp $
EAPI="4"
WANT_AUTOMAKE="none"
@@ -19,7 +19,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
LICENSE="PSF-2"
SLOT="2.7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
# Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-libs/apr-util/apr-util-1.5.3-r1.ebuild b/dev-libs/apr-util/apr-util-1.5.3-r1.ebuild
index a82b5c12c0ab..58068e4edd1e 100644
--- a/dev-libs/apr-util/apr-util-1.5.3-r1.ebuild
+++ b/dev-libs/apr-util/apr-util-1.5.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.5.3-r1.ebuild,v 1.4 2014/03/30 19:58:09 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.5.3-r1.ebuild,v 1.5 2014/04/01 16:28:57 polynomial-c Exp $
EAPI="4"
@@ -33,6 +33,7 @@ RDEPEND="dev-libs/expat
postgres? ( dev-db/postgresql-base )
sqlite? ( dev-db/sqlite:3 )"
DEPEND="${RDEPEND}
+ >=sys-devel/libtool-2.4.2
doc? ( app-doc/doxygen )"
DOCS=(CHANGES NOTICE README)
diff --git a/dev-libs/apr/apr-1.5.0-r2.ebuild b/dev-libs/apr/apr-1.5.0-r2.ebuild
index 19611bd43b6b..51145308d97c 100644
--- a/dev-libs/apr/apr-1.5.0-r2.ebuild
+++ b/dev-libs/apr/apr-1.5.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.5.0-r2.ebuild,v 1.5 2014/03/30 19:56:20 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.5.0-r2.ebuild,v 1.6 2014/04/01 16:24:28 polynomial-c Exp $
EAPI="4"
@@ -18,6 +18,7 @@ IUSE="doc elibc_FreeBSD older-kernels-compatibility static-libs +urandom"
RDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
DEPEND="${RDEPEND}
+ >=sys-devel/libtool-2.4.2
doc? ( app-doc/doxygen )"
DOCS=(CHANGES NOTICE README)
diff --git a/dev-libs/gmp/gmp-5.1.3-r1.ebuild b/dev-libs/gmp/gmp-5.1.3-r1.ebuild
index a2ef496b3807..286cd87a627e 100644
--- a/dev-libs/gmp/gmp-5.1.3-r1.ebuild
+++ b/dev-libs/gmp/gmp-5.1.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.1.3-r1.ebuild,v 1.10 2014/03/28 03:48:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.1.3-r1.ebuild,v 1.11 2014/04/01 19:03:47 maekke Exp $
EAPI="4"
@@ -17,7 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="doc cxx pgo static-libs"
DEPEND="sys-devel/m4
diff --git a/dev-libs/libyaml/libyaml-0.1.6.ebuild b/dev-libs/libyaml/libyaml-0.1.6.ebuild
index 6bd3e2777748..92fef8f625da 100644
--- a/dev-libs/libyaml/libyaml-0.1.6.ebuild
+++ b/dev-libs/libyaml/libyaml-0.1.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libyaml/libyaml-0.1.6.ebuild,v 1.4 2014/03/28 18:33:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libyaml/libyaml-0.1.6.ebuild,v 1.5 2014/04/01 19:02:22 maekke Exp $
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples test static-libs"
S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/suikyo/Manifest b/dev-libs/suikyo/Manifest
deleted file mode 100644
index 27d184d4e360..000000000000
--- a/dev-libs/suikyo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST suikyo-2.1.0.tar.gz 202155 SHA256 34e4d5438372ed670c516cb92b7e0ee9d059999c420b90e0a90f924d8fde5ec3 SHA512 f27d0213d5f0ac5249820e2119f0df389be955988149dc6d1f53d9d4af63209e85d265a702927a66fef217c019eae5f3077d662394fc74922497f5bd9d18b799 WHIRLPOOL 18ff440cade3cf32a9eaa4c78db28c7839165cf494180513388a25343af0a2b74c64c60396b92286e1ae94159a614e323242c96e457ff9b7e78bfac51cf90d75
diff --git a/dev-libs/suikyo/files/50suikyo-gentoo.el b/dev-libs/suikyo/files/50suikyo-gentoo.el
deleted file mode 100644
index 90c796f4b8cd..000000000000
--- a/dev-libs/suikyo/files/50suikyo-gentoo.el
+++ /dev/null
@@ -1,5 +0,0 @@
-
-;;; suikyo site-lisp configuration
-
-(require 'init-suikyo)
-
diff --git a/dev-libs/suikyo/files/suikyo-2.1.0-pkgconfig.patch b/dev-libs/suikyo/files/suikyo-2.1.0-pkgconfig.patch
deleted file mode 100644
index 9064e2853db8..000000000000
--- a/dev-libs/suikyo/files/suikyo-2.1.0-pkgconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur suikyo-2.1.0.orig/suikyo.pc.in suikyo-2.1.0/suikyo.pc.in
---- suikyo-2.1.0.orig/suikyo.pc.in 2004-01-31 17:00:55.000000000 +0900
-+++ suikyo-2.1.0/suikyo.pc.in 2007-12-02 00:58:08.000000000 +0900
-@@ -1,5 +1,7 @@
- prefix=@prefix@
-
-+exec_prefix=@exec_prefix@
-+
- bindir=@bindir@
- sbindir=@sbindir@
- libexecdir=@libexecdir@
diff --git a/dev-libs/suikyo/metadata.xml b/dev-libs/suikyo/metadata.xml
deleted file mode 100644
index 9d2444037c24..000000000000
--- a/dev-libs/suikyo/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
- cjk
- ruby
-
diff --git a/dev-libs/suikyo/suikyo-2.1.0-r3.ebuild b/dev-libs/suikyo/suikyo-2.1.0-r3.ebuild
deleted file mode 100644
index b0e3eb6471db..000000000000
--- a/dev-libs/suikyo/suikyo-2.1.0-r3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/suikyo/suikyo-2.1.0-r3.ebuild,v 1.8 2013/09/06 14:58:14 ago Exp $
-
-EAPI="2"
-USE_RUBY="ruby18"
-inherit elisp-common eutils multilib ruby-ng
-
-DESCRIPTION="Romaji Hiragana conversion library"
-HOMEPAGE="http://taiyaki.org/suikyo/"
-SRC_URI="http://prime.sourceforge.jp/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="emacs"
-
-DEPEND="$(ruby_implementation_depend ruby18)
- emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-
-SITEFILE=50${PN}-gentoo.el
-
-src_unpack() {
- # prevent ruby-ng.eclass from messing with src_unpack
- default
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-pkgconfig.patch"
-}
-
-src_configure() {
- econf \
- --with-suikyo-docdir="/usr/share/doc/${PF}/html" \
- --with-rubydir="/usr/$(get_libdir)/ruby/site_ruby/1.8" || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- dodoc AUTHORS ChangeLog NEWS README || die
-
- if use emacs ; then
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
- else
- rm -rf "${D}"/usr/share/emacs/ || die
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-libs/suikyo/suikyo-2.1.0-r4.ebuild b/dev-libs/suikyo/suikyo-2.1.0-r4.ebuild
deleted file mode 100644
index b426476d5690..000000000000
--- a/dev-libs/suikyo/suikyo-2.1.0-r4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/suikyo/suikyo-2.1.0-r4.ebuild,v 1.1 2012/02/05 02:38:28 matsuu Exp $
-
-EAPI="2"
-# ruby19: failed
-USE_RUBY="ruby18 ree18 jruby rbx"
-inherit elisp-common ruby-ng
-
-DESCRIPTION="Romaji Hiragana conversion library"
-HOMEPAGE="http://taiyaki.org/suikyo/"
-SRC_URI="http://prime.sourceforge.jp/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="emacs"
-
-DEPEND="emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-
-SITEFILE=50${PN}-gentoo.el
-
-RUBY_PATCHES=(
- "${P}-pkgconfig.patch"
-)
-
-each_ruby_configure() {
- econf \
- --with-suikyo-docdir="/usr/share/doc/${PF}/html" \
- --with-rubydir="$(ruby_rbconfig_value 'sitelibdir')" || die
-}
-
-each_ruby_compile() {
- emake || die
-}
-
-each_ruby_install() {
- emake DESTDIR="${D}" install || die
-}
-
-all_ruby_install() {
- dodoc AUTHORS ChangeLog NEWS README || die
-
- if use emacs ; then
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
- else
- rm -rf "${D}"/usr/share/emacs/ || die
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-perl/MooseX-Types/MooseX-Types-0.360.0.ebuild b/dev-perl/MooseX-Types/MooseX-Types-0.360.0.ebuild
index 07d9dfe22a15..05125289ea37 100644
--- a/dev-perl/MooseX-Types/MooseX-Types-0.360.0.ebuild
+++ b/dev-perl/MooseX-Types/MooseX-Types-0.360.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/MooseX-Types/MooseX-Types-0.360.0.ebuild,v 1.1 2013/08/25 10:28:48 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MooseX-Types/MooseX-Types-0.360.0.ebuild,v 1.2 2014/04/02 12:26:28 zlogene Exp $
EAPI=4
@@ -23,6 +23,7 @@ DEPEND="${RDEPEND}
test? (
dev-perl/Test-Fatal
dev-perl/Test-Requires
+ dev-perl/Test-CheckDeps
)"
SRC_TEST=do
diff --git a/dev-python/Kivy/Kivy-1.8.0.ebuild b/dev-python/Kivy/Kivy-1.8.0.ebuild
new file mode 100644
index 000000000000..bdf4f9b7dece
--- /dev/null
+++ b/dev-python/Kivy/Kivy-1.8.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/Kivy/Kivy-1.8.0.ebuild,v 1.2 2014/04/02 10:39:25 slis Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_1,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A software library for rapid development of hardware-accelerated multitouch applications."
+HOMEPAGE="http://kivy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cairo camera doc examples garden gstreamer spell"
+
+DEPEND="dev-python/cython
+ garden? ( dev-python/kivy-garden )
+ gstreamer? ( dev-python/gst-python )
+ cairo? ( dev-python/pycairo )
+ spell? ( dev-python/pyenchant )
+ dev-python/pygame
+ dev-python/setuptools
+ camera? ( media-libs/opencv )
+ virtual/python-imaging
+ "
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ sed -e '/data_files=/d' -i "${S}/setup.py"
+}
+
+src_install() {
+ distutils-r1_src_install
+ use doc && dodoc -r doc/sources/*
+ use examples && insinto "/usr/share/doc/${PF}/" && doins -r examples
+}
\ No newline at end of file
diff --git a/dev-python/Kivy/Manifest b/dev-python/Kivy/Manifest
new file mode 100644
index 000000000000..7db5ee25d04d
--- /dev/null
+++ b/dev-python/Kivy/Manifest
@@ -0,0 +1 @@
+DIST Kivy-1.8.0.tar.gz 14655888 SHA256 1bb5add88132c902ed746e7624034ecaab49e61f3fbbfde231604e887e6fb324 SHA512 e7057b008cceec9513961ddc3d4aaef2aa1a10de9c2de09ad82bd90ca88300047374e5f8c982cb018712fb0465c03208108c3110887ef383c00a45ee9e5bc81d WHIRLPOOL a6530edebcae34aede981c2f0db37a26a9378e148a073dc1396096b4db04ebdef0f6d96de4222383a5e2d84858bdf10383611751f9bf5ae625eafc67d1cf702f
diff --git a/dev-python/Kivy/metadata.xml b/dev-python/Kivy/metadata.xml
new file mode 100644
index 000000000000..e09b456b13c4
--- /dev/null
+++ b/dev-python/Kivy/metadata.xml
@@ -0,0 +1,15 @@
+
+
+
+
+ slis@gentoo.org
+
+
+
diff --git a/dev-python/PyQt4/metadata.xml b/dev-python/PyQt4/metadata.xml
index 8dfc9b4c9fdd..dd76926d8138 100644
--- a/dev-python/PyQt4/metadata.xml
+++ b/dev-python/PyQt4/metadata.xml
@@ -2,7 +2,6 @@
qt
- python