diff --git a/app-admin/fleet/Manifest b/app-admin/fleet/Manifest
new file mode 100644
index 000000000000..b409e46793aa
--- /dev/null
+++ b/app-admin/fleet/Manifest
@@ -0,0 +1,2 @@
+DIST fleet-0.5.3.tar.gz 359305 SHA256 10cc25190df66fa407d06570b9d42248b7bb59b98a1c37fa9b6a8816f26fb9b5 SHA512 c321eb29a4ef383103e45dd62d91516d98f025d5d63e363f119d27906b49f8bb2791e0c40fdbd2e130b40c3a9a3de0c9d08ec6c98768b1badb76818257d11248 WHIRLPOOL 90d738de2b2e78b7c07e010fa0ac593bd26192b7cacef3d8853a8ca6b3573ed765f87f3a7e50bb8296d2c825152689dfdfa5e0fd9afd634da4fab55dd95fafcd
+DIST fleet-0.5.4.tar.gz 362695 SHA256 a293afa0c0fe0819fe40feff2650503a59831816aaad03f39866e8ecf30c00be SHA512 a67210ccc62cc7805f280fd1c61bc98460cb336ba9e97897f6ec49fcd88522bedf0b26ad5bce362abd0292a9adaf8f374b8923d8fa4630d5c06d9a171d29bb0f WHIRLPOOL 246dde2734da93eed044f9a783dd61d00ee3d5dbcd8783067844b30abda8458e7f34e89c25fe7917f609c32942bfc8c74237a3dd50012f66323672790b8b7183
diff --git a/app-admin/fleet/files/fleet.service b/app-admin/fleet/files/fleet.service
new file mode 100644
index 000000000000..82d2bcc9790c
--- /dev/null
+++ b/app-admin/fleet/files/fleet.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=fleet
+Wants=etcd.service
+
+[Service]
+ExecStart=/usr/bin/fleet
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/fleet/fleet-0.5.3.ebuild b/app-admin/fleet/fleet-0.5.3.ebuild
new file mode 100644
index 000000000000..875edd4cf763
--- /dev/null
+++ b/app-admin/fleet/fleet-0.5.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fleet/fleet-0.5.3.ebuild,v 1.1 2014/07/19 19:43:53 alunduil Exp $
+
+EAPI=5
+
+inherit systemd vcs-snapshot
+
+DESCRIPTION="A Distributed init System"
+HOMEPAGE="https://github.com/coreos/fleet"
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.2"
+
+src_compile() {
+ ./build || die
+}
+
+src_install() {
+ dobin "${S}"/bin/fleet
+ dobin "${S}"/bin/fleetctl
+
+ systemd_dounit "${FILESDIR}"/${PN}.service
+}
diff --git a/app-admin/fleet/fleet-0.5.4.ebuild b/app-admin/fleet/fleet-0.5.4.ebuild
new file mode 100644
index 000000000000..58deac7851ee
--- /dev/null
+++ b/app-admin/fleet/fleet-0.5.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fleet/fleet-0.5.4.ebuild,v 1.1 2014/07/19 19:43:53 alunduil Exp $
+
+EAPI=5
+
+inherit systemd vcs-snapshot
+
+DESCRIPTION="A Distributed init System"
+HOMEPAGE="https://github.com/coreos/fleet"
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.2"
+
+src_compile() {
+ ./build || die
+}
+
+src_install() {
+ dobin "${S}"/bin/fleet
+ dobin "${S}"/bin/fleetctl
+
+ systemd_dounit "${FILESDIR}"/${PN}.service
+}
diff --git a/app-admin/fleet/fleet-9999.ebuild b/app-admin/fleet/fleet-9999.ebuild
new file mode 100644
index 000000000000..7f0da442139f
--- /dev/null
+++ b/app-admin/fleet/fleet-9999.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fleet/fleet-9999.ebuild,v 1.1 2014/07/19 19:43:53 alunduil Exp $
+
+EAPI=5
+
+inherit git-2 systemd
+
+EGIT_REPO_URI="git://github.com/coreos/fleet.git"
+
+DESCRIPTION="A Distributed init System"
+HOMEPAGE="https://github.com/coreos/fleet"
+SRC_URI=""
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.2"
+RDEPEND=""
+
+src_compile() {
+ ./build || die
+}
+
+src_install() {
+ dobin "${S}"/bin/fleet
+ dobin "${S}"/bin/fleetctl
+
+ systemd_dounit "${FILESDIR}"/${PN}.service
+}
diff --git a/app-admin/fleet/metadata.xml b/app-admin/fleet/metadata.xml
new file mode 100644
index 000000000000..02be8c5eb78f
--- /dev/null
+++ b/app-admin/fleet/metadata.xml
@@ -0,0 +1,10 @@
+
+
+
+
+ alunduil@gentoo.org
+ Alex Brandt
+
+
+
+
diff --git a/app-admin/pass/pass-1.6.3.ebuild b/app-admin/pass/pass-1.6.3.ebuild
index d59ace5d84f4..b37af419a5db 100644
--- a/app-admin/pass/pass-1.6.3.ebuild
+++ b/app-admin/pass/pass-1.6.3.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/pass/pass-1.6.3.ebuild,v 1.1 2014/07/01 08:52:02 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/pass/pass-1.6.3.ebuild,v 1.2 2014/07/19 07:39:30 grobian Exp $
EAPI=4
@@ -47,7 +47,7 @@ src_compile() {
src_install() {
use zsh-completion && export FORCE_ZSHCOMP=1
use fish-completion && export FORCE_FISHCOMP=1
- default
+ emake PREFIX="${EPREFIX}/usr" install
use dmenu && dobin contrib/dmenu/passmenu
newbashcomp src/completion/pass.bash-completion pass
if use emacs; then
diff --git a/app-admin/pass/pass-9999.ebuild b/app-admin/pass/pass-9999.ebuild
index 9e53c2580ed0..318c6192e575 100644
--- a/app-admin/pass/pass-9999.ebuild
+++ b/app-admin/pass/pass-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/app-admin/pass/pass-9999.ebuild,v 1.17 2014/06/29 09:35:10 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/pass/pass-9999.ebuild,v 1.18 2014/07/19 07:39:30 grobian Exp $
EAPI=4
@@ -47,7 +47,7 @@ src_compile() {
src_install() {
use zsh-completion && export FORCE_ZSHCOMP=1
use fish-completion && export FORCE_FISHCOMP=1
- default
+ emake PREFIX="${EPREFIX}/usr" install
use dmenu && dobin contrib/dmenu/passmenu
newbashcomp src/completion/pass.bash-completion pass
if use emacs; then
diff --git a/app-arch/engrampa/engrampa-1.8.0.ebuild b/app-arch/engrampa/engrampa-1.8.0.ebuild
index 58ca12d3ff21..be130991e1e4 100644
--- a/app-arch/engrampa/engrampa-1.8.0.ebuild
+++ b/app-arch/engrampa/engrampa-1.8.0.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-arch/engrampa/engrampa-1.8.0.ebuild,v 1.5 2014/07/07 23:42:48 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/engrampa/engrampa-1.8.0.ebuild,v 1.6 2014/07/18 14:40:15 tomwij Exp $
EAPI="5"
@@ -21,13 +21,16 @@ KEYWORDS="amd64 x86"
IUSE="caja"
+# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed
+#
+# ... thus we depend on Caja regardless of the Caja USE flag. Patches welcome.
RDEPEND=">=x11-libs/gtk+-2.21.4:2
>=dev-libs/glib-2.25.5:2
>=dev-libs/json-glib-0.14:0
x11-libs/gdk-pixbuf:2
x11-libs/pango:0
virtual/libintl:0
- caja? ( || ( >=mate-base/caja-1.8:0 >=mate-base/mate-file-manager-1.6:0 ) )
+ || ( >=mate-base/caja-1.8:0 >=mate-base/mate-file-manager-1.6:0 )
!!app-arch/mate-file-archiver"
DEPEND="${RDEPEND}
diff --git a/app-arch/engrampa/metadata.xml b/app-arch/engrampa/metadata.xml
index 91262c10f902..56018656ac37 100644
--- a/app-arch/engrampa/metadata.xml
+++ b/app-arch/engrampa/metadata.xml
@@ -7,7 +7,7 @@
diff --git a/app-backup/cyphertite/cyphertite-2.0.2-r2.ebuild b/app-backup/cyphertite/cyphertite-2.0.2-r3.ebuild
similarity index 96%
rename from app-backup/cyphertite/cyphertite-2.0.2-r2.ebuild
rename to app-backup/cyphertite/cyphertite-2.0.2-r3.ebuild
index 938988bb41b2..e9d5ca7a2a42 100644
--- a/app-backup/cyphertite/cyphertite-2.0.2-r2.ebuild
+++ b/app-backup/cyphertite/cyphertite-2.0.2-r3.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/cyphertite/cyphertite-2.0.2-r2.ebuild,v 1.1 2014/07/06 20:43:31 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/cyphertite/cyphertite-2.0.2-r3.ebuild,v 1.1 2014/07/19 13:09:15 grknight Exp $
EAPI=5
diff --git a/app-backup/cyphertite/files/cyphertite-2.0.2-fix-build.patch b/app-backup/cyphertite/files/cyphertite-2.0.2-fix-build.patch
index 1862acc79269..452a63038491 100644
--- a/app-backup/cyphertite/files/cyphertite-2.0.2-fix-build.patch
+++ b/app-backup/cyphertite/files/cyphertite-2.0.2-fix-build.patch
@@ -42,8 +42,9 @@ diff -aurNw cyphertite-2.0.2/cyphertite/cyphertite/GNUmakefile cyphertite-2.0.2.
# curl
-CURL.LDLIBS = $(shell PATH=$(BINDIR):$$PATH curl-config --static-libs | \
+- sed -e 's/-lssl//g' -e 's/-lcrypto//g' -e 's/-lz//g' -e 's/ \+/ /g')
+CURL.LDLIBS = $(shell PATH=$(BINDIR):$$PATH curl-config --libs | \
- sed -e 's/-lssl//g' -e 's/-lcrypto//g' -e 's/-lz//g' -e 's/ \+/ /g')
++ sed -e 's/-lssl //g' -e 's/-lcrypto //g' -e 's/-lz //g' -e 's/ \+/ /g')
# Compiler and linker flags.
CPPFLAGS += -DNEED_LIBCLENS
@@ -132,8 +133,9 @@ diff -aurwN cyphertite-2.0.2/cyphertite/examples/ct_archive/GNUmakefile cypherti
# curl
-CURL.LDLIBS = $(shell PATH=$(BINDIR):$$PATH curl-config --static-libs | \
+- sed -e 's/-lssl//g' -e 's/-lcrypto//g' -e 's/-lz//g' -e 's/ \+/ /g')
+CURL.LDLIBS = $(shell PATH=$(BINDIR):$$PATH curl-config --libs | \
- sed -e 's/-lssl//g' -e 's/-lcrypto//g' -e 's/-lz//g' -e 's/ \+/ /g')
++ sed -e 's/-lssl //g' -e 's/-lcrypto //g' -e 's/-lz //g' -e 's/ \+/ /g')
# Compiler and linker flags.
CPPFLAGS += -DNEED_LIBCLENS
@@ -154,8 +156,9 @@ diff -aurwN cyphertite-2.0.2/cyphertite/examples/ct_delete/GNUmakefile cyphertit
# curl
-CURL.LDLIBS = $(shell PATH=$(BINDIR):$$PATH curl-config --static-libs | \
+- sed -e 's/-lssl//g' -e 's/-lcrypto//g' -e 's/-lz//g' -e 's/ \+/ /g')
+CURL.LDLIBS = $(shell PATH=$(BINDIR):$$PATH curl-config --libs | \
- sed -e 's/-lssl//g' -e 's/-lcrypto//g' -e 's/-lz//g' -e 's/ \+/ /g')
++ sed -e 's/-lssl //g' -e 's/-lcrypto //g' -e 's/-lz //g' -e 's/ \+/ /g')
# Compiler and linker flags.
CPPFLAGS += -DNEED_LIBCLENS
@@ -176,8 +179,9 @@ diff -aurwN cyphertite-2.0.2/cyphertite/examples/ct_exists/GNUmakefile cyphertit
# curl
-CURL.LDLIBS = $(shell PATH=$(BINDIR):$$PATH curl-config --static-libs | \
+- sed -e 's/-lssl//g' -e 's/-lcrypto//g' -e 's/-lz//g' -e 's/ \+/ /g')
+CURL.LDLIBS = $(shell PATH=$(BINDIR):$$PATH curl-config --libs | \
- sed -e 's/-lssl//g' -e 's/-lcrypto//g' -e 's/-lz//g' -e 's/ \+/ /g')
++ sed -e 's/-lssl //g' -e 's/-lcrypto //g' -e 's/-lz //g' -e 's/ \+/ /g')
# Compiler and linker flags.
CPPFLAGS += -DNEED_LIBCLENS
@@ -198,8 +202,9 @@ diff -aurwN cyphertite-2.0.2/cyphertite/examples/ct_extract/GNUmakefile cypherti
# curl
-CURL.LDLIBS = $(shell PATH=$(BINDIR):$$PATH curl-config --static-libs | \
+- sed -e 's/-lssl//g' -e 's/-lcrypto//g' -e 's/-lz//g' -e 's/ \+/ /g')
+CURL.LDLIBS = $(shell PATH=$(BINDIR):$$PATH curl-config --libs | \
- sed -e 's/-lssl//g' -e 's/-lcrypto//g' -e 's/-lz//g' -e 's/ \+/ /g')
++ sed -e 's/-lssl //g' -e 's/-lcrypto //g' -e 's/-lz //g' -e 's/ \+/ /g')
# Compiler and linker flags.
CPPFLAGS += -DNEED_LIBCLENS
@@ -220,8 +225,9 @@ diff -aurwN cyphertite-2.0.2/cyphertite/examples/ct_list/GNUmakefile cyphertite-
# curl
-CURL.LDLIBS = $(shell PATH=$(BINDIR):$$PATH curl-config --static-libs | \
+- sed -e 's/-lssl//g' -e 's/-lcrypto//g' -e 's/-lz//g' -e 's/ \+/ /g')
+CURL.LDLIBS = $(shell PATH=$(BINDIR):$$PATH curl-config --libs | \
- sed -e 's/-lssl//g' -e 's/-lcrypto//g' -e 's/-lz//g' -e 's/ \+/ /g')
++ sed -e 's/-lssl //g' -e 's/-lcrypto //g' -e 's/-lz //g' -e 's/ \+/ /g')
# Compiler and linker flags.
CPPFLAGS += -DNEED_LIBCLENS
diff --git a/app-crypt/signing-party/Manifest b/app-crypt/signing-party/Manifest
index adf0cea8df4f..78e2d7f544bf 100644
--- a/app-crypt/signing-party/Manifest
+++ b/app-crypt/signing-party/Manifest
@@ -1,4 +1,4 @@
-DIST signing-party_1.1.3.orig.tar.gz 223459 SHA256 b3d774de41b97861f1acd33502be44e5f3dcec05d990a4095518dc65106237c4 SHA512 8ae680971ea97eff761b2aba55c4e95f043b6052ea27cc6009878a8a5bf53cca21a87d55364b5fa0e7436151124e73a9edc95635545889204083b0d8830643eb WHIRLPOOL c545c23c67e0d49bcaeaac9800aa418113d88264d2cbe72f865bf0c081b26efbd658123b3f8a18883dbddf76aaf39c1a59612a23ac9540a707d319f62ceee82d
DIST signing-party_1.1.4.orig.tar.gz 230259 SHA256 3d135437540ad1e5b3bb209ee90896a6b9153170eb0e4c93d018c1952fb80fa1 SHA512 935a192d8ce0057731b3422d217a90890dd97d9c84a3a46e3e4a2536f41e6752a44a86ba13db9b9a3e24a629dd6e78cb599a7999eeffea0a2b3b83b775dea36c WHIRLPOOL b5efdbd37d3277fd4fedc0938abcedada2c9a603bfdb1e93882e60abd698e4d4ef9535fde8d6c0c57818603e12507d911a150022fea5690b72eac66eecda803f
DIST signing-party_1.1.5.orig.tar.gz 230579 SHA256 af67052373996d8c34f9a4eb4822305c4d5f1dab6c807722f4b04fb5035c1363 SHA512 9af5cf2ac0bd19730c834af9185d5c9ed9b55a22ff8f5b9ed143e1246e01bebfe78754d690a17c2785fd7d7b02559fb45089ab5cdf5d766e9bd88d69abdbe6db WHIRLPOOL 46832d7236bdf0ac8de4337abf7b53f4f264add4e87887bd2bd20fcd1e08a893e898d35f42e18a7518b84a5184dab35ba9a22796dfeb2c11c85b7627d7b0086a
DIST signing-party_1.1.7.orig.tar.gz 220479 SHA256 5e183d840a5cd76269ca14772ee4039ef4b162bff00636f5054900e1f459bcc7 SHA512 e07fe5605fafcf86c9c6db4534dbb01398c6e14d2b689c99549726584d04fcd8bf06e4552b3fdcba296f899793d6c6b007c3fdf5c1b700b2b41ba86c57862b08 WHIRLPOOL 4c59aacc917b69f43ddacddde1ae2ed62ad92ec4b0b7264bb8e4f7043b29eadb5878b9501c1ff1cf46aeaf607ce2fdaf97e543d27e4a1725bd517e9abe34a9c6
+DIST signing-party_1.1.8.orig.tar.gz 228408 SHA256 dd6ff82067096a31d37d2f74c53bd326fe49e38a55e99f8719e9b1b773e56a8d SHA512 42bc300e83ff038329a51f105ad67291e9118c7b57966458767e5ff65ed092baae75fa01362b89111af07f51f653e07452fd1a7e1cf6dadd6499ce7c708ff01e WHIRLPOOL 0580f15794867813a2a49f18343ed2c33a8ea70198ed57d0574bf4cf9d8023e148a318ba9c01c1a67b05258faef19551557ed06903fdf72a61721a4ae3acf146
diff --git a/app-crypt/signing-party/signing-party-1.1.3-r4.ebuild b/app-crypt/signing-party/signing-party-1.1.3-r4.ebuild
deleted file mode 100644
index e626916560a0..000000000000
--- a/app-crypt/signing-party/signing-party-1.1.3-r4.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/signing-party/signing-party-1.1.3-r4.ebuild,v 1.6 2011/05/24 09:47:21 hwoarang Exp $
-
-EAPI="3"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A collection of several tools related to OpenPGP"
-HOMEPAGE="http://pgp-tools.alioth.debian.org/"
-SRC_URI="mirror://debian/pool/main/s/signing-party/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~ppc-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=app-crypt/gnupg-1.3.92
- dev-perl/GnuPG-Interface
- dev-perl/text-template
- dev-perl/MIME-tools
- net-mail/qprint
- >=dev-perl/MailTools-1.62
- virtual/mailx
- virtual/mta
- dev-lang/perl
- || (
- dev-perl/libintl-perl
- dev-perl/Text-Iconv
- app-text/recode
- )"
-
-src_prepare() {
- # app-crypt/keylookup
- rm -fr keylookup
- # media-gfx/springgraph
- rm -fr springgraph
-
- epatch "${FILESDIR}"/${PN}-makefile.diff
-
- sed -i -e \
- "s:/usr/share/doc/signing-party/caff/caffrc.sample:${EPREFIX}/usr/share/doc/${P}/caff/caffrc.sample.gz:g" \
- caff/caff || die "Sed failed"
- sed -i -e "s/make pgpring/\$(MAKE) pgpring/" keyanalyze/Makefile \
- || die "Sed failed"
- sed -i -e \
- "s|:/usr/share/signing-party|:${EPREFIX}/usr/share/signing-party|" \
- gpgsigs/gpgsigs || die "Sed failed"
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
- # Check Makefile when a new tool is introduced to this package.
- # caff
- dobin caff/caff caff/pgp-clean caff/pgp-fixkey || die
- docinto caff
- dodoc caff/{README*,THANKS,TODO,caffrc.sample} || die
- # gpgdir
- dobin gpgdir/gpgdir || die
- docinto gpgdir
- dodoc gpgdir/{VERSION,LICENSE,README,INSTALL,CREDITS,ChangeLog*} || die
- # gpg-key2ps
- dobin gpg-key2ps/gpg-key2ps || die
- docinto gpg-key2ps
- dodoc gpg-key2ps/README || die
- # gpglist
- dobin gpglist/gpglist || die
- # gpg-mailkeys
- dobin gpg-mailkeys/gpg-mailkeys || die
- docinto gpg-mailkeys
- dodoc gpg-mailkeys/{example.gpg-mailkeysrc,README} || die
- # gpgparticipants
- dobin gpgparticipants/gpgparticipants || die
- # gpgwrap
- dobin gpgwrap/bin/gpgwrap || die
- docinto gpgwrap
- dodoc gpgwrap/{LICENSE,NEWS,README} || die
- doman gpgwrap/doc/gpgwrap.1 || die
- # gpgsigs
- dobin gpgsigs/gpgsigs || die
- insinto /usr/share/signing-party
- doins gpgsigs/gpgsigs-eps-helper || die
- # keyanalyze
- # TODO: some of the scripts are intended for webpages, and not really
- # packaging, so they are NOT installed yet.
- newbin keyanalyze/pgpring/pgpring pgpring-keyanalyze || die
- dobin keyanalyze/{keyanalyze,process_keys} || die
- docinto keyanalyze
- dodoc keyanalyze/{README,Changelog} || die
- # See app-crypt/keylookup instead
- #dobin keylookup/keylookup
- #docinto keylookup
- #dodoc keylookup/NEWS
- # sig2dot
- dobin sig2dot/sig2dot || die
- dodoc sig2dot/README.sig2dot || die
- # See media-gfx/springgraph instead
- #dobin springgraph/springgraph
- #dodoc springgraph/README.springgraph
- # all other manpages, and the root doc
- doman */*.1 || die
- dodoc README || die
-}
diff --git a/app-crypt/signing-party/signing-party-1.1.8.ebuild b/app-crypt/signing-party/signing-party-1.1.8.ebuild
new file mode 100644
index 000000000000..1f8815493e7d
--- /dev/null
+++ b/app-crypt/signing-party/signing-party-1.1.8.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/signing-party/signing-party-1.1.8.ebuild,v 1.1 2014/07/18 18:45:17 alonbl Exp $
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A collection of several tools related to OpenPGP"
+HOMEPAGE="http://pgp-tools.alioth.debian.org/"
+SRC_URI="mirror://debian/pool/main/s/signing-party/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+ >=app-crypt/gnupg-1.3.92
+ dev-perl/GnuPG-Interface
+ dev-perl/text-template
+ dev-perl/MIME-tools
+ net-mail/qprint
+ >=dev-perl/MailTools-1.62
+ virtual/mailx
+ virtual/mta
+ || (
+ dev-perl/libintl-perl
+ dev-perl/Text-Iconv
+ app-text/recode
+ )"
+S=$WORKDIR
+
+src_prepare() {
+ # app-crypt/keylookup
+ rm -r keylookup || die
+ # media-gfx/springgraph
+ rm -r springgraph || die
+
+ sed -i "s:/usr/share/doc/signing-party/caff/caffrc.sample:${EPREFIX}/usr/share/doc/${P}/caff/caffrc.sample.gz:g" \
+ caff/caff || die
+ sed -i "s/make pgpring/\$(MAKE) pgpring/" keyanalyze/Makefile || die
+ sed -i "s|:/usr/share/signing-party|:${EPREFIX}/usr/share/signing-party|" \
+ gpgsigs/gpgsigs || die
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" STRIP=true
+}
+
+src_install() {
+ # Check Makefile when a new tool is introduced to this package.
+ # caff
+ dobin caff/caff caff/pgp-clean caff/pgp-fixkey
+ docinto caff
+ dodoc caff/{README*,THANKS,TODO,caffrc.sample}
+ # gpgdir
+ dobin gpgdir/gpgdir
+ docinto gpgdir
+ dodoc gpgdir/{VERSION,LICENSE,README,INSTALL,CREDITS,ChangeLog*}
+ # gpg-key2ps
+ dobin gpg-key2ps/gpg-key2ps
+ docinto gpg-key2ps
+ dodoc gpg-key2ps/README
+ # gpglist
+ dobin gpglist/gpglist
+ # gpg-mailkeys
+ dobin gpg-mailkeys/gpg-mailkeys
+ docinto gpg-mailkeys
+ dodoc gpg-mailkeys/{example.gpg-mailkeysrc,README}
+ # gpgparticipants
+ dobin gpgparticipants/gpgparticipants
+ # gpgwrap
+ dobin gpgwrap/bin/gpgwrap
+ docinto gpgwrap
+ dodoc gpgwrap/{LICENSE,NEWS,README}
+ doman gpgwrap/doc/gpgwrap.1
+ # gpgsigs
+ dobin gpgsigs/gpgsigs
+ insinto /usr/share/signing-party
+ # keyanalyze
+ # TODO: some of the scripts are intended for webpages, and not really
+ # packaging, so they are NOT installed yet.
+ newbin keyanalyze/pgpring/pgpring pgpring-keyanalyze
+ dobin keyanalyze/{keyanalyze,process_keys}
+ docinto keyanalyze
+ dodoc keyanalyze/{README,Changelog}
+ # See app-crypt/keylookup instead
+ #dobin keylookup/keylookup
+ #docinto keylookup
+ #dodoc keylookup/NEWS
+ # sig2dot
+ dobin sig2dot/sig2dot
+ dodoc sig2dot/README.sig2dot
+ # See media-gfx/springgraph instead
+ #dobin springgraph/springgraph
+ #dodoc springgraph/README.springgraph
+ # all other manpages, and the root doc
+ doman */*.1
+ dodoc README
+}
diff --git a/app-editors/mg/mg-20140414.ebuild b/app-editors/mg/mg-20140414.ebuild
index 90cfd217b65d..d7d013a3d1a8 100644
--- a/app-editors/mg/mg-20140414.ebuild
+++ b/app-editors/mg/mg-20140414.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-editors/mg/mg-20140414.ebuild,v 1.4 2014/06/13 17:08:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/mg-20140414.ebuild,v 1.5 2014/07/18 13:04:08 klausman Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://homepage.boetes.org/software/mg/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="amd64 arm hppa ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE="livecd"
RDEPEND="sys-libs/ncurses
diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest
index 910c0fc9427e..3e64538453f1 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -1,3 +1,4 @@
DIST ReText-4.0.1.tar.gz 92892 SHA256 547f4d4cd6ca826963799a55e124ee22bbd2c1dc33fd11dc0d891cb66af8b77e SHA512 7055df357573ea87227bb169d9016e6d94fa7a299461019b12e56f8f1f15738f239dd6a1fbd2b37a84ea66abac4f85af6ae5d0b41e85323fbe10bbe8a6db4a81 WHIRLPOOL bf47d53870c3d3d913d09c3094a6451aa3b11f51126dd26c21e4f0d814fa876dbaba38adeb36c5660ad849742beb024bc567d49825c8f244941b761ff7eef471
DIST ReText-4.1.0.tar.gz 125515 SHA256 7fb1207acbe8b6ef87eaeda2338a99214990b68d12c951d71ffaeb9527f08b29 SHA512 ab872dc2fcdd2fcf43ade28b04cf62887d3228f39ecca09778c3d9c29692faabcfe51a61a0e713f710b167aa82aa0e803e09b78492cf43c74aff6240804cab0d WHIRLPOOL 5152bfd47bb93493bb02d86b411bfe3ea64ccc3ed38bcf2f7adfe32907e002fb96b3c1b2b3f9fc2167becb912a4c9fc5e5d68fce5e15aaa8e74c74d1d2cc266a
DIST ReText-4.1.1.tar.gz 125987 SHA256 a0184f003518073c9e38b7fb8737b84f70d7420522c5ecf688ad8c7fe22d8c1d SHA512 db5a66e3da145fcadb6c12b1e91e005374c1758b9a3ec4484171546071dd2cae80ceeee9be4a035b87815634deff8a4e8db407855027b53538174b2a6004a4ec WHIRLPOOL e013e73f9ef75d99312e627263d84a798a5d3e99b4b730479751317a2af972afcea2dcc383a7fcb2d8f6868caf6a5ac99fc65a8fdc25ba15a5852e8d920ebc23
+DIST ReText-4.1.3.tar.gz 129283 SHA256 bb4409982d27ac62cab01b0748fe41d9c6660853668b350f3369e76d155edd6c SHA512 d2b3fa901afa9870f6cecc7ab3126b91f1420ca1b14ddd4f609c2ada7121388840b5be679914694664f3bbf876ee8522aa6b0c82a23f837844f788fa10a46323 WHIRLPOOL 3be71e5d7ec612ae4e4fec17ca544f6d0e7cb7421fcdeb517d3c13156ed07f5e5e7c3e352cf604bfb5f2287964fdc173a1bac0eeab41ee1cda8b265ad0f57686
diff --git a/app-editors/retext/retext-4.1.3.ebuild b/app-editors/retext/retext-4.1.3.ebuild
new file mode 100644
index 000000000000..3031c3beef24
--- /dev/null
+++ b/app-editors/retext/retext-4.1.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/retext-4.1.3.ebuild,v 1.1 2014/07/18 15:24:17 tomwij Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python3_3 )
+PLOCALES="ca cs cy da de es et eu fr it ja pl pt pt_BR ru sk uk zh_CN zh_TW"
+
+inherit distutils-r1 l10n
+
+MY_PN="ReText"
+MY_P="${MY_PN}-${PV/_/~}"
+
+if [[ ${PV} == *9999* ]] ; then
+ inherit git-2
+ EGIT_REPO_URI="git://git.code.sf.net/p/retext/git"
+ KEYWORDS=""
+else
+ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A Qt-based text editor for Markdown and reStructuredText"
+HOMEPAGE="http://sourceforge.net/p/retext/home/ReText/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+spell"
+
+RDEPEND+="
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/markdown[${PYTHON_USEDEP}]
+ dev-python/markups[${PYTHON_USEDEP}]
+ dev-python/PyQt4[webkit,${PYTHON_USEDEP}]
+ spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}"/${MY_P}
+
+src_install() {
+ distutils-r1_src_install
+
+ newicon {icons/,}${PN}.png
+ newicon {icons/,}${PN}.svg
+
+ l10n_for_each_disabled_locale_do remove_locale
+
+ make_desktop_entry ${PN} "${MY_PN} Editor" ${PN} "Development;Utility;TextEditor"
+}
+
+remove_locale() {
+ find "${D}" -name "retext_${1}.qm" -delete || die "Failed to remove locale ${1}."
+}
diff --git a/app-editors/retext/retext-9999.ebuild b/app-editors/retext/retext-9999.ebuild
index 680fcad50fc2..228ebe609b6e 100644
--- a/app-editors/retext/retext-9999.ebuild
+++ b/app-editors/retext/retext-9999.ebuild
@@ -1,10 +1,10 @@
-# 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/app-editors/retext/retext-9999.ebuild,v 1.3 2013/10/26 23:48:57 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/retext-9999.ebuild,v 1.4 2014/07/18 15:24:17 tomwij Exp $
EAPI="5"
-PYTHON_COMPAT=( python3_2 )
+PYTHON_COMPAT=( python3_3 )
PLOCALES="ca cs cy da de es et eu fr it ja pl pt pt_BR ru sk uk zh_CN zh_TW"
inherit distutils-r1 l10n
@@ -26,7 +26,6 @@ HOMEPAGE="http://sourceforge.net/p/retext/home/ReText/"
LICENSE="GPL-2"
SLOT="0"
-
IUSE="+spell"
RDEPEND+="
diff --git a/app-editors/xemacs/xemacs-21.4.22-r3.ebuild b/app-editors/xemacs/xemacs-21.4.22-r3.ebuild
index 0d707928314e..593099d1c513 100644
--- a/app-editors/xemacs/xemacs-21.4.22-r3.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.22-r3.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-editors/xemacs/xemacs-21.4.22-r3.ebuild,v 1.5 2014/03/23 12:13:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.22-r3.ebuild,v 1.6 2014/07/18 13:19:27 klausman Exp $
# Note: xemacs currently does not work with a hardened profile. If you
# want to use xemacs on a hardened profile then compile with the
@@ -18,7 +18,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 ~sparc x86"
IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
diff --git a/app-editors/zile/zile-2.4.11.ebuild b/app-editors/zile/zile-2.4.11.ebuild
index 5e3cf118b910..9ab87a26818b 100644
--- a/app-editors/zile/zile-2.4.11.ebuild
+++ b/app-editors/zile/zile-2.4.11.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-editors/zile/zile-2.4.11.ebuild,v 1.4 2014/06/14 10:57:41 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/zile/zile-2.4.11.ebuild,v 1.5 2014/07/19 19:19:37 klausman Exp $
EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/zile/${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ppc ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~ppc ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="acl test"
RDEPEND=">=dev-libs/boehm-gc-7.2
diff --git a/app-emacs/apel/apel-10.8-r1.ebuild b/app-emacs/apel/apel-10.8-r1.ebuild
index c43a78ce061e..26ff8e7de5ae 100644
--- a/app-emacs/apel/apel-10.8-r1.ebuild
+++ b/app-emacs/apel/apel-10.8-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-emacs/apel/apel-10.8-r1.ebuild,v 1.6 2014/03/23 10:14:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/apel/apel-10.8-r1.ebuild,v 1.7 2014/07/18 14:22:07 klausman Exp $
EAPI=4
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.jpl.org/pub/elisp/apel/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE=""
ELISP_PATCHES=("${FILESDIR}/${PN}-10.8-020_Prevent-fontset-error.patch"
diff --git a/app-emacs/auctex/auctex-11.87-r1.ebuild b/app-emacs/auctex/auctex-11.87-r1.ebuild
index aebdcf414537..f4a129b979f0 100644
--- a/app-emacs/auctex/auctex-11.87-r1.ebuild
+++ b/app-emacs/auctex/auctex-11.87-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-emacs/auctex/auctex-11.87-r1.ebuild,v 1.3 2014/07/13 09:52:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/auctex-11.87-r1.ebuild,v 1.5 2014/07/19 13:57:39 zlogene Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3+ FDL-1.3+"
SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE="preview-latex"
DEPEND="virtual/latex-base
diff --git a/app-emacs/auctex/auctex-11.87.ebuild b/app-emacs/auctex/auctex-11.87.ebuild
deleted file mode 100644
index 7f8fd50d5612..000000000000
--- a/app-emacs/auctex/auctex-11.87.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/auctex-11.87.ebuild,v 1.5 2013/01/22 17:31:45 ago Exp $
-
-EAPI=5
-
-inherit elisp latex-package
-
-DESCRIPTION="Extended support for writing, formatting and using (La)TeX, Texinfo and BibTeX files"
-HOMEPAGE="http://www.gnu.org/software/auctex/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ FDL-1.3+"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE="preview-latex"
-
-DEPEND="virtual/latex-base
- preview-latex? (
- app-text/dvipng
- app-text/ghostscript-gpl
- )"
-RDEPEND="${DEPEND}"
-
-TEXMF="/usr/share/texmf-site"
-
-src_configure() {
- EMACS_NAME=emacs EMACS_FLAVOUR=emacs econf --disable-build-dir-test \
- --with-auto-dir="${EPREFIX}/var/lib/auctex" \
- --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
- --with-packagelispdir="${EPREFIX}${SITELISP}/${PN}" \
- --with-packagedatadir="${EPREFIX}${SITEETC}/${PN}" \
- --with-texmf-dir="${EPREFIX}${TEXMF}" \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- $(use_enable preview-latex preview)
-}
-
-src_compile() {
- export VARTEXFONTS="${T}"/fonts
- emake
-}
-
-src_install() {
- emake -j1 DESTDIR="${D}" install
- elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" || die
- if use preview-latex; then
- elisp-site-file-install "${FILESDIR}/60${PN}-gentoo.el" || die
- fi
- dodoc ChangeLog CHANGES FAQ INSTALL README RELEASE TODO
-}
-
-pkg_postinst() {
- # rebuild TeX-inputfiles-database
- use preview-latex && latex-package_pkg_postinst
- elisp-site-regen
-}
-
-pkg_postrm(){
- use preview-latex && latex-package_pkg_postrm
- elisp-site-regen
-}
diff --git a/app-emacs/gnuplot-mode/gnuplot-mode-0.7.0.ebuild b/app-emacs/gnuplot-mode/gnuplot-mode-0.7.0.ebuild
index 1be08d94b48e..7190bbadd945 100644
--- a/app-emacs/gnuplot-mode/gnuplot-mode-0.7.0.ebuild
+++ b/app-emacs/gnuplot-mode/gnuplot-mode-0.7.0.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-emacs/gnuplot-mode/gnuplot-mode-0.7.0.ebuild,v 1.9 2014/06/08 11:08:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/gnuplot-mode/gnuplot-mode-0.7.0.ebuild,v 1.14 2014/07/18 20:34:24 zlogene Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/bruceravel/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 arm hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc"
DEPEND="doc? ( virtual/latex-base )"
diff --git a/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild b/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild
index 8cd330200fc5..95c054e92dba 100644
--- a/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild
+++ b/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.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-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild,v 1.3 2014/06/14 10:12:26 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild,v 1.4 2014/07/18 14:08:17 klausman Exp $
EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="bbdb ssl linguas_ja"
DEPEND=">=app-emacs/apel-10.6
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index a621dbb57a0f..2dbe88ba7b7f 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,4 +1,4 @@
-DIST VBoxGuestAdditions_4.2.22.iso 59686912 SHA256 222e003d038b757cd761361bb5da33123e0f9574af246fb95eb558593c8c7c76 SHA512 28f634d1082744442bf7a0aa5fb78adadd85dc0374b8fc23dada9f5a460c7d0cfcac2442be90e5effa9dcf9418220fe1dfd5864e49ffd6d14c814bae510c0e3d WHIRLPOOL 97bd797ec9fcf602885675e751941114ce1db4ada9389a2ed99d21b222c0f44da0e8400063062519b26060d0bd15b1bce8b9b0e00067b7ab2e0a21d690c60f73
DIST VBoxGuestAdditions_4.2.24.iso 59760640 SHA256 9e50d9dcbc973e448389aabdf5feb8c5363afd4e3543f1b81cf03e90477519b0 SHA512 b8079f802d0fad64fd5383c2a4f05e7ab8ce33148247a3126fb560cd66975211351bc675d235536c0d7ff6eaa23dd999528d116fd4054ac9e40dee82fe045c39 WHIRLPOOL 79943190cc78800e3d27fa5876c397471684ee4146d087a5d7a6db4b50460c94dd3acdfae5ad66a2ad7a3bdccfd64dc68bc30c2e6503e6e7abea697223ecaa5b
-DIST VBoxGuestAdditions_4.3.10.iso 64647168 SHA256 247e15e9a205dcd4761f6cb547ceca2a61e8d6905c1930870939fd323f4cd1ae SHA512 9af8e01abb8f29e1cd165ad73918b83c681b902636e608d49d2264d30be58d8fe3d2e3a1ad28bd37b644bc54b1a08b3fad32b3d55d7ec9f6b7c018c0ba64c866 WHIRLPOOL f9b3b6af97224ce2ff093f9ed23c465303d695140383bb599c52392fe2f03093f22431c975334bad962c32706832e2e5240a0317eb4bf403931b7ce9b4a0b172
+DIST VBoxGuestAdditions_4.2.26.iso 60534784 SHA256 6986eebc92da52799a4f54098504669dafc04479821ebbdc7ca421a76db040a5 SHA512 bea7a98f60972458a65b4989556d0c5e309c5cdc2bce114f0312f9582f66d2f06f5b6274c6222d14272a1541640bd039ca425e0ceaf9fe569eac3037ac8ed8ca WHIRLPOOL 9d513f7aa9096bf41e0b01cefbfabf82f10c70917d18de6cf4b825ee009c9910141866a9af577b2a5a170d5c21820ba76214e29bc748561c91817daace3eb533
DIST VBoxGuestAdditions_4.3.12.iso 64770048 SHA256 c76dd5ec86f61ad72263ab6d2405723b06badfc2fae57f83ffa5de96f553400d SHA512 46166817d66c2b86ea8539fa6646154f969ac84033526fbb6208c19bfedad71c79fd437156ec89e95cfdc696b260894080217de201cb785ee5c67c96f605f822 WHIRLPOOL c27b3bbaa31113d7604df2d98d10bc2b05f39c1159f0ac44ebf8607ee5b0bcf6857dae614bd2068d92d17687e905dfd12dc8d0b71ae0e46f24320706d2a39317
+DIST VBoxGuestAdditions_4.3.14.iso 65943552 SHA256 2a87971ae3c7e57e87713967a6f242acbdafcc09b635cba98e6dd3a7f5292d3b SHA512 86247988ab7c137104c120d3ed7aaab2d741254f6e5eda673283a0c342117177555074aa597fbea2dcc59ecba4dcaf256f63a05052099a719858f93583e6c9a3 WHIRLPOOL f178f55df823d6a2a9c71181f1d15854e4fb4ed0688674ad77f701c794b7b609e25e0bfdbda3186d5b54205049a8b5155e284be5f8603417bff52483a6bf69f3
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-4.3.10-r1.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-4.2.26.ebuild
similarity index 89%
rename from app-emulation/virtualbox-additions/virtualbox-additions-4.3.10-r1.ebuild
rename to app-emulation/virtualbox-additions/virtualbox-additions-4.2.26.ebuild
index bc0912a65182..74f157c127b3 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.3.10-r1.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.2.26.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-emulation/virtualbox-additions/virtualbox-additions-4.3.10-r1.ebuild,v 1.1 2014/03/27 12:34:03 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.2.26.ebuild,v 1.1 2014/07/18 13:49:23 polynomial-c Exp $
EAPI=5
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-4.2.22.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-4.3.14.ebuild
similarity index 87%
rename from app-emulation/virtualbox-additions/virtualbox-additions-4.2.22.ebuild
rename to app-emulation/virtualbox-additions/virtualbox-additions-4.3.14.ebuild
index fd6a9679210b..fa0af3c3ea02 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.2.22.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.3.14.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-emulation/virtualbox-additions/virtualbox-additions-4.2.22.ebuild,v 1.3 2014/01/16 20:28:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.3.14.ebuild,v 1.1 2014/07/18 13:49:23 polynomial-c Exp $
EAPI=5
@@ -17,7 +17,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
RESTRICT="mirror"
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index 12aee104e01b..6d406aa56957 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -1,16 +1,16 @@
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.22-91556.tar.gz 12393533 SHA256 79c0da87451cab3868f64d48bf9a7fdd710786c05ed4b3070b008c3aa1ce4f7a SHA512 e30d69b15bcee97f90716173aeb88ad24d8a0806cbfeb30229e04febcfc2280bfa581e19c1cb9e5101b9647df1350071c2b298dbc790b32c6968b05abf94ecb6 WHIRLPOOL 34cc8d2213c432d3e8e92e16defd2095e7efe86fc3a9d80c0278ed36b1012eb20b83792b44c84918383e415ffceb23d82b8866f40bb2fcc6cdb230203c8ee567
DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.24-92790.tar.gz 12404740 SHA256 f58099d2b1d4829d359799025765e097ec0155df0683c009794d867d9720ef3e SHA512 d2cc9dacb8704afab4b2ae114d95bc7963f83c52d6b6fa41f54c50971404ef44162465102f3299fa475e0a91f6b4d24d032182176c960d8a60d60cb8d3dd4d11 WHIRLPOOL 273887d34f664b3df233ee0fcb27c502c6e100e4b48fc956a63d2da978b12ba54f2d3a925bbc60ae1142f2bc01a25b62e7e958779eb3566290511b868972367c
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.10-93012.tar.gz 10432166 SHA256 ec3f2a98373d5e228acb4756ac07f44212c4d53f6b83deee81b791abb0d2608a SHA512 cb4551caf296f51ea2a11cac340335333fc7e7b56caa22dd354bbacf041c9c228e8b5262bc585033196b1381389e664c798197654049a334814fd94faeac3e56 WHIRLPOOL a4902e5d6fe3c156ca26607d2cde5ac5ff3ac6deeb520ad83293b4d1eae7f5ec46b7053195739b66bb39b4837aa22ec9c84f2bf627b7176de253cb8cd6c508bf
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.26-95022.tar.gz 12434839 SHA256 561b9f28e5caca5ae2f65033ad8cbb1b5fd5a11131d56ce2aa8a892b90922989 SHA512 49f6cd0c6b036fcd598ac758930c7cb94222066740f02e896db121e432cd7090ba789f158f05d45f11af1efdfb4eafd820746b9e1bae0689c82c76b4e2cd2e86 WHIRLPOOL 21fd3823137e52be718f91d46a82f34e9512264d2e472b862151a6b54206bd0e42f752fa74dfd323b8ec4d4b560169f43ecd356697d6803ce498d00fd7c26cfa
DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.12-93733.tar.gz 10441011 SHA256 f931ce41b2cc9500dc43aba004630cf7bb7050ba737eae38827e91062f072d1f SHA512 df585f378e778b16ea3f979445da74baf4143aec1cc87f0ee28021947d3f4827ef73de8aebd92c4dd6e525d90322986726729a51ed9736bb2c8f7c6c2a0579a0 WHIRLPOOL ab11ed5ca46144c651ed27b3a402018866eef35f1f5ef917fc6659d505949c64d4b8799f6223dd12d8d8963ebe9adbb5cf09971cde9e1a25742167b08a9a1c98
-DIST VirtualBox-4.2.22-91556-Linux_amd64.run 85872081 SHA256 e65c8844743cfd991fdb8d513bf88e707c9456f4cd795bdc7ec77886bedbf08d SHA512 146b1bbceae2dbb98d49dc92393bed05f8f43db6172fc042de18559b9b119fa49615bc1441b1a91c5fa80f34ad5e554ea66de4a411a97999700ac34e30060e1a WHIRLPOOL 85a03937c09ea1aac6713cfcd2732c8700e6f29f5fdd1f2a6ea0ec564bfc349b10ff73ead4e022007aeda6737258851f715e80f30dd3704a03fe9d4f8c2fee3c
-DIST VirtualBox-4.2.22-91556-Linux_x86.run 85657037 SHA256 7d236cefe20be96d4cbd9adb2b531a1d473c64f97bec9b3add3f1dda8b826f84 SHA512 9a4c349c8f6e04746bfdef15c79e7c528470c0541f7a2a7094b577bbd02eeacf56dcecf9dbe49f547a4b44c077466d0d2bf773881eb1f8c8d8a836c2e9845056 WHIRLPOOL bfc9a973e2cebfbff7d85f580a0cf15150126148eccd4714258ac06521f952b72179fc3b2ea48b69dde4748e850f51871d352c00b60ff249665fd552a6f68c6e
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.14-95030.tar.gz 15890382 SHA256 b965c3565e7933bc61019d2992f4da084944cfd9e809fbeaff330f4743d47537 SHA512 f6ac955d675dcf85815138eed8b58788625bd67eb9569a73b28d2b32f5114b082d742c5915bf729631a1cc0cb019965ee5722108a0a3b00b158662446974a85a WHIRLPOOL c1d12e45ff8820e99cb22dce3e044cbbe2890e4bf24baf4bc97b7eab38e8ff7656f3cb1f30f50b671ac4b7acdbddec77f0325683ffa3035c987e10c6c9343eb2
DIST VirtualBox-4.2.24-92790-Linux_amd64.run 86066641 SHA256 1a36b91e0b8b9f2aeb91ebd6b2d4869b6cbdd1f72e6002c1e2c4aa3c2f6f126e SHA512 4a20b5d2cfdc6f1d69b7407df7ab55279d4b2c1106d1996f6ab9b87faabc0071d89fbe56a3a2a190b9500eb969cc636c0820650efca5f162b7b0fd3f4b9c07cd WHIRLPOOL 7d0e858abe12612e5c08be8f17aa980c612fd998b6ab4678736d65681c0cbca4fcf70c59a48890b365ea70143a3bad85fe8020c450d1dfad4103d21adb54ad2e
DIST VirtualBox-4.2.24-92790-Linux_x86.run 85841357 SHA256 c7767ec0178fc4b37a547722b9da5933d786110b84e44d52ceaebe158ba530fb SHA512 3544becd17798b5e556dadd454103345263739b84253b823b189a73032d5f39f1d7056fa79aae3e3a7f7fef5b0a50b14dc93c984eee7919915087b97fcdf3aa4 WHIRLPOOL bcb2dc4fb2af77edc840f0d2047423ccdbaf1ba93605e03d2f26f4eb78c01887485741fc3906e630e859f206acb04854525dccfe508904d2f6612d75338775ff
-DIST VirtualBox-4.3.10-93012-Linux_amd64.run 91422161 SHA256 3483517046c5db6d96ba8d3b632715f44570a85eee0326cd252f783ed84120be SHA512 39d6f5b89dadb57f51ef0f08fccd5d9670a14595ce650952ead4411a538313dfdf834d032a8aa9f25f4c1aec9e037b84e4448c6ebe7a34625ef3f7b41d15788d WHIRLPOOL 94cbaca3b5b1034ee2bab954361e208d1bbeb878a1f93e1ffd0a33080db38e917f94bc74fa36bdb835a70793e1755e3e83632807cbadbde84f027b84ac99673b
-DIST VirtualBox-4.3.10-93012-Linux_x86.run 90848715 SHA256 3feefd78c15189ae97d3a3275726b0dc9977cc1a0b2722e1d8d1b17e57393003 SHA512 4a28228b516e67f111eab011d0fae6b4b3bea5b602282a9a505d39311a14c568440c4f8a9f8f50634b3669340b12e6aaaf16c2be52a0141638bced75b8ebba11 WHIRLPOOL caf3d693834d7f118582a9054caaa8262a1a5f4aa12cc6cee5311ddd006595893dc798d8da7e9f9df435eea7461f01e7d9bbc2ac6ff3bcf60b88cecb0eac7bcc
+DIST VirtualBox-4.2.26-95022-Linux_amd64.run 86906322 SHA256 a0c13f5cf239257a73d3805c5e4b37b97317cdcbc95fb902b71b8027e1b18627 SHA512 0f6eabfbcc5e2ba8dffd236b19426e7bcca150df46b6787cf3b0208fd57fdc6e6dc7906bb853a447582dc560d1a9b56c92a5f995ba5fae50f168054f349d7786 WHIRLPOOL 39af2a322edc7f4eb8a9b46ae3b40f5bb5a4b5a5b752210edb50656464a50ca669aadbad972270c3a932a509332bd5aa28f215013d33c5e7e96b9f7c0f05c6ab
+DIST VirtualBox-4.2.26-95022-Linux_x86.run 86691278 SHA256 3c896f4f60bfed252468d9b754bbe5797d9626be22297c24c13e42b831a1e007 SHA512 2a5f47fae75c7cbe29830c2453b82c6f598ec0933e4cf5b7fb8e14b3b42637ac24f55b099f4feb1298e13db61066a52fd30bb6573e2616c99a5b3dfc4ee12618 WHIRLPOOL dc7c9dcf303ca8dba661de8b770e2185531464aaade914192a86596a29ba86d02f05305f302e7a546473ef5ff2ac3450dfb038b3e493332308e33f8ffa4a490d
DIST VirtualBox-4.3.12-93733-Linux_amd64.run 91626962 SHA256 d37075e601f13ed3564ba51359b4a43b725cb532266cedd9af5e42304d533a2c SHA512 bdbfb98618c301fa7ebcbe79699875f492453e1cafabfae02c0d9b8bb0512ef9d0d34361aa599b72aa3d98eb37a306394e767f8c8774935b0fe5522b3426b3fa WHIRLPOOL 730d995d57af0212cc64a1821c665683502ef190e216d5fc10ef9a0b3d063fb3276d57cdfb6d259b789192bb2675a8703015d10cf990a58aea3a500c9100d61c
DIST VirtualBox-4.3.12-93733-Linux_x86.run 91084237 SHA256 7e1d6b808826aa85cc2500a3e4146928da1cc8d91499ddcb1f0ac0b49f84a0b4 SHA512 03b35607b272b0fede34488e0faac5e52509ebc61155f04e9a8e3de36d6bd3a09cf637f05d3c99e218a50fc28ce602584bdff7964da725e3540992001b7f16f3 WHIRLPOOL 953f2d295d533db41c800665a882ca7e4214babe9ebccf9a5ebeac485f4a418607d3fefea7706258f110b48655794930b3e572706875ab301976a9c636be5d71
-DIST VirtualBoxSDK-4.2.22-91556.zip 9735807 SHA256 ac623985db8f41638833107a14191ee809e4b39187398fece99ad206778c2dc9 SHA512 b575550f0664a044b0141d72675097cdd6ac57e4ad870acc87d8be552c5aca8206adb3d502abcd1e6ad4c41c935a86e96cd513dbb66c851fbf885b149fabedc5 WHIRLPOOL f8ad91acab19596a484f12bc4653957ba271b44e6cef2bd4d01d55ab8a3b22ae0ced2628e47c5633e75afc539564244c91191e38b77727636a2420e93ad4c06c
+DIST VirtualBox-4.3.14-95030-Linux_amd64.run 92988880 SHA256 8ed9fe965941a7bbd0e40f074b2e835a4b03a8e66d7056ae18ef5bb86e3ee38c SHA512 84062f352595261492087aca8f39484696b37a00f27ee9369c91dbb8e7ac53467cf6a05ab8a21c6171298b4302d4d2295ec48b1b0fb46f3b45e92ac5eb511eea WHIRLPOOL e34fc2eaf4d2d5292c70e802c3dd0645027533b85fd35080cd943fe70346e2e323a9d8c2df73b06c2fb591649749c1dc5c2018950277f9b30d2bfd5bff908b2b
+DIST VirtualBox-4.3.14-95030-Linux_x86.run 92528077 SHA256 577ee63df90e2cc03452ec5311af121e68b62b01d88a26b3a1aeb235dac0de08 SHA512 2a25d4488ad94c4bb1b52c7f4cd2039772dee79a726e846666fd7ad622aa5b1a2e053e973870848339899843d9465a52cff64eabfbc3dd1d5e07d5402351fcd7 WHIRLPOOL f6d02a7bd0cc75aefc7de2319c2fc045ff079814bd22f0ad8eb04825fecf2c8741100474bd20cecb008fcde7b22f0a3362e34ee2eaf41ff8d865dfe6b387ad82
DIST VirtualBoxSDK-4.2.24-92790.zip 9738032 SHA256 096d9ccf56b221c014e036ebda70f02e4857a12246d9cf58d36ffb6de736b7d6 SHA512 9933d4c494731b245c8d08d50a4194217745623543e879966214ebe3b14ec8d43a510a1eac08135115ec2eea87f9a68b904faa8b5deab8cd8c83a7b06c4d9a11 WHIRLPOOL cd736c06bb1c031d6b40edaa7a5e5c7d79c963dc3f427e8ecf96a61a762f0771203f8fc945321f80af72a092c495bfd17d1f12c1e90973207f765c06fb938e1c
-DIST VirtualBoxSDK-4.3.10-93012.zip 11688966 SHA256 9ec5c8b8f5ed9742b745e709893b79b1f676fa6cb96b352f4ebf1567c8fc0f90 SHA512 daa5c1c35a5f8d93e8ce32c3520952a25dcb9e3c12a3d093c10de2c43526d842d139e5155e60970ba1ff5d553db572dc76a753ea703a02d4da4334369f28f2b8 WHIRLPOOL 95dfd7153b10de5146e62d07b9963fa89daebd221106a62a92249e11cefee3203014691e4f203129292a13b6c20cadc8cbf5a61a542b7d488d8356d0921abac5
+DIST VirtualBoxSDK-4.2.26-95022.zip 9738427 SHA256 997760832e997e9adbf772cbc5c56efb734006d16251148cf39fcb0db3800cd5 SHA512 d22ae20f0bdc0078388dfc9cdc8ce7ff7c682a3e399c45bbf9ebb4c2ae5145ef2833f57adbdf15bbbb7313655d4f3551dd0e0ffc6f32a9aa1606ece7e58b047d WHIRLPOOL 63906988190812dc3a5d5c1e1bf4dd48ed2561e70de371d54fb4415458be6555ebba9cf9fb83207637cae7f6e126f1872b19a496233484a35d6c500f9f265a07
DIST VirtualBoxSDK-4.3.12-93733.zip 11690248 SHA256 94e0c81b2271945c7025923e2394b53b0d510ebc45b0803d18e746f560d2ec3f SHA512 c08b270fd48e39ace9ae1a4ce0af8f647628e5c0268806a90de9a9a62799bab129343354328e2376cb33d4d27b4d98699e3e7d817332b0bc32efd25390eea957 WHIRLPOOL c1258b35b5d46e065a7533484c5f7d4272a585dbf68f8cc9d12da46222cebba55886029fa16ad01a4a703811443a6364c95b6220305e285ca58dbbbc06297d5f
+DIST VirtualBoxSDK-4.3.14-95030.zip 11691524 SHA256 04cc2eeedd85e0bb93bf8e0720a0d941d74b7a7156ad1c48e70fbf436d9ec09e SHA512 16be0467f19db18b4b4b067eb8ac0765cf4f7b46bc8913dc21b29da2f00eb8743821708b465d9a35835ceea07ceeed8003e40cfd29a79322f58c19281d303d8e WHIRLPOOL bfebc2e36912520a70963e77d2f264b603f747c53a65b86b8667b9e1b4e919406365f2161cbb0bf0fb22e07c3163877e526f748d24461520f686e7e93e967a7d
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.2.22.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.2.26.95022.ebuild
similarity index 88%
rename from app-emulation/virtualbox-bin/virtualbox-bin-4.2.22.ebuild
rename to app-emulation/virtualbox-bin/virtualbox-bin-4.2.26.95022.ebuild
index 0a4cf4506002..5e1a6124929c 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.2.22.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.2.26.95022.ebuild
@@ -1,37 +1,53 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.22.ebuild,v 1.3 2014/01/16 20:28:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.26.95022.ebuild,v 1.1 2014/07/18 13:49:00 polynomial-c Exp $
EAPI=5
-inherit eutils unpacker fdo-mime gnome2 pax-utils udev
-
-MY_PV=${PV/beta/BETA}
-MY_PV=${MY_PV/rc/RC}
-VBOX_PV=${MY_PV}-91556
-SDK_PV=${VBOX_PV}
-EXTP_PV=${SDK_PV}
-MY_P=VirtualBox-${VBOX_PV}-Linux
-EXTP_PN=Oracle_VM_VirtualBox_Extension_Pack
+inherit eutils fdo-mime gnome2 pax-utils udev unpacker versionator
+
+MAIN_PV="$(get_version_component_range 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+ MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
+ MY_PV="${MY_PV/beta/BETA}"
+ MY_PV="${MY_PV/rc/RC}"
+else
+ MY_PV="${MAIN_PV}"
+fi
+VBOX_BUILD_ID="$(get_version_component_range 4)"
+VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
+MY_P="VirtualBox-${VBOX_PV}-Linux"
+# needed as sometimes the extpack gets another build ID
+EXTP_PV="${VBOX_PV}"
+EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack"
+EXTP_P="${EXTP_PN}-${EXTP_PV}"
+# needed as sometimes the SDK gets another build ID
+SDK_PV="${VBOX_PV}"
+SDK_P="VirtualBoxSDK-${SDK_PV}"
DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
HOMEPAGE="http://www.virtualbox.org/"
SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
x86? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
- sdk? ( http://download.virtualbox.org/virtualbox/${MY_PV}/VirtualBoxSDK-${SDK_PV}.zip )
- http://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_PN}-${EXTP_PV}.vbox-extpack -> ${EXTP_PN}-${EXTP_PV}.tar.gz"
+ http://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
LICENSE="GPL-2 PUEL"
SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+additions +chm headless python sdk vboxwebsrv rdesktop-vrdp"
+KEYWORDS="~amd64 ~x86"
+IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
RESTRICT="mirror"
+if [[ "${PV}" != *beta* ]] ; then
+ SRC_URI+="
+ sdk? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )"
+ IUSE+=" sdk"
+fi
+
DEPEND="app-arch/unzip"
RDEPEND="!!app-emulation/virtualbox
!app-emulation/virtualbox-additions
- ~app-emulation/virtualbox-modules-${PV}
+ ~app-emulation/virtualbox-modules-${MAIN_PV}
!headless? (
x11-libs/libXcursor
media-libs/libsdl[X]
@@ -154,10 +170,10 @@ src_unpack() {
mkdir "${S}"/${EXTP_PN} || die
pushd "${S}"/${EXTP_PN} &>/dev/null || die
- unpack ${EXTP_PN}-${EXTP_PV}.tar.gz
+ unpack ${EXTP_P}.tar.gz
popd &>/dev/null || die
- if use sdk; then
+ if [[ "${PV}" != *beta* ]] && use sdk ; then
unpack VirtualBoxSDK-${SDK_PV}.zip
fi
}
@@ -203,7 +219,7 @@ src_install() {
doins UserManual.pdf
- if use sdk ; then
+ if [[ "${PV}" != *beta* ]] && use sdk ; then
doins -r sdk
fi
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.3.10.93012.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.3.14.95030.ebuild
similarity index 99%
rename from app-emulation/virtualbox-bin/virtualbox-bin-4.3.10.93012.ebuild
rename to app-emulation/virtualbox-bin/virtualbox-bin-4.3.14.95030.ebuild
index 477b77e4a392..505a424b6e55 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.3.10.93012.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.3.14.95030.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-emulation/virtualbox-bin/virtualbox-bin-4.3.10.93012.ebuild,v 1.2 2014/03/27 12:14:29 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.3.14.95030.ebuild,v 1.1 2014/07/18 13:49:00 polynomial-c Exp $
EAPI=5
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index dc6739a74189..e71962915c06 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,4 +1,4 @@
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.22-91556.tar.gz 12393533 SHA256 79c0da87451cab3868f64d48bf9a7fdd710786c05ed4b3070b008c3aa1ce4f7a SHA512 e30d69b15bcee97f90716173aeb88ad24d8a0806cbfeb30229e04febcfc2280bfa581e19c1cb9e5101b9647df1350071c2b298dbc790b32c6968b05abf94ecb6 WHIRLPOOL 34cc8d2213c432d3e8e92e16defd2095e7efe86fc3a9d80c0278ed36b1012eb20b83792b44c84918383e415ffceb23d82b8866f40bb2fcc6cdb230203c8ee567
DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.24-92790.tar.gz 12404740 SHA256 f58099d2b1d4829d359799025765e097ec0155df0683c009794d867d9720ef3e SHA512 d2cc9dacb8704afab4b2ae114d95bc7963f83c52d6b6fa41f54c50971404ef44162465102f3299fa475e0a91f6b4d24d032182176c960d8a60d60cb8d3dd4d11 WHIRLPOOL 273887d34f664b3df233ee0fcb27c502c6e100e4b48fc956a63d2da978b12ba54f2d3a925bbc60ae1142f2bc01a25b62e7e958779eb3566290511b868972367c
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.10-93012.tar.gz 10432166 SHA256 ec3f2a98373d5e228acb4756ac07f44212c4d53f6b83deee81b791abb0d2608a SHA512 cb4551caf296f51ea2a11cac340335333fc7e7b56caa22dd354bbacf041c9c228e8b5262bc585033196b1381389e664c798197654049a334814fd94faeac3e56 WHIRLPOOL a4902e5d6fe3c156ca26607d2cde5ac5ff3ac6deeb520ad83293b4d1eae7f5ec46b7053195739b66bb39b4837aa22ec9c84f2bf627b7176de253cb8cd6c508bf
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.26-95022.tar.gz 12434839 SHA256 561b9f28e5caca5ae2f65033ad8cbb1b5fd5a11131d56ce2aa8a892b90922989 SHA512 49f6cd0c6b036fcd598ac758930c7cb94222066740f02e896db121e432cd7090ba789f158f05d45f11af1efdfb4eafd820746b9e1bae0689c82c76b4e2cd2e86 WHIRLPOOL 21fd3823137e52be718f91d46a82f34e9512264d2e472b862151a6b54206bd0e42f752fa74dfd323b8ec4d4b560169f43ecd356697d6803ce498d00fd7c26cfa
DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.12-93733.tar.gz 10441011 SHA256 f931ce41b2cc9500dc43aba004630cf7bb7050ba737eae38827e91062f072d1f SHA512 df585f378e778b16ea3f979445da74baf4143aec1cc87f0ee28021947d3f4827ef73de8aebd92c4dd6e525d90322986726729a51ed9736bb2c8f7c6c2a0579a0 WHIRLPOOL ab11ed5ca46144c651ed27b3a402018866eef35f1f5ef917fc6659d505949c64d4b8799f6223dd12d8d8963ebe9adbb5cf09971cde9e1a25742167b08a9a1c98
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.14-95030.tar.gz 15890382 SHA256 b965c3565e7933bc61019d2992f4da084944cfd9e809fbeaff330f4743d47537 SHA512 f6ac955d675dcf85815138eed8b58788625bd67eb9569a73b28d2b32f5114b082d742c5915bf729631a1cc0cb019965ee5722108a0a3b00b158662446974a85a WHIRLPOOL c1d12e45ff8820e99cb22dce3e044cbbe2890e4bf24baf4bc97b7eab38e8ff7656f3cb1f30f50b671ac4b7acdbddec77f0325683ffa3035c987e10c6c9343eb2
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.10.93012.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.26.95022.ebuild
similarity index 91%
rename from app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.10.93012.ebuild
rename to app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.26.95022.ebuild
index ef7edeb63223..418b66933ce5 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.10.93012.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.26.95022.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-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.10.93012.ebuild,v 1.1 2014/03/27 12:21:26 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.26.95022.ebuild,v 1.1 2014/07/18 13:49:43 polynomial-c Exp $
EAPI=5
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.22.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.14.95030.ebuild
similarity index 56%
rename from app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.22.ebuild
rename to app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.14.95030.ebuild
index 5a905831bdc7..4c9d14d20fd3 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.22.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.14.95030.ebuild
@@ -1,16 +1,22 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.22.ebuild,v 1.3 2014/01/16 20:28:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.14.95030.ebuild,v 1.1 2014/07/18 13:49:43 polynomial-c Exp $
EAPI=5
-inherit eutils multilib
-
-MY_BUILD="91556"
+inherit eutils multilib versionator
+
+MAIN_PV="$(get_version_component_range 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+ MY_PV="${MAIN_PV}_$(get_version_componen_range 5)"
+ MY_PV="${MY_PV/beta/BETA}"
+ MY_PV="${MY_PV/rc/RC}"
+else
+ MY_PV="${MAIN_PV}"
+fi
+VBOX_BUILD_ID="$(get_version_component_range 4)"
MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P="${MY_PN}-${MY_PV}-${MY_BUILD}"
+MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
DESCRIPTION="PUEL extensions for VirtualBox"
HOMEPAGE="http://www.virtualbox.org/"
@@ -18,11 +24,11 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack
LICENSE="PUEL"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
RESTRICT="mirror strip"
-RDEPEND="~app-emulation/virtualbox-${PV}"
+RDEPEND="~app-emulation/virtualbox-${MAIN_PV}"
S="${WORKDIR}"
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 4aec8abf6d13..136e9fbc1a82 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,4 +1,4 @@
-DIST VirtualBox-4.2.22.tar.bz2 77039185 SHA256 4a017ec5fa0e0cfa830ae6c2b9d680c9b108e5fb96348e1397a7d0ea051f8bc1 SHA512 136b3f3ea9a79493aecd86883c619d10934d80c391ce88985501736fc95d7066e0e31d02e7867974f9077eae5a431519d0c1001fc781d240f0578a1c63c29ee6 WHIRLPOOL e6ea0768587ee152463c3388476199333cf39f56f7bda43094ad98ea2179b8f0e81819004c6433133a68d7ede9606d2aaa4ee2aa96ad05bda06a7706f4e079cc
DIST VirtualBox-4.2.24.tar.bz2 77067941 SHA256 6ae695a84f722e1a9fbf1fa5e89d2c05239f058a6a20f04a708d47d7f2081b9d SHA512 df75324e43c6781af41caccad7718ce71cae293f3deec907785678bf7769810df70a57f61a83f593c1766bcedde1209f8e1698bb5aaf0681fc3f51a2e80037c4 WHIRLPOOL 5f546b35a5bb0431ff3c3d585ab46f59630dce6e08a31a69663700ba05692ff89f7b6d019aff416fae4f4a546c3fb5b1ed29db7af4918afe48981c45c82be4de
-DIST VirtualBox-4.3.10.tar.bz2 90333712 SHA256 739835aee3274a663b23eeb748bd0430e8a5d8ba2f4d0eae5dc47ff2c485e23b SHA512 1744145508567f811216d884f9cad60d2698be7323333dd7784edff9ef76ba432712285f6c6e8936f026e1e032983a310ddac3dd0f1cdd6909b16699f856ebca WHIRLPOOL f0b202fac8f49a4a4ab0b8ff99c9ea58e4b7befc789dad00ec721ef4a322813f2be82ad4387a35079cb9c3c7e74c24c4192b53e5d4d2487b4a0dad57256d0c43
+DIST VirtualBox-4.2.26.tar.bz2 77724304 SHA256 7fa840edd5c0e691936c14fcf49d50f4654fd63e2b71510232c226dda863b270 SHA512 c2a0c201e677a23702865256b80af2118b067356313939b1d3af3bf8f42746c2eaf04ab3d7ece8a3d98b2be67c1d3d2b2b34d4debbe2fc667e375391f2510b51 WHIRLPOOL 495cd625e1641e630ef826ca6d287d462af681b699205af7095b04bc96e381af728beb0c265fac609830955208c1c17265469c3450e495e077146a0545c20694
DIST VirtualBox-4.3.12.tar.bz2 90346010 SHA256 db84ddf47d1ecd316ec46417595f0252e3ec2f67e35e1e17320aba87b7c2934f SHA512 3c7afe744b49908dae74d57e694976672ea1c638cefb17a8b569ce8663250a1b8157f88c8f1b29b11174a7c65d97a8eb28b77a6bd4526b9bceaa1e503412519d WHIRLPOOL 0ee4a6a3a1985b59425628b10cc4f146e2ac51a9cc1135f2997299b50eaf2c2c0ebf6320d468f3e24f887ab29327fdec60e89cc66681a0c69a237775f0b2d620
+DIST VirtualBox-4.3.14.tar.bz2 90833795 SHA256 bc893adde4449a2d35d8b4d0b8b247f0f2ac62a434fd8a8f7c54f613a100855a SHA512 afc08be0e95b28bed3d03db7d5e72f27cfbe323fabd7db4eef2a3e031bbbc39d74a46ebfe8e1c24b9b2fb3cd4e160e681186e0a9c3b23b099dcdec757f7fb434 WHIRLPOOL d2ad01fd017a3a0c6a503d0f78db045d997a630d62376d2b7dbcae86b2e6783ef346666b9d786cf7d912c1a4ea6a94a9f397d519ad642ac7d2336782aa1e76b4
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.22.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.26.ebuild
similarity index 97%
rename from app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.22.ebuild
rename to app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.26.ebuild
index 7af38b221133..bef49f6fb94b 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.22.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.26.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-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.22.ebuild,v 1.3 2014/01/16 20:28:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.26.ebuild,v 1.1 2014/07/18 13:53:13 polynomial-c Exp $
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="X"
RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.10.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.14.ebuild
similarity index 98%
rename from app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.10.ebuild
rename to app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.14.ebuild
index 3da45bdd7f31..a8ae32194c21 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.10.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.14.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-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.10.ebuild,v 1.1 2014/03/26 10:13:26 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.14.ebuild,v 1.1 2014/07/18 13:53:13 polynomial-c Exp $
EAPI=5
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 3d510984aea3..46d580126f89 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,4 +1,4 @@
-DIST vbox-kernel-module-src-4.2.22.tar.xz 494536 SHA256 0351ecae185164125c952bcaca19bf05811ce48bf22af2270e6207f0872d7960 SHA512 468b718de893ac921a02a13ddf8b6a1fed2335ee63826b0d351b9c7c2acbe7b880610529ea43934b7ee5167c7b0b8be87c6dc845c2a36e23144c7c4d569bef72 WHIRLPOOL 9de05f062270cbf3e38369366a044f483777d8a0ffd73a9f1d4b0a375a30e81c344e33c763db6407e65b26b1b4a087cae9a6fd92ee7094f4a964c5174899da8e
DIST vbox-kernel-module-src-4.2.24.tar.xz 494432 SHA256 b1fec8e809885104f3d86f4782d858e723aebc75b7bfc94bc0a4416c04759a4d SHA512 2aed47ceda7e0ad0fadb4ca85853a54d1e44ce62a6fe3618be4169915b80ef580ed45b0c73b8c502b0b470b607f3a2bbcbb6c5b261bba900dc0e23b61356adec WHIRLPOOL 960cc8750c5c4aecfd1b425fc82fe5bb58642aceafe61d587bb744a239efea11591a0f25bebd4e31c1e05f5b30a03bb7a96f3aeaeb73c5719725058a4ef7df0e
-DIST vbox-kernel-module-src-4.3.10.tar.xz 517568 SHA256 96fd82c79820fd099ddb970f281b86c070b6176c40fc65c61aa8e072bff8485f SHA512 d7d26d34a97ff4a90acb04b5969e2273b709d8857c2c163289b50d83d170aa191e337f07393b4088c4343a28e0fe8596f603de7db3ea7e28baaec578ab025b02 WHIRLPOOL df2e636945ba085d11f29430b8a2bbbf7a165f245a87a00fa504e6b04db9bc0220cce75ca36315009af10df6cca513e2956dc9ed544ec35daf231e1e2150eb93
+DIST vbox-kernel-module-src-4.2.26.tar.xz 512708 SHA256 489e78b2ffcd29663c58c6d827c077001ff28347a5ad6d99e6ecbd6afe68d372 SHA512 881b742c11a51a6af41a0aa094f92f07daac635c543166504766b87e9eccbe3bede7983bc94cec67948bce141b1ed9f9a2a39e3fee726df9c9b1c135aec5b89e WHIRLPOOL 47a6eeedf5e19c37cb4b1efa4c79580577e35efaef950813f94429abdd068ad113943dee3e1644708687fe309153ac57ae18e5dfd887d61b873fd01a428db74b
DIST vbox-kernel-module-src-4.3.12.tar.xz 517768 SHA256 63baad3f8a4970af78c671306676ab79ccf4784c4204c44c5ac9c031cb5ca3fc SHA512 127ab3d121ce69cb34d4adc774a29eae1f16662078734b2838f7c2f95b78eb4f0493dd4cd5ac8a3772cb38c85533d51d87456a0425e828216f680f486ed7fd8d WHIRLPOOL 1eeb54535af0c30113e37cc1b8111889116a1afe90066b0911c87e017e92a51416d8f931eeabfbc285dfe03dc60d06f5b8ce8ed7b47871780fdfeb62720b5f59
+DIST vbox-kernel-module-src-4.3.14.tar.xz 534712 SHA256 9dd6ed0a4706444a0ac91538ca7bfdd662721e08e9c3969473d3520aceee37f8 SHA512 c71d5d87bc768432d4ed7d9652d8fbc2ccb2612db6942d9911638acae4c3b5f64797ed117b66fab122e52ad7b3e88ecd7f074fea0abb63408b2e3723cb9549a9 WHIRLPOOL 464a5236c14800e18f8298e2e7f8d568086d39da0b891458fc5c5642f224d898d1b015d24d234245260a136963b4924012432f912b4e15a974b1448bda7c9582
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.2.22.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.2.26.ebuild
similarity index 93%
rename from app-emulation/virtualbox-modules/virtualbox-modules-4.2.22.ebuild
rename to app-emulation/virtualbox-modules/virtualbox-modules-4.2.26.ebuild
index 1b599e7dcb85..506bcc2f903e 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.2.22.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.2.26.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-emulation/virtualbox-modules/virtualbox-modules-4.2.22.ebuild,v 1.3 2014/01/16 20:29:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.2.26.ebuild,v 1.1 2014/07/18 13:47:55 polynomial-c Exp $
# XXX: the tarball here is just the kernel modules split out of the binary
# package that comes from virtualbox-bin
@@ -16,7 +16,7 @@ SRC_URI="http://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="pax_kernel"
RDEPEND="!=app-emulation/virtualbox-9999"
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.10.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.14.ebuild
similarity index 95%
rename from app-emulation/virtualbox-modules/virtualbox-modules-4.3.10.ebuild
rename to app-emulation/virtualbox-modules/virtualbox-modules-4.3.14.ebuild
index ea61d04a8916..e45574f80220 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.10.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.14.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-emulation/virtualbox-modules/virtualbox-modules-4.3.10.ebuild,v 1.1 2014/03/26 10:10:13 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.3.14.ebuild,v 1.1 2014/07/18 13:47:55 polynomial-c Exp $
# XXX: the tarball here is just the kernel modules split out of the binary
# package that comes from virtualbox-bin
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 72a2befdd98f..a7e82d0cd40e 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -1,7 +1,8 @@
-DIST VirtualBox-4.2.22.tar.bz2 77039185 SHA256 4a017ec5fa0e0cfa830ae6c2b9d680c9b108e5fb96348e1397a7d0ea051f8bc1 SHA512 136b3f3ea9a79493aecd86883c619d10934d80c391ce88985501736fc95d7066e0e31d02e7867974f9077eae5a431519d0c1001fc781d240f0578a1c63c29ee6 WHIRLPOOL e6ea0768587ee152463c3388476199333cf39f56f7bda43094ad98ea2179b8f0e81819004c6433133a68d7ede9606d2aaa4ee2aa96ad05bda06a7706f4e079cc
DIST VirtualBox-4.2.24.tar.bz2 77067941 SHA256 6ae695a84f722e1a9fbf1fa5e89d2c05239f058a6a20f04a708d47d7f2081b9d SHA512 df75324e43c6781af41caccad7718ce71cae293f3deec907785678bf7769810df70a57f61a83f593c1766bcedde1209f8e1698bb5aaf0681fc3f51a2e80037c4 WHIRLPOOL 5f546b35a5bb0431ff3c3d585ab46f59630dce6e08a31a69663700ba05692ff89f7b6d019aff416fae4f4a546c3fb5b1ed29db7af4918afe48981c45c82be4de
-DIST VirtualBox-4.3.10.tar.bz2 90333712 SHA256 739835aee3274a663b23eeb748bd0430e8a5d8ba2f4d0eae5dc47ff2c485e23b SHA512 1744145508567f811216d884f9cad60d2698be7323333dd7784edff9ef76ba432712285f6c6e8936f026e1e032983a310ddac3dd0f1cdd6909b16699f856ebca WHIRLPOOL f0b202fac8f49a4a4ab0b8ff99c9ea58e4b7befc789dad00ec721ef4a322813f2be82ad4387a35079cb9c3c7e74c24c4192b53e5d4d2487b4a0dad57256d0c43
+DIST VirtualBox-4.2.26.tar.bz2 77724304 SHA256 7fa840edd5c0e691936c14fcf49d50f4654fd63e2b71510232c226dda863b270 SHA512 c2a0c201e677a23702865256b80af2118b067356313939b1d3af3bf8f42746c2eaf04ab3d7ece8a3d98b2be67c1d3d2b2b34d4debbe2fc667e375391f2510b51 WHIRLPOOL 495cd625e1641e630ef826ca6d287d462af681b699205af7095b04bc96e381af728beb0c265fac609830955208c1c17265469c3450e495e077146a0545c20694
DIST VirtualBox-4.3.12.tar.bz2 90346010 SHA256 db84ddf47d1ecd316ec46417595f0252e3ec2f67e35e1e17320aba87b7c2934f SHA512 3c7afe744b49908dae74d57e694976672ea1c638cefb17a8b569ce8663250a1b8157f88c8f1b29b11174a7c65d97a8eb28b77a6bd4526b9bceaa1e503412519d WHIRLPOOL 0ee4a6a3a1985b59425628b10cc4f146e2ac51a9cc1135f2997299b50eaf2c2c0ebf6320d468f3e24f887ab29327fdec60e89cc66681a0c69a237775f0b2d620
+DIST VirtualBox-4.3.14.tar.bz2 90833795 SHA256 bc893adde4449a2d35d8b4d0b8b247f0f2ac62a434fd8a8f7c54f613a100855a SHA512 afc08be0e95b28bed3d03db7d5e72f27cfbe323fabd7db4eef2a3e031bbbc39d74a46ebfe8e1c24b9b2fb3cd4e160e681186e0a9c3b23b099dcdec757f7fb434 WHIRLPOOL d2ad01fd017a3a0c6a503d0f78db045d997a630d62376d2b7dbcae86b2e6783ef346666b9d786cf7d912c1a4ea6a94a9f397d519ad642ac7d2336782aa1e76b4
DIST virtualbox-4.2.18-patches-01.tar.xz 3788 SHA256 9a147e3a3da7e1e07b70aed67042c822897c7874ccaa3690c9497862373d8222 SHA512 021f8a566ede223ead5a2605bff3917195165c543f760ee7af004ab97d5dcf0771e6ccb62148d7986a34872ea8c35db952286fb8534b1f69804e192701bd8108 WHIRLPOOL 9818df1703636fecfbda1bbeb4d167d845701fe9de2827a97573a26ffb3cb9feaa22ee2849c45d3ea700a9c305185eb404b15572b0f4e666f8a8e6158a48b9eb
-DIST virtualbox-4.3.10-patches-01.tar.xz 4076 SHA256 3c8dc2a072e5554b309637ccf8776c0555837dd4251c44f73602fa606f8439b4 SHA512 16b51301d41452636a7cd552306105ed7c8c6b37a1aef5115ba281e3a8cf50317119e226d33c724bedd7f6e9ec2813fc9d3f3fa798ca20352643898f2abbbd64 WHIRLPOOL f12b6ad44ea18b3eb933168b22a91945e60f0843d0f51f4afe1e972dd39dceb7ae515178eaee97697988ecea0d76aa7ca927aab48b82f056f6f8f04a2e083d7b
+DIST virtualbox-4.2.26-patches-01.tar.xz 3804 SHA256 0cccbd963ae77e85e8c7bc1a5ec73f8eec0dfcbba30e8b85281c3adeb849e66f SHA512 7b5de7efe0087ee6148201ad7bb987a95cdf4e1a0625ed2f368fcbf1080505e8904f67be69aedbcc5469348f62351b6b913aae438f2ea8868f2b07a7a42d3538 WHIRLPOOL 99b981c05f877750bd5bbdb1ec9098ad8bb07805fa6ddaa81a8309def3ec40189b6b947115d5ea86cc8d887ac2cca64f3d13257ea6f872e8a0974c7da20c3e7d
DIST virtualbox-4.3.12-patches-01.tar.xz 4248 SHA256 90f65d8911ea8ca16aaa08181aaae023fae08720b5085af1d4248ead0e4d2343 SHA512 ab66a86e7533c952ae3d64dfa30b8265b0fb96f95bef50f888e221ce11dabbe57454c116b478a5bb8ac8b542ae487da59b3b9427bb1cae9b0c3ece4dadf781dc WHIRLPOOL 531dca73bb18b7f23219398a11a56009f91a6318c7bc36e0bc1b7964676f62d5cb7a46fde0d0d7673c669c097fc9ca3f48967665cc143164f28a7f27ebf3ab4a
+DIST virtualbox-4.3.14-patches-02.tar.xz 4092 SHA256 25a02a44933e40734e7cd3ac90992ee86cc108862f5aea70aff7b358f458e917 SHA512 3e0700de76c48dac1e4edb780406aa6f4d8cf162405a65c01dcfa9dc80d06736c1cdacc7749e93821bb471b0e39b671f80d688f38ecc99a7d92200eedecf98b8 WHIRLPOOL db6c598ed3469ec34df805c53359bb99e3e9d805c161feda82b7b17a0c9c26b8073ca7c6b6e15e59dc0dde98d020710dfbf01628f3613c50c0947a8954aa3c7d
diff --git a/app-emulation/virtualbox/virtualbox-4.2.22.ebuild b/app-emulation/virtualbox/virtualbox-4.2.26.ebuild
similarity index 98%
rename from app-emulation/virtualbox/virtualbox-4.2.22.ebuild
rename to app-emulation/virtualbox/virtualbox-4.2.26.ebuild
index c99116278ddf..8f96c65228d9 100644
--- a/app-emulation/virtualbox/virtualbox-4.2.22.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.2.26.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-emulation/virtualbox/virtualbox-4.2.22.ebuild,v 1.5 2014/03/26 10:12:13 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.26.ebuild,v 1.1 2014/07/18 13:51:47 polynomial-c Exp $
EAPI=5
@@ -11,7 +11,7 @@ MY_PV="${PV/beta/BETA}"
MY_PV="${MY_PV/rc/RC}"
MY_P=VirtualBox-${MY_PV}
SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
- http://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-4.2.18-patches-01.tar.xz"
+ http://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-4.2.26-patches-01.tar.xz"
S="${WORKDIR}/${MY_P}"
DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.virtualbox.org/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
RDEPEND="!app-emulation/virtualbox-bin
@@ -72,7 +72,7 @@ DEPEND="${RDEPEND}
vboxwebsrv? (
+ #endif
+
++#include /* isspace() toupper() */
++
+ #include "letters.h"
+
+
diff --git a/app-misc/logitech-applet/files/add-new-id-of-mx300.patch b/app-misc/logitech-applet/files/add-new-id-of-mx300.patch
deleted file mode 100644
index 3a1407ce141b..000000000000
--- a/app-misc/logitech-applet/files/add-new-id-of-mx300.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur logitech_applet-0.4test1/logitech_applet.c logitech_applet-0.4test1-new/logitech_applet.c
---- logitech_applet-0.4test1/logitech_applet.c 2006-06-28 23:29:04.000000000 +0100
-+++ logitech_applet-0.4test1-new/logitech_applet.c 2006-06-28 23:27:55.000000000 +0100
-@@ -61,6 +61,7 @@
- { VENDOR_LOGITECH, 0xC01B, "M-BP86", "MX310 Optical Mouse", HAS_RES },
- { VENDOR_LOGITECH, 0xC01D, "M-BS81A", "MX510 Optical Mouse", HAS_RES | HAS_SS | HAS_SSR },
- { VENDOR_LOGITECH, 0xC01E, "M-BS81A", "MX518 Optical Mouse", HAS_RES },
-+ { VENDOR_LOGITECH, 0xC01F, "M-BS82", "MX300 Optical Mouse", HAS_RES },
- { VENDOR_LOGITECH, 0xC024, "M-BP82", "MX300 Optical Mouse", HAS_RES },
- { VENDOR_LOGITECH, 0xC025, "M-BP81A", "MX500 Optical Mouse", HAS_RES | HAS_SS | HAS_SSR },
- { VENDOR_LOGITECH, 0xC031, "M-UT58A", "iFeel Mouse (silver)", HAS_RES },
diff --git a/app-misc/logitech-applet/files/logitech_applet-mx518.patch b/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-mx300-mx518.patch
similarity index 93%
rename from app-misc/logitech-applet/files/logitech_applet-mx518.patch
rename to app-misc/logitech-applet/files/logitech-applet-0.4_pre1-mx300-mx518.patch
index ae9f333eb844..3e2e06536fcd 100644
--- a/app-misc/logitech-applet/files/logitech_applet-mx518.patch
+++ b/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-mx300-mx518.patch
@@ -1,6 +1,6 @@
---- logitech_applet-0.4test1/logitech_applet.c 2004-09-21 13:18:55.000000000 +0100
-+++ logitech_applet.c 2006-02-03 14:30:35.000000000 +0000
-@@ -40,6 +40,42 @@
+--- a/logitech_applet.c
++++ b/logitech_applet.c
+@@ -40,6 +40,44 @@
#endif
#define VENDOR_LOGITECH 0x046D
@@ -25,9 +25,11 @@
+ { VENDOR_LOGITECH, 0xC01B, "M-BP86", "MX310 Optical Mouse", HAS_RES },
+ { VENDOR_LOGITECH, 0xC01D, "M-BS81A", "MX510 Optical Mouse", HAS_RES | HAS_SS | HAS_SSR },
+ { VENDOR_LOGITECH, 0xC01E, "M-BS81A", "MX518 Optical Mouse", HAS_RES },
++ { VENDOR_LOGITECH, 0xC01F, "M-BS82", "MX300 Optical Mouse", HAS_RES },
+ { VENDOR_LOGITECH, 0xC024, "M-BP82", "MX300 Optical Mouse", HAS_RES },
+ { VENDOR_LOGITECH, 0xC025, "M-BP81A", "MX500 Optical Mouse", HAS_RES | HAS_SS | HAS_SSR },
+ { VENDOR_LOGITECH, 0xC031, "M-UT58A", "iFeel Mouse (silver)", HAS_RES },
++ { VENDOR_LOGITECH, 0xC051, "M-BS81A", "MX518 Optical Mouse", HAS_RES },
+ { VENDOR_LOGITECH, 0xC501, "C-BA4-MSE", "Mouse Receiver", HAS_CSR },
+ { VENDOR_LOGITECH, 0xC502, "C-UA3-DUAL", "Dual Receiver", HAS_CSR | USE_CH2},
+ { VENDOR_LOGITECH, 0xC504, "C-BD9-DUAL", "Cordless Freedom Optical", HAS_CSR | USE_CH2 },
@@ -43,7 +45,7 @@
int get_resolution(struct usb_device *dev)
{
-@@ -141,7 +177,12 @@
+@@ -141,7 +179,12 @@
return cruise;
}
@@ -52,12 +54,12 @@
+ * - 0x03 for 400cpi
+ * - 0x04 for 800cpi
+ * - 0x05 for 1200cpi
-+ * - 0x06 for 1600cpi
++ * - 0x06 for 1600cpi (actually 1800cpi on newer MX518)
+ */
int set_resolution(struct usb_device *dev, int resolution)
{
usb_dev_handle *usb_h;
-@@ -233,39 +274,6 @@
+@@ -233,39 +276,6 @@
printf("Logitech Mouse Applet, Version %s\n", VERSION);
}
@@ -97,7 +99,7 @@
int main(int argc, char **argv)
{
struct usb_bus *bus;
-@@ -318,8 +326,12 @@
+@@ -318,8 +328,12 @@
resolution = 400;
else if (!strcmp("800", optarg))
resolution = 800;
@@ -111,7 +113,7 @@
break;
case 'v':
version();
-@@ -363,14 +375,22 @@
+@@ -363,14 +377,22 @@
break;
case 4: printf("800cpi\n");
break;
diff --git a/app-misc/logitech-applet/files/logitech_applet-mx518-2.patch b/app-misc/logitech-applet/files/logitech_applet-mx518-2.patch
deleted file mode 100644
index 6529b88d7871..000000000000
--- a/app-misc/logitech-applet/files/logitech_applet-mx518-2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=278077
-
---- logitech_applet.c
-+++ logitech_applet.c
-@@ -65,6 +65,7 @@
- { VENDOR_LOGITECH, 0xC024, "M-BP82", "MX300 Optical Mouse", HAS_RES },
- { VENDOR_LOGITECH, 0xC025, "M-BP81A", "MX500 Optical Mouse", HAS_RES | HAS_SS | HAS_SSR },
- { VENDOR_LOGITECH, 0xC031, "M-UT58A", "iFeel Mouse (silver)", HAS_RES },
-+ { VENDOR_LOGITECH, 0xC051, "M-BS81A", "MX518 Optical Mouse", HAS_RES },
- { VENDOR_LOGITECH, 0xC501, "C-BA4-MSE", "Mouse Receiver", HAS_CSR },
- { VENDOR_LOGITECH, 0xC502, "C-UA3-DUAL", "Dual Receiver", HAS_CSR | USE_CH2},
- { VENDOR_LOGITECH, 0xC504, "C-BD9-DUAL", "Cordless Freedom Optical", HAS_CSR | USE_CH2 },
-@@ -182,7 +183,7 @@
- * - 0x03 for 400cpi
- * - 0x04 for 800cpi
- * - 0x05 for 1200cpi
-- * - 0x06 for 1600cpi
-+ * - 0x06 for 1600cpi (actually 1800cpi on newer MX518)
- */
- int set_resolution(struct usb_device *dev, int resolution)
- {
diff --git a/app-misc/logitech-applet/logitech-applet-0.4_pre1-r2.ebuild b/app-misc/logitech-applet/logitech-applet-0.4_pre1-r2.ebuild
deleted file mode 100644
index b1ce4e9a1ff6..000000000000
--- a/app-misc/logitech-applet/logitech-applet-0.4_pre1-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/logitech-applet/logitech-applet-0.4_pre1-r2.ebuild,v 1.6 2010/06/06 06:19:19 ssuominen Exp $
-
-inherit eutils
-
-MY_P=${P/_pre/test}
-MY_P=${MY_P/-applet/_applet}
-
-DESCRIPTION="Control utility for some special features of some special
- Logitech USB mice!"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="=virtual/libusb-0*"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- epatch "${FILESDIR}/logitech_applet-mx518.patch" || die "Failed to apply
- patch"
- epatch "${FILESDIR}/add-new-id-of-mx300.patch" || die "Failed to apply
- patch"
-}
-
-src_install() {
- dosbin logitech_applet
- dodoc AUTHORS ChangeLog README doc/article.txt
-}
diff --git a/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild b/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild
index 7bfc870aab02..9ae960229a7f 100644
--- a/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild
+++ b/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild
@@ -1,8 +1,8 @@
-# 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/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild,v 1.3 2010/06/06 17:04:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild,v 1.4 2014/07/19 03:46:38 jer Exp $
-EAPI=2
+EAPI=5
inherit eutils
MY_P=${P/_pre/test}
@@ -14,21 +14,19 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 x86"
DEPEND="virtual/libusb:0"
+RDEPEND="${DEPEND}"
S=${WORKDIR}/${MY_P}
src_prepare() {
- epatch "${FILESDIR}"/logitech_applet-mx518.patch \
- "${FILESDIR}"/logitech_applet-mx518-2.patch \
- "${FILESDIR}"/add-new-id-of-mx300.patch
+ epatch "${FILESDIR}"/${P}-mx300-mx518.patch
}
src_install() {
- dosbin logitech_applet || die
+ dosbin logitech_applet
dodoc AUTHORS ChangeLog README doc/article.txt
docinto examples
diff --git a/app-misc/logitech-applet/metadata.xml b/app-misc/logitech-applet/metadata.xml
index 5f759f9a0053..40838bc36783 100644
--- a/app-misc/logitech-applet/metadata.xml
+++ b/app-misc/logitech-applet/metadata.xml
@@ -1,9 +1,5 @@
- desktop-misc
-
- Control utility for some special features of some special Logitech USB
- mice!
-
+desktop-misc
diff --git a/app-misc/oneko/oneko-1.2-r2.ebuild b/app-misc/oneko/oneko-1.2-r2.ebuild
index b532b226b66d..8007496dbd9c 100644
--- a/app-misc/oneko/oneko-1.2-r2.ebuild
+++ b/app-misc/oneko/oneko-1.2-r2.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/oneko/oneko-1.2-r2.ebuild,v 1.5 2012/11/16 14:41:39 ulm Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/app-misc/oneko/oneko-1.2-r2.ebuild,v 1.6 2014/07/19 14:15:17 jer Exp $
+EAPI=5
inherit eutils toolchain-funcs
DESCRIPTION="A cat, dog and others which chase the mouse or windows around the screen"
@@ -16,26 +15,29 @@ SRC_URI="http://www.daidouji.com/oneko/distfiles/${P}.sakura.5.tar.gz
LICENSE="public-domain"
SLOT="0"
KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-RDEPEND="x11-libs/libX11
- x11-libs/libXext"
-DEPEND="${RDEPEND}
+RDEPEND="
+ x11-libs/libX11
+ x11-libs/libXext
+"
+DEPEND="
+ ${RDEPEND}
x11-misc/gccmakedep
x11-misc/imake
app-text/rman
- x11-proto/xextproto"
+ x11-proto/xextproto
+"
-S="${WORKDIR}/oneko-${PV}.sakura.5"
+S=${WORKDIR}/oneko-${PV}.sakura.5
src_prepare() {
epatch \
- "${WORKDIR}/${P}-sakura-nobsd.patch" \
- "${FILESDIR}/${P}-include.patch"
+ "${WORKDIR}"/${P}-sakura-nobsd.patch \
+ "${FILESDIR}"/${P}-include.patch
}
src_configure() {
- xmkmf -a || die "running xmkmf failed!"
+ xmkmf -a || die
}
src_compile() {
@@ -43,7 +45,7 @@ src_compile() {
CC="$(tc-getCC)" \
CCOPTIONS="${CFLAGS}" \
EXTRA_LDOPTIONS="${LDFLAGS}" \
- || die "make failed!"
+ || die
}
src_install() {
diff --git a/app-misc/remind/Manifest b/app-misc/remind/Manifest
index aab4a7bf0792..2f4628c28129 100644
--- a/app-misc/remind/Manifest
+++ b/app-misc/remind/Manifest
@@ -1,2 +1 @@
-DIST remind-03.01.12.tar.gz 361662 SHA256 b8c7773ebbae80c7f340073c0c7f73124672c56a950d721f6afdab7b29f9cbb9 SHA512 d714208d793b436d2261913f1c25ac43d409650e732dfc3e910c7926ac232157aa183a60e75b01c8a57d467926ec39118d6afff12bc5835e1a910bdaa01cac2a WHIRLPOOL 384075ab4b5c14c4c0b5704986332428e0ab8233e3ff2b10abe0280a956f5f1e79095cc4b6364e87bed14977bbda0237e8ec8c5bd5a9e6b2d6c72a0179ce6ff4
DIST remind-03.01.13.tar.gz 361650 SHA256 cf2663d5eb41863fc98da7c8db31ae0a86fbe7137aada81d0649523b4a0bfc4f SHA512 28478e78a52055ca0c8f8d1da82149c4afa4436bb02652c39eb0547777b7fad0a9489faf3c86f9225dad5f843a708b72dd48e1aa44bd02f4361600cf2d0f0392 WHIRLPOOL dede62bb7e053317ca6434907ce63d4e49517ad0c250f12fd66769df2babef8f56306b4082a9948a501ee0f9766ba3e3a35440d38317bde230d1ebd7f53782a9
diff --git a/app-misc/remind/files/03.01.12-test.patch b/app-misc/remind/files/03.01.12-test.patch
deleted file mode 100644
index f921304e36c0..000000000000
--- a/app-misc/remind/files/03.01.12-test.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit c56cfe9e1d61a7739fe88fcb42878432e75b3680
-Author: David F. Skoll
-Date: Tue May 8 16:54:54 2012 -0400
-
- Fix test harness failure.
-
-diff --git a/tests/test-rem b/tests/test-rem
-index 13b5ba6..bad3f49 100644
---- a/tests/test-rem
-+++ b/tests/test-rem
-@@ -68,7 +68,7 @@ echo "Sort Test" >> ../tests/test.out
- (echo "REM AT 12:00 MSG Untimed"; echo "REM MSG Timed") | ../src/remind -q -gaaad - 1 Jan 2000 >> ../tests/test.out 2>&1
-
- echo "Purge Test" >> ../tests/test.out
--../src/remind -j999 ../tests/purge_dir/f1.rem >> ../tests/test.out 2>&1
-+../src/remind -j999 ../tests/purge_dir/f1.rem 3 Feb 2012 >> ../tests/test.out 2>&1
- echo "F1" >> ../tests/test.out
- cat ../tests/purge_dir/f1.rem.purged >> ../tests/test.out
- echo "F2" >> ../tests/test.out
diff --git a/app-misc/remind/remind-03.01.12.ebuild b/app-misc/remind/remind-03.01.12.ebuild
deleted file mode 100644
index 61f85c8f4598..000000000000
--- a/app-misc/remind/remind-03.01.12.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/remind/remind-03.01.12.ebuild,v 1.6 2012/07/29 17:18:10 armin76 Exp $
-
-inherit eutils
-
-MY_P=${P/_beta/-BETA-}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Ridiculously functional reminder program"
-HOMEPAGE="http://www.roaringpenguin.com/products/remind"
-SRC_URI="http://www.roaringpenguin.com/files/download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE="tk"
-
-RDEPEND="tk? ( dev-lang/tk dev-tcltk/tcllib )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- sed -i 's:$(MAKE) install:&-nostripped:' "${S}"/Makefile || die
- epatch "${FILESDIR}"/03.01.12-test.patch
-}
-
-src_test() {
- if [[ ${EUID} -eq 0 ]] ; then
- ewarn "Testing fails if run as root. Skipping tests."
- return
- fi
- make test || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- dobin www/rem2html || die "dobin failed"
-
- dodoc docs/WHATSNEW examples/defs.rem www/README.* || die "dodoc failed"
-
- if ! use tk ; then
- rm "${D}"/usr/bin/tkremind "${D}"/usr/share/man/man1/tkremind* \
- "${D}"/usr/bin/cm2rem* "${D}"/usr/share/man/man1/cm2rem*
- fi
-
- rm "${S}"/contrib/rem2ics-*/{Makefile,rem2ics.spec} || die
- insinto /usr/share/${PN}
- doins -r contrib/
-}
diff --git a/app-office/rubrica/files/rubrica-2.1.6_fix-menu-language.patch b/app-office/rubrica/files/rubrica-2.1.6-fix-menu-language.patch
old mode 100755
new mode 100644
similarity index 98%
rename from app-office/rubrica/files/rubrica-2.1.6_fix-menu-language.patch
rename to app-office/rubrica/files/rubrica-2.1.6-fix-menu-language.patch
index d152d0b8b1a2..6647f5e2c28d
--- a/app-office/rubrica/files/rubrica-2.1.6_fix-menu-language.patch
+++ b/app-office/rubrica/files/rubrica-2.1.6-fix-menu-language.patch
@@ -1,5 +1,5 @@
---- org/de.po 2008-09-03 23:41:02.000000000 +0200
-+++ po/de.po 2008-09-04 01:51:15.000000000 +0200
+--- a/po/de.po
++++ b/po/de.po
@@ -4,7 +4,7 @@
"Project-Id-Version: Rubrica 2.0rc1\n"
"Report-Msgid-Bugs-To: \n"
@@ -680,8 +680,8 @@
#: ../rubrica2.schemas.in.h:10
msgid "Rubrica will make a backup of addressbooks before overwrite them"
---- org/fr.po 2008-09-03 23:41:02.000000000 +0200
-+++ po/fr.po 2008-09-04 12:32:32.000000000 +0200
+--- a/po/fr.po
++++ b/po/fr.po
@@ -4,7 +4,7 @@
"Project-Id-Version: Rubrica 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
diff --git a/app-office/rubrica/files/rubrica-2.1.6-gthread.patch b/app-office/rubrica/files/rubrica-2.1.6-gthread.patch
new file mode 100644
index 000000000000..564f01a13eb8
--- /dev/null
+++ b/app-office/rubrica/files/rubrica-2.1.6-gthread.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -114,7 +114,7 @@
+ AC_SUBST(LIBRAL_LIBS)
+ AC_SUBST(LIBRAL_CFLAGS)
+
+-PKG_CHECK_MODULES(RUBRICA, gtk+-2.0 >= 2.6 glib-2.0 >= 2.6 libglade-2.0 gconf-2.0 libnotify)
++PKG_CHECK_MODULES(RUBRICA, gtk+-2.0 >= 2.6 glib-2.0 >= 2.6 gthread-2.0 libglade-2.0 gconf-2.0 libnotify)
+ AC_SUBST(RUBRICA_LIBS)
+ AC_SUBST(RUBRICA_CFLAGS)
+
diff --git a/app-office/rubrica/files/rubrica-2.1.6-libm.patch b/app-office/rubrica/files/rubrica-2.1.6-libm.patch
new file mode 100644
index 000000000000..b7d239fae58e
--- /dev/null
+++ b/app-office/rubrica/files/rubrica-2.1.6-libm.patch
@@ -0,0 +1,24 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -110,7 +110,7 @@
+
+
+
+-rubrica2_LDADD = $(top_builddir)/libral/libral.la $(RUBRICA_LIBS) $(LIBRAL_LIBS)
++rubrica2_LDADD = $(top_builddir)/libral/libral.la $(RUBRICA_LIBS) $(LIBRAL_LIBS) $(LIBM)
+
+
+
+--- a/configure.in
++++ b/configure.in
+@@ -102,6 +102,10 @@
+ AC_DEFINE_UNQUOTED(RUBRICA_CAP_NAME, "$RUBRICA_CAP_NAME", The program name with capital initial letter)
+ AC_DEFINE_UNQUOTED(RUBRICA_VERSION, "$RUBRICA_VERSION", The program version)
+
++dnl
++dnl libm
++LT_LIB_M
++dnl
+
+ dnl
+ dnl Start of pkg-config checks
diff --git a/app-office/rubrica/files/rubrica-2.1.6-libnotify-0.7.patch b/app-office/rubrica/files/rubrica-2.1.6-libnotify-0.7.patch
index 9ab854aff20a..a2e2fca3cfd1 100644
--- a/app-office/rubrica/files/rubrica-2.1.6-libnotify-0.7.patch
+++ b/app-office/rubrica/files/rubrica-2.1.6-libnotify-0.7.patch
@@ -1,5 +1,5 @@
---- src/app.c
-+++ src/app.c
+--- a/src/app.c
++++ b/src/app.c
@@ -1338,8 +1338,15 @@
self->priv->statusbar = rubrica_statusbar_new();
diff --git a/app-office/rubrica/files/rubrica-2.1.6-linguas_hu.patch b/app-office/rubrica/files/rubrica-2.1.6-linguas_hu.patch
new file mode 100644
index 000000000000..d3a8b454e026
--- /dev/null
+++ b/app-office/rubrica/files/rubrica-2.1.6-linguas_hu.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -116,7 +116,7 @@
+
+
+ dnl Add the languages which your application supports here.
+-ALL_LINGUAS="it uk de fr ru"
++ALL_LINGUAS="de fr hu it ru uk"
+ AM_GLIB_GNU_GETTEXT
+
+
diff --git a/app-office/rubrica/files/rubrica-2.1.6_missing-icons.patch b/app-office/rubrica/files/rubrica-2.1.6-missing-icons.patch
old mode 100755
new mode 100644
similarity index 84%
rename from app-office/rubrica/files/rubrica-2.1.6_missing-icons.patch
rename to app-office/rubrica/files/rubrica-2.1.6-missing-icons.patch
index 09928eb8b24d..17eef8af1baf
--- a/app-office/rubrica/files/rubrica-2.1.6_missing-icons.patch
+++ b/app-office/rubrica/files/rubrica-2.1.6-missing-icons.patch
@@ -1,5 +1,5 @@
---- org/app.c 2008-09-04 19:43:43.000000000 +0200
-+++ src/app.c 2008-09-04 19:51:38.000000000 +0200
+--- a/src/app.c
++++ b/src/app.c
@@ -59,13 +59,13 @@
{"all", "all groups", N_("all groups") },
@@ -16,8 +16,8 @@
{"applications-multimedia", "hobbies", N_("hobbies") },
{"sport", "sport", N_("sport") },
---- org/callbacks.c 2008-09-06 15:02:19.000000000 +0200
-+++ src/callbacks.c 2008-09-06 15:04:36.000000000 +0200
+--- a/src/callbacks.c
++++ b/src/callbacks.c
@@ -597,7 +597,8 @@
"Ukrainian Iryna Rtveliashvili \n"
"Deutsch Christian Faulhammer \n"
diff --git a/app-office/rubrica/files/rubrica-2.1.6-schema.patch b/app-office/rubrica/files/rubrica-2.1.6-schema.patch
new file mode 100644
index 000000000000..20f4ee866d11
--- /dev/null
+++ b/app-office/rubrica/files/rubrica-2.1.6-schema.patch
@@ -0,0 +1,29 @@
+--- a/rubrica2.schemas.in
++++ b/rubrica2.schemas.in
+@@ -6,7 +6,7 @@
+ /apps/rubrica2/file_format
+ rubrica
+ int
+- @FILE_FORMAT@
++ @RUBRICA_FILE_FORMAT@
+
+ rubrica file format
+
+@@ -88,7 +88,7 @@
+ /schemas/apps/rubrica2/file/load_files
+ /apps/rubrica2/file/load_files
+ rubrica
+- boolean
++ bool
+ false
+
+ Load addressbooks on startup
+@@ -100,7 +100,7 @@
+ /apps/rubrica2/file/files
+ rubrica
+ list
+-
++ string
+
+ Files that rubrica will open at startup
+
diff --git a/app-office/rubrica/files/rubrica-2.1.6_url-crash.patch b/app-office/rubrica/files/rubrica-2.1.6-url-crash.patch
similarity index 86%
rename from app-office/rubrica/files/rubrica-2.1.6_url-crash.patch
rename to app-office/rubrica/files/rubrica-2.1.6-url-crash.patch
index 97a20f3260af..1d8bebbb888c 100644
--- a/app-office/rubrica/files/rubrica-2.1.6_url-crash.patch
+++ b/app-office/rubrica/files/rubrica-2.1.6-url-crash.patch
@@ -1,5 +1,5 @@
---- de.po.orig 2008-10-17 20:08:33.000000000 +0200
-+++ de.po 2008-10-17 20:10:55.000000000 +0200
+--- a/po/de.po
++++ b/po/de.po
@@ -4,7 +4,7 @@
"Project-Id-Version: Rubrica 2.0rc1\n"
"Report-Msgid-Bugs-To: \n"
@@ -18,8 +18,8 @@
#: ../src/app.c:742 ../rubrica2.desktop.in.h:2
msgid "Rubrica Addressbook"
---- fr.po.orig 2008-10-17 20:08:40.000000000 +0200
-+++ fr.po 2008-10-17 20:11:17.000000000 +0200
+--- a/po/fr.po
++++ b/po/fr.po
@@ -4,7 +4,7 @@
"Project-Id-Version: Rubrica 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
diff --git a/app-office/rubrica/rubrica-2.1.6-r1.ebuild b/app-office/rubrica/rubrica-2.1.6-r1.ebuild
index 1c514f568199..52f7b9773ceb 100644
--- a/app-office/rubrica/rubrica-2.1.6-r1.ebuild
+++ b/app-office/rubrica/rubrica-2.1.6-r1.ebuild
@@ -1,32 +1,36 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/rubrica/rubrica-2.1.6-r1.ebuild,v 1.7 2012/05/03 20:00:41 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/rubrica/rubrica-2.1.6-r1.ebuild,v 1.8 2014/07/19 16:31:03 jer Exp $
-EAPI=2
-inherit eutils gnome2
+EAPI=5
+inherit autotools eutils gnome2
MY_PN=${PN}2
DESCRIPTION="A contact database for Gnome"
-HOMEPAGE="http://rubrica.berlios.de/"
-SRC_URI="mirror://berlios/${PN}/${MY_PN}-${PV}.tar.bz2
- linguas_hu? ( mirror://gentoo/${P}-hu.po.bz2 )"
-
LICENSE="GPL-3"
+HOMEPAGE="http://rubrica.berlios.de/"
SLOT="0"
-KEYWORDS="x86"
-IUSE="linguas_hu"
-
-RDEPEND="dev-libs/glib:2
+KEYWORDS="~amd64 x86"
+SRC_URI="
+ mirror://berlios/${PN}/${MY_PN}-${PV}.tar.bz2
+ mirror://gentoo/${P}-hu.po.bz2
+"
+
+RDEPEND="
+ dev-libs/glib:2
dev-libs/libxml2
>=gnome-base/libglade-2
gnome-base/gconf:2
x11-libs/gtk+:2
- x11-libs/libnotify"
-DEPEND="${RDEPEND}
+ x11-libs/libnotify
+"
+DEPEND="
+ ${RDEPEND}
+ >=sys-devel/gettext-0.16.1
dev-util/intltool
virtual/pkgconfig
- linguas_hu? ( >=sys-devel/gettext-0.16.1 )"
+"
S=${WORKDIR}/${MY_PN}-${PV}
@@ -40,33 +44,20 @@ pkg_setup() {
}
src_prepare() {
+ mv "${WORKDIR}"/${P}-hu.po po/hu.po || die
epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
- # False menu in locales
- epatch "${FILESDIR}"/${P}_fix-menu-language.patch
- # Missing gnome icons
- epatch "${FILESDIR}"/${P}_missing-icons.patch
- cd po
- epatch "${FILESDIR}"/${P}_url-crash.patch
-}
-
-src_compile() {
- gnome2_src_compile
-
- # Add Hungarian translation
- if use linguas_hu; then
- msgfmt "${WORKDIR}"/${P}-hu.po --output-file po/hu.gmo || die
- fi
+ epatch "${FILESDIR}"/${P}-fix-menu-language.patch
+ epatch "${FILESDIR}"/${P}-missing-icons.patch
+ epatch "${FILESDIR}"/${P}-url-crash.patch
+ epatch "${FILESDIR}"/${P}-linguas_hu.patch
+ epatch "${FILESDIR}"/${P}-libm.patch
+ epatch "${FILESDIR}"/${P}-gthread.patch
+ epatch "${FILESDIR}"/${P}-schema.patch
+ eautoreconf
}
src_install() {
gnome2_src_install
-
domenu "${FILESDIR}"/${MY_PN}.desktop
-
- if use linguas_hu; then
- domo po/hu.gmo || die
- dosym ${PN}.mo /usr/share/locale/hu/LC_MESSAGES/${MY_PN}.mo || die
- fi
-
- find "${D}" -name '*.la' -exec rm -f '{}' +
+ prune_libtool_files
}
diff --git a/dev-cpp/gmock/gmock-1.7.0.ebuild b/dev-cpp/gmock/gmock-1.7.0.ebuild
index a72e535f48e8..19d931b98321 100644
--- a/dev-cpp/gmock/gmock-1.7.0.ebuild
+++ b/dev-cpp/gmock/gmock-1.7.0.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-cpp/gmock/gmock-1.7.0.ebuild,v 1.2 2014/06/29 18:57:06 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.7.0.ebuild,v 1.3 2014/07/19 07:28:13 pacho Exp $
EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="http://googlemock.googlecode.com/files/${P}.zip"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
IUSE="static-libs"
RDEPEND="=dev-cpp/gtest-${PV}*"
diff --git a/dev-cpp/gtest/gtest-1.7.0.ebuild b/dev-cpp/gtest/gtest-1.7.0.ebuild
index 4e9965772654..5eb2bb9e029a 100644
--- a/dev-cpp/gtest/gtest-1.7.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.7.0.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-cpp/gtest/gtest-1.7.0.ebuild,v 1.4 2014/06/29 18:56:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.7.0.ebuild,v 1.5 2014/07/19 07:27:53 pacho Exp $
EAPI="5"
@@ -17,7 +17,7 @@ SRC_URI="http://googletest.googlecode.com/files/${P}.zip"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="examples static-libs"
DEPEND="app-arch/unzip
diff --git a/dev-db/lmdb/Manifest b/dev-db/lmdb/Manifest
index 4105d59ed6f7..442a3bff26cd 100644
--- a/dev-db/lmdb/Manifest
+++ b/dev-db/lmdb/Manifest
@@ -1,2 +1,3 @@
+DIST lmdb-0.9.13.tar.gz 116425 SHA256 8b41a7f0f1263e607d91c16530c85567cd8bc383680dad6577847611e5266214 SHA512 9f81ab8319123c9662112210bddcf136d732af5c930fad9c88472ad6a0b8a7dbd066c8adbf64ee03a26a006fad57913ffee1cb17e6fe8d9f9ae1472760014d18 WHIRLPOOL dd7bb50f5b218bd3b97d45c90e2df3fa8a967731a75432cbaa38a8e2f6fa6e8b55edeed1999f6c385d848ff94e4ba2e53e7c2a30f4094c214606047fdb4d9294
DIST lmtp-0.9.11.tar.gz 114646 SHA256 c1235660f081c5bd6e14b9e4a84ef36c490de34ff09c015519c3f384fd47a0da SHA512 b34362a6c46e7cbb3e8fa7d2c9dc224609f5d661af03eaa0a84ce0ff500611f863bc41e3fdb139e20dfbffcc2a14a2c769eaf060994dffb60470a0bc5a73507a WHIRLPOOL 604c905efc643d977511bd465fbc0d75fbd053163d52d6c167acebc896baaaa9468bd1fdd1a397579ffcb38332eca383611b233cdf5a77e7c2f59cd6773a17cb
DIST openldap-2.4.38.tgz 5506085 SHA256 88209a3599ec5d9354fc09bbe29b99db1ffa1b612127c06bad0c5265d0b31fd1 SHA512 df7b6b2b84102ba996f84575396c7505ada851b5f09841fd821d34fd8d62580f85ecc655e2cd3965730b44d6919d64864f56b23791f38b411d142d345f250666 WHIRLPOOL bb6a19b353f9dcde07afe78052ce9d5db5a2aaa09236b69d22da0879e74c4de8587312bad66939702db30af779f7ee9720ad792b73d225f004a1a90d80a6fed1
diff --git a/dev-db/lmdb/lmdb-0.9.13.ebuild b/dev-db/lmdb/lmdb-0.9.13.ebuild
new file mode 100644
index 000000000000..806ae1223267
--- /dev/null
+++ b/dev-db/lmdb/lmdb-0.9.13.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/lmdb/lmdb-0.9.13.ebuild,v 1.1 2014/07/19 14:12:45 eras Exp $
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="An ultra-fast, ultra-compact key-value embedded data store"
+HOMEPAGE="http://symas.com/mdb/"
+SRC_URI="https://gitorious.org/mdb/mdb/archive/59d30a49c3ad403235ba30f65e074eddf1c125f0.tar.gz
+ -> lmdb-0.9.13.tar.gz"
+
+LICENSE="OPENLDAP"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86"
+IUSE="static-libs"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/mdb-mdb/libraries/liblmdb"
+
+src_prepare() {
+ sed -i -e "s/^CC.*/CC = $(tc-getCC)/" \
+ -e "s/^CFLAGS.*/CFLAGS = ${CFLAGS}/" \
+ -e "s/ar rs/$(tc-getAR) rs/" \
+ -e "s:^prefix.*:prefix = /usr:" \
+ -e "s:/man/:/share/man/:" \
+ -e "/for f/s:lib:$(get_libdir):" \
+ -e "s:shared:shared -Wl,-soname,liblmdb.so.0:" \
+ "${S}/Makefile" || die
+}
+
+src_configure() {
+ :
+}
+
+src_compile() {
+ emake LDLIBS+=" -pthread"
+}
+
+src_install() {
+ mkdir -p "${D}"/usr/{bin,$(get_libdir),include,share/man/man1}
+ default
+
+ mv "${D}"/usr/$(get_libdir)/liblmdb.so{,.0} || die
+ dosym liblmdb.so.0 /usr/$(get_libdir)/liblmdb.so
+
+ use static-libs || rm -f "${D}"/usr/$(get_libdir)/liblmdb.a
+}
diff --git a/dev-db/mysql++/mysql++-2.3.2.ebuild b/dev-db/mysql++/mysql++-2.3.2.ebuild
index 85f558c2e98d..dc65203181a8 100644
--- a/dev-db/mysql++/mysql++-2.3.2.ebuild
+++ b/dev-db/mysql++/mysql++-2.3.2.ebuild
@@ -1,6 +1,8 @@
-# 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-db/mysql++/mysql++-2.3.2.ebuild,v 1.10 2008/11/29 10:58:21 tcunha Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-2.3.2.ebuild,v 1.11 2014/07/20 02:21:13 grknight Exp $
+
+EAPI=5
inherit eutils
@@ -17,9 +19,7 @@ RDEPEND=">=virtual/mysql-4.0"
DEPEND="${RDEPEND}
>=sys-devel/gcc-3"
-src_unpack() {
- unpack ${A}
- cd "${S}"
+src_prepare() {
epatch "${FILESDIR}"/${P}-gcc-4.3.patch
@@ -31,7 +31,7 @@ src_unpack() {
done
}
-src_compile() {
+src_configure() {
local myconf
# we want C++ exceptions turned on
myconf="--enable-exceptions"
@@ -43,16 +43,14 @@ src_compile() {
# force the cflags into place otherwise they get totally ignored by
# configure
CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
- econf ${myconf} || die "econf failed"
-
- emake || die "unable to make"
+ econf ${myconf}
}
src_install() {
- emake DESTDIR="${D}" install || die
+ default
# install the docs and HTML pages
dodoc README* CREDITS ChangeLog HACKERS Wishlist
- dodoc doc/*
- cp -ra doc/html "${D}"/usr/share/doc/${PF}/html
- prepalldocs
+ dohtml -r doc/html/*
+ rm -r doc/html || die
+ dodoc -r doc/*
}
diff --git a/dev-db/mysql/mysql-5.5.38.ebuild b/dev-db/mysql/mysql-5.5.38.ebuild
index 908e106ba751..3832c2ae1ece 100644
--- a/dev-db/mysql/mysql-5.5.38.ebuild
+++ b/dev-db/mysql/mysql-5.5.38.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-db/mysql/mysql-5.5.38.ebuild,v 1.1 2014/06/20 00:10:37 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.38.ebuild,v 1.2 2014/07/19 10:27:34 grobian Exp $
EAPI="5"
@@ -19,7 +19,7 @@ IUSE="$IUSE"
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
# When MY_EXTRAS is bumped, the index should be revised to exclude these.
EPATCH_EXCLUDE=''
diff --git a/dev-haskell/feed/Manifest b/dev-haskell/feed/Manifest
index 60b4027fd879..66e26a96bb86 100644
--- a/dev-haskell/feed/Manifest
+++ b/dev-haskell/feed/Manifest
@@ -1,2 +1 @@
-DIST feed-0.3.8.tar.gz 72269 SHA256 e614f7019a035c1eaa8952cdcfe5291c539f670f218ab591727d33b4367b71fb SHA512 48f4c4ff85c64dce4620747b01df3540db6f26b8109d44a4d83885e7da3c8a77c81dc17812c573e4e78b14606c34dc265ff9f7f8c55baf3b6575d77687d8b871 WHIRLPOOL 65bc11c3c22ea24674c661c50854c1a37c50f6827bdbd7c74742856cfb9bec582d402c5cd910e0b42350a5aad4f701cea7207a2a2d132f93bf4eeabb141d795d
DIST feed-0.3.9.2.tar.gz 73353 SHA256 ef1d23d130b766186a0bacd6e4807279cab681712b0fb09d1ed1ee1b3c154f17 SHA512 36e9d75d7bab4c26967d39a20c1b8382a24f2f5059dadf0425bbcc16a659587a842f948a456d63cb32660feb4d7d56ffdf6aead7ec5c40abb678b9fdce25ff0f WHIRLPOOL 953bda571eb1f8e8925459065e52e8759db5253f433f82427c3ff246c0ce3d3cf3c26a04a751272d216badc64677938bdf1f0fb309c9007ff8c115680036bb92
diff --git a/dev-haskell/feed/feed-0.3.8-r1.ebuild b/dev-haskell/feed/feed-0.3.8-r1.ebuild
deleted file mode 100644
index 5adf7c3a5dc2..000000000000
--- a/dev-haskell/feed/feed-0.3.8-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/feed/feed-0.3.8-r1.ebuild,v 1.1 2013/06/20 04:57:00 qnikst Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds."
-HOMEPAGE="http://hackage.haskell.org/package/feed"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-#hackport: ignore-flag new-base ; redundant flag, do nothing
-IUSE=
-
-RDEPEND="dev-haskell/utf8-string:=[profile?]
- >=dev-haskell/xml-1.2.6:=[profile?]
- >=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.2"
diff --git a/dev-java/javolution/javolution-6.0.0.ebuild b/dev-java/javolution/javolution-6.0.0.ebuild
index 673e1a14542e..ba9850c92932 100644
--- a/dev-java/javolution/javolution-6.0.0.ebuild
+++ b/dev-java/javolution/javolution-6.0.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-java/javolution/javolution-6.0.0.ebuild,v 1.1 2013/10/16 12:49:26 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javolution/javolution-6.0.0.ebuild,v 1.2 2014/07/20 06:56:06 ercpe Exp $
EAPI="5"
@@ -30,10 +30,12 @@ RDEPEND=">=virtual/jre-1.5
EANT_BUILD_TARGET="package"
JAVA_PKG_BSFIX_NAME="build.xml maven-build.xml"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="osgi-core-api,osgi-compendium"
src_unpack() {
unpacker ${P}.tar.xz
- cd "${S}"
+ cd "${S}" || die
unpacker ${P}-build.xml.tar.xz
}
diff --git a/dev-lang/erlang/erlang-16.3.1.ebuild b/dev-lang/erlang/erlang-16.3.1.ebuild
index 2135146c275b..6869485781ce 100644
--- a/dev-lang/erlang/erlang-16.3.1.ebuild
+++ b/dev-lang/erlang/erlang-16.3.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/erlang/erlang-16.3.1.ebuild,v 1.2 2014/04/05 15:39:42 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-16.3.1.ebuild,v 1.3 2014/07/19 18:18:09 klausman Exp $
EAPI=4
WX_GTK_VER="2.8"
@@ -24,7 +24,7 @@ SRC_URI="http://www.erlang.org/download/otp_src_${MY_PV}.tar.gz
LICENSE="ErlPL-1.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="compat-ethread doc emacs halfword hipe java kpoll odbc smp sctp ssl tk wxwidgets"
RDEPEND=">=dev-lang/perl-5.6.1
diff --git a/dev-lang/go/go-1.3.ebuild b/dev-lang/go/go-1.3.ebuild
index 3eadc876d1ac..55714b392a4d 100644
--- a/dev-lang/go/go-1.3.ebuild
+++ b/dev-lang/go/go-1.3.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/go/go-1.3.ebuild,v 1.1 2014/06/19 10:18:30 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.3.ebuild,v 1.2 2014/07/18 17:04:39 williamh Exp $
EAPI=5
@@ -14,7 +14,7 @@ if [[ ${PV} = 9999 ]]; then
else
SRC_URI="https://storage.googleapis.com/golang/go${PV}.src.tar.gz"
# Upstream only supports go on amd64, arm and x86 architectures.
- KEYWORDS="-* ~amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+ KEYWORDS="-* amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
fi
DESCRIPTION="A concurrent garbage collected and typesafe programming language"
diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild
index a1f9b380110b..43aa1ffb50d6 100644
--- a/dev-lang/go/go-9999.ebuild
+++ b/dev-lang/go/go-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/go/go-9999.ebuild,v 1.17 2014/07/17 20:48:05 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-9999.ebuild,v 1.18 2014/07/18 16:18:51 williamh Exp $
EAPI=5
@@ -70,7 +70,7 @@ src_test()
src_install()
{
dobin bin/*
- dodoc AUTHORS CONTRIBUTORS PATENTS README
+ dodoc AUTHORS CONTRIBUTORS PATENTS README misc/editors
dodir /usr/lib/go
insinto /usr/lib/go
diff --git a/dev-lang/python/python-2.7.6.ebuild b/dev-lang/python/python-2.7.6.ebuild
index f6ff49286292..1cf7bbe4ab2a 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.13 2014/06/15 14:33:47 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.6.ebuild,v 1.14 2014/07/18 13:48:30 klausman 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/jemalloc/jemalloc-3.6.0.ebuild b/dev-libs/jemalloc/jemalloc-3.6.0.ebuild
index 68da8a32f0e0..4c1b51fb9d63 100644
--- a/dev-libs/jemalloc/jemalloc-3.6.0.ebuild
+++ b/dev-libs/jemalloc/jemalloc-3.6.0.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/jemalloc/jemalloc-3.6.0.ebuild,v 1.5 2014/07/03 15:53:28 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/jemalloc-3.6.0.ebuild,v 1.6 2014/07/18 17:26:10 mrueg Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://www.canonware.com/download/${PN}/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x64-macos ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="debug static-libs stats"
HTML_DOCS=( doc/jemalloc.html )
PATCHES=( "${FILESDIR}/${PN}-3.5.1-strip-optimization.patch"
diff --git a/dev-libs/libbsd/libbsd-0.6.0.ebuild b/dev-libs/libbsd/libbsd-0.6.0.ebuild
index 5663e70002aa..7cc9786d5df2 100644
--- a/dev-libs/libbsd/libbsd-0.6.0.ebuild
+++ b/dev-libs/libbsd/libbsd-0.6.0.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/libbsd/libbsd-0.6.0.ebuild,v 1.8 2014/06/20 14:04:14 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libbsd/libbsd-0.6.0.ebuild,v 1.9 2014/07/18 13:04:14 klausman Exp $
EAPI=5
inherit eutils multilib
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.freedesktop.org/releases/${P}.tar.xz"
LICENSE="BSD BSD-2 BSD-4 ISC"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa x86"
+KEYWORDS="~alpha amd64 arm hppa x86"
IUSE="static-libs"
DOCS="ChangeLog README TODO"
diff --git a/dev-libs/libmba/files/libmba-0.9.1-qa.patch b/dev-libs/libmba/files/libmba-0.9.1-qa.patch
index 16476dfd1e51..a3edfd527bc6 100644
--- a/dev-libs/libmba/files/libmba-0.9.1-qa.patch
+++ b/dev-libs/libmba/files/libmba-0.9.1-qa.patch
@@ -10,8 +10,8 @@ http://bugs.gentoo.org/show_bug.cgi?id=313673
Patch written by Kacper Kowalik
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
@@ -1,13 +1,13 @@
# Makefile for libmba
# Supported flags: -DVARRAY_INIT_SIZE=N -DUSE_WCHAR
@@ -23,8 +23,9 @@ Patch written by Kacper Kowalik
-prefix = /usr/local
+prefix = $(DESTDIR)/usr
includedir = $(prefix)/include
- libdir = $(prefix)/lib
+-libdir = $(prefix)/lib
-mandir = $(prefix)/man
++libdir = $(prefix)/$(LIBDIR)
+mandir = $(prefix)/share/man
LIBNAME = mba
LIBVERS = 0.9.1
diff --git a/dev-libs/libmba/libmba-0.9.1-r1.ebuild b/dev-libs/libmba/libmba-0.9.1-r1.ebuild
index 6cb986426cf8..929d67d8b97d 100644
--- a/dev-libs/libmba/libmba-0.9.1-r1.ebuild
+++ b/dev-libs/libmba/libmba-0.9.1-r1.ebuild
@@ -1,37 +1,36 @@
-# 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/dev-libs/libmba/libmba-0.9.1-r1.ebuild,v 1.3 2011/12/18 19:48:09 phajdan.jr Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmba/libmba-0.9.1-r1.ebuild,v 1.4 2014/07/18 21:36:23 jer Exp $
+EAPI=5
inherit eutils multilib toolchain-funcs
-DESCRIPTION="A library of generic C modules."
-HOMEPAGE="http://www.ioplex.com/~miallen/libmba/"
-SRC_URI="http://www.ioplex.com/~miallen/libmba/dl/${P}.tar.gz"
-
+DESCRIPTION="A library of generic C modules"
LICENSE="MIT"
+HOMEPAGE="http://www.ioplex.com/~miallen/libmba/"
+SRC_URI="${HOMEPAGE}dl/${P}.tar.gz"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="static-libs"
-pkg_setup(){
- use static-libs && export STATIC="1"
-}
-
src_prepare() {
+ use static-libs && export STATIC="1"
epatch "${FILESDIR}"/${P}-qa.patch
+
tc-export CC
sed -i -e "s:gcc:${CC}:g" mktool.c || die
- sed -i -e "s:\$(prefix)/lib:\$(prefix)/$(get_libdir):" Makefile || die
+}
+
+src_compile() {
+ emake LIBDIR="$(get_libdir)"
}
src_install() {
- emake DESTDIR="${D}" install || die
+ default
- dodoc README.txt docs/*.txt || die
- dohtml -r docs/*.html docs/www/* docs/ref || die
+ dodoc README.txt docs/*.txt
+ dohtml -r docs/*.html docs/www/* docs/ref
insinto /usr/share/doc/${PF}/examples
- doins examples/* || die
+ doins examples/*
}
diff --git a/dev-lua/luvit/Manifest b/dev-lua/luvit/Manifest
index 9c417698f015..1ad7f9403042 100644
--- a/dev-lua/luvit/Manifest
+++ b/dev-lua/luvit/Manifest
@@ -1,2 +1,3 @@
DIST luvit-0.6.1.tar.gz 7022830 SHA256 da0951cc92fec2809d5aa6a54512856917985177002fb7ef5d99392f1ed8a46c SHA512 5a3ff741149afae2f8e358b7a4c71b11c1543bf63845a94906d4f4a42bd88c4ad98a9e8c54b579b795c344e6053a8406f6acc29ed9a755c5b452a1704f9a6213 WHIRLPOOL 7206d6f1785e9e17142b91c2f02d29e91a0633b52018e5a89f6857362b9a0c11f69869a51a5fb2a2de725a4d2111ae5d88544890c5745e1d55e31f47c1c8a8a6
DIST luvit-0.7.0.tar.gz 6440621 SHA256 7a688c269cc1f428816447451a73c237b8fac6f807bae49fdcc232d82d54ff15 SHA512 9a2366d7033f685bdaed9d8fc22b74e570a6b2b5f0c2e5ecdea6b92776e12fed7ec8fa6c84ff457bdfc8849a7ee79c27803577857b3263e20c1fc53b87383b12 WHIRLPOOL 4ee2bbce7cd33ff167fd6ee30262795539b4e0d05634f314679162de8a9a2c8e2c67e20ae7207d0363a8dec3554cb8db353d7157073d7a206a4a5dc5244f594b
+DIST luvit-0.8.2.tar.gz 7126452 SHA256 c2639348d1716c38ac3cd66ea4c4ff1c8a72f4610dbd6e50cf31426d3956c5ff SHA512 46ce9e99d1a002697bb777000d97849135805c3b36344880c1d5cb48c648c7252ec440af35a78eb595d7706d11dc85f76e72c72569e2b3d26e2747b870f98c2b WHIRLPOOL 1010c2321671742ab7fad91d7dcbd005d3093805af66a1d71b7f322759685788a2ae834b56d31a2d0f7ea317afe06e1a8a5713e0aa80f751dd3a2652faf36c9d
diff --git a/dev-lua/luvit/luvit-0.8.2.ebuild b/dev-lua/luvit/luvit-0.8.2.ebuild
new file mode 100644
index 000000000000..0d53fc4def49
--- /dev/null
+++ b/dev-lua/luvit/luvit-0.8.2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/luvit/luvit-0.8.2.ebuild,v 1.1 2014/07/18 18:53:37 hasufell Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs multilib
+
+# TODO: FHS https://github.com/luvit/luvit/issues/379
+
+DESCRIPTION="Takes node.js' architecture and dependencies and fits it in the Lua language"
+HOMEPAGE="http://luvit.io/"
+SRC_URI="http://luvit.io/dist/latest/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="bundled-libs examples"
+# luvit Apache-2.0
+# luajit MIT
+# yajl BSD
+LICENSE="Apache-2.0 bundled-libs? ( BSD MIT )"
+
+# fails in portage environment
+# succeeds if run manually
+RESTRICT="test"
+
+RDEPEND="
+ dev-libs/openssl:0
+ sys-libs/zlib
+ !bundled-libs? (
+ dev-lang/luajit:2[lua52compat]
+ >=dev-libs/yajl-2.0.2
+ net-libs/http-parser
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ rm -r deps/{openssl,zlib} || die
+ epatch "${FILESDIR}"/${PN}-0.7.0-unbundle-http-parser.patch
+ if use bundled-libs ; then
+ sed -i \
+ -e "s/-Werror//" \
+ -e "s/-O3//" \
+ deps/http-parser/Makefile || die "fixing flags failed!"
+ else
+ rm -r deps/{luajit,yajl,http-parser} || die
+ # TODO: no version detection for http-parser yet
+ MY_YAJL_VERSION=$($(tc-getPKG_CONFIG) --modversion yajl)
+ MY_LUAJIT_VERSION=$($(tc-getPKG_CONFIG) --modversion luajit)
+ sed -i \
+ -e "s:^YAJL_VERSION=.*:YAJL_VERSION=${MY_YAJL_VERSION}:" \
+ -e "s:^LUAJIT_VERSION=.*:LUAJIT_VERSION=${MY_LUAJIT_VERSION}:" \
+ Makefile || die "setting yajl version failed"
+ fi
+
+}
+
+src_configure() {
+ # skip retarded gyp build system
+ :
+}
+
+src_compile() {
+ tc-export CC AR
+
+ emake -C deps/cares
+
+ myemakeargs=(
+ DEBUG=0
+ WERROR=0
+ USE_SYSTEM_SSL=1
+ # bundled luajit is compiled with special flags
+ USE_SYSTEM_LUAJIT=$(usex bundled-libs "0" "1")
+ USE_SYSTEM_YAJL=$(usex bundled-libs "0" "1")
+ USE_SYSTEM_HTTPPARSER=$(usex bundled-libs "0" "1")
+ USE_SYSTEM_ZLIB=1
+ PREFIX=/usr
+ LIBDIR="${D%/}"/usr/$(get_libdir)/${PN}
+ DESTDIR="${D}"
+ )
+
+ emake "${myemakeargs[@]}" all
+}
+
+src_install() {
+ emake "${myemakeargs[@]}" install
+ dodoc TODO ChangeLog README.markdown errors.markdown
+
+ if use examples ; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/dev-python/bpython/bpython-0.13.ebuild b/dev-python/bpython/bpython-0.13.ebuild
index 8a3080d924b6..8d0d619ca8c5 100644
--- a/dev-python/bpython/bpython-0.13.ebuild
+++ b/dev-python/bpython/bpython-0.13.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-python/bpython/bpython-0.13.ebuild,v 1.3 2014/07/05 06:28:04 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bpython/bpython-0.13.ebuild,v 1.4 2014/07/18 13:25:23 idella4 Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3} )
@@ -20,7 +20,6 @@ IUSE="doc gtk"
RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
gtk? ( dev-python/pygobject:2[$(python_gen_usedep python2_7)]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
dev-python/pygtk[$(python_gen_usedep python2_7)] )
dev-python/urwid[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
diff --git a/dev-python/cython/cython-0.19.1-r1.ebuild b/dev-python/cython/cython-0.19.1-r1.ebuild
index a0bd6f71921d..eda2b30c7464 100644
--- a/dev-python/cython/cython-0.19.1-r1.ebuild
+++ b/dev-python/cython/cython-0.19.1-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-python/cython/cython-0.19.1-r1.ebuild,v 1.2 2014/03/31 21:03:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.19.1-r1.ebuild,v 1.3 2014/07/19 21:22:50 klausman Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
@@ -16,7 +16,7 @@ SRC_URI="http://www.cython.org/release/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris ~x64-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="doc test"
# Note: update numpy dep when it is fixed for py3.3.
diff --git a/dev-python/extras/extras-0.0.3.ebuild b/dev-python/extras/extras-0.0.3.ebuild
index e7583f5367d8..e8e8cfdf9c66 100644
--- a/dev-python/extras/extras-0.0.3.ebuild
+++ b/dev-python/extras/extras-0.0.3.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-python/extras/extras-0.0.3.ebuild,v 1.19 2014/06/14 10:20:57 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/extras/extras-0.0.3.ebuild,v 1.20 2014/07/19 19:47:49 klausman Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="test"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild b/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild
index 4bd74d9a995d..6b067615d2a3 100644
--- a/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild
+++ b/dev-python/mimeparse/mimeparse-0.1.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-python/mimeparse/mimeparse-0.1.4-r1.ebuild,v 1.18 2014/07/03 15:59:04 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild,v 1.19 2014/07/19 19:47:59 klausman Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE=""
S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pexpect/pexpect-3.0.ebuild b/dev-python/pexpect/pexpect-3.0.ebuild
index 0c09df09ab5a..1908a014ec93 100644
--- a/dev-python/pexpect/pexpect-3.0.ebuild
+++ b/dev-python/pexpect/pexpect-3.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-python/pexpect/pexpect-3.0.ebuild,v 1.5 2013/12/06 19:28:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pexpect/pexpect-3.0.ebuild,v 1.6 2014/07/19 21:22:29 klausman Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~amd64-fbsd ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc examples"
DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
diff --git a/dev-python/py/py-1.4.20.ebuild b/dev-python/py/py-1.4.20.ebuild
index 239bd2003e4e..53e20fdcf25d 100644
--- a/dev-python/py/py-1.4.20.ebuild
+++ b/dev-python/py/py-1.4.20.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-python/py/py-1.4.20.ebuild,v 1.5 2014/06/08 09:03:36 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py/py-1.4.20.ebuild,v 1.7 2014/07/19 21:22:08 klausman Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -12,12 +12,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc test"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( >=dev-python/pytest-2[${PYTHON_USEDEP}] )"
+ test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )"
RDEPEND=""
DOCS=( CHANGELOG README.txt )
diff --git a/dev-python/pytest/pytest-2.4.2.ebuild b/dev-python/pytest/pytest-2.4.2.ebuild
index 8468dd8f9960..2bf1790a2ced 100644
--- a/dev-python/pytest/pytest-2.4.2.ebuild
+++ b/dev-python/pytest/pytest-2.4.2.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-python/pytest/pytest-2.4.2.ebuild,v 1.10 2014/07/06 12:49:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.4.2.ebuild,v 1.12 2014/07/19 21:22:19 klausman Exp $
EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc test"
# When bumping, please check setup.py for the proper py version
@@ -24,7 +24,7 @@ RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
- dev-python/pexpect[$(python_gen_usedep python{2_6,2_7,3_2,3_3})]
+ $(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python*')
dev-python/pyyaml[${PYTHON_USEDEP}]
)
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
diff --git a/dev-python/pytest/pytest-2.5.2.ebuild b/dev-python/pytest/pytest-2.5.2.ebuild
index a6b1f9c465df..b731bf76c695 100644
--- a/dev-python/pytest/pytest-2.5.2.ebuild
+++ b/dev-python/pytest/pytest-2.5.2.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-python/pytest/pytest-2.5.2.ebuild,v 1.5 2014/07/06 12:49:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.5.2.ebuild,v 1.6 2014/07/19 18:59:11 floppym Exp $
EAPI="5"
@@ -24,7 +24,7 @@ RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
- dev-python/pexpect[$(python_gen_usedep python{2_6,2_7,3_2,3_3,3_4})]
+ $(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python*')
dev-python/pyyaml[${PYTHON_USEDEP}]
)
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
diff --git a/dev-python/pyyaml/pyyaml-3.10-r1.ebuild b/dev-python/pyyaml/pyyaml-3.10-r1.ebuild
index b87cfb89df61..acad4081fe53 100644
--- a/dev-python/pyyaml/pyyaml-3.10-r1.ebuild
+++ b/dev-python/pyyaml/pyyaml-3.10-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-python/pyyaml/pyyaml-3.10-r1.ebuild,v 1.8 2014/05/03 21:19:27 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyyaml/pyyaml-3.10-r1.ebuild,v 1.9 2014/07/19 21:22:39 klausman Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
@@ -15,7 +15,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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="examples libyaml"
RDEPEND="libyaml? ( dev-libs/libyaml )"
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index ac6dd1a56039..0b842ff4bd21 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,2 +1,2 @@
DIST QScintilla-gpl-2.7.2.tar.gz 2842625 SHA256 14b47d686dc1586321f84fcf3c9a911ddaace37a1cb0b1e6a6195e252e5bb69c SHA512 d3ca9d75687687210ca6ae3599fd44bfbbad8c99d6d38aaf1c92c83250dc0c5af1c713bdd74d077d0fb9ba1eccbd5e2910eef855d3656392c33c4832d46ff7fb WHIRLPOOL 1ea4a189a5998755afaa0fad111a7f2153e5ecbe13290d62930cce992b0159040de9cb304e848705abc3d0f1909a82fde908d8179ddd9de05970323cee5ffebe
-DIST QScintilla-gpl-2.8.tar.gz 2917864 SHA256 41d32af71501bdfdfc0668f304ba7d7c15019462795e9441d3b23fc054fdfb71 SHA512 531cec5fb89037f79b71bfd07bc94f2744b8b43c7cf8376d102bd4c85d91af1213ac39cce0cb19e8b90d2fbcda47a8617d1b787dbbadaf6270b66660d7d72cd4 WHIRLPOOL 39eb0231fb6c557f49de1abf8c851dd22dd6416841acecf2350a0dcb23f500f571c1bab67a7e5c28d0c31c142781feb32c8475e5a9840dfbfe6decaa6909df80
+DIST QScintilla-gpl-2.8.3.tar.gz 3028154 SHA256 fb94e6d61c3ccd4bf167d5f092629e619f7069d42207469458998b761a7cf505 SHA512 088973c1ac3947594e46464b02bee5bae09a2c92054911b7ce73d7723f018d3e8e4f5ebe97480180d275bc7bf5684711f44604310d02c790e4ef2d94bc4df603 WHIRLPOOL eff01464a6d9f6d77bfcf52d6451120104bd88f71ef752a563a23a64d553f0dd0f1a2cc4a227b5893256f306ccc0eb2435382a651690b647ea024c85c20ea8f8
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.8.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.8.3.ebuild
similarity index 63%
rename from dev-python/qscintilla-python/qscintilla-python-2.8.ebuild
rename to dev-python/qscintilla-python/qscintilla-python-2.8.3.ebuild
index 238324eb7b8a..5e647bdd27ca 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.8.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.8.3.ebuild
@@ -1,11 +1,11 @@
-# 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-python/qscintilla-python/qscintilla-python-2.8.ebuild,v 1.1 2013/11/14 01:33:47 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.8.3.ebuild,v 1.1 2014/07/18 22:15:47 pesa Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-inherit eutils multilib python-r1 toolchain-funcs
+inherit python-r1 qmake-utils
MY_P=QScintilla-gpl-${PV}
@@ -20,8 +20,8 @@ IUSE="debug"
DEPEND="
${PYTHON_DEPS}
- >=dev-python/sip-4.12:=[${PYTHON_USEDEP}]
- >=dev-python/PyQt4-4.8[X,${PYTHON_USEDEP}]
+ >=dev-python/sip-4.16:=[${PYTHON_USEDEP}]
+ >=dev-python/PyQt4-4.11[X,${PYTHON_USEDEP}]
dev-qt/qtcore:4
dev-qt/qtgui:4
~x11-libs/qscintilla-${PV}:=
@@ -39,29 +39,32 @@ src_prepare() {
src_configure() {
configuration() {
local myconf=(
- "${PYTHON}" configure-old.py
- --apidir="${EPREFIX}"/usr/share/qt4/qsci
+ "${PYTHON}" configure.py
--destdir="$(python_get_sitedir)"/PyQt4
- --sipdir="${EPREFIX}"/usr/share/sip
- -n "${EPREFIX}"/usr/include/qt4
- -o "${EPREFIX}"/usr/$(get_libdir)/qt4
- -p 4
- --no-timestamp
+ --pyqt=PyQt4
+ --sip-incdir="$(python_get_includedir)"
+ --pyqt-sipdir="${EPREFIX}"/usr/share/sip
+ --qsci-sipdir="${EPREFIX}"/usr/share/sip
$(use debug && echo --debug)
+ --no-timestamp
)
echo "${myconf[@]}"
"${myconf[@]}" || die
+
+ # Run eqmake4 to respect toolchain, build flags, and prevent stripping
+ eqmake4
}
python_parallel_foreach_impl run_in_build_dir configuration
}
src_compile() {
- compilation() {
- emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)"
- }
- python_foreach_impl run_in_build_dir compilation
+ python_foreach_impl run_in_build_dir default
}
src_install() {
- python_foreach_impl run_in_build_dir default
+ installation() {
+ emake INSTALL_ROOT="${D}" install
+ python_optimize
+ }
+ python_foreach_impl run_in_build_dir installation
}
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.9.2.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.9.2.ebuild
index 29941f9abf98..b0c46c4c0077 100644
--- a/dev-python/sqlalchemy/sqlalchemy-0.9.2.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-0.9.2.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-python/sqlalchemy/sqlalchemy-0.9.2.ebuild,v 1.9 2014/06/23 15:00:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.9.2.ebuild,v 1.10 2014/07/18 15:08:41 klausman Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc examples +sqlite test"
RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/subunit/subunit-0.0.16.ebuild b/dev-python/subunit/subunit-0.0.16.ebuild
index 091a83284ef4..5448208d2a4f 100644
--- a/dev-python/subunit/subunit-0.0.16.ebuild
+++ b/dev-python/subunit/subunit-0.0.16.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-python/subunit/subunit-0.0.16.ebuild,v 1.8 2014/06/14 10:20:32 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/subunit/subunit-0.0.16.ebuild,v 1.9 2014/07/19 19:48:21 klausman Exp $
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
LICENSE="Apache-2.0 BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~x86-fbsd"
#need to keyword the following in =dev-python/extras-0.0.3 then readd the keywords here
#ia64 s390 sh sparc amd64-fbsd
IUSE="static-libs"
diff --git a/dev-python/testscenarios/testscenarios-0.4-r4.ebuild b/dev-python/testscenarios/testscenarios-0.4-r4.ebuild
index 359a1cf66464..863fd908524f 100644
--- a/dev-python/testscenarios/testscenarios-0.4-r4.ebuild
+++ b/dev-python/testscenarios/testscenarios-0.4-r4.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-python/testscenarios/testscenarios-0.4-r4.ebuild,v 1.7 2014/06/08 09:47:47 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testscenarios/testscenarios-0.4-r4.ebuild,v 1.8 2014/07/19 19:28:13 klausman Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_2,3_3} pypy2_0 pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux"
RDEPEND="dev-python/testtools[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
diff --git a/dev-python/testtools/testtools-0.9.34.ebuild b/dev-python/testtools/testtools-0.9.34.ebuild
index 09cc98a72bbb..ad4ec6eb72b2 100644
--- a/dev-python/testtools/testtools-0.9.34.ebuild
+++ b/dev-python/testtools/testtools-0.9.34.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-python/testtools/testtools-0.9.34.ebuild,v 1.6 2014/06/14 10:20:05 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-0.9.34.ebuild,v 1.7 2014/07/19 19:48:10 klausman Exp $
EAPI=5
@@ -17,7 +17,7 @@ SRC_URI="http://launchpad.net/${PN}/${SERIES}/${PV}/+download/${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"
+KEYWORDS="alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="dev-python/mimeparse[${PYTHON_USEDEP}]
diff --git a/dev-python/unidecode/unidecode-0.04.16.ebuild b/dev-python/unidecode/unidecode-0.04.16.ebuild
index 5cfce00abea1..77ec12cd5c29 100644
--- a/dev-python/unidecode/unidecode-0.04.16.ebuild
+++ b/dev-python/unidecode/unidecode-0.04.16.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-python/unidecode/unidecode-0.04.16.ebuild,v 1.2 2014/06/27 12:36:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/unidecode/unidecode-0.04.16.ebuild,v 1.3 2014/07/19 17:25:14 klausman Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86"
S=${WORKDIR}/${MY_P}
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index c3142fe86304..5b4cbeb5b902 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,4 +1,2 @@
DIST capybara-1.1.4.gem 72192 SHA256 33073d7e4920a3e74c61ec46d1afe655eb0f3361187113c5e146df498e4611ed SHA512 102738031281d0fabd645fa6d941cf0a9ddd56f90d53d7cc1c8a7b03a37b6af8f4cddd178e6fc07d6751a539a5039cf20502eabdd49e8001793601bb312b47a3 WHIRLPOOL 81eff318acfdc0806c9f8d4e212068edd57694d44db1e29bbefaa7a4db162f3a2354374d6ab97ad7c2372ff9e6f6bb864ed483050facad5c298c2223a39c63cc
-DIST capybara-2.1.0.gem 214016 SHA256 a9a19f8d6bb2dfcb1f05ea3e1727cb556d1cba0d234d1712b481e8d4f7bbb91e SHA512 8c29f0bcce5f21cc16d55c19b0c1b16f189deeeacca5568ee11631bb135106776bcd18c38044bf44a0eda85b1aea861dec802b23b91d837b977201defd06d931 WHIRLPOOL 92442b1edfaf89f2992b65204dc1222f2e8cb4f803c48794ede2615e01c3710b3acf592afdd0aa58842b98b9467d31b03256974e53af2fd2c45b1bec08d2b6e4
-DIST capybara-2.2.0.gem 218112 SHA256 0dcac2967da19e250280e477c7a8433a3759a4c187f1d23b953321ddf3e869e7 SHA512 2824bb137e94f354c6bfe9f1d6c68f451cc096db1fd8c71be9d269113963f69292a7bd5b702d4eb033801fe93b3339d1ab8ba58dba6f73daba032c5c68f67658 WHIRLPOOL f6ab7360a8f46efd6f2ec91dc77a74de5de6bf7b020260303e8b0718f413ffc69a67202e757d00555a3403cbf32550d47f7516be32ae2bb052850c75e5a9658e
DIST capybara-2.2.1.gem 218112 SHA256 0081ff6eaa33f4b5b0427db7ef0ca0af015a9bf6606126f41016db6feb58cdeb SHA512 e060706ef408f4ba2494fe45020b587914c5e1ab42717450be1818ab16782fc6e5eb49dd559ac00297cf83b267d4cec9c9766c19b0967573c6dd54e976a0fd59 WHIRLPOOL 2d58952539170ab298e80503431750feff40e4287edfefd4c0a564d9cb4abb8b0eb0833b28ebe467063be754d4d22bfddb868d4b605e992fd017a3fc8f432571
diff --git a/dev-ruby/capybara/capybara-2.1.0.ebuild b/dev-ruby/capybara/capybara-2.1.0.ebuild
deleted file mode 100644
index cd58d18c936f..000000000000
--- a/dev-ruby/capybara/capybara-2.1.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/capybara/capybara-2.1.0.ebuild,v 1.1 2013/04/19 12:34:59 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-# Rake tasks are not distributed in the gem.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit virtualx ruby-fakegem
-
-DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications."
-HOMEPAGE="http://github.com/jnicklas/capybara"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="2"
-IUSE="test"
-
-# Restrict tests until launchy is part of the main tree. With it
-# installed all tests should pass.
-RESTRICT="test"
-
-#ruby_add_bdepend "test? ( dev-ruby/rspec:2 dev-ruby/launchy >=dev-ruby/selenium-webdriver-2.0 www-client/firefox )"
-
-ruby_add_rdepend "
- >=dev-ruby/mime-types-1.16
- >=dev-ruby/nokogiri-1.3.3
- >=dev-ruby/rack-1.0.0
- >=dev-ruby/rack-test-0.5.4
- >=dev-ruby/xpath-2.0.0:2"
-
-all_ruby_prepare() {
- sed -i -e '/bundler/d' -e '/pry/d' spec/spec_helper.rb || die
-}
-
-each_ruby_test() {
- VIRTUALX_COMMAND="${RUBY} -Ilib -S rspec spec"
- virtualmake || die "Tests failed."
-}
diff --git a/dev-ruby/capybara/capybara-2.2.0.ebuild b/dev-ruby/capybara/capybara-2.2.0.ebuild
deleted file mode 100644
index 1085a1345e32..000000000000
--- a/dev-ruby/capybara/capybara-2.2.0.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/dev-ruby/capybara/capybara-2.2.0.ebuild,v 1.1 2013/11/23 09:02:10 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-# Rake tasks are not distributed in the gem.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit virtualx ruby-fakegem
-
-DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications."
-HOMEPAGE="http://github.com/jnicklas/capybara"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="2"
-IUSE="test"
-
-DEPEND="${DEPEND} test? ( www-client/firefox )"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:2 dev-ruby/launchy >=dev-ruby/selenium-webdriver-2.0 )"
-
-ruby_add_rdepend "
- >=dev-ruby/mime-types-1.16
- >=dev-ruby/nokogiri-1.3.3
- >=dev-ruby/rack-1.0.0
- >=dev-ruby/rack-test-0.5.4
- >=dev-ruby/xpath-2.0.0:2"
-
-all_ruby_prepare() {
- sed -i -e '/bundler/d' -e '/pry/d' spec/spec_helper.rb || die
-}
-
-each_ruby_test() {
- VIRTUALX_COMMAND="${RUBY} -Ilib -S rspec spec"
- virtualmake || die "Tests failed."
-}
diff --git a/dev-ruby/color/Manifest b/dev-ruby/color/Manifest
index 89ecd4b61abb..4175a4957002 100644
--- a/dev-ruby/color/Manifest
+++ b/dev-ruby/color/Manifest
@@ -1,3 +1,4 @@
DIST color-1.4.1.gem 49664 SHA256 145980ad0ae549debf17ddeca30665b2745b573297f9802f04ef8321393e6431 SHA512 750e1cbc793f56a9654d118966a8fb3b3f094b22178951a87fc919ffbaacf2e26d96be45d7f470a1fa158cba5f96b2540ed89931d85cce778b62be2df470c7d3 WHIRLPOOL d8093e9479d3f4892b082edb63c422f1b278cf21c8b5eb538dc4eb53c183458f6f284b2254cb340261808d17753e836c67378a69deb49fbf86a94493d14d84fb
DIST color-1.6.tar.gz 40339 SHA256 b2709d884a8153cbb1768a96a0f444748ff204c3e7dfa794efef10ff7f6d5454 SHA512 1e7c506d5a9d83d42f3eda1d6001a2e89b676f64d26c2e3e227ab327f5676b0c1340f29582bcf34a81c0e9fdfb43ca9f71662ac800e46c3ec74cb0458b50784c WHIRLPOOL d9d80d63edc51ba8401c14964b6465c589f63f8345dc1a4e1899babd4967b5f59d591358f31667679c88fb1e948578edb87683f4953327e35f6415cb921c5e67
+DIST color-1.7.1.tar.gz 40780 SHA256 36deaa02dc327452f7ac4e35fe1ae1c2d7faa9bb2a0b0d9b6c1a112fe29d7f7b SHA512 78e0b4c171ab2754531cf0874088e7b9cc495957fa3de5c3899f176fd629f1677f1fd9bdb68c0a3784cd5939242f8a4127cda8932f114800052c973431739f07 WHIRLPOOL eb719f91162c15aef89f81e263940c41941e18f0fd7007b27377ca3fd781239951eb0dca80df142bb2f22a84e9917ffd322cb9640a684e95227c43d6f0678256
DIST color-1.7.tar.gz 40672 SHA256 22cbbf41e033ff5ff74a423106dd3c0fb2a0e1cfd1db2e56f7231e96c3bbde23 SHA512 900b385a372829d862475211125eafe95838e1c068e74740ae9b7bcde411a677981bf54350525b2bff0a5b54fae8bd59e76e2e2458ea64cf839e5657bce82852 WHIRLPOOL 748bbe8d39abda7281fddf5510f50baf8a6174e4e4735ff6485ee2c8d165beae9cfe21d5ccea0de8fd54cf1024ed0647c6b3cab7f19d2bfc6ca2bc436c994a3b
diff --git a/dev-ruby/color/color-1.7.1.ebuild b/dev-ruby/color/color-1.7.1.ebuild
new file mode 100644
index 000000000000..d0532fff0828
--- /dev/null
+++ b/dev-ruby/color/color-1.7.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/color/color-1.7.1.ebuild,v 1.1 2014/07/19 07:34:19 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 jruby"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Colour management with Ruby"
+HOMEPAGE="http://color.rubyforge.org/"
+SRC_URI="https://github.com/halostatue/color/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "
+ test? (
+ >=dev-ruby/minitest-5.0
+ )"
+
+each_ruby_test() {
+ ${RUBY} -S testrb -Ilib test/test_*.rb || die
+}
diff --git a/dev-ruby/minitest/minitest-5.3.3.ebuild b/dev-ruby/minitest/minitest-5.3.3.ebuild
index f5bb6dccebf8..303e6d656faa 100644
--- a/dev-ruby/minitest/minitest-5.3.3.ebuild
+++ b/dev-ruby/minitest/minitest-5.3.3.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-ruby/minitest/minitest-5.3.3.ebuild,v 1.6 2014/07/14 14:05:56 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/minitest/minitest-5.3.3.ebuild,v 1.8 2014/07/18 17:52:48 klausman Exp $
EAPI=5
USE_RUBY="ruby19 ruby20 jruby"
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/seattlerb/minitest"
LICENSE="MIT"
SLOT="5"
-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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
each_ruby_prepare() {
diff --git a/dev-ruby/rest-client/Manifest b/dev-ruby/rest-client/Manifest
index a8cb56d74ad4..f95067a8fcea 100644
--- a/dev-ruby/rest-client/Manifest
+++ b/dev-ruby/rest-client/Manifest
@@ -1 +1,2 @@
DIST rest-client-1.6.7.gem 58368 SHA256 a3203433b8b0c914648caea54395a8791a61e0df7d401c81f4e2b7f8a8fac75a SHA512 9a3f1d334be5e4bf7f2d0155f44cc94ca0062c0de2d505d3c039d9d169e926cf918dce5461f1c1e5993334bb04f63d236df83c1f34e8c3f4eb8cca28dee3d3a8 WHIRLPOOL 85ab098afb6307e864eb5298254b43f2d09eb8f1e88a574ad64ce5b77ee7847fee82bf147c89fc12b097e117f5277de49bdd82fcf468304290d42eaecc25f85a
+DIST rest-client-1.7.2.gem 123392 SHA256 2016e11e990551b7023098633b02bb317bc23a30958f1a23ba658be8f2050c41 SHA512 32f9f24c2ae4aa70cff161200f9b2f9c89a3f6df399f021c000407b3e79e870f677f26c18ca432185c794c0f1ac95cb6fbe88092f59bb41bae372c6f35e4e6b1 WHIRLPOOL 3eb8faa81f4be17419f59b914d616f55d13df995224e46cd0d836eebbc614c1522b8ac9fc3c6b15b0dc8ab4bc04148f9801111f398c318af25a6a807ff080e2b
diff --git a/dev-ruby/rest-client/rest-client-1.7.2.ebuild b/dev-ruby/rest-client/rest-client-1.7.2.ebuild
new file mode 100644
index 000000000000..17939f2f0223
--- /dev/null
+++ b/dev-ruby/rest-client/rest-client-1.7.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rest-client/rest-client-1.7.2.ebuild,v 1.1 2014/07/20 06:34:48 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_EXTRADOC="history.md README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple Simple HTTP and REST client for Ruby"
+HOMEPAGE="http://github.com/archiloque/rest-client"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/webmock )"
+
+ruby_add_rdepend ">=dev-ruby/mime-types-1.16 >=dev-ruby/netrc-0.7:0"
+
+all_ruby_prepare() {
+ sed -e '/bundler/I s:^:#:' \
+ -e '/namespace :windows/,/^end/ s:^:#:' -i Rakefile || die
+
+ # Remove spec that requires network access.
+ rm spec/integration/request_spec.rb || die
+}
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8-r1.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8-r1.ebuild
new file mode 100644
index 000000000000..163bee2e43e7
--- /dev/null
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8-r1.ebuild,v 1.1 2014/07/19 00:41:18 jer Exp $
+
+EAPI="5"
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-ng
+
+MY_P=${P/-bindings}
+
+DESCRIPTION="Ruby bindings for rrdtool."
+HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
+SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
+RUBY_S="$MY_P"/bindings/ruby
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
+
+# Block on older versions of rrdtool that install the bindings themselves.
+# requires rrd_xport which requires rrd_graph
+RDEPEND="${RDEPEND} net-analyzer/rrdtool[graph] !!=dev-ruby/rr-0.10.2 dev-ruby/activesupport )"
+ruby_add_rdepend ">=dev-ruby/polyglot-0.3.1"
+
+all_ruby_prepare() {
+ # Use a ruby18 compatible regexp, already fixed upstream.
+ sed -i -e 's/\[:\^space:\]/\^[:space:]/' spec/compiler/character_class_spec.rb || die
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ insinto /usr/share/doc/${PF}/examples
+ doins -r examples/*
+}
diff --git a/dev-ruby/uuidtools/uuidtools-2.1.3.ebuild b/dev-ruby/uuidtools/uuidtools-2.1.3.ebuild
index 58c365e82bf3..a1435a1e1aff 100644
--- a/dev-ruby/uuidtools/uuidtools-2.1.3.ebuild
+++ b/dev-ruby/uuidtools/uuidtools-2.1.3.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-ruby/uuidtools/uuidtools-2.1.3.ebuild,v 1.4 2014/04/05 14:09:06 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/uuidtools/uuidtools-2.1.3.ebuild,v 1.5 2014/07/18 13:06:49 mrueg Exp $
EAPI=2
@@ -21,6 +21,8 @@ SRC_URI="mirror://rubyforge/${PN}/${P}.tgz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 x86 ~x86-macos"
-IUSE=""
+IUSE="doc"
RUBY_PATCHES=( ${PN}-2.1.2-macaddress.patch )
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
diff --git a/dev-ruby/uuidtools/uuidtools-2.1.4-r1.ebuild b/dev-ruby/uuidtools/uuidtools-2.1.4-r1.ebuild
index acccb89e228b..5b6466a687cc 100644
--- a/dev-ruby/uuidtools/uuidtools-2.1.4-r1.ebuild
+++ b/dev-ruby/uuidtools/uuidtools-2.1.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-ruby/uuidtools/uuidtools-2.1.4-r1.ebuild,v 1.3 2014/07/18 08:24:36 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/uuidtools/uuidtools-2.1.4-r1.ebuild,v 1.4 2014/07/18 13:06:49 mrueg Exp $
EAPI=5
@@ -20,4 +20,6 @@ HOMEPAGE="http://uuidtools.rubyforge.org/"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~x86-macos"
-IUSE=""
+IUSE="doc"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
diff --git a/dev-ruby/uuidtools/uuidtools-2.1.4-r3.ebuild b/dev-ruby/uuidtools/uuidtools-2.1.4-r3.ebuild
index 9662495a766f..40dddf01db06 100644
--- a/dev-ruby/uuidtools/uuidtools-2.1.4-r3.ebuild
+++ b/dev-ruby/uuidtools/uuidtools-2.1.4-r3.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-ruby/uuidtools/uuidtools-2.1.4-r3.ebuild,v 1.1 2014/06/02 17:58:01 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/uuidtools/uuidtools-2.1.4-r3.ebuild,v 1.2 2014/07/18 13:06:49 mrueg Exp $
EAPI=5
@@ -20,4 +20,6 @@ HOMEPAGE="http://uuidtools.rubyforge.org/"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~x86-macos"
-IUSE=""
+IUSE="doc"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
diff --git a/dev-ruby/webmock/webmock-1.18.0.ebuild b/dev-ruby/webmock/webmock-1.18.0.ebuild
index 906c7ec2b50a..d64f6fa4c384 100644
--- a/dev-ruby/webmock/webmock-1.18.0.ebuild
+++ b/dev-ruby/webmock/webmock-1.18.0.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/webmock/webmock-1.18.0.ebuild,v 1.1 2014/05/24 08:00:26 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/webmock/webmock-1.18.0.ebuild,v 1.2 2014/07/20 06:45:35 graaff Exp $
EAPI=5
-USE_RUBY="ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20 ruby21 jruby"
RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
diff --git a/dev-ruby/zentest/zentest-4.10.1.ebuild b/dev-ruby/zentest/zentest-4.10.1.ebuild
index a2a876c4f361..a67faaf6e2cc 100644
--- a/dev-ruby/zentest/zentest-4.10.1.ebuild
+++ b/dev-ruby/zentest/zentest-4.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-ruby/zentest/zentest-4.10.1.ebuild,v 1.1 2014/07/18 08:07:59 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/zentest/zentest-4.10.1.ebuild,v 1.2 2014/07/18 15:55:29 graaff Exp $
EAPI=5
@@ -25,5 +25,5 @@ ruby_add_bdepend "
test? (
>=dev-ruby/hoe-2.10
dev-ruby/hoe-seattlerb
- virtual/ruby-minitest
+ dev-ruby/minitest:5
)"
diff --git a/dev-ruby/zentest/zentest-4.9.5.ebuild b/dev-ruby/zentest/zentest-4.9.5.ebuild
index f16f68f773c3..bfa2b0f294e4 100644
--- a/dev-ruby/zentest/zentest-4.9.5.ebuild
+++ b/dev-ruby/zentest/zentest-4.9.5.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-ruby/zentest/zentest-4.9.5.ebuild,v 1.8 2014/07/18 08:09:58 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/zentest/zentest-4.9.5.ebuild,v 1.9 2014/07/18 17:57:40 mrueg Exp $
EAPI=5
@@ -18,7 +18,7 @@ DESCRIPTION="ZenTest provides tools to support testing: zentest, unit_diff, auto
HOMEPAGE="https://github.com/seattlerb/zentest"
LICENSE="Ruby"
-KEYWORDS="alpha ~amd64 arm hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
@@ -30,5 +30,5 @@ ruby_add_bdepend "
test? (
>=dev-ruby/hoe-2.10
dev-ruby/hoe-seattlerb
- virtual/ruby-minitest
+ dev-ruby/minitest:5
)"
diff --git a/dev-util/debhelper/debhelper-9.20140228.ebuild b/dev-util/debhelper/debhelper-9.20140228.ebuild
index ec8e97621009..b6659efa9e54 100644
--- a/dev-util/debhelper/debhelper-9.20140228.ebuild
+++ b/dev-util/debhelper/debhelper-9.20140228.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-util/debhelper/debhelper-9.20140228.ebuild,v 1.5 2014/06/16 09:31:26 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20140228.ebuild,v 1.6 2014/07/19 17:51:41 klausman Exp $
EAPI=5
inherit eutils toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
IUSE="test"
DH_LINGUAS=( de es fr )
IUSE+=" ${DH_LINGUAS[@]/#/linguas_}"
diff --git a/dev-util/debootstrap/debootstrap-1.0.59.ebuild b/dev-util/debootstrap/debootstrap-1.0.59.ebuild
index e1a3114da7d9..7467fa60dc5d 100644
--- a/dev-util/debootstrap/debootstrap-1.0.59.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.59.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-util/debootstrap/debootstrap-1.0.59.ebuild,v 1.5 2014/06/16 09:33:01 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debootstrap/debootstrap-1.0.59.ebuild,v 1.6 2014/07/19 17:51:51 klausman Exp $
EAPI=5
inherit eutils
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND="
diff --git a/dev-util/perf/perf-3.13.1-r1.ebuild b/dev-util/perf/perf-3.13.1-r1.ebuild
index 1803525f84dd..cecc5141026f 100644
--- a/dev-util/perf/perf-3.13.1-r1.ebuild
+++ b/dev-util/perf/perf-3.13.1-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-util/perf/perf-3.13.1-r1.ebuild,v 1.2 2014/07/18 02:23:34 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/perf-3.13.1-r1.ebuild,v 1.3 2014/07/18 20:20:17 hwoarang Exp $
EAPI="5"
@@ -38,7 +38,7 @@ SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
IUSE="audit +demangle +doc gtk perl python slang unwind"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r1.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r1.ebuild
index a6758773731c..f65888601c0b 100644
--- a/dev-util/pkgconfig/pkgconfig-0.28-r1.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.28-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-util/pkgconfig/pkgconfig-0.28-r1.ebuild,v 1.11 2014/07/18 02:05:55 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r1.ebuild,v 1.12 2014/07/19 13:40:17 zlogene Exp $
EAPI=5
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="git://anongit.freedesktop.org/pkg-config"
inherit autotools git-2
else
- KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SRC_URI="http://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
fi
diff --git a/dev-util/rbtools/Manifest b/dev-util/rbtools/Manifest
index 51e93c4488f0..415969950dfe 100644
--- a/dev-util/rbtools/Manifest
+++ b/dev-util/rbtools/Manifest
@@ -1,4 +1,2 @@
-DIST RBTools-0.5.3.tar.gz 103278 SHA256 db4f243fd2c62b37d16debcaa88699a0066f6066f0561461b98723712b9864cb SHA512 381d06c4c6891b192a630915955f04eaa5414f1a0de4f897d2cbb67daac5bd977757da267b3b997602f3ee000646da35db726675851100c5eca4a4db3d952dbc WHIRLPOOL 7ad66758ce87b0aaea6b7089b7cad1d20f3fa40f6d089439525d630d7f6b7bb46395fc4a309e54e512daa7bca3029b193fce6d14cbb3fb39f5b506c0a5d4b84c
-DIST RBTools-0.6.1.tar.gz 109488 SHA256 485c5875f704d39418375802d3def52aa124eca3fce411bf76004cb010687735 SHA512 801a3f8d98eff6e85811ed33948f8a892bb60269b2fec2dea7dc89fe1b6d7fe05f96b48c1e527cf439acc7550689d19dc361cbb5470b347350125fdae0c74a81 WHIRLPOOL 9abd88b13800dbe1ce943057bad86d5cfa9c3b36c6f0a135fb0c9927bb669c5218f83846d79a1018ccbf642b685c80cb39e978f7b8dc55b4b5b8aea976dc1b9e
DIST RBTools-0.6.2.tar.gz 109583 SHA256 86ad4e3fc92abe39d7a3178a34cbc60992c7dac02d621feb574bda18fa1710fd SHA512 c490ba5d961caf8fd0613fe22b724ab918a38d955c3fcef7d2e9004aa59b6ac4b84c10fe0af8e15dd1f57f5e9a7735eaf2dc2191c7ed7523b13ab56b65bc28cc WHIRLPOOL 0cba57562ade47ecc8fc761fb1b735d0ec05b1101a8ece3ab032d3ac97bea2c5f6b68f1c883987a4834237a2814b639e2c1d9789147f600a67c8819ab119b3ba
DIST RBTools-0.6.tar.gz 104123 SHA256 473eea80aee8b2d68411e4ab7785eafbe9c7372307f5d5391e35583193857df8 SHA512 26aa4f3e891f2f0bee0f0f3f2304cd9d6a65e956aee976276ce8f48a15bc68f21864dd038219dd3a883c534110f6a51aaee1e184f42873c479895de34eb75f48 WHIRLPOOL 47c0e6986e0fdcbdbd71e1d844804da7aea0d14a98b25fbb0cad9355127c1aa71eabcfe0f4163b06119949a5833eb82006aaf1d313908dc9ab46f8440bfe5585
diff --git a/dev-util/rbtools/rbtools-0.5.3.ebuild b/dev-util/rbtools/rbtools-0.5.3.ebuild
deleted file mode 100644
index d6730e192bc9..000000000000
--- a/dev-util/rbtools/rbtools-0.5.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rbtools/rbtools-0.5.3.ebuild,v 1.3 2014/03/04 20:09:16 ago Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit distutils-r1 versionator
-
-MY_PN="RBTools"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Command line tools for use with Review Board"
-HOMEPAGE="http://www.reviewboard.org/"
-SRC_URI="http://downloads.reviewboard.org/releases/${MY_PN}/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( AUTHORS NEWS README )
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-util/rbtools/rbtools-0.6.1.ebuild b/dev-util/rbtools/rbtools-0.6.1.ebuild
deleted file mode 100644
index 8543fed645b3..000000000000
--- a/dev-util/rbtools/rbtools-0.6.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rbtools/rbtools-0.6.1.ebuild,v 1.1 2014/06/10 07:54:05 kensington Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 versionator
-
-MY_PN="RBTools"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Command line tools for use with Review Board"
-HOMEPAGE="http://www.reviewboard.org/"
-SRC_URI="http://downloads.reviewboard.org/releases/${MY_PN}/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( AUTHORS NEWS README )
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-vcs/cvs/cvs-1.12.12-r10.ebuild b/dev-vcs/cvs/cvs-1.12.12-r10.ebuild
index 60b20ecfeeba..be86af6805e0 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r10.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r10.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-vcs/cvs/cvs-1.12.12-r10.ebuild,v 1.11 2014/06/08 15:49:05 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r10.ebuild,v 1.12 2014/07/19 17:36:57 klausman Exp $
EAPI=3
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="crypt doc kerberos nls pam server"
RESTRICT='test'
diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index 74631824db28..e6c81376c085 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -4,3 +4,4 @@ DIST git-annex-5.20140306.tar.gz 4340927 SHA256 89cacd6b17a0db65c09c5bc0e2129862
DIST git-annex-5.20140405.tar.gz 4453804 SHA256 73dc81e3d2ddc823263734b7b073024aad6d7ff040552bb2141d4af1d3b66e59 SHA512 6723bb3a0eaca521559492606db6ba27256f16d45c6cc129991daddf442996b08b9eb9aeb9245d32c241435c66cf6581aaa0c1c4cde7dfaf196f0d2b5dd66e7a WHIRLPOOL 3c7d1eddbba082f4cac8a9fcf886d78e40e644b0d71047aa9f72fa1bb24d0a8c821b8dc26b3aa990cd2e8090302e2583ccfd5178964cfa0d7ef8e0f67f3e57be
DIST git-annex-5.20140613.tar.gz 4322696 SHA256 d129872505e7a5d435ddf5afdd4168096d26403a54619a58ec38078e8cc77006 SHA512 58e8a9c05d7d7ffa3a703163389f2ba75ea4587119eb98615ac5d125c6104a324efa38fb133efd08017727631208ac05c02ea08d0e5d1d90005a15de82d51ded WHIRLPOOL bea07f3848034a82c1eb947df16e9d0fdabdbb2b109fb9a900cda923b5fcb5858574798d40a202be151c041d8272853998d7efb5c1cf0637e77ae72ed4997e12
DIST git-annex-5.20140709.tar.gz 4369194 SHA256 5a7c73c6cb1d5c8d72826ebd31c29ae630f396cadb7135389233a520ca32c358 SHA512 21cf9cadd39a9450305dc5ac1305ac76a656fdad9be46c8815d4ab7d643fb1dcc450de77a15d356ef095c537e7797d0b91046833d2568049ed73b245f8177180 WHIRLPOOL 4b7195d6a9955298c5901fb952147bed6df9aa9090483f917bff65c30f419ecd253b8fa45e22419467d90bcc62e6c6ea635359249769fd6f081bd836f95a1c44
+DIST git-annex-5.20140717.tar.gz 4390361 SHA256 746570ffafc92b3acd19bef84ffea6ee126cf2b043e8adc7f3b61b57d0c52fa5 SHA512 2ea950cb025885df6d2abc3618c6e4775abef826291108a0c745f8dac8fa664eb42a15a036179c972aede36f1bc049f9abc01b0c72b9fa6ba1dc3736520c9a1f WHIRLPOOL 2f5f486ed93a421e3e09b2df413edc5d7f0be8bea1b6cbba303debd2559c23baab1b035c25a5511498383c51921dba38d71afceb5624947db2df519936fb0725
diff --git a/dev-vcs/git-annex/git-annex-5.20140717.ebuild b/dev-vcs/git-annex/git-annex-5.20140717.ebuild
new file mode 100644
index 000000000000..b8b5bf759d19
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-5.20140717.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-5.20140717.ebuild,v 1.1 2014/07/19 06:27:45 slyfox Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.5
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal
+
+DESCRIPTION="manage files with git, without checking their contents into git"
+HOMEPAGE="http://git-annex.branchable.com/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+RESTRICT="test"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="android androidsplice +assistant +cryptohash +dbus +dns doc +desktop-notify ekg +feed +inotify +pairing +production +quvi +s3 +tahoe +tdfa +testsuite +webapp +webapp-secure +webdav +xmpp"
+
+RDEPEND="dev-vcs/git
+"
+DEPEND="${RDEPEND}
+ dev-haskell/async
+ dev-haskell/bloomfilter
+ >=dev-haskell/cabal-1.8
+ dev-haskell/case-insensitive
+ dev-haskell/dataenc
+ dev-haskell/data-default
+ dev-haskell/dlist
+ dev-haskell/edit-distance
+ >=dev-haskell/exceptions-0.5
+ dev-haskell/extensible-exceptions
+ dev-haskell/hslogger
+ dev-haskell/http
+ dev-haskell/ifelse
+ dev-haskell/json[generic]
+ dev-haskell/missingh
+ dev-haskell/monad-control
+ >=dev-haskell/mtl-2
+ >=dev-haskell/network-2.0
+ >=dev-haskell/quickcheck-2.1:2
+ dev-haskell/random
+ dev-haskell/safesemaphore
+ dev-haskell/sha
+ >=dev-haskell/stm-2.3
+ dev-haskell/text
+ dev-haskell/unix-compat
+ dev-haskell/utf8-string
+ dev-haskell/uuid
+ >=dev-lang/ghc-7.4.1
+ android? ( dev-haskell/data-endian )
+ assistant? ( >=dev-haskell/stm-2.3
+ inotify? ( dev-haskell/hinotify ) )
+ cryptohash? ( >=dev-haskell/cryptohash-0.10.0 )
+ dbus? ( >=dev-haskell/dbus-0.10.3 )
+ dns? ( dev-haskell/dns )
+ ekg? ( dev-haskell/aeson
+ dev-haskell/ekg
+ dev-haskell/http-types )
+ feed? ( dev-haskell/feed )
+ pairing? ( dev-haskell/network-info
+ dev-haskell/network-multicast )
+ quvi? ( dev-haskell/aeson )
+ s3? ( dev-haskell/hs3 )
+ tdfa? ( dev-haskell/regex-tdfa )
+ tahoe? ( dev-haskell/aeson )
+ testsuite? ( >=dev-haskell/tasty-0.7
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck
+ dev-haskell/tasty-rerun
+ dev-haskell/optparse-applicative
+ )
+ webapp? ( dev-haskell/blaze-builder
+ dev-haskell/aeson
+ dev-haskell/clientsession
+ dev-haskell/crypto-api
+ dev-haskell/hamlet
+ dev-haskell/http-types
+ dev-haskell/path-pieces
+ dev-haskell/transformers
+ dev-haskell/shakespeare
+ dev-haskell/wai
+ dev-haskell/wai-extra
+ dev-haskell/warp
+ dev-haskell/warp-tls
+ dev-haskell/yesod
+ dev-haskell/yesod-core
+ dev-haskell/yesod-default
+ dev-haskell/yesod-form
+ dev-haskell/yesod-static
+ webapp-secure? ( dev-haskell/warp-tls
+ dev-haskell/securemem
+ dev-haskell/byteable ) )
+ webdav? ( >=dev-haskell/dav-0.3
+ dev-haskell/http-conduit
+ dev-haskell/http-client
+ dev-haskell/http-types
+ dev-haskell/lifted-base
+ dev-haskell/xml-conduit )
+ xmpp? ( >=dev-haskell/gnutls-0.1.4
+ dev-haskell/network-protocol-xmpp
+ dev-haskell/xml-types )
+ dev-lang/perl
+ doc? ( www-apps/ikiwiki net-misc/rsync )
+"
+
+src_prepare() {
+ # at least USE="cryptohash dbus dns inotify pairing production quvi s3 tdfa testsuite -xmpp -webdav -webapp -feed -assistant"
+ # need STM via Remote.External
+ cabal_chdeps \
+ 'MissingH, hslogger, directory, filepath,' 'MissingH, hslogger, directory, filepath, stm,'
+
+ cabal_chdeps \
+ 'hamlet' 'hamlet, shakespeare'
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag android android) \
+ $(cabal_flag androidsplice androidsplice) \
+ $(cabal_flag assistant assistant) \
+ $(cabal_flag cryptohash cryptohash) \
+ $(cabal_flag dbus dbus) \
+ $(cabal_flag desktop-notify desktop-notify) \
+ $(cabal_flag dns dns) \
+ $(cabal_flag ekg ekg) \
+ $(cabal_flag feed feed) \
+ $(cabal_flag inotify inotify) \
+ $(cabal_flag pairing pairing) \
+ $(cabal_flag production production) \
+ $(cabal_flag quvi quvi) \
+ $(cabal_flag s3 s3) \
+ $(cabal_flag tahoe tahoe) \
+ $(cabal_flag tdfa tdfa) \
+ $(cabal_flag testsuite testsuite) \
+ $(cabal_flag webapp webapp) \
+ $(cabal_flag webapp-secure webapp-secure) \
+ $(cabal_flag webdav webdav) \
+ $(cabal_flag xmpp xmpp)
+}
+
+src_compile() {
+ haskell-cabal_src_compile
+ use doc && emake docs
+}
+
+src_test() {
+ if use webapp; then
+ export GIT_CONFIG=${T}/temp-git-config
+ git config user.email "git@src_test"
+ git config user.name "Mr. ${P} The Test"
+
+ emake test
+ fi
+}
+
+src_install() {
+ haskell-cabal_src_install
+ dosym git-annex /usr/bin/git-annex-shell # standard make install does more, than needed
+
+ # install-mans wants ikiwiki. It returns 0 and builds the man pages without ikiwiki.
+ emake install-mans DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
+ use doc && emake install-docs DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
+ mv "${ED}"/usr/share/doc/{${PN},${PF}}
+ dodoc CHANGELOG README
+ if use webapp ; then
+ doicon "${FILESDIR}"/${PN}.xpm
+ make_desktop_entry "${PN} webapp" "git-annex" ${PN}.xpm "Office"
+ fi
+}
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 82389cbb75e0..7971904bb82b 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -3,22 +3,22 @@ DIST git-1.8.2.1.tar.gz 4400440 SHA256 ed6dbf91b56c1540627563b5e8683fe726dac881a
DIST git-1.8.3.2.tar.gz 4474347 SHA256 2f798db86859c85608fe4120f52a1b1cb13ca9c4daa4f59eb1dc090280f46473 SHA512 6e19948821dfbf78c5b9ea95614d3c10f4625583e3c17b6c55110b74f28679e525c449179cf49c2587a86c3b7fd7b6a27589824fcea0ec6fb69ca752a6942931 WHIRLPOOL 26892e039b67b35ae9df0a124d0812b36a22f481f146561b733a758b89a00770c05902c2820f2a783bc0fac07ecb335accbc939d21481da821177e0548d6a077
DIST git-1.8.4.5.tar.gz 4677738 SHA256 37772b18b8184bb3b746963b8e1047a1205447df68c2b25698351434f8092d90 SHA512 56060aebf013becf884e27bf2a71a140c17055e0214a6a461ad3476d1d7017f63f3e2231047040adc5c42c2a08b0e75c9ae12b50c913c6689494337f3f7ad8e2 WHIRLPOOL 4dc0e1fbb8bf1d02706ec3943f506cf4f28a5f9146797dc35ac5401db752810220e1da109e3ce0750a8b2e2d7b7340ce223fe55c0279a1fdf60c457117da64c9
DIST git-1.8.5.5.tar.gz 4761469 SHA256 c59268c33d2412af329cb09b10e5348e4001a47e1b948b74ecd9937e0897dbb1 SHA512 8921c76b8826fa706450b64198f377ce7c650f06899c4d8e43f499f2e5ee93940a42f4c3483390e034d4babebbeadb400221ae7614e40731674c309da407bf3c WHIRLPOOL 62e8b3cc7c96ea9c22b88c0e5abebfb8ac7d8b84fcfcc4ca0a19a6ce1e9dbfbb6b8cd1180faedd67440cc88c39b3ca9c992d2251670a335e716f11b574475d30
-DIST git-1.9.2.tar.gz 4845863 SHA256 d0dceb2e881f6a8f6eada128f782904b8711ea93a4c86dd38da99a7773edc25b SHA512 f18ddab53db9bf272762258f142390178b9b4f5e955cf0fb8305b9a0d3d13759599cdec9b03206c7c470da9a3213fe10d08032a39640a623c707196dabbecbf8 WHIRLPOOL 0d4bf0b34385df2aa6eb666dd009e04313817265c0ee786c4f8e5e21c3b04114cefbaec0a6a6857585eeec864714729e6327f9a82501ad89a0991e38db271e25
DIST git-1.9.3.tar.gz 4846233 SHA256 71bca677efa3b87a060cba1de9e3512e7ab0f09197ef95d648e5280d9a6d1357 SHA512 42a774f0d2b9d0ace9e555b3d12b7a27fabdad407d5d1f342792d56cc1b7d1c9d1f921432238ec1bc61e9fd7f9dba7c5d8bcadea8b05bf73bab8c3b428f17b89 WHIRLPOOL b0cd2a18404af0856972d3ab1bad776b5c3cb5088369e5556aa2293feb6a164ef1af7a79cd4a1d7e20c37795921c05d811f9faebe57e31ea5621cc9990b8e5f3
DIST git-2.0.0.tar.gz 4898319 SHA256 c6a370e95326701037dfe32f8e66f39cdd28557ca84ffdb282d6042c37a98b68 SHA512 ee1132e259bc9dbcf1b5124131ab81ae0ee00a850640903d80bb78ba6122764d2d10a76b1fe1341c17a3caf22d7d27a726a68be28a54c4d28791074e98ff604a WHIRLPOOL 4c8a70c462f5beddd653c5e159237958573881e457471fc85b0e56381ace6a48eb500e21727301c35853fb586300b2e6df96e00441143bb268f4c61e532ee612
+DIST git-2.0.1.tar.xz 3433780 SHA256 ab12a103523b430d8d3e26ac2e05e759bdb1349f10e13bba48bed98f45c6d4df SHA512 51307c395c012f65842a53850dbcb5bde90dfee8ea731eab9bc099b3b284254fdbe86df08ab6fcae7b25f82edd87e3edb1fee4e5af1d2a01f2bfdfb7306d6107 WHIRLPOOL efd26778248472a742bae5208476a101aed5aaf0d81d7c924a2e09c89e7e39dbec9fab34c77f1d35405ae9d7a30be6a4c1757d12bb7c45a1827ec2dbae9afd6d
DIST git-htmldocs-1.8.1.5.tar.gz 2060977 SHA256 108e34217b2668945ca78b36b08ceeb9fe283617fe68b8f181219076bb225de0 SHA512 0b46a95a47df4326633d10295eeb09d41cee78d9c30775f7784690715e3b5d607ff26027f4cd6036f31dfc458ba2757ceb5ed6ea675a863a5dc69d8e5a7b34f5 WHIRLPOOL d273fbee9fb0a68ef3f0d19ba2249481bd15ff69b289e046e975fccda7639102519aa79bff94f6317e6b73cc414128b8b8619fcda1a910b74770b0aba1694d26
DIST git-htmldocs-1.8.2.1.tar.gz 2093688 SHA256 3f2482089eb345ec7d2ad61ad731c17ea87733b763585b580cf99b17194e0286 SHA512 8e7f25a0b230473f9e9290f61e9ea80a675459eea163ef76e281aa95747f5bc4df2ddb7f9bba9c2b0fb75819cd206f2415ba665bc986a628a07e8da4e5aa6efc WHIRLPOOL 574a01d1e403b25444ac88f66a939fcad1c96025a62f91550f328d400246955e61255dd403f3cf8302b961032f536e394b77228a8434c7b2065b564163f49114
DIST git-htmldocs-1.8.3.2.tar.gz 2115320 SHA256 805b7fc4399daf9258e8cc28ecc3dd043fdd7f339447f4d84674826916109246 SHA512 0890b60bfa110ca7eaf7aaddbf0aca9574f608addc384cece3c91c8c04ef6397064a0669f3d61d0a65eb120b626ccd85df26f04438ca301f349136cd55e5080a WHIRLPOOL 377c39ac7988a3c1bb6e80333c43878d38fe5eecbb75dcbcbef3c2186842fcc170a552d72be891f1479c336fdd6c5ac1ce1ca2c0adf9a8238bd057f093c3f912
DIST git-htmldocs-1.8.4.5.tar.gz 2207155 SHA256 ecaaef864b1794301af4af17a4d378966ac1dbeee9a82f524d1ebc0b6d6da299 SHA512 1bb5d8fd2884f0bd39ff0924579a4bd16d225da10ae78cb3c535133d187b9306dce55d14a2df7fa0a40c6fa1df523eec2e118e2f5268dd624bbdb6c65fd32363 WHIRLPOOL ca5ce52d02eac3f079ab89eb5e41640c9dee724c8a3356b362eae0ba120cb9640c5f6a4576ae98fd42002f84ad066ed3e6254fdc77b95731ac1b17549b5911e5
DIST git-htmldocs-1.8.5.5.tar.gz 2228410 SHA256 14088e41803a9127946a9f31146d5ac4806d2c6075668bb2833c3af72b32c8ab SHA512 8424f241e32e89e2b7eb0dcfcbf37a74b7f9883b9fcde815be9081a16ab0a3eb150f09d41ab08e01a7980f8151b56313912eed79341c8c31df10ff94ca0efca3 WHIRLPOOL c7e3e769307a23a0f05d764cb957b0854a4f0df8825703aa1b32fb3a0697d30871c4d3a4d41388a1e92b27f46535551117a843bd47a70ee22332612cd2ce8ad8
-DIST git-htmldocs-1.9.2.tar.gz 2242774 SHA256 ad36ec63e9d77310cd341d832eb9238cb47fde7852448b5cf63ab825973aa323 SHA512 c0cf90c8eb31939ca689f59232c5ec59572e94b1104eaf8e88c7f092e537e2b8f821cbf9e7be6865b56e692da15fc4443638d6b3c8963dd137a43abfebe0f752 WHIRLPOOL 342f4d4dfa29ed4e81a176816d5aae0a7eb365c2e91793073dea11d57f2d60c146891bf16ecda9cbcf24e1c42915f90b73c1ccea50d8a330e5890e93e937460d
DIST git-htmldocs-1.9.3.tar.gz 2243608 SHA256 d23f3f3ccd421706f8805c40ee199fb1d3dda7e6720eb8b260f3dbed20f2536f SHA512 c381f560d5f67f723920ba679665725d377b40e0074ca49826436310f7c64d9c9814ff8a3e98a9d00c0d47e9d9f613ec4ed035d15420b87221fdb17de4ebaf3d WHIRLPOOL 9437271b91b5667fa7a6e979aa86822c1824bcf786a2fad07c0a3cdb1c576bccfe2a098f0e43ebfc66f0dc54cf32443988018ce15f191747b412d200599d0af7
DIST git-htmldocs-2.0.0.tar.gz 2274715 SHA256 19d34736cc50e3a4b5641e0998191d67d89d3146b8652e7abd88780ca475dbcb SHA512 16d1baa93f8ee14d7e5ad1048261875cd37722ff5fb4e742196edfa282c5b93b2e45b2f38b632f25afdffbf27f3162eeedd42f07dfee9c05abfd5f9c0e101769 WHIRLPOOL d3823421435ae58dbd7d6cec7a00333cf32280c036086d71d9917303be47102eee53b017ae74d30a18f69bde69514ce15a52f8c2461c47c7d81119fb7cdf56f3
+DIST git-htmldocs-2.0.1.tar.xz 943016 SHA256 22df5f33657d0b6106e3ae87e6fce806cefc6ea10fa51fad292f6823f3be0e5b SHA512 73f3d3f4b38fb7760a6c9668bd379fdb46133ccdddfbe8f21c1c6cd9e2b20e01422fba41ce74508e512796fcaca7f360612db8667ab5632746f262175d74dc75 WHIRLPOOL 188db71fbc9d310d9217537fd51a42ff8efc94381c64935598fdc49947fd9c395dcf1119e8eadbe543b4adeb38f1d65ff178014bb77656750b0c4a8b3963322c
DIST git-manpages-1.8.1.5.tar.gz 528540 SHA256 b171761f13deb738a2464c9d3967c12539067a34d6f2bfa5739a1006786fd24a SHA512 c0106da12ae3beeba3c23e68b37113082d829fe80160c53df51aac207557a2045c662b4d01b5a1cb211e75f9f7629290b7ecf3907b3bdc828820382793414e8e WHIRLPOOL 3da3b254707c06cb069fa462561634a4f5869fadab6ab8a07301eeb0b2244f159415d409d71c5ebceb4a74ef51f645f2f4c9ca19080a84ee370b5787740d08c2
DIST git-manpages-1.8.2.1.tar.gz 536718 SHA256 1d3bc31d10564d29d0c3a45f98f98a7d936dfcdb1692528bf2fdb2140fe89824 SHA512 a6463c8bc8a23301d89e985b88fa0073c154e126c51a1f7699cd09e79723ed463f46a9cf5dd63f9e2e46ee4111e6154ae86553bd446f5cf76db9fd4e3bff5a1f WHIRLPOOL 8aa3c57475d8cfd7c47019c4eb05c091c76fb0ec5d213942b5a16ee9f6c540111aecb6b754eb98578e9e129d4e8ba941a3bee326a2845b2a098cc30e1109d35d
DIST git-manpages-1.8.3.2.tar.gz 542769 SHA256 599bc8f6c56986a994a237cfebb53b4fab9051576775e32d0353e0455ab84115 SHA512 42fd781b924355c969ce381aae828f877059472741d7b53b0d1aad53f04c8a27b6b161b5dfc353098370ead73ccb9cdc86ac5374cf02829134f8c4d70bcbb7cf WHIRLPOOL 90226006a35b7b6e644f887981f2725238ff428f572425942701614e14fab5c8c5c602746de93a113d83d9b9c76ea1805a9c7cfa353305b0f817c33976048d77
DIST git-manpages-1.8.4.5.tar.gz 565177 SHA256 8cf38e3a48425fe74c4a71286633ea895bd03d32481ea5112e9682a6adb3b4bf SHA512 6f9d56da7493ae50275f259ca65649a4dbada3a3d0e32e0a418ed73c2e2661c90f23cfe9a62800cbceec1db86a2bb7b93eccaaf28c282cb5046c2aea3f928774 WHIRLPOOL 1f92c6437214f9d8d998a916cf34399be4f49a5c2dd5fe930850ae3b7ef10da66594c8d4544fa313b485bdcfd9259322c5ba0b83f9403263c80d12b19ca8c5f0
DIST git-manpages-1.8.5.5.tar.gz 568976 SHA256 375870364a67e663ee85de30d64a12388c6147ac4a263aed1a447e0e2dffd0b8 SHA512 c07a5ddbe158868a7c94575408c2f8d0cc6fd9d1da95e3ff1b93b140708830a50175f38217eb75456d508f05c9720df93b22bd9f336a2b8edb6812bee5cd4a0b WHIRLPOOL 275b352e40ba3891d1ddcda7ef002528f2ec498af41d3f3ea1638f9baa4f9065973c434b7cb7d731b0a951f7bf5c0bbf582677aab727533cd065c64bfa20d1a0
-DIST git-manpages-1.9.2.tar.gz 571591 SHA256 bcf7cb8aa17885f6923c33cf420ecf249e097510079c2996396c6369014c4ca8 SHA512 4eb1a0c0cd676c3983c36f9202e3d2832b59375bd7f1c60e7a1a465e60d233112d404213648f7baddc2ead31459a34068df2ec00707a4ca83dc1eef04ce60e03 WHIRLPOOL 01936ecade547e90593c0d1117d29f25e521365c0bfc9b34600f998b7076f1eb1b3c1156ae110f87695531f1e22ea4a1db79df48cd5510a40f4721bf75670639
DIST git-manpages-1.9.3.tar.gz 571550 SHA256 43bfb09c072ccfe0ed4b0ad30d04c8f34b6af4d2f52cd8dfdb48787cc9c8509d SHA512 3f985a4446e3ce1b8bff356585eb5f33565179517e7ba9ae53fc59399c2e4f3ee8498567ce5282e3ddafe0709e79b80877ee53166986facc1ce348495cbb254a WHIRLPOOL 21e96604e4d6581c34ccf0c1367b706e383c47e45ffe9bfb05e9998c7de45507aa72c3fe95f8fd1d81eced81cea149e6bb393a097fe95d8debbeebfbecde6efd
DIST git-manpages-2.0.0.tar.gz 575350 SHA256 12523fe1c8de8b88997b5483313e143c96c0a116c19a498ddbbfe573ed98bded SHA512 50b27b1fa5fd005f17e52c91d8bc6ed8b387611525d6d5aa5d7a5b8808d94d4afa34e56fa6921d768ca623535ed720a699b092ed2826a2d78fde7592826d27db WHIRLPOOL 7acdba3f493fc26b39854d71026fa0235c2989d99a42cb63e0811afa2e9c1536f5980f0c11dabf7fd85f71dd54632bc36c9e556e4597216e69aa962f30743fff
+DIST git-manpages-2.0.1.tar.xz 358984 SHA256 197bc5e447be0dbd5185717a555d7f908dd064e8d2bf3ed9fdbb822c3ddd35d8 SHA512 72b7a9e08552f4b3cef35572aa1575700825098480ef5dc118c9440afee3bbec180571eae01df2ea349e8ab1170f2ffd6c1763b6947e67779e3eba9ea69c5489 WHIRLPOOL 8bba425ccd1d19e8a69e1a53f69c55c26fd065d8022b2e6d3a86c5f0e07c445731eeae6658e659f38b89868213da8a200ad6151dadc4c5ea49dcc6b40c4dd936
diff --git a/dev-vcs/git/files/git-2.0.0-optional-cvs.patch b/dev-vcs/git/files/git-2.0.0-optional-cvs.patch
deleted file mode 100644
index cffba390e8d6..000000000000
--- a/dev-vcs/git/files/git-2.0.0-optional-cvs.patch
+++ /dev/null
@@ -1,375 +0,0 @@
-From e19ad5a8492d83db79a09b459cb17ccee78e0001 Mon Sep 17 00:00:00 2001
-From: Robin Johnson
-Date: Fri, 25 Apr 2014 12:30:42 +0200
-Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface
- utilities
-
-Forward-ported from 1.7.12 to current git.git v1.8.4
-Forward-ported from v1.8.4 to v1.8.5.1
-Forward-ported from v1.8.5.3 to v1.9.0_rc3
-Forward-ported from 1.9.0_rc3 to current git.git v2.0.0_rc0
-Forward-ported from v2.0.0_rc0 to v2.0.0
-
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/Makefile git-2.0.0/Makefile
---- git-2.0.0.orig/Makefile 2014-05-28 12:10:36.000000000 -0700
-+++ git-2.0.0/Makefile 2014-05-28 16:50:10.148376954 -0700
-@@ -255,6 +255,8 @@
- #
- # Define NO_TCLTK if you do not want Tcl/Tk GUI.
- #
-+# Define NO_CVS if you do not want any CVS interface utilities.
-+#
- # The TCL_PATH variable governs the location of the Tcl interpreter
- # used to optimize git-gui for your system. Only used if NO_TCLTK
- # is not set. Defaults to the bare 'tclsh'.
-@@ -436,6 +438,7 @@
- PROGRAM_OBJS =
- PROGRAMS =
- SCRIPT_PERL =
-+SCRIPT_PERL_CVS =
- SCRIPT_PYTHON =
- SCRIPT_SH =
- SCRIPT_LIB =
-@@ -475,20 +478,21 @@
- SCRIPT_PERL += git-add--interactive.perl
- SCRIPT_PERL += git-difftool.perl
- SCRIPT_PERL += git-archimport.perl
--SCRIPT_PERL += git-cvsexportcommit.perl
--SCRIPT_PERL += git-cvsimport.perl
--SCRIPT_PERL += git-cvsserver.perl
- SCRIPT_PERL += git-relink.perl
- SCRIPT_PERL += git-send-email.perl
- SCRIPT_PERL += git-svn.perl
-
-+SCRIPT_PERL_CVS += git-cvsexportcommit.perl
-+SCRIPT_PERL_CVS += git-cvsimport.perl
-+SCRIPT_PERL_CVS += git-cvsserver.perl
-+
- SCRIPT_PYTHON += git-p4.py
-
- NO_INSTALL += git-remote-testgit
-
- # Generated files for scripts
- SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH))
--SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL))
-+SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS))
- SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON))
-
- SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN))
-@@ -1779,8 +1783,18 @@
- $(join -DMAJOR= -DMINOR=, $(wordlist 1,2,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \
- -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@
-
-+_SCRIPT_PERL_BUILD =
-+_SCRIPT_PERL_NOBUILD =
-+
- ifndef NO_PERL
--$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
-+
-+_SCRIPT_PERL_BUILD += $(SCRIPT_PERL)
-+
-+ifndef NO_CVS
-+_SCRIPT_PERL_BUILD += $(SCRIPT_PERL_CVS)
-+else # NO_CVS
-+_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL_CVS)
-+endif # NO_CVS
-
- perl/perl.mak: perl/PM.stamp
-
-@@ -1793,7 +1807,7 @@
- $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
-
- PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ)
--$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE
-+$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE
- $(QUIET_GEN)$(RM) $@ $@+ && \
- INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
- INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \
-@@ -1826,15 +1840,18 @@
- $(QUIET_GEN)$(cmd_munge_script) && \
- chmod +x $@+ && \
- mv $@+ $@
- else # NO_PERL
--$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh
-+_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) git-instaweb
-+endif # NO_PERL
-+
-+# This is any perl scripts that were disabled it might be empty...
-+$(patsubst %.perl,%,$(_SCRIPT_PERL_NOBUILD)) git-instaweb: % : unimplemented.sh
- $(QUIET_GEN)$(RM) $@ $@+ && \
- sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
- -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
- unimplemented.sh >$@+ && \
- chmod +x $@+ && \
- mv $@+ $@
--endif # NO_PERL
-
- ifndef NO_PYTHON
- $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/t9200-git-cvsexportcommit.sh git-2.0.0/t/t9200-git-cvsexportcommit.sh
---- git-2.0.0.orig/t/t9200-git-cvsexportcommit.sh 2014-05-28 12:10:36.000000000 -0700
-+++ git-2.0.0/t/t9200-git-cvsexportcommit.sh 2014-05-28 16:47:41.812727825 -0700
-@@ -11,6 +11,11 @@
- test_done
- fi
-
-+if ! test_have_prereq CVS; then
-+ skip_all='skipping git cvsexportcommit tests, cvs not available'
-+ test_done
-+fi
-+
- cvs >/dev/null 2>&1
- if test $? -ne 1
- then
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/t9400-git-cvsserver-server.sh git-2.0.0/t/t9400-git-cvsserver-server.sh
---- git-2.0.0.orig/t/t9400-git-cvsserver-server.sh 2014-05-28 12:10:36.000000000 -0700
-+++ git-2.0.0/t/t9400-git-cvsserver-server.sh 2014-05-28 16:47:41.812727825 -0700
-@@ -11,9 +11,15 @@
- . ./test-lib.sh
-
- if ! test_have_prereq PERL; then
-- skip_all='skipping git cvsserver tests, perl not available'
-+ skip_all='skipping git-cvsserver tests, perl not available'
- test_done
- fi
-+
-+if ! test_have_prereq CVS; then
-+ skip_all='skipping git-cvsserver tests, cvs not available'
-+ test_done
-+fi
-+
- cvs >/dev/null 2>&1
- if test $? -ne 1
- then
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/t9401-git-cvsserver-crlf.sh git-2.0.0/t/t9401-git-cvsserver-crlf.sh
---- git-2.0.0.orig/t/t9401-git-cvsserver-crlf.sh 2014-05-28 12:10:36.000000000 -0700
-+++ git-2.0.0/t/t9401-git-cvsserver-crlf.sh 2014-05-28 16:47:41.812727825 -0700
-@@ -57,15 +57,20 @@
- return $stat
- }
-
--cvs >/dev/null 2>&1
--if test $? -ne 1
-+if ! test_have_prereq PERL
- then
-- skip_all='skipping git-cvsserver tests, cvs not found'
-+ skip_all='skipping git-cvsserver tests, perl not available'
- test_done
- fi
--if ! test_have_prereq PERL
-+if ! test_have_prereq CVS
- then
-- skip_all='skipping git-cvsserver tests, perl not available'
-+ skip_all='skipping git-cvsserver tests, cvs not available'
-+ test_done
-+fi
-+cvs >/dev/null 2>&1
-+if test $? -ne 1
-+then
-+ skip_all='skipping git-cvsserver tests, cvs not found'
- test_done
- fi
- perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/t9600-cvsimport.sh git-2.0.0/t/t9600-cvsimport.sh
---- git-2.0.0.orig/t/t9600-cvsimport.sh 2014-05-28 12:10:36.000000000 -0700
-+++ git-2.0.0/t/t9600-cvsimport.sh 2014-05-28 16:47:41.813727843 -0700
-@@ -3,14 +3,25 @@
- test_description='git cvsimport basic tests'
- . ./lib-cvs.sh
-
--test_expect_success PERL 'setup cvsroot environment' '
-+if ! test_have_prereq PERL
-+then
-+ skip_all='skipping git cvsimport tests, perl not available'
-+ test_done
-+fi
-+if ! test_have_prereq CVS
-+then
-+ skip_all='skipping git cvsimport tests, cvs not available'
-+ test_done
-+fi
-+
-+test_expect_success 'setup cvsroot environment' '
- CVSROOT=$(pwd)/cvsroot &&
- export CVSROOT
- '
-
--test_expect_success PERL 'setup cvsroot' '$CVS init'
-+test_expect_success 'setup cvsroot' '$CVS init'
-
--test_expect_success PERL 'setup a cvs module' '
-+test_expect_success 'setup a cvs module' '
-
- mkdir "$CVSROOT/module" &&
- $CVS co -d module-cvs module &&
-@@ -42,23 +53,23 @@
- )
- '
-
--test_expect_success PERL 'import a trivial module' '
-+test_expect_success 'import a trivial module' '
-
- git cvsimport -a -R -z 0 -C module-git module &&
- test_cmp module-cvs/o_fortuna module-git/o_fortuna
-
- '
-
--test_expect_success PERL 'pack refs' '(cd module-git && git gc)'
-+test_expect_success 'pack refs' '(cd module-git && git gc)'
-
--test_expect_success PERL 'initial import has correct .git/cvs-revisions' '
-+test_expect_success 'initial import has correct .git/cvs-revisions' '
-
- (cd module-git &&
- git log --format="o_fortuna 1.1 %H" -1) > expected &&
- test_cmp expected module-git/.git/cvs-revisions
- '
-
--test_expect_success PERL 'update cvs module' '
-+test_expect_success 'update cvs module' '
- (cd module-cvs &&
- cat <o_fortuna &&
- O Fortune,
-@@ -86,7 +97,7 @@
- )
- '
-
--test_expect_success PERL 'update git module' '
-+test_expect_success 'update git module' '
-
- (cd module-git &&
- git config cvsimport.trackRevisions true &&
-@@ -97,7 +108,7 @@
-
- '
-
--test_expect_success PERL 'update has correct .git/cvs-revisions' '
-+test_expect_success 'update has correct .git/cvs-revisions' '
-
- (cd module-git &&
- git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
-@@ -105,7 +116,7 @@
- test_cmp expected module-git/.git/cvs-revisions
- '
-
--test_expect_success PERL 'update cvs module' '
-+test_expect_success 'update cvs module' '
-
- (cd module-cvs &&
- echo 1 >tick &&
-@@ -114,7 +125,7 @@
- )
- '
-
--test_expect_success PERL 'cvsimport.module config works' '
-+test_expect_success 'cvsimport.module config works' '
-
- (cd module-git &&
- git config cvsimport.module module &&
-@@ -126,7 +137,7 @@
-
- '
-
--test_expect_success PERL 'second update has correct .git/cvs-revisions' '
-+test_expect_success 'second update has correct .git/cvs-revisions' '
-
- (cd module-git &&
- git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
-@@ -135,7 +146,7 @@
- test_cmp expected module-git/.git/cvs-revisions
- '
-
--test_expect_success PERL 'import from a CVS working tree' '
-+test_expect_success 'import from a CVS working tree' '
-
- $CVS co -d import-from-wt module &&
- (cd import-from-wt &&
-@@ -148,12 +159,12 @@
-
- '
-
--test_expect_success PERL 'no .git/cvs-revisions created by default' '
-+test_expect_success 'no .git/cvs-revisions created by default' '
-
- ! test -e import-from-wt/.git/cvs-revisions
-
- '
-
--test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master'
-+test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master'
-
- test_done
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/t9601-cvsimport-vendor-branch.sh git-2.0.0/t/t9601-cvsimport-vendor-branch.sh
---- git-2.0.0.orig/t/t9601-cvsimport-vendor-branch.sh 2014-05-28 12:10:36.000000000 -0700
-+++ git-2.0.0/t/t9601-cvsimport-vendor-branch.sh 2014-05-28 16:47:41.813727843 -0700
-@@ -34,6 +34,17 @@
- test_description='git cvsimport handling of vendor branches'
- . ./lib-cvs.sh
-
-+if ! test_have_prereq PERL
-+then
-+ skip_all='skipping git cvsimport tests, perl not available'
-+ test_done
-+fi
-+if ! test_have_prereq CVS
-+then
-+ skip_all='skipping git cvsimport tests, cvs not available'
-+ test_done
-+fi
-+
- setup_cvs_test_repository t9601
-
- test_expect_success PERL 'import a module with a vendor branch' '
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/t9602-cvsimport-branches-tags.sh git-2.0.0/t/t9602-cvsimport-branches-tags.sh
---- git-2.0.0.orig/t/t9602-cvsimport-branches-tags.sh 2014-05-28 12:10:36.000000000 -0700
-+++ git-2.0.0/t/t9602-cvsimport-branches-tags.sh 2014-05-28 16:47:41.813727843 -0700
-@@ -6,6 +6,17 @@
- test_description='git cvsimport handling of branches and tags'
- . ./lib-cvs.sh
-
-+if ! test_have_prereq PERL
-+then
-+ skip_all='skipping git cvsimport tests, perl not available'
-+ test_done
-+fi
-+if ! test_have_prereq CVS
-+then
-+ skip_all='skipping git cvsimport tests, cvs not available'
-+ test_done
-+fi
-+
- setup_cvs_test_repository t9602
-
- test_expect_success PERL 'import module' '
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/t9603-cvsimport-patchsets.sh git-2.0.0/t/t9603-cvsimport-patchsets.sh
---- git-2.0.0.orig/t/t9603-cvsimport-patchsets.sh 2014-05-28 12:10:36.000000000 -0700
-+++ git-2.0.0/t/t9603-cvsimport-patchsets.sh 2014-05-28 16:47:41.813727843 -0700
-@@ -14,6 +14,17 @@
- test_description='git cvsimport testing for correct patchset estimation'
- . ./lib-cvs.sh
-
-+if ! test_have_prereq PERL
-+then
-+ skip_all='skipping git cvsimport tests, perl not available'
-+ test_done
-+fi
-+if ! test_have_prereq CVS
-+then
-+ skip_all='skipping git cvsimport tests, cvs not available'
-+ test_done
-+fi
-+
- setup_cvs_test_repository t9603
-
- test_expect_failure 'import with criss cross times on revisions' '
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/test-lib.sh git-2.0.0/t/test-lib.sh
---- git-2.0.0.orig/t/test-lib.sh 2014-05-28 12:10:36.000000000 -0700
-+++ git-2.0.0/t/test-lib.sh 2014-05-28 16:47:41.813727843 -0700
-@@ -777,6 +777,7 @@
- esac
-
- ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1
-+test -z "$NO_CVS" && test_set_prereq CVS
- test -z "$NO_PERL" && test_set_prereq PERL
- test -z "$NO_PYTHON" && test_set_prereq PYTHON
- test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE
diff --git a/dev-vcs/git/git-1.9.2.ebuild b/dev-vcs/git/git-1.9.2.ebuild
deleted file mode 100644
index 531a3e6a0e8f..000000000000
--- a/dev-vcs/git/git-1.9.2.ebuild
+++ /dev/null
@@ -1,641 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.9.2.ebuild,v 1.2 2014/06/24 01:44:07 tetromino Exp $
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_{6,7} )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI_SUFFIX="gz"
- SRC_URI_GOOG="http://git-core.googlecode.com/files"
- SRC_URI_KORG="mirror://kernel/software/scm/git"
- SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- doc? (
- ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- )"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-else
- SRC_URI=""
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
- dev-libs/openssl
- sys-libs/zlib
- pcre? ( dev-libs/libpcre )
- perl? ( dev-lang/perl:=[-build(-)] )
- tk? ( dev-lang/tk )
- curl? (
- net-misc/curl
- webdav? ( dev-libs/expat )
- )
- emacs? ( virtual/emacs )
- gnome-keyring? ( gnome-base/libgnome-keyring )"
-
-RDEPEND="${CDEPEND}
- gpg? ( app-crypt/gnupg )
- mediawiki? (
- dev-perl/HTML-Tree
- dev-perl/MediaWiki-API
- )
- perl? ( dev-perl/Error
- dev-perl/Net-SMTP-SSL
- dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
- cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
- subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
- )
- python? ( gtk?
- (
- >=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
- >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
- )
- ${PYTHON_DEPS} )"
-
-# This is how info docs are created with Git:
-# .txt/asciidoc --(asciidoc)---------> .xml/docbook
-# .xml/docbook --(docbook2texi.pl)--> .texi
-# .texi --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
- app-arch/cpio
- doc? (
- app-text/asciidoc
- app-text/docbook2X
- sys-apps/texinfo
- app-text/xmlto
- )
- nls? ( sys-devel/gettext )
- test? ( app-crypt/gnupg )"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
- DEPEND="${DEPEND}
- app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
- cgi? ( perl )
- cvs? ( perl )
- mediawiki? ( perl )
- subversion? ( perl )
- webdav? ( curl )
- gtk? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-pkg_setup() {
- if use subversion && has_version "dev-vcs/subversion[dso]"; then
- ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
- ewarn "with USE=dso, there may be weird crashes in git-svn. You"
- ewarn "have been warned."
- fi
- if use python ; then
- python-single-r1_pkg_setup
- fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
- local myopts
-
- if use blksha1 ; then
- myopts="${myopts} BLK_SHA1=YesPlease"
- elif use ppcsha1 ; then
- myopts="${myopts} PPC_SHA1=YesPlease"
- fi
-
- if use curl ; then
- use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
- else
- myopts="${myopts} NO_CURL=YesPlease"
- fi
-
- # broken assumptions, because of broken build system ...
- myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
- myopts="${myopts} INSTALL=install TAR=tar"
- myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
- myopts="${myopts} SANE_TOOL_PATH="
- myopts="${myopts} OLD_ICONV="
- myopts="${myopts} NO_EXTERNAL_GREP="
-
- # For svn-fe
- extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
- # can't define this to null, since the entire makefile depends on it
- sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
- use iconv \
- || myopts="${myopts} NO_ICONV=YesPlease"
- use nls \
- || myopts="${myopts} NO_GETTEXT=YesPlease"
- use tk \
- || myopts="${myopts} NO_TCLTK=YesPlease"
- use pcre \
- && myopts="${myopts} USE_LIBPCRE=yes" \
- && extlibs="${extlibs} -lpcre"
- use perl \
- && myopts="${myopts} INSTALLDIRS=vendor" \
- || myopts="${myopts} NO_PERL=YesPlease"
- use python \
- || myopts="${myopts} NO_PYTHON=YesPlease"
- use subversion \
- || myopts="${myopts} NO_SVN_TESTS=YesPlease"
- use threads \
- && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \
- || myopts="${myopts} NO_PTHREADS=YesPlease"
- use cvs \
- || myopts="${myopts} NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-# if [[ ${CHOST} == *-mint* ]] ; then
-# myopts="${myopts} NO_MMAP=YesPlease"
-# myopts="${myopts} NO_IPV6=YesPlease"
-# myopts="${myopts} NO_STRLCPY=YesPlease"
-# myopts="${myopts} NO_MEMMEM=YesPlease"
-# myopts="${myopts} NO_MKDTEMP=YesPlease"
-# myopts="${myopts} NO_MKSTEMPS=YesPlease"
-# fi
- if [[ ${CHOST} == ia64-*-hpux* ]]; then
- myopts="${myopts} NO_NSEC=YesPlease"
- fi
- if [[ ${CHOST} == *-*-aix* ]]; then
- myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
- fi
- if [[ ${CHOST} == *-solaris* ]]; then
- myopts="${myopts} NEEDS_LIBICONV=YesPlease"
- fi
-
- has_version '>=app-text/asciidoc-8.0' \
- && myopts="${myopts} ASCIIDOC8=YesPlease"
- myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
-
- # Bug 290465:
- # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
- [[ "${CHOST}" == *-uclibc* ]] && \
- myopts="${myopts} NO_NSEC=YesPlease"
-
- export MY_MAKEOPTS="${myopts}"
- export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
- if [[ ${PV} != *9999 ]]; then
- unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
- cd "${S}"
- unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- use doc && \
- cd "${S}"/Documentation && \
- unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- cd "${S}"
- else
- git-2_src_unpack
- cd "${S}"
- #cp "${FILESDIR}"/GIT-VERSION-GEN .
- fi
-
-}
-
-src_prepare() {
- # bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-1.9.0_rc3-optional-cvs.patch
-
- # install mediawiki perl modules also in vendor_dir
- # hack, needs better upstream solution
- epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
- epatch_user
-
- sed -i \
- -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
- -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
- -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
- -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
- -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
- -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
- Makefile contrib/svn-fe/Makefile || die "sed failed"
-
- # Never install the private copy of Error.pm (bug #296310)
- sed -i \
- -e '/private-Error.pm/s,^,#,' \
- perl/Makefile.PL
-
- # Fix docbook2texi command
- sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
- Documentation/Makefile || die "sed failed"
-
- # Fix git-subtree missing DESTDIR
- sed -i \
- -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
- -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \
- contrib/subtree/Makefile
-}
-
-git_emake() {
- # bug #326625: PERL_PATH, PERL_MM_OPT
- # bug #320647: PYTHON_PATH
- PYTHON_PATH=""
- use python && PYTHON_PATH="${PYTHON}"
- emake ${MY_MAKEOPTS} \
- DESTDIR="${D}" \
- OPTCFLAGS="${CFLAGS}" \
- OPTLDFLAGS="${LDFLAGS}" \
- OPTCC="$(tc-getCC)" \
- OPTAR="$(tc-getAR)" \
- prefix="${EPREFIX}"/usr \
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
- sysconfdir="${EPREFIX}"/etc \
- PYTHON_PATH="${PYTHON_PATH}" \
- PERL_MM_OPT="" \
- GIT_TEST_OPTS="--no-color" \
- V=1 \
- "$@"
- # This is the fix for bug #326625, but it also causes breakage, see bug
- # #352693.
- # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
- exportmakeopts
-}
-
-src_compile() {
- if use perl ; then
- git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
- git_emake perl/perl.mak || die "emake perl/perl.mak failed"
- fi
- git_emake || die "emake failed"
-
- if use emacs ; then
- elisp-compile contrib/emacs/git{,-blame}.el
- fi
-
- if use perl && use cgi ; then
- git_emake \
- gitweb/gitweb.cgi \
- || die "emake gitweb/gitweb.cgi failed"
- fi
-
- if [[ ${CHOST} == *-darwin* ]]; then
- cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
- git_emake || die "emake credential-osxkeychain"
- fi
-
- cd "${S}"/Documentation
- if [[ ${PV} == *9999 ]] ; then
- git_emake man \
- || die "emake man failed"
- if use doc ; then
- git_emake info html \
- || die "emake info html failed"
- fi
- else
- if use doc ; then
- git_emake info \
- || die "emake info html failed"
- fi
- fi
-
- if use subversion ; then
- cd "${S}"/contrib/svn-fe
- git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed"
- if use doc ; then
- git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
- fi
- cd "${S}"
- fi
-
- if use gnome-keyring ; then
- cd "${S}"/contrib/credential/gnome-keyring
- git_emake || die "emake git-credential-gnome-keyring failed"
- fi
-
- cd "${S}"/contrib/subtree
- git_emake
- use doc && git_emake doc
-
- if use mediawiki ; then
- cd "${S}"/contrib/mw-to-git
- git_emake
- fi
-}
-
-src_install() {
- git_emake \
- install || \
- die "make install failed"
-
- if [[ ${CHOST} == *-darwin* ]]; then
- dobin contrib/credential/osxkeychain/git-credential-osxkeychain
- fi
-
- # Depending on the tarball and manual rebuild of the documentation, the
- # manpages may exist in either OR both of these directories.
- find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
- find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-
- dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
- use doc && dodir /usr/share/doc/${PF}/html
- for d in / /howto/ /technical/ ; do
- docinto ${d}
- dodoc Documentation${d}*.txt
- use doc && dohtml -p ${d} Documentation${d}*.html
- done
- docinto /
- # Upstream does not ship this pre-built :-(
- use doc && doinfo Documentation/{git,gitman}.info
-
- newbashcomp contrib/completion/git-completion.bash ${PN}
- # Not really a bash-completion file (bug #477920)
- dodoc contrib/completion/git-prompt.sh
-
- if use emacs ; then
- elisp-install ${PN} contrib/emacs/git.{el,elc}
- elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
- #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
- # don't add automatically to the load-path, so the sitefile
- # can do a conditional loading
- touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
- elisp-site-file-install "${FILESDIR}"/${SITEFILE}
- fi
-
- if use python && use gtk ; then
- python_doscript "${S}"/contrib/gitview/gitview
- dodoc "${S}"/contrib/gitview/gitview.txt
- fi
-
- #dobin contrib/fast-import/git-p4 # Moved upstream
- #dodoc contrib/fast-import/git-p4.txt # Moved upstream
- newbin contrib/fast-import/import-tars.perl import-tars
- exeinto /usr/libexec/git-core/
- newexe contrib/git-resurrect.sh git-resurrect
-
- # git-subtree
- cd "${S}"/contrib/subtree
- git_emake install || die "Failed to emake install git-subtree"
- if use doc ; then
- git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
- fi
- newdoc README README.git-subtree
- dodoc git-subtree.txt
- cd "${S}"
-
- if use mediawiki ; then
- cd "${S}"/contrib/mw-to-git
- git_emake install
- cd "${S}"
- fi
-
- # git-diffall
- dobin contrib/diffall/git-diffall
- newdoc contrib/diffall/README git-diffall.txt
-
- # diff-highlight
- dobin contrib/diff-highlight/diff-highlight
- newdoc contrib/diff-highlight/README README.diff-highlight
-
- # git-jump
- exeinto /usr/libexec/git-core/
- doexe contrib/git-jump/git-jump
- newdoc contrib/git-jump/README git-jump.txt
-
- # git-contacts
- exeinto /usr/libexec/git-core/
- doexe contrib/contacts/git-contacts
- dodoc contrib/contacts/git-contacts.txt
-
- if use gnome-keyring ; then
- cd "${S}"/contrib/credential/gnome-keyring
- dobin git-credential-gnome-keyring
- fi
-
- if use subversion ; then
- cd "${S}"/contrib/svn-fe
- dobin svn-fe
- dodoc svn-fe.txt
- use doc && doman svn-fe.1 && dohtml svn-fe.html
- cd "${S}"
- fi
-
- # remote-helpers
- if use python ; then
- python_scriptinto /usr/libexec/git-core/
- python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg}
- python_optimize
- fi
-
- dodir /usr/share/${PN}/contrib
- # The following are excluded:
- # completion - installed above
- # credential/gnome-keyring TODO
- # diff-highlight - done above
- # diffall - done above
- # emacs - installed above
- # examples - these are stuff that is not used in Git anymore actually
- # git-jump - done above
- # gitview - installed above
- # p4import - excluded because fast-import has a better one
- # patches - stuff the Git guys made to go upstream to other places
- # persistent-https - TODO
- # mw-to-git - TODO
- # subtree - build seperately
- # svnimport - use git-svn
- # thunderbird-patch-inline - fixes thunderbird
- for i in \
- buildsystems convert-objects fast-import \
- hg-to-git hooks remotes2config.sh rerere-train.sh \
- stats vim workdir \
- ; do
- cp -rf \
- "${S}"/contrib/${i} \
- "${ED}"/usr/share/${PN}/contrib \
- || die "Failed contrib ${i}"
- done
-
- if use perl && use cgi ; then
- # We used to install in /usr/share/${PN}/gitweb
- # but upstream installs in /usr/share/gitweb
- # so we will install a symlink and use their location for compat with other
- # distros
- dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
- # INSTALL discusses configuration issues, not just installation
- docinto /
- newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
- newdoc "${S}"/gitweb/README README.gitweb
-
- find "${ED}"/usr/lib64/perl5/ \
- -name .packlist \
- -exec rm \{\} \;
- else
- rm -rf "${ED}"/usr/share/gitweb
- fi
-
- if ! use subversion ; then
- rm -f "${ED}"/usr/libexec/git-core/git-svn \
- "${ED}"/usr/share/man/man1/git-svn.1*
- fi
-
- if use xinetd ; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/git-daemon.xinetd git-daemon
- fi
-
- if use !prefix ; then
- newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
- newconfd "${FILESDIR}"/git-daemon.confd git-daemon
- systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
- systemd_dounit "${FILESDIR}/git-daemon.socket"
- fi
-
- fixlocalpod
-}
-
-src_test() {
- local disabled=""
- local tests_cvs="t9200-git-cvsexportcommit.sh \
- t9400-git-cvsserver-server.sh \
- t9401-git-cvsserver-crlf.sh \
- t9402-git-cvsserver-refs.sh \
- t9600-cvsimport.sh \
- t9601-cvsimport-vendor-branch.sh \
- t9602-cvsimport-branches-tags.sh \
- t9603-cvsimport-patchsets.sh \
- t9604-cvsimport-timestamps.sh"
- local tests_perl="t3701-add-interactive.sh \
- t5502-quickfetch.sh \
- t5512-ls-remote.sh \
- t5520-pull.sh \
- t7106-reset-unborn-branch.sh \
- t7501-commit.sh"
- # Bug #225601 - t0004 is not suitable for root perm
- # Bug #219839 - t1004 is not suitable for root perm
- # t0001-init.sh - check for init notices EPERM* fails
- local tests_nonroot="t0001-init.sh \
- t0004-unwritable.sh \
- t0070-fundamental.sh \
- t1004-read-tree-m-u-wf.sh \
- t3700-add.sh \
- t7300-clean.sh"
- # t9100 still fails with symlinks in SVN 1.7
- local test_svn="t9100-git-svn-basic.sh"
-
- # Unzip is used only for the testcase code, not by any normal parts of Git.
- if ! has_version app-arch/unzip ; then
- einfo "Disabling tar-tree tests"
- disabled="${disabled} t5000-tar-tree.sh"
- fi
-
- cvs=0
- use cvs && let cvs=$cvs+1
- if [[ ${EUID} -eq 0 ]]; then
- if [[ $cvs -eq 1 ]]; then
- ewarn "Skipping CVS tests because CVS does not work as root!"
- ewarn "You should retest with FEATURES=userpriv!"
- disabled="${disabled} ${tests_cvs}"
- fi
- einfo "Skipping other tests that require being non-root"
- disabled="${disabled} ${tests_nonroot}"
- else
- [[ $cvs -gt 0 ]] && \
- has_version dev-vcs/cvs && \
- let cvs=$cvs+1
- [[ $cvs -gt 1 ]] && \
- has_version "dev-vcs/cvs[server]" && \
- let cvs=$cvs+1
- if [[ $cvs -lt 3 ]]; then
- einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
- disabled="${disabled} ${tests_cvs}"
- fi
- fi
-
- if ! use perl ; then
- einfo "Disabling tests that need Perl"
- disabled="${disabled} ${tests_perl}"
- fi
-
- einfo "Disabling tests that fail with SVN 1.7"
- disabled="${disabled} ${test_svn}"
-
- # Reset all previously disabled tests
- cd "${S}/t"
- for i in *.sh.DISABLED ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
- done
- einfo "Disabled tests:"
- for i in ${disabled} ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
- done
-
- # Avoid the test system removing the results because we want them ourselves
- sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
- -i "${S}"/t/Makefile
-
- # Clean old results first, must always run
- cd "${S}/t"
- nonfatal git_emake clean
-
- # Now run the tests, keep going if we hit an error, and don't terminate on
- # failure
- cd "${S}"
- einfo "Start test run"
- #MAKEOPTS=-j1
- nonfatal git_emake --keep-going test
- rc=$?
-
- # Display nice results, now print the results
- cd "${S}/t"
- nonfatal git_emake aggregate-results
-
- # And bail if there was a problem
- [ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
- local pkg=$1
- shift
- elog " $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
- einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt"
- einfo "Note that the prompt bash code is now in the seperate script"
- elog "These additional scripts need some dependencies:"
- echo
- showpkgdeps git-quiltimport "dev-util/quilt"
- showpkgdeps git-instaweb \
- "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
- echo
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.0.0.ebuild b/dev-vcs/git/git-2.0.0.ebuild
deleted file mode 100644
index 489550d01d99..000000000000
--- a/dev-vcs/git/git-2.0.0.ebuild
+++ /dev/null
@@ -1,644 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.0.ebuild,v 1.3 2014/06/24 01:44:07 tetromino Exp $
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_{6,7} )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=pu
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI_SUFFIX="gz"
- SRC_URI_GOOG="http://git-core.googlecode.com/files"
- SRC_URI_KORG="mirror://kernel/software/scm/git"
- SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- doc? (
- ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- )"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-else
- SRC_URI=""
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
- dev-libs/openssl
- sys-libs/zlib
- pcre? ( dev-libs/libpcre )
- perl? ( dev-lang/perl:=[-build(-)] )
- tk? ( dev-lang/tk )
- curl? (
- net-misc/curl
- webdav? ( dev-libs/expat )
- )
- emacs? ( virtual/emacs )
- gnome-keyring? ( gnome-base/libgnome-keyring )"
-
-RDEPEND="${CDEPEND}
- gpg? ( app-crypt/gnupg )
- mediawiki? (
- dev-perl/HTML-Tree
- dev-perl/MediaWiki-API
- )
- perl? ( dev-perl/Error
- dev-perl/Net-SMTP-SSL
- dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
- cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
- subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
- )
- python? ( gtk?
- (
- >=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
- >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
- )
- ${PYTHON_DEPS} )"
-
-# This is how info docs are created with Git:
-# .txt/asciidoc --(asciidoc)---------> .xml/docbook
-# .xml/docbook --(docbook2texi.pl)--> .texi
-# .texi --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
- app-arch/cpio
- doc? (
- app-text/asciidoc
- app-text/docbook2X
- sys-apps/texinfo
- app-text/xmlto
- )
- nls? ( sys-devel/gettext )
- test? ( app-crypt/gnupg )"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
- DEPEND="${DEPEND}
- app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
- cgi? ( perl )
- cvs? ( perl )
- mediawiki? ( perl )
- subversion? ( perl )
- webdav? ( curl )
- gtk? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-pkg_setup() {
- if use subversion && has_version "dev-vcs/subversion[dso]"; then
- ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
- ewarn "with USE=dso, there may be weird crashes in git-svn. You"
- ewarn "have been warned."
- fi
- if use python ; then
- python-single-r1_pkg_setup
- fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
- local myopts
-
- if use blksha1 ; then
- myopts="${myopts} BLK_SHA1=YesPlease"
- elif use ppcsha1 ; then
- myopts="${myopts} PPC_SHA1=YesPlease"
- fi
-
- if use curl ; then
- use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
- else
- myopts="${myopts} NO_CURL=YesPlease"
- fi
-
- # broken assumptions, because of broken build system ...
- myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
- myopts="${myopts} INSTALL=install TAR=tar"
- myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
- myopts="${myopts} SANE_TOOL_PATH="
- myopts="${myopts} OLD_ICONV="
- myopts="${myopts} NO_EXTERNAL_GREP="
-
- # For svn-fe
- extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
- # can't define this to null, since the entire makefile depends on it
- sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
- use iconv \
- || myopts="${myopts} NO_ICONV=YesPlease"
- use nls \
- || myopts="${myopts} NO_GETTEXT=YesPlease"
- use tk \
- || myopts="${myopts} NO_TCLTK=YesPlease"
- use pcre \
- && myopts="${myopts} USE_LIBPCRE=yes" \
- && extlibs="${extlibs} -lpcre"
- use perl \
- && myopts="${myopts} INSTALLDIRS=vendor" \
- || myopts="${myopts} NO_PERL=YesPlease"
- use python \
- || myopts="${myopts} NO_PYTHON=YesPlease"
- use subversion \
- || myopts="${myopts} NO_SVN_TESTS=YesPlease"
- use threads \
- && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \
- || myopts="${myopts} NO_PTHREADS=YesPlease"
- use cvs \
- || myopts="${myopts} NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-# if [[ ${CHOST} == *-mint* ]] ; then
-# myopts="${myopts} NO_MMAP=YesPlease"
-# myopts="${myopts} NO_IPV6=YesPlease"
-# myopts="${myopts} NO_STRLCPY=YesPlease"
-# myopts="${myopts} NO_MEMMEM=YesPlease"
-# myopts="${myopts} NO_MKDTEMP=YesPlease"
-# myopts="${myopts} NO_MKSTEMPS=YesPlease"
-# fi
- if [[ ${CHOST} == ia64-*-hpux* ]]; then
- myopts="${myopts} NO_NSEC=YesPlease"
- fi
- if [[ ${CHOST} == *-*-aix* ]]; then
- myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
- fi
- if [[ ${CHOST} == *-solaris* ]]; then
- myopts="${myopts} NEEDS_LIBICONV=YesPlease"
- fi
-
- has_version '>=app-text/asciidoc-8.0' \
- && myopts="${myopts} ASCIIDOC8=YesPlease"
- myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
-
- # Bug 290465:
- # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
- [[ "${CHOST}" == *-uclibc* ]] && \
- myopts="${myopts} NO_NSEC=YesPlease"
-
- export MY_MAKEOPTS="${myopts}"
- export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
- if [[ ${PV} != *9999 ]]; then
- unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
- cd "${S}"
- unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- use doc && \
- cd "${S}"/Documentation && \
- unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- cd "${S}"
- else
- git-2_src_unpack
- cd "${S}"
- #cp "${FILESDIR}"/GIT-VERSION-GEN .
- fi
-
-}
-
-src_prepare() {
- # bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-2.0.0-optional-cvs.patch
-
- # install mediawiki perl modules also in vendor_dir
- # hack, needs better upstream solution
- epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
- epatch_user
-
- sed -i \
- -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
- -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
- -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
- -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
- -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
- -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
- Makefile contrib/svn-fe/Makefile || die "sed failed"
-
- # Never install the private copy of Error.pm (bug #296310)
- sed -i \
- -e '/private-Error.pm/s,^,#,' \
- perl/Makefile.PL
-
- # Fix docbook2texi command
- sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
- Documentation/Makefile || die "sed failed"
-
- # Fix git-subtree missing DESTDIR
- sed -i \
- -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
- -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \
- contrib/subtree/Makefile
-}
-
-git_emake() {
- # bug #326625: PERL_PATH, PERL_MM_OPT
- # bug #320647: PYTHON_PATH
- PYTHON_PATH=""
- use python && PYTHON_PATH="${PYTHON}"
- emake ${MY_MAKEOPTS} \
- DESTDIR="${D}" \
- OPTCFLAGS="${CFLAGS}" \
- OPTLDFLAGS="${LDFLAGS}" \
- OPTCC="$(tc-getCC)" \
- OPTAR="$(tc-getAR)" \
- prefix="${EPREFIX}"/usr \
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
- sysconfdir="${EPREFIX}"/etc \
- PYTHON_PATH="${PYTHON_PATH}" \
- PERL_MM_OPT="" \
- GIT_TEST_OPTS="--no-color" \
- V=1 \
- "$@"
- # This is the fix for bug #326625, but it also causes breakage, see bug
- # #352693.
- # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
- exportmakeopts
-}
-
-src_compile() {
- if use perl ; then
- git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
- git_emake perl/perl.mak || die "emake perl/perl.mak failed"
- fi
- git_emake || die "emake failed"
-
- if use emacs ; then
- elisp-compile contrib/emacs/git{,-blame}.el
- fi
-
- if use perl && use cgi ; then
- git_emake \
- gitweb/gitweb.cgi \
- || die "emake gitweb/gitweb.cgi failed"
- fi
-
- if [[ ${CHOST} == *-darwin* ]]; then
- cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
- git_emake || die "emake credential-osxkeychain"
- fi
-
- cd "${S}"/Documentation
- if [[ ${PV} == *9999 ]] ; then
- git_emake man \
- || die "emake man failed"
- if use doc ; then
- git_emake info html \
- || die "emake info html failed"
- fi
- else
- if use doc ; then
- git_emake info \
- || die "emake info html failed"
- fi
- fi
-
- if use subversion ; then
- cd "${S}"/contrib/svn-fe
- git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed"
- if use doc ; then
- git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
- fi
- cd "${S}"
- fi
-
- if use gnome-keyring ; then
- cd "${S}"/contrib/credential/gnome-keyring
- git_emake || die "emake git-credential-gnome-keyring failed"
- fi
-
- cd "${S}"/contrib/subtree
- git_emake
- use doc && git_emake doc
-
- if use mediawiki ; then
- cd "${S}"/contrib/mw-to-git
- git_emake
- fi
-}
-
-src_install() {
- git_emake \
- install || \
- die "make install failed"
-
- if [[ ${CHOST} == *-darwin* ]]; then
- dobin contrib/credential/osxkeychain/git-credential-osxkeychain
- fi
-
- # Depending on the tarball and manual rebuild of the documentation, the
- # manpages may exist in either OR both of these directories.
- find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
- find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-
- dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
- use doc && dodir /usr/share/doc/${PF}/html
- for d in / /howto/ /technical/ ; do
- docinto ${d}
- dodoc Documentation${d}*.txt
- use doc && dohtml -p ${d} Documentation${d}*.html
- done
- docinto /
- # Upstream does not ship this pre-built :-(
- use doc && doinfo Documentation/{git,gitman}.info
-
- newbashcomp contrib/completion/git-completion.bash ${PN}
- # Not really a bash-completion file (bug #477920)
- # but still needed uncompressed (bug #507480)
- insinto /usr/share/${PN}
- doins contrib/completion/git-prompt.sh
-
- if use emacs ; then
- elisp-install ${PN} contrib/emacs/git.{el,elc}
- elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
- #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
- # don't add automatically to the load-path, so the sitefile
- # can do a conditional loading
- touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
- elisp-site-file-install "${FILESDIR}"/${SITEFILE}
- fi
-
- if use python && use gtk ; then
- python_doscript "${S}"/contrib/gitview/gitview
- dodoc "${S}"/contrib/gitview/gitview.txt
- fi
-
- #dobin contrib/fast-import/git-p4 # Moved upstream
- #dodoc contrib/fast-import/git-p4.txt # Moved upstream
- newbin contrib/fast-import/import-tars.perl import-tars
- exeinto /usr/libexec/git-core/
- newexe contrib/git-resurrect.sh git-resurrect
-
- # git-subtree
- cd "${S}"/contrib/subtree
- git_emake install || die "Failed to emake install git-subtree"
- if use doc ; then
- git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
- fi
- newdoc README README.git-subtree
- dodoc git-subtree.txt
- cd "${S}"
-
- if use mediawiki ; then
- cd "${S}"/contrib/mw-to-git
- git_emake install
- cd "${S}"
- fi
-
- # git-diffall
- dobin contrib/diffall/git-diffall
- newdoc contrib/diffall/README git-diffall.txt
-
- # diff-highlight
- dobin contrib/diff-highlight/diff-highlight
- newdoc contrib/diff-highlight/README README.diff-highlight
-
- # git-jump
- exeinto /usr/libexec/git-core/
- doexe contrib/git-jump/git-jump
- newdoc contrib/git-jump/README git-jump.txt
-
- # git-contacts
- exeinto /usr/libexec/git-core/
- doexe contrib/contacts/git-contacts
- dodoc contrib/contacts/git-contacts.txt
-
- if use gnome-keyring ; then
- cd "${S}"/contrib/credential/gnome-keyring
- dobin git-credential-gnome-keyring
- fi
-
- if use subversion ; then
- cd "${S}"/contrib/svn-fe
- dobin svn-fe
- dodoc svn-fe.txt
- use doc && doman svn-fe.1 && dohtml svn-fe.html
- cd "${S}"
- fi
-
- # remote-helpers
- if use python ; then
- python_scriptinto /usr/libexec/git-core/
- python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg}
- python_optimize
- fi
-
- dodir /usr/share/${PN}/contrib
- # The following are excluded:
- # completion - installed above
- # credential/gnome-keyring TODO
- # diff-highlight - done above
- # diffall - done above
- # emacs - installed above
- # examples - these are stuff that is not used in Git anymore actually
- # git-jump - done above
- # gitview - installed above
- # p4import - excluded because fast-import has a better one
- # patches - stuff the Git guys made to go upstream to other places
- # persistent-https - TODO
- # mw-to-git - TODO
- # subtree - build seperately
- # svnimport - use git-svn
- # thunderbird-patch-inline - fixes thunderbird
- for i in \
- buildsystems convert-objects fast-import \
- hg-to-git hooks remotes2config.sh rerere-train.sh \
- stats vim workdir \
- ; do
- cp -rf \
- "${S}"/contrib/${i} \
- "${ED}"/usr/share/${PN}/contrib \
- || die "Failed contrib ${i}"
- done
-
- if use perl && use cgi ; then
- # We used to install in /usr/share/${PN}/gitweb
- # but upstream installs in /usr/share/gitweb
- # so we will install a symlink and use their location for compat with other
- # distros
- dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
- # INSTALL discusses configuration issues, not just installation
- docinto /
- newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
- newdoc "${S}"/gitweb/README README.gitweb
-
- find "${ED}"/usr/lib64/perl5/ \
- -name .packlist \
- -exec rm \{\} \;
- else
- rm -rf "${ED}"/usr/share/gitweb
- fi
-
- if ! use subversion ; then
- rm -f "${ED}"/usr/libexec/git-core/git-svn \
- "${ED}"/usr/share/man/man1/git-svn.1*
- fi
-
- if use xinetd ; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/git-daemon.xinetd git-daemon
- fi
-
- if use !prefix ; then
- newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
- newconfd "${FILESDIR}"/git-daemon.confd git-daemon
- systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
- systemd_dounit "${FILESDIR}/git-daemon.socket"
- fi
-
- fixlocalpod
-}
-
-src_test() {
- local disabled=""
- local tests_cvs="t9200-git-cvsexportcommit.sh \
- t9400-git-cvsserver-server.sh \
- t9401-git-cvsserver-crlf.sh \
- t9402-git-cvsserver-refs.sh \
- t9600-cvsimport.sh \
- t9601-cvsimport-vendor-branch.sh \
- t9602-cvsimport-branches-tags.sh \
- t9603-cvsimport-patchsets.sh \
- t9604-cvsimport-timestamps.sh"
- local tests_perl="t3701-add-interactive.sh \
- t5502-quickfetch.sh \
- t5512-ls-remote.sh \
- t5520-pull.sh \
- t7106-reset-unborn-branch.sh \
- t7501-commit.sh"
- # Bug #225601 - t0004 is not suitable for root perm
- # Bug #219839 - t1004 is not suitable for root perm
- # t0001-init.sh - check for init notices EPERM* fails
- local tests_nonroot="t0001-init.sh \
- t0004-unwritable.sh \
- t0070-fundamental.sh \
- t1004-read-tree-m-u-wf.sh \
- t3700-add.sh \
- t7300-clean.sh"
- # t9100 still fails with symlinks in SVN 1.7
- local test_svn="t9100-git-svn-basic.sh"
-
- # Unzip is used only for the testcase code, not by any normal parts of Git.
- if ! has_version app-arch/unzip ; then
- einfo "Disabling tar-tree tests"
- disabled="${disabled} t5000-tar-tree.sh"
- fi
-
- cvs=0
- use cvs && let cvs=$cvs+1
- if [[ ${EUID} -eq 0 ]]; then
- if [[ $cvs -eq 1 ]]; then
- ewarn "Skipping CVS tests because CVS does not work as root!"
- ewarn "You should retest with FEATURES=userpriv!"
- disabled="${disabled} ${tests_cvs}"
- fi
- einfo "Skipping other tests that require being non-root"
- disabled="${disabled} ${tests_nonroot}"
- else
- [[ $cvs -gt 0 ]] && \
- has_version dev-vcs/cvs && \
- let cvs=$cvs+1
- [[ $cvs -gt 1 ]] && \
- has_version "dev-vcs/cvs[server]" && \
- let cvs=$cvs+1
- if [[ $cvs -lt 3 ]]; then
- einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
- disabled="${disabled} ${tests_cvs}"
- fi
- fi
-
- if ! use perl ; then
- einfo "Disabling tests that need Perl"
- disabled="${disabled} ${tests_perl}"
- fi
-
- einfo "Disabling tests that fail with SVN 1.7"
- disabled="${disabled} ${test_svn}"
-
- # Reset all previously disabled tests
- cd "${S}/t"
- for i in *.sh.DISABLED ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
- done
- einfo "Disabled tests:"
- for i in ${disabled} ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
- done
-
- # Avoid the test system removing the results because we want them ourselves
- sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
- -i "${S}"/t/Makefile
-
- # Clean old results first, must always run
- cd "${S}/t"
- nonfatal git_emake clean
-
- # Now run the tests, keep going if we hit an error, and don't terminate on
- # failure
- cd "${S}"
- einfo "Start test run"
- #MAKEOPTS=-j1
- nonfatal git_emake --keep-going test
- rc=$?
-
- # Display nice results, now print the results
- cd "${S}/t"
- nonfatal git_emake aggregate-results
-
- # And bail if there was a problem
- [ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
- local pkg=$1
- shift
- elog " $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
- einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
- einfo "Note that the prompt bash code is now in that separate script"
- elog "These additional scripts need some dependencies:"
- echo
- showpkgdeps git-quiltimport "dev-util/quilt"
- showpkgdeps git-instaweb \
- "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
- echo
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.0.0-r1.ebuild b/dev-vcs/git/git-2.0.1.ebuild
similarity index 99%
rename from dev-vcs/git/git-2.0.0-r1.ebuild
rename to dev-vcs/git/git-2.0.1.ebuild
index 4428469a2e1e..0fa2a2f52bad 100644
--- a/dev-vcs/git/git-2.0.0-r1.ebuild
+++ b/dev-vcs/git/git-2.0.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-vcs/git/git-2.0.0-r1.ebuild,v 1.2 2014/06/24 01:44:07 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.1.ebuild,v 1.1 2014/07/18 14:04:11 polynomial-c Exp $
EAPI=5
@@ -22,7 +22,7 @@ DOC_VER=${MY_PV}
DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
HOMEPAGE="http://www.git-scm.com/"
if [[ ${PV} != *9999 ]]; then
- SRC_URI_SUFFIX="gz"
+ SRC_URI_SUFFIX="xz"
SRC_URI_GOOG="http://git-core.googlecode.com/files"
SRC_URI_KORG="mirror://kernel/software/scm/git"
SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
@@ -225,7 +225,7 @@ src_unpack() {
src_prepare() {
# bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-2.0.0-optional-cvs.patch
+ epatch "${FILESDIR}"/git-2.0.0-r2-optional-cvs.patch
# install mediawiki perl modules also in vendor_dir
# hack, needs better upstream solution
diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index 644c1e7489d2..692790072d16 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -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/eclass/mysql-autotools.eclass,v 1.18 2013/06/26 19:31:49 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.19 2014/07/19 10:18:41 grobian Exp $
# @ECLASS: mysql-autotools.eclass
# @MAINTAINER:
@@ -112,7 +112,7 @@ mysql-autotools_configure_common() {
myconf="${myconf} $(use_with big-tables)"
myconf="${myconf} --enable-local-infile"
myconf="${myconf} --with-extra-charsets=all"
- myconf="${myconf} --with-mysqld-user=mysql"
+ use prefix || myconf="${myconf} --with-mysqld-user=mysql"
myconf="${myconf} --with-server"
myconf="${myconf} --with-unix-socket-path=${EPREFIX}/var/run/mysqld/mysqld.sock"
myconf="${myconf} --without-libwrap"
@@ -606,6 +606,7 @@ mysql-autotools_src_install() {
-e "s!= /var!= ${EPREFIX}/var!" \
"${FILESDIR}/${mycnf_src}" \
> "${TMPDIR}/my.cnf.ok"
+ use prefix && sed -i -e '/^user[ ]*= mysql$/d' "${TMPDIR}/my.cnf.ok"
if use latin1 ; then
sed -i \
-e "/character-set/s|utf8|latin1|g" \
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 1f398ea5e3e3..25012d13a1bd 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -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/eclass/mysql-cmake.eclass,v 1.21 2014/06/20 00:03:33 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.22 2014/07/19 10:18:41 grobian Exp $
# @ECLASS: mysql-cmake.eclass
# @MAINTAINER:
@@ -411,6 +411,7 @@ mysql-cmake_src_install() {
sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
"${FILESDIR}/${mycnf_src}" \
> "${TMPDIR}/my.cnf.ok" || die
+ use prefix && sed -i -e '/^user[ ]*= mysql$/d' "${TMPDIR}/my.cnf.ok"
if use latin1 ; then
sed -i \
-e "/character-set/s|utf8|latin1|g" \
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index d98fb8c3121a..049a03503f45 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -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/eclass/mysql-v2.eclass,v 1.31 2014/06/20 00:03:33 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.32 2014/07/19 10:18:41 grobian Exp $
# @ECLASS: mysql-v2.eclass
# @MAINTAINER:
@@ -669,7 +669,7 @@ mysql-v2_pkg_config() {
local old_MY_DATADIR="${MY_DATADIR}"
local old_HOME="${HOME}"
# my_print_defaults needs to read stuff in $HOME/.my.cnf
- export HOME=/root
+ export HOME=${EPREFIX}/root
# Make sure the vars are correctly initialized
mysql_init_vars
@@ -720,13 +720,13 @@ mysql-v2_pkg_config() {
MYSQL_LOG_BIN="$(mysql-v2_getoptval mysqld log-bin)"
MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
- if [[ ! -d "${EROOT}"/$MYSQL_TMPDIR ]]; then
+ if [[ ! -d "${ROOT}"/$MYSQL_TMPDIR ]]; then
einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
- install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_TMPDIR
+ install -d -m 770 -o mysql -g mysql "${ROOT}"/$MYSQL_TMPDIR
fi
- if [[ ! -d "${EROOT}"/$MYSQL_LOG_BIN ]]; then
+ if [[ ! -d "${ROOT}"/$MYSQL_LOG_BIN ]]; then
einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
- install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_LOG_BIN
+ install -d -m 770 -o mysql -g mysql "${ROOT}"/$MYSQL_LOG_BIN
fi
if [[ ! -d "${EROOT}"/$MYSQL_RELAY_LOG ]]; then
einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
@@ -747,7 +747,7 @@ mysql-v2_pkg_config() {
if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
einfo "Please provide a password for the mysql 'root' user now, in the"
- einfo "MYSQL_ROOT_PASSWORD env var or through the /root/.my.cnf file."
+ einfo "MYSQL_ROOT_PASSWORD env var or through the ${HOME}/.my.cnf file."
ewarn "Avoid [\"'\\_%] characters in the password"
read -rsp " >" pwd1 ; echo
@@ -761,9 +761,13 @@ mysql-v2_pkg_config() {
unset pwd1 pwd2
fi
- local options="--log-warnings=0"
+ local options
local sqltmp="$(emktemp)"
+ # Fix bug 446200. Don't reference host my.cnf, needs to come first,
+ # see http://bugs.mysql.com/bug.php?id=31312
+ use prefix && options="${options} --defaults-file=${MY_SYSCONFDIR}/my.cnf"
+
local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
[[ -r "${help_tables}" ]] \
&& cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
@@ -786,10 +790,6 @@ mysql-v2_pkg_config() {
use prefix || options="${options} --user=mysql"
- # Fix bug 446200. Don't reference host my.cnf
- use prefix && [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] \
- && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
-
# MySQL 5.6+ needs InnoDB
if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] ; then
mysql_version_is_at_least "5.6" || options="${options} --loose-skip-innodb"
@@ -810,7 +810,7 @@ mysql-v2_pkg_config() {
#cmd="'${EROOT}/usr/share/mysql/scripts/mysql_install_db' '--basedir=${EPREFIX}/usr' ${options}"
cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db
[[ -f ${cmd} ]] || cmd=${EROOT}usr/bin/mysql_install_db
- cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} '--datadir=${EROOT}/${MY_DATADIR}' '--tmpdir=${EROOT}/${MYSQL_TMPDIR}'"
+ cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} '--datadir=${ROOT}/${MY_DATADIR}' '--tmpdir=${ROOT}/${MYSQL_TMPDIR}'"
einfo "Command: $cmd"
eval $cmd \
>"${TMPDIR}"/mysql_install_db.log 2>&1
@@ -836,16 +836,16 @@ mysql-v2_pkg_config() {
local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
local mysqld="${EROOT}/usr/sbin/mysqld \
${options} \
- --user=mysql \
+ $(use prefix || echo --user=mysql) \
--log-warnings=0 \
--basedir=${EROOT}/usr \
- --datadir=${EROOT}/${MY_DATADIR} \
+ --datadir=${ROOT}/${MY_DATADIR} \
--max_allowed_packet=8M \
--net_buffer_length=16K \
--default-storage-engine=MyISAM \
--socket=${socket} \
--pid-file=${pidfile}
- --tmpdir=${EROOT}/${MYSQL_TMPDIR}"
+ --tmpdir=${ROOT}/${MYSQL_TMPDIR}"
#einfo "About to start mysqld: ${mysqld}"
ebegin "Starting mysqld"
einfo "Command ${mysqld}"
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 56468edf375a..6d5cc288335b 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -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/eclass/mysql.eclass,v 1.178 2014/01/08 06:20:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.179 2014/07/19 10:18:41 grobian Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -458,7 +458,7 @@ configure_common() {
myconf="${myconf} $(use_with big-tables)"
myconf="${myconf} --enable-local-infile"
myconf="${myconf} --with-extra-charsets=all"
- myconf="${myconf} --with-mysqld-user=mysql"
+ use prefix || myconf="${myconf} --with-mysqld-user=mysql"
myconf="${myconf} --with-server"
myconf="${myconf} --with-unix-socket-path=${EPREFIX}/var/run/mysqld/mysqld.sock"
myconf="${myconf} --without-libwrap"
@@ -1366,17 +1366,17 @@ mysql_pkg_config() {
MYSQL_LOG_BIN="$(mysql_getoptval mysqld log-bin)"
MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
- if [[ ! -d "${EROOT}"/$MYSQL_TMPDIR ]]; then
+ if [[ ! -d "${ROOT}"/$MYSQL_TMPDIR ]]; then
einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
- install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_TMPDIR
+ install -d -m 770 -o mysql -g mysql "${ROOT}"/$MYSQL_TMPDIR
fi
- if [[ ! -d "${EROOT}"/$MYSQL_LOG_BIN ]]; then
+ if [[ ! -d "${ROOT}"/$MYSQL_LOG_BIN ]]; then
einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
- install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_LOG_BIN
+ install -d -m 770 -o mysql -g mysql "${ROOT}"/$MYSQL_LOG_BIN
fi
- if [[ ! -d "${EROOT}"/$MYSQL_RELAY_LOG ]]; then
+ if [[ ! -d "${ROOT}"/$MYSQL_RELAY_LOG ]]; then
einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
- install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_RELAY_LOG
+ install -d -m 770 -o mysql -g mysql "${ROOT}"/$MYSQL_RELAY_LOG
fi
if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
@@ -1467,7 +1467,7 @@ mysql_pkg_config() {
local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
local mysqld="${EROOT}/usr/sbin/mysqld \
${options} \
- --user=mysql \
+ $(use prefix || echo --user=mysql) \
--log-warnings=0 \
--basedir=${EROOT}/usr \
--datadir=${ROOT}/${MY_DATADIR} \
diff --git a/games-action/maelstrom/maelstrom-3.0.6-r2.ebuild b/games-action/maelstrom/maelstrom-3.0.6-r2.ebuild
index 5b868c940b67..eb6101106d5d 100644
--- a/games-action/maelstrom/maelstrom-3.0.6-r2.ebuild
+++ b/games-action/maelstrom/maelstrom-3.0.6-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/games-action/maelstrom/maelstrom-3.0.6-r2.ebuild,v 1.5 2014/05/15 16:23:38 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/maelstrom/maelstrom-3.0.6-r2.ebuild,v 1.6 2014/07/18 14:23:05 klausman Exp $
EAPI=5
inherit autotools eutils games
@@ -10,7 +10,7 @@ DESCRIPTION="An asteroids battle game"
HOMEPAGE="http://www.libsdl.org/projects/Maelstrom/"
SRC_URI="http://www.libsdl.org/projects/Maelstrom/src/${MY_P}.tar.gz"
-KEYWORDS="~alpha amd64 ppc x86"
+KEYWORDS="alpha amd64 ppc x86"
SLOT="0"
LICENSE="GPL-2"
IUSE=""
diff --git a/games-sports/torcs/files/torcs-1.3.4-noXmuXt.patch b/games-sports/torcs/files/torcs-1.3.4-noXmuXt.patch
new file mode 100644
index 000000000000..200c6522c9c0
--- /dev/null
+++ b/games-sports/torcs/files/torcs-1.3.4-noXmuXt.patch
@@ -0,0 +1,15 @@
+--- configure.in.old 2014-07-19 15:43:50.480681694 +0200
++++ configure.in 2014-07-19 15:44:12.487294592 +0200
+@@ -116,12 +116,8 @@
+ AC_CHECK_LIB(ICE, IceSetIOErrorHandler,,AC_MSG_ERROR([Can't find libICE. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
+ dnl Replace `main' with a function in -lSM:
+ AC_CHECK_LIB(SM, SmsSetErrorHandler,,AC_MSG_ERROR([Can't find libSM. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
+-dnl Replace `main' with a function in -lXt:
+-AC_CHECK_LIB(Xt, XtDisplay,,AC_MSG_ERROR([Can't find libXt. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
+ dnl Replace `main' with a function in -lXi:
+ AC_CHECK_LIB(Xi, XOpenDevice,,AC_MSG_ERROR([Can't find libXi. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
+-dnl Replace `main' with a function in -lXmu:
+-AC_CHECK_LIB(Xmu, XmuSimpleErrorHandler,,AC_MSG_ERROR([Can't find libXmu. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
+ AC_CHECK_LIB(Xxf86vm, XF86VidModeSetViewPort,,AC_MSG_ERROR([Can't find libXxf86vm. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
+ AC_CHECK_LIB(Xrender, XRenderSetSubpixelOrder,,AC_MSG_ERROR([Can't find libXrender. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
+ AC_CHECK_LIB(Xrandr, XRRQueryVersion,,AC_MSG_ERROR([Can't find libXrandr. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
diff --git a/games-sports/torcs/torcs-1.3.4.ebuild b/games-sports/torcs/torcs-1.3.4.ebuild
index 4762db73e5f3..d04079f79d6d 100644
--- a/games-sports/torcs/torcs-1.3.4.ebuild
+++ b/games-sports/torcs/torcs-1.3.4.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/games-sports/torcs/torcs-1.3.4.ebuild,v 1.3 2013/01/30 18:06:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/torcs/torcs-1.3.4.ebuild,v 1.4 2014/07/19 13:55:10 tupone Exp $
EAPI=5
inherit autotools eutils multilib games
@@ -24,8 +24,7 @@ RDEPEND="media-libs/freealut
virtual/opengl
virtual/glu
x11-libs/libX11
- x11-libs/libXrandr
- x11-libs/libXt"
+ x11-libs/libXrandr"
DEPEND="${RDEPEND}
x11-proto/xf86vidmodeproto"
@@ -33,7 +32,8 @@ src_prepare() {
epatch \
"${FILESDIR}"/${P}-no-automake.patch \
"${FILESDIR}"/${P}-as-needed.patch \
- "${FILESDIR}"/${P}-flags.patch
+ "${FILESDIR}"/${P}-flags.patch \
+ "${FILESDIR}"/${P}-noXmuXt.patch
eautoreconf
ecvs_clean
}
diff --git a/mail-mta/postfix/postfix-2.10.3.ebuild b/mail-mta/postfix/postfix-2.10.3.ebuild
index 36096d56d712..fe59120ea1d8 100644
--- a/mail-mta/postfix/postfix-2.10.3.ebuild
+++ b/mail-mta/postfix/postfix-2.10.3.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/mail-mta/postfix/postfix-2.10.3.ebuild,v 1.5 2014/06/14 10:05:36 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.10.3.ebuild,v 1.6 2014/07/18 13:35:40 klausman Exp $
EAPI=5
inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam user versionator systemd
@@ -19,7 +19,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
LICENSE="IBM"
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="+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
DEPEND=">=dev-libs/libpcre-3.4
diff --git a/media-gfx/eog-plugins/eog-plugins-3.12.1.ebuild b/media-gfx/eog-plugins/eog-plugins-3.12.1.ebuild
index 02f1f2d9e699..5f7755ac72ec 100644
--- a/media-gfx/eog-plugins/eog-plugins-3.12.1.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-3.12.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/media-gfx/eog-plugins/eog-plugins-3.12.1.ebuild,v 1.1 2014/04/27 17:27:45 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog-plugins/eog-plugins-3.12.1.ebuild,v 1.2 2014/07/19 08:41:13 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -16,6 +16,9 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+exif +flickr map +picasa +python"
+# Let people emerge this by default, bug #472932
+IUSE+=" python_single_target_python3_2 +python_single_target_python3_3"
+
REQUIRED_USE="
map? ( exif )
python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/giflib/giflib-4.1.6-r3.ebuild b/media-libs/giflib/giflib-4.1.6-r3.ebuild
index 6fd30fe521d7..e6183bf25c48 100644
--- a/media-libs/giflib/giflib-4.1.6-r3.ebuild
+++ b/media-libs/giflib/giflib-4.1.6-r3.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/media-libs/giflib/giflib-4.1.6-r3.ebuild,v 1.7 2014/07/18 12:58:35 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.6-r3.ebuild,v 1.8 2014/07/18 14:25:48 jer Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="rle static-libs X"
RDEPEND="
diff --git a/media-libs/imlib2/imlib2-1.4.6-r2.ebuild b/media-libs/imlib2/imlib2-1.4.6-r2.ebuild
index 3915b312a5c7..0898085cd748 100644
--- a/media-libs/imlib2/imlib2-1.4.6-r2.ebuild
+++ b/media-libs/imlib2/imlib2-1.4.6-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/media-libs/imlib2/imlib2-1.4.6-r2.ebuild,v 1.9 2014/07/18 12:58:24 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.6-r2.ebuild,v 1.10 2014/07/18 14:29:33 jer Exp $
# NOTE!!!: to avoid masking of -9999 the
# package.mask entry for multilib version
@@ -22,7 +22,7 @@ DESCRIPTION="Version 2 of an advanced replacement library for libraries like lib
HOMEPAGE="http://www.enlightenment.org/"
# See bug #342185#c13
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="bzip2 gif jpeg mmx mp3 png static-libs tiff X zlib"
diff --git a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild b/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
index cd29385fe383..0aac350b81a6 100644
--- a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
+++ b/media-libs/libid3tag/libid3tag-0.15.1b-r4.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/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild,v 1.5 2014/07/18 12:58:45 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild,v 1.6 2014/07/18 14:28:24 jer Exp $
EAPI=5
inherit eutils multilib libtool multilib-minimal
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="debug static-libs"
RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 3b286218b83f..759aecca6a98 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -6,6 +6,7 @@ DIST MesaLib-10.1.4.tar.bz2 6955567 SHA256 6fc567e00a547a967b232bd3b29c42952d87e
DIST MesaLib-10.1.6.tar.bz2 6956684 SHA256 cde60e06b340d7598802fe4a4484b3fb8befd714f9ab9caabe1f27d3149e8815 SHA512 7611b3e4b1154b3cc1abd466d70fb219fdeb4a49e18f3e31a0f1e4e59c2af2e00b2150156e7ae2d9cecf547311666b2d4ab50c9fb76c9cfd4b89cedde4f0e244 WHIRLPOOL aa03e8dbe7ee661c4de0641f1846ffd487bb2d1a08ad5c7249aaa7d14a8bc7f957f979c7977fc591833e357ef574f7fbc74cfc25d11f8add5381d78976019168
DIST MesaLib-10.2.1.tar.bz2 7109792 SHA256 461277909207da689d8152cfbf9e182ea6f70e1e672ab64c67df83725c8d2b54 SHA512 71221293cccb24f7b3312bdea5afac7e46e37bd40a17da3c2313198018f144a12f96da5dbeb62784a365c2c9baf294e8ebb50998a6f3763b7659c1154ddb5d6e WHIRLPOOL 54cc2436ce47a6165c0fc2aadcaa044da52d7e4e136dd109957b47243254030d1a2fef517f201391877c416307aa5d530d0024814c773b33614c0bc30dd59483
DIST MesaLib-10.2.2.tar.bz2 7125358 SHA256 38c4a40364000f89cddaa1694f6f3cfb444981d1110238ce603093585477399c SHA512 c01e336bd7ef629c4867041c3e78eda1d2a3abe1f73cd7cc43f6bcff810f52df4362bb461b27456c49083e31cf47ccba5f0ffc67f1706858572759ee173f870d WHIRLPOOL 92e723edd018065c0da1b5d195c10225b56e7ad03947438558399d8214cb1a8ed0b418e23f7e1e0196b98d8a3faf033846cfd1f4f9c9d0da9260baf48b8fa2af
+DIST MesaLib-10.2.4.tar.bz2 7128555 SHA256 06a2341244eb85c283f59f70161e06ded106f835ed9b6be1ef0243bd9344811a SHA512 b74e9dd8e013b3f1f5bf4d51116e4ed2cb053a91135c57eed10cc87398169665b8e5f83076742da9ea4612f7340e9defd6d2ca2a49d456068cbe81ee3695d24d WHIRLPOOL 9c12021cace338d90fa476517b442a203d833fb8c8203906c3f13d9eb06e11e5109d88954dc36cd61f8898565fe4a076767fb8915190e9c4877faaff762ba292
DIST MesaLib-7.10.3.tar.bz2 6056837 SHA256 1e701fc839b872677ddca9ed8784d754c9da1fbeda98173980e06aa7df0e85c0 SHA512 aa1f5f068b305fae5519e11cad2db9c6dc647d3122252bbcb210f13ac6ef1b667ae750344898bca7c5bfae94934db05eff915cb7417a59590e6d3ba230817aa8 WHIRLPOOL 5c2adda647936ed4163a4e4d5afad8344eb576712f9432f697aa0fc22ca17d7aaf0aeb6ad2d4e7e0825dc27cae570660332450778f8091e9b27aad2865c9b5fc
DIST MesaLib-7.11.2.tar.bz2 6257280 SHA256 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357 SHA512 f9f93aeb5ba3e4f0cdd7041a7bba6cd18dd8f58446b796849f43c6037297011df826017c32e03f03c8527d4afd3b9096e9ae3cbfb3c86b4ad145c66867198c21 WHIRLPOOL 0cf1b328b95e4f09e549c8adb2f6dc67e36c48ef570c1a5fda73efad54b8327cbec896d67bd01838be8bba7274f32704feca3fde8bb68bf1141563d17e8be707
DIST MesaLib-8.0.4.tar.bz2 5737052 SHA256 02ed19f4f5f6535dda03a9932a81438aa78ea723ebba1f39a3d49a70a4e1d07e SHA512 b7e8879e92252d0588d9eeeed904fd502ce1f48551b9a97f52aeb1318c79a80fab27504521107d61fbb5d986b2d778d89023a892baf9f1c5a5d2ee3746fefa57 WHIRLPOOL 5371a13e93e2d43264e2580e1e5e28ed85b6bfbdda9dd89104b1c18e62d35417e20b0ed8f13d8c54f58b83875fac9348d57f14ba08e4a88599e5fc0202502173
diff --git a/media-libs/mesa/mesa-10.2.4.ebuild b/media-libs/mesa/mesa-10.2.4.ebuild
new file mode 100644
index 000000000000..81475c78e160
--- /dev/null
+++ b/media-libs/mesa/mesa-10.2.4.ebuild
@@ -0,0 +1,530 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.2.4.ebuild,v 1.1 2014/07/19 00:06:41 mattst88 Exp $
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
+
+if [[ ${PV} = 9999* ]]; then
+ GIT_ECLASS="git-r3"
+ EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit base autotools multilib multilib-minimal flag-o-matic \
+ python-any-r1 toolchain-funcs pax-utils ${GIT_ECLASS}
+
+OPENGL_DIR="xorg-x11"
+
+MY_PN="${PN/m/M}"
+MY_P="${MY_PN}-${PV/_/-}"
+MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
+
+FOLDER="${PV/.0_rc*/}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="http://mesa3d.sourceforge.net/"
+
+#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
+if [[ $PV = 9999* ]]; then
+ SRC_URI="${SRC_PATCHES}"
+else
+ SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_SRC_P}.tar.bz2
+ ${SRC_PATCHES}"
+fi
+
+# The code is MIT/X11.
+# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
+LICENSE="MIT SGI-B-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+INTEL_CARDS="i915 i965 ilo intel"
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware"
+for card in ${VIDEO_CARDS}; do
+ IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+ bindist +classic debug +dri3 +egl +gallium gbm gles1 gles2 +llvm +nptl
+ opencl openvg osmesa pax_kernel openmax pic r600-llvm-compiler selinux
+ vdpau wayland xvmc xa kernel_FreeBSD"
+
+REQUIRED_USE="
+ llvm? ( gallium )
+ openvg? ( egl gallium )
+ opencl? (
+ gallium
+ video_cards_r600? ( r600-llvm-compiler )
+ video_cards_radeon? ( r600-llvm-compiler )
+ video_cards_radeonsi? ( r600-llvm-compiler )
+ )
+ openmax? ( gallium )
+ gles1? ( egl )
+ gles2? ( egl )
+ r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi video_cards_radeon ) )
+ wayland? ( egl gbm )
+ xa? ( gallium )
+ video_cards_freedreno? ( gallium )
+ video_cards_intel? ( || ( classic gallium ) )
+ video_cards_i915? ( || ( classic gallium ) )
+ video_cards_i965? ( classic )
+ video_cards_ilo? ( gallium )
+ video_cards_nouveau? ( || ( classic gallium ) )
+ video_cards_radeon? ( || ( classic gallium ) )
+ video_cards_r100? ( classic )
+ video_cards_r200? ( classic )
+ video_cards_r300? ( gallium )
+ video_cards_r600? ( gallium )
+ video_cards_radeonsi? ( gallium llvm )
+ video_cards_vmware? ( gallium )
+ ${PYTHON_REQUIRED_USE}
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.54"
+# keep correct libdrm and dri2proto dep
+# keep blocks in rdepend for binpkg
+RDEPEND="
+ !=app-admin/eselect-opengl-1.2.7
+ >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+ gbm? ( >=virtual/udev-208-r2[${MULTILIB_USEDEP}] )
+ dri3? ( >=virtual/udev-208-r2[${MULTILIB_USEDEP}] )
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.9.3[${MULTILIB_USEDEP}]
+ llvm? (
+ video_cards_radeonsi? ( || (
+ >=dev-libs/elfutils-0.155-r1[${MULTILIB_USEDEP}]
+ >=dev-libs/libelf-0.8.13-r2[${MULTILIB_USEDEP}]
+ ) )
+ video_cards_r600? ( || (
+ >=dev-libs/elfutils-0.155-r1[${MULTILIB_USEDEP}]
+ >=dev-libs/libelf-0.8.13-r2[${MULTILIB_USEDEP}]
+ ) )
+ !video_cards_r600? (
+ video_cards_radeon? ( || (
+ >=dev-libs/elfutils-0.155-r1[${MULTILIB_USEDEP}]
+ >=dev-libs/libelf-0.8.13-r2[${MULTILIB_USEDEP}]
+ ) )
+ )
+ >=sys-devel/llvm-3.3-r3[${MULTILIB_USEDEP}]
+ )
+ opencl? (
+ app-admin/eselect-opencl
+ dev-libs/libclc
+ )
+ openmax? ( >=media-libs/libomxil-bellagio-0.9.3[${MULTILIB_USEDEP}] )
+ vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+ wayland? ( >=dev-libs/wayland-1.2.0[${MULTILIB_USEDEP}] )
+ xvmc? ( >=x11-libs/libXvMC-1.0.8[${MULTILIB_USEDEP}] )
+ ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
+"
+for card in ${INTEL_CARDS}; do
+ RDEPEND="${RDEPEND}
+ video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+ "
+done
+
+for card in ${RADEON_CARDS}; do
+ RDEPEND="${RDEPEND}
+ video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+ "
+done
+
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ llvm? (
+ r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] )
+ video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
+ )
+ opencl? (
+ >=sys-devel/llvm-3.3-r3[${MULTILIB_USEDEP}]
+ >=sys-devel/clang-3.3[${MULTILIB_USEDEP}]
+ >=sys-devel/gcc-4.6
+ )
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ >=x11-proto/dri2proto-2.8-r1[${MULTILIB_USEDEP}]
+ dri3? (
+ >=x11-proto/dri3proto-1.0[${MULTILIB_USEDEP}]
+ >=x11-proto/presentproto-1.0[${MULTILIB_USEDEP}]
+ )
+ >=x11-proto/glproto-1.4.16-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xf86driproto-2.1.1-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xf86vidmodeproto-2.3.1-r1[${MULTILIB_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+# It is slow without texrels, if someone wants slow
+# mesa without texrels +pic use is worth the shot
+QA_EXECSTACK="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
+QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
+
+# Think about: ggi, fbcon, no-X configs
+
+pkg_setup() {
+ # workaround toc-issue wrt #386545
+ use ppc64 && append-flags -mminimal-toc
+
+ # warning message for bug 459306
+ if use llvm && has_version sys-devel/llvm[!debug=]; then
+ ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+ ewarn "detected! This can cause problems. For details, see bug 459306."
+ fi
+
+ python-any-r1_pkg_setup
+}
+
+src_unpack() {
+ default
+ [[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+src_prepare() {
+ # apply patches
+ if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
+ EPATCH_FORCE="yes" \
+ EPATCH_SOURCE="${WORKDIR}/patches" \
+ EPATCH_SUFFIX="patch" \
+ epatch
+ fi
+
+ # relax the requirement that r300 must have llvm, bug 380303
+ epatch "${FILESDIR}"/${PN}-10.2-dont-require-llvm-for-r300.patch
+
+ # fix for hardened pax_kernel, bug 240956
+ [[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
+
+ # Solaris needs some recent POSIX stuff in our case
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die
+ fi
+
+ base_src_prepare
+
+ eautoreconf
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ local myconf
+
+ if use classic; then
+ # Configurable DRI drivers
+ driver_enable swrast
+
+ # Intel code
+ driver_enable video_cards_i915 i915
+ driver_enable video_cards_i965 i965
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ driver_enable video_cards_intel i915 i965
+ fi
+
+ # Nouveau code
+ driver_enable video_cards_nouveau nouveau
+
+ # ATI code
+ driver_enable video_cards_r100 radeon
+ driver_enable video_cards_r200 r200
+ if ! use video_cards_r100 && \
+ ! use video_cards_r200; then
+ driver_enable video_cards_radeon radeon r200
+ fi
+ fi
+
+ if use egl; then
+ myconf+="--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") "
+ fi
+
+ if use gallium; then
+ myconf+="
+ $(use_enable llvm gallium-llvm)
+ $(use_enable openvg)
+ $(use_enable openvg gallium-egl)
+ $(use_enable openmax omx)
+ $(use_enable r600-llvm-compiler)
+ $(use_enable vdpau)
+ $(use_enable xa)
+ $(use_enable xvmc)
+ "
+ gallium_enable swrast
+ gallium_enable video_cards_vmware svga
+ gallium_enable video_cards_nouveau nouveau
+ gallium_enable video_cards_i915 i915
+ gallium_enable video_cards_ilo ilo
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ gallium_enable video_cards_intel i915
+ fi
+
+ gallium_enable video_cards_r300 r300
+ gallium_enable video_cards_r600 r600
+ gallium_enable video_cards_radeonsi radeonsi
+ if ! use video_cards_r300 && \
+ ! use video_cards_r600; then
+ gallium_enable video_cards_radeon r300 r600
+ fi
+
+ gallium_enable video_cards_freedreno freedreno
+ # opencl stuff
+ if use opencl; then
+ myconf+="
+ $(use_enable opencl)
+ --with-opencl-libdir="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/mesa"
+ --with-clang-libdir="${EPREFIX}/usr/lib"
+ "
+ fi
+ fi
+
+ # x86 hardened pax_kernel needs glx-rts, bug 240956
+ if use pax_kernel; then
+ myconf+="
+ $(use_enable x86 glx-rts)
+ "
+ fi
+
+ # on abi_x86_32 hardened we need to have asm disable
+ if [[ ${ABI} == x86* ]] && use pic; then
+ myconf+=" --disable-asm"
+ fi
+
+ # build fails with BSD indent, bug #428112
+ use userland_GNU || export INDENT=cat
+
+ econf \
+ --enable-dri \
+ --enable-glx \
+ --enable-shared-glapi \
+ $(use_enable !bindist texture-float) \
+ $(use_enable debug) \
+ $(use_enable dri3) \
+ $(use_enable egl) \
+ $(use_enable gbm) \
+ $(use_enable gles1) \
+ $(use_enable gles2) \
+ $(use_enable nptl glx-tls) \
+ $(use_enable osmesa) \
+ --enable-llvm-shared-libs \
+ --with-dri-drivers=${DRI_DRIVERS} \
+ --with-gallium-drivers=${GALLIUM_DRIVERS} \
+ PYTHON2="${PYTHON}" \
+ ${myconf}
+}
+
+multilib_src_install() {
+ emake install DESTDIR="${D}"
+
+ # Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
+ # because user can eselect desired GL provider.
+ ebegin "Moving libGL and friends for dynamic switching"
+ local x
+ local gl_dir="/usr/$(get_libdir)/opengl/${OPENGL_DIR}/"
+ dodir ${gl_dir}/{lib,extensions,include/GL}
+ for x in "${ED}"/usr/$(get_libdir)/lib{EGL,GL*,OpenVG}.{la,a,so*}; do
+ if [ -f ${x} -o -L ${x} ]; then
+ mv -f "${x}" "${ED}${gl_dir}"/lib \
+ || die "Failed to move ${x}"
+ fi
+ done
+ for x in "${ED}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
+ if [ -f ${x} -o -L ${x} ]; then
+ mv -f "${x}" "${ED}${gl_dir}"/include/GL \
+ || die "Failed to move ${x}"
+ fi
+ done
+ for x in "${ED}"/usr/include/{EGL,GLES*,VG,KHR}; do
+ if [ -d ${x} ]; then
+ mv -f "${x}" "${ED}${gl_dir}"/include \
+ || die "Failed to move ${x}"
+ fi
+ done
+ eend $?
+
+ if use classic || use gallium; then
+ ebegin "Moving DRI/Gallium drivers for dynamic switching"
+ local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
+ keepdir /usr/$(get_libdir)/dri
+ dodir /usr/$(get_libdir)/mesa
+ for x in ${gallium_drivers[@]}; do
+ if [ -f "$(get_libdir)/gallium/${x}" ]; then
+ mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
+ || die "Failed to move ${x}"
+ fi
+ done
+ if use classic; then
+ emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
+ fi
+ for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
+ if [ -f ${x} -o -L ${x} ]; then
+ mv -f "${x}" "${x/dri/mesa}" \
+ || die "Failed to move ${x}"
+ fi
+ done
+ pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
+ ln -s ../mesa/*.so . || die "Creating symlink failed"
+ # remove symlinks to drivers known to eselect
+ for x in ${gallium_drivers[@]}; do
+ if [ -f ${x} -o -L ${x} ]; then
+ rm "${x}" || die "Failed to remove ${x}"
+ fi
+ done
+ popd
+ eend $?
+ fi
+ if use opencl; then
+ ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
+ local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
+ dodir ${cl_dir}/{lib,include}
+ if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
+ mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
+ "${ED}"${cl_dir}
+ fi
+ if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
+ mv -f "${ED}"/usr/include/CL \
+ "${ED}"${cl_dir}/include
+ fi
+ eend $?
+ fi
+
+ if use openmax; then
+ echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
+ doenvd "${T}"/99mesaxdgomx
+ keepdir /usr/share/mesa/xdg
+ fi
+}
+
+multilib_src_install_all() {
+ prune_libtool_files --all
+ einstalldocs
+
+ if use !bindist; then
+ dodoc docs/patents.txt
+ fi
+
+ # Install config file for eselect mesa
+ insinto /usr/share/mesa
+ newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
+}
+
+multilib_src_test() {
+ if use llvm; then
+ local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
+ pushd src/gallium/drivers/llvmpipe >/dev/null || die
+ emake ${llvm_tests}
+ pax-mark m ${llvm_tests}
+ popd >/dev/null || die
+ fi
+ emake check
+}
+
+pkg_postinst() {
+ # Switch to the xorg implementation.
+ echo
+ eselect opengl set --use-old ${OPENGL_DIR}
+
+ # switch to xorg-x11 and back if necessary, bug #374647 comment 11
+ OLD_IMPLEM="$(eselect opengl show)"
+ if [[ ${OPENGL_DIR}x != ${OLD_IMPLEM}x ]]; then
+ eselect opengl set ${OPENGL_DIR}
+ eselect opengl set ${OLD_IMPLEM}
+ fi
+
+ # Select classic/gallium drivers
+ if use classic || use gallium; then
+ eselect mesa set --auto
+ fi
+
+ # Switch to mesa opencl
+ if use opencl; then
+ eselect opencl set --use-old ${PN}
+ fi
+
+ # run omxregister-bellagio to make the OpenMAX drivers known system-wide
+ if use openmax; then
+ ebegin "Registering OpenMAX drivers"
+ BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
+ OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
+ omxregister-bellagio
+ eend $?
+ fi
+
+ # warn about patent encumbered texture-float
+ if use !bindist; then
+ elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
+ elog "enabled. Please see patents.txt for an explanation."
+ fi
+
+ local using_radeon r_flag
+ for r_flag in ${RADEON_CARDS}; do
+ if use video_cards_${r_flag}; then
+ using_radeon=1
+ break
+ fi
+ done
+
+ if [[ ${using_radeon} = 1 ]] && ! has_version media-libs/libtxc_dxtn; then
+ elog "Note that in order to have full S3TC support, it is necessary to install"
+ elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
+ elog "textures in some apps, and some others even require this to run."
+ fi
+}
+
+pkg_prerm() {
+ if use openmax; then
+ rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
+ fi
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+# TODO: avoid code duplication for a more elegant implementation
+driver_enable() {
+ case $# in
+ # for enabling unconditionally
+ 1)
+ DRI_DRIVERS+=",$1"
+ ;;
+ *)
+ if use $1; then
+ shift
+ for i in $@; do
+ DRI_DRIVERS+=",${i}"
+ done
+ fi
+ ;;
+ esac
+}
+
+gallium_enable() {
+ case $# in
+ # for enabling unconditionally
+ 1)
+ GALLIUM_DRIVERS+=",$1"
+ ;;
+ *)
+ if use $1; then
+ shift
+ for i in $@; do
+ GALLIUM_DRIVERS+=",${i}"
+ done
+ fi
+ ;;
+ esac
+}
diff --git a/media-libs/opusfile/opusfile-0.5.ebuild b/media-libs/opusfile/opusfile-0.5.ebuild
index 385b1216873f..73f62cc3e652 100644
--- a/media-libs/opusfile/opusfile-0.5.ebuild
+++ b/media-libs/opusfile/opusfile-0.5.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/media-libs/opusfile/opusfile-0.5.ebuild,v 1.2 2014/05/03 14:21:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opusfile/opusfile-0.5.ebuild,v 1.3 2014/07/19 17:27:13 klausman Exp $
EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.xiph.org/releases/opus/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~x86"
IUSE="doc fixed-point +float +http static-libs"
RDEPEND="media-libs/libogg
diff --git a/media-libs/portaudio/portaudio-19_pre20140130.ebuild b/media-libs/portaudio/portaudio-19_pre20140130.ebuild
index acfad7eed780..013d7bf38454 100644
--- a/media-libs/portaudio/portaudio-19_pre20140130.ebuild
+++ b/media-libs/portaudio/portaudio-19_pre20140130.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/media-libs/portaudio/portaudio-19_pre20140130.ebuild,v 1.5 2014/06/15 14:31:04 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/portaudio/portaudio-19_pre20140130.ebuild,v 1.7 2014/07/19 07:29:41 pacho Exp $
EAPI=5
AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
@@ -14,7 +14,7 @@ SRC_URI="http://www.portaudio.com/archives/${MY_P}.tgz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
IUSE="alsa +cxx debug jack oss static-libs"
RDEPEND="alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
diff --git a/media-sound/easytag/easytag-2.2.2.ebuild b/media-sound/easytag/easytag-2.2.2.ebuild
index 8076c027b40a..062ffc859a1b 100644
--- a/media-sound/easytag/easytag-2.2.2.ebuild
+++ b/media-sound/easytag/easytag-2.2.2.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/media-sound/easytag/easytag-2.2.2.ebuild,v 1.5 2014/05/11 12:36:52 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-2.2.2.ebuild,v 1.6 2014/07/19 17:27:06 klausman Exp $
EAPI=5
inherit fdo-mime gnome.org gnome2-utils
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="flac gtk2 +gtk3 mp3 mp4 opus speex test vorbis wavpack"
REQUIRED_USE="|| ( gtk2 gtk3 )
opus? ( vorbis )
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index e4e33046e16b..f97e702934fc 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,4 +1,5 @@
DIST lilypond-2.16.2.tar.gz 16062982 SHA256 1f4326cf8f9363076a83ce3cbe35f747188084f7492000ed3a7ccc3ce60aa1cb SHA512 3ead74ddb7e51be274aa5aa607b776261ae5d0e9863ebe745451875e62a60fac2376f7e80546df66010cdec2752c271e7006275608f30ce9a2d1b88f22dc1d8d WHIRLPOOL a25539dac5e508220e1ddeeaed261b730e76fd26c5dbc0f97683b65bcbc5907ef6bfbe8c16a7f6a15d12950d4a7d547ee1716e25cdfb5b750e235c913a8ef38e
DIST lilypond-2.18.2.tar.gz 16027977 SHA256 329d733765b0ba7be1878ae3f457dbbb875cc2840d2b75af4afc48c9454fba07 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6 WHIRLPOOL 95db264992a1e425fd1ee53d980941eef554c1784a1adfc105750d82d11664f61207c2b1897b6e99448790131c0715f08401f45b663c420553925596c6fd4b1c
+DIST lilypond-2.19.10.tar.gz 16317295 SHA256 dc1eed3bffdadfebcdecf649e1d748293070fd77b6855f67512ecc681802778b SHA512 d1986866e62fd101264dd287f16954dbf21d8f533e62202e87405fbf5e5020e8ac6cf048818f5b35aca074551c301eb9065bab6fcaa0a6701c15119a39bafeae WHIRLPOOL 0967428df5528abad3ada6fe3bbec38ba380548f2a6d43dd8241f1b9b7dc25fe829c4cb565e5fb5b20d30a349f9765f8067d18fbebf7a35cb37a625462c147a7
DIST lilypond-2.19.8.tar.gz 16046971 SHA256 9796cea12a8a603d7bdf045b5997874774548017c3baa68094fc5f28007f3e14 SHA512 6b8499e8a98f5bdba93b3c1c35144b6dbd945dc068d77d5cd94d0d8540f956348100a8b5a66355b73c328774a6a8a2dc713dc66a42d93c5e0c21be39d84c389d WHIRLPOOL 2c2ec4f29e17b60106152dca96a1b85aa3c6d79719212da1d77d742812c4fc51f64dbb921001dd782ce7f45ea6dfd5011fbd94ac764ac64640c2bfa7a81f266f
DIST lilypond-2.19.9.tar.gz 16310478 SHA256 3efb4d719749184e577d6af6ff6d7b9c0376ccd7edce100e12bd6a2184c44eca SHA512 15316fa72855d612d2e8a8d9b9fad5656fc8446bcb4337c83acb2030957b4232a57c4c0025232c726bb9a483fb4963e6b1560d418bcfbb80a1aa222aa32e1f8c WHIRLPOOL ad7f2066f28f078613860f3b965fae018c8343a8c60f32d7c9f2f7cdb512d403932943241fbe2a137aae92c7f8cfeb4a9b975e301044527d4d39e962fc413a07
diff --git a/media-sound/lilypond/lilypond-2.19.10.ebuild b/media-sound/lilypond/lilypond-2.19.10.ebuild
new file mode 100644
index 000000000000..b1be5efac097
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.19.10.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.19.10.ebuild,v 1.1 2014/07/19 04:36:35 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit elisp-common autotools eutils python-single-r1
+
+DESCRIPTION="GNU Music Typesetter"
+SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
+HOMEPAGE="http://lilypond.org/"
+
+LICENSE="GPL-3 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
+IUSE="debug emacs profile vim-syntax ${LANGS// / linguas_}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=app-text/ghostscript-gpl-8.15
+ >=dev-scheme/guile-1.8.2[deprecated,regex]
+ media-fonts/urw-fonts
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=x11-libs/pango-1.12.3
+ emacs? ( virtual/emacs )
+ ${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+ app-text/t1utils
+ dev-lang/perl
+ || (
+ ( >=dev-texlive/texlive-metapost-2013 >=dev-tex/metapost-1.803 )
+ =sys-apps/texinfo-4.11
+ >=sys-devel/bison-2.0
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/make"
+
+# Correct output data for tests isn't bundled with releases
+RESTRICT="test"
+
+pkg_setup() {
+ # make sure >=metapost-1.803 is selected if it's installed, bug 498704
+ if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then
+ if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then
+ einfo "Updating metapost symlink"
+ eselect mpost update || die
+ fi
+ fi
+
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.17.2-tex-docs.patch
+
+ if ! use vim-syntax ; then
+ sed -i 's/vim//' GNUmakefile.in || die
+ fi
+
+ # respect CFLAGS
+ sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
+
+ for lang in ${LANGS}; do
+ use linguas_${lang} || rm po/${lang}.po || die
+ done
+
+ # respect AR
+ sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die
+
+ eautoreconf
+}
+
+src_configure() {
+ # documentation generation currently not supported since it requires a newer
+ # version of texi2html than is currently in the tree
+
+ econf \
+ --with-ncsb-dir=/usr/share/fonts/urw-fonts \
+ --disable-documentation \
+ --disable-optimising \
+ --disable-pipe \
+ $(use_enable debug debugging) \
+ $(use_enable profile profiling)
+}
+
+src_compile() {
+ default
+
+ if use emacs ; then
+ elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
+ || die "elisp-compile failed"
+ fi
+}
+
+src_install () {
+ emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
+
+ # remove elisp files since they are in the wrong directory
+ rm -r "${ED}"/usr/share/emacs || die
+
+ if use emacs ; then
+ elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
+ || die "elisp-install failed"
+ elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+ fi
+
+ dodoc AUTHORS.txt HACKING NEWS.txt README.txt
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/media-sound/tomahawk/tomahawk-0.6.1.ebuild b/media-sound/tomahawk/tomahawk-0.6.1.ebuild
index 6a84c05e83da..b74d7ae24204 100644
--- a/media-sound/tomahawk/tomahawk-0.6.1.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.6.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/media-sound/tomahawk/tomahawk-0.6.1.ebuild,v 1.7 2014/02/09 19:07:08 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.6.1.ebuild,v 1.8 2014/07/19 11:40:34 johu Exp $
EAPI=5
@@ -19,7 +19,7 @@ fi
inherit cmake-utils qt4-r2 ${GIT_ECLASS}
-DESCRIPTION="Qt playdar social music player"
+DESCRIPTION="Multi-source social music player"
HOMEPAGE="http://tomahawk-player.org/"
LICENSE="GPL-3 BSD"
diff --git a/media-sound/tomahawk/tomahawk-0.7.0.ebuild b/media-sound/tomahawk/tomahawk-0.7.0.ebuild
index 4f017d886e54..e93380c79c57 100644
--- a/media-sound/tomahawk/tomahawk-0.7.0.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.7.0.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/media-sound/tomahawk/tomahawk-0.7.0.ebuild,v 1.6 2014/02/09 19:07:08 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.7.0.ebuild,v 1.7 2014/07/19 11:40:34 johu Exp $
EAPI=5
@@ -19,7 +19,7 @@ fi
inherit cmake-utils qt4-r2 ${GIT_ECLASS}
-DESCRIPTION="Qt playdar social music player"
+DESCRIPTION="Multi-source social music player"
HOMEPAGE="http://tomahawk-player.org/"
LICENSE="GPL-3 BSD"
diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild
index f36a4ddd163b..4529c1952ca6 100644
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ b/media-sound/tomahawk/tomahawk-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/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.25 2014/05/07 17:36:48 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.26 2014/07/19 11:40:34 johu Exp $
EAPI=5
@@ -16,7 +16,7 @@ else
KEYWORDS=""
fi
-DESCRIPTION="Qt playdar social music player"
+DESCRIPTION="Multi-source social music player"
HOMEPAGE="http://tomahawk-player.org/"
LICENSE="GPL-3 BSD"
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 8fbb0476dbc7..8711fd9f9424 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 18 Jul 2014 13:07:02 +0000
+Sun, 20 Jul 2014 07:07:03 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 8fbb0476dbc7..8711fd9f9424 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 18 Jul 2014 13:07:02 +0000
+Sun, 20 Jul 2014 07:07:03 +0000
diff --git a/metadata/md5-cache/app-admin/fleet-0.5.3 b/metadata/md5-cache/app-admin/fleet-0.5.3
new file mode 100644
index 000000000000..84f3929e6687
--- /dev/null
+++ b/metadata/md5-cache/app-admin/fleet-0.5.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=dev-lang/go-1.2 virtual/pkgconfig
+DESCRIPTION=A Distributed init System
+EAPI=5
+HOMEPAGE=https://github.com/coreos/fleet
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/coreos/fleet/archive/v0.5.3.tar.gz -> fleet-0.5.3.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402 vcs-snapshot 58b766562c9fbfb3268b04e33cdf2f66
+_md5_=e325bec150b2307987310363c79f634e
diff --git a/metadata/md5-cache/app-admin/fleet-0.5.4 b/metadata/md5-cache/app-admin/fleet-0.5.4
new file mode 100644
index 000000000000..1550eb001029
--- /dev/null
+++ b/metadata/md5-cache/app-admin/fleet-0.5.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=dev-lang/go-1.2 virtual/pkgconfig
+DESCRIPTION=A Distributed init System
+EAPI=5
+HOMEPAGE=https://github.com/coreos/fleet
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/coreos/fleet/archive/v0.5.4.tar.gz -> fleet-0.5.4.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402 vcs-snapshot 58b766562c9fbfb3268b04e33cdf2f66
+_md5_=9da73b5e9c2f7a0efadd648ee55279b0
diff --git a/metadata/md5-cache/app-admin/fleet-9999 b/metadata/md5-cache/app-admin/fleet-9999
new file mode 100644
index 000000000000..0bb06c44519a
--- /dev/null
+++ b/metadata/md5-cache/app-admin/fleet-9999
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=dev-lang/go-1.2 dev-vcs/git virtual/pkgconfig
+DESCRIPTION=A Distributed init System
+EAPI=5
+HOMEPAGE=https://github.com/coreos/fleet
+LICENSE=Apache-2.0
+SLOT=0
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 git-2 2027b81a576527fa16bece425941e094 git-r3 49fc3d60d7bcd6f8913ad6ec0cb4c67b multilib 3bf24e6abb9b76d9f6c20600f0b716bf systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=93377066d4a6cb35fb40e0b797ccaffb
diff --git a/metadata/md5-cache/app-admin/pass-1.6.3 b/metadata/md5-cache/app-admin/pass-1.6.3
index 61f8cfd9c76e..c95e51c409b4 100644
--- a/metadata/md5-cache/app-admin/pass-1.6.3
+++ b/metadata/md5-cache/app-admin/pass-1.6.3
@@ -9,4 +9,4 @@ RDEPEND=app-crypt/gnupg app-admin/pwgen >=app-text/tree-1.7.0 git? ( dev-vcs/git
SLOT=0
SRC_URI=http://git.zx2c4.com/password-store/snapshot/password-store-1.6.3.tar.xz
_eclasses_=bash-completion-r1 db412e427e3317ffd3e15f17df269c5e elisp-common 1aa23b3de5dae55456fa2071428eb5bf multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=fddfa99a419c3a44652b20b222a2df13
+_md5_=0cb58dccdcd2f64118eed49747acad53
diff --git a/metadata/md5-cache/app-admin/pass-9999 b/metadata/md5-cache/app-admin/pass-9999
index 513bf5717b81..bbaf9ecc1541 100644
--- a/metadata/md5-cache/app-admin/pass-9999
+++ b/metadata/md5-cache/app-admin/pass-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
RDEPEND=app-crypt/gnupg app-admin/pwgen >=app-text/tree-1.7.0 git? ( dev-vcs/git ) X? ( x11-misc/xclip ) elibc_Darwin? ( app-misc/getopt ) zsh-completion? ( app-shells/zsh-completion ) fish-completion? ( app-shells/fish ) dmenu? ( x11-misc/dmenu x11-misc/xdotool ) emacs? ( virtual/emacs )
SLOT=0
_eclasses_=bash-completion-r1 db412e427e3317ffd3e15f17df269c5e elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 06133990e861be0fe60c2b428fd025d9 git-2 2027b81a576527fa16bece425941e094 git-r3 49fc3d60d7bcd6f8913ad6ec0cb4c67b multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=5c0d749c9200121e073bc8c472e9ba59
+_md5_=47800100e557c622d5de0bf6266df1ef
diff --git a/metadata/md5-cache/app-arch/engrampa-1.8.0 b/metadata/md5-cache/app-arch/engrampa-1.8.0
index d027a731728f..f84153b691a1 100644
--- a/metadata/md5-cache/app-arch/engrampa-1.8.0
+++ b/metadata/md5-cache/app-arch/engrampa-1.8.0
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=x11-libs/gtk+-2.21.4:2 >=dev-libs/glib-2.25.5:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( || ( >=mate-base/caja-1.8:0 >=mate-base/mate-file-manager-1.6:0 ) ) !!app-arch/mate-file-archiver >=dev-util/intltool-0.35:* dev-util/itstool:0 >=mate-base/mate-common-1.6:0 sys-devel/gettext:* virtual/pkgconfig:* app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=x11-libs/gtk+-2.21.4:2 >=dev-libs/glib-2.25.5:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 || ( >=mate-base/caja-1.8:0 >=mate-base/mate-file-manager-1.6:0 ) !!app-arch/mate-file-archiver >=dev-util/intltool-0.35:* dev-util/itstool:0 >=mate-base/mate-common-1.6:0 sys-devel/gettext:* virtual/pkgconfig:* app-arch/xz-utils >=sys-apps/sed-4
DESCRIPTION=Engrampa archive manager for MATE
EAPI=5
HOMEPAGE=http://mate-desktop.org
IUSE=caja debug
KEYWORDS=amd64 x86
LICENSE=GPL-2
-RDEPEND=>=x11-libs/gtk+-2.21.4:2 >=dev-libs/glib-2.25.5:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( || ( >=mate-base/caja-1.8:0 >=mate-base/mate-file-manager-1.6:0 ) ) !!app-arch/mate-file-archiver
+RDEPEND=>=x11-libs/gtk+-2.21.4:2 >=dev-libs/glib-2.25.5:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 || ( >=mate-base/caja-1.8:0 >=mate-base/mate-file-manager-1.6:0 ) !!app-arch/mate-file-archiver
SLOT=0
SRC_URI=http://pub.mate-desktop.org/releases/1.8/engrampa-1.8.0.tar.xz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 9637c29fc715b17a6328f24251129557 gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=bd4d03a175e140492ff50071023ea85c
+_md5_=40a63e71b2f669203c412e91298ca647
diff --git a/metadata/md5-cache/app-backup/cyphertite-2.0.2-r2 b/metadata/md5-cache/app-backup/cyphertite-2.0.2-r3
similarity index 95%
rename from metadata/md5-cache/app-backup/cyphertite-2.0.2-r2
rename to metadata/md5-cache/app-backup/cyphertite-2.0.2-r3
index 0f0df04f98d5..76d04f0cf783 100644
--- a/metadata/md5-cache/app-backup/cyphertite-2.0.2-r2
+++ b/metadata/md5-cache/app-backup/cyphertite-2.0.2-r3
@@ -9,4 +9,4 @@ RDEPEND=app-arch/xz-utils:0= dev-db/sqlite:3= >=dev-libs/openssl-1.0.1g:0= dev-l
SLOT=0
SRC_URI=https://www.cyphertite.com/snapshots/source/2.0.2/cyphertite-full-2.0.2.tar.gz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=1da9664e543e58d430ab365f910cd98d
+_md5_=4e32cea5e97157041234c25e1728c93f
diff --git a/metadata/md5-cache/app-crypt/signing-party-1.1.3-r4 b/metadata/md5-cache/app-crypt/signing-party-1.1.8
similarity index 57%
rename from metadata/md5-cache/app-crypt/signing-party-1.1.3-r4
rename to metadata/md5-cache/app-crypt/signing-party-1.1.8
index a92834b2361b..132e234e78be 100644
--- a/metadata/md5-cache/app-crypt/signing-party-1.1.3-r4
+++ b/metadata/md5-cache/app-crypt/signing-party-1.1.8
@@ -1,11 +1,12 @@
DEFINED_PHASES=compile install prepare
+DEPEND=dev-lang/perl
DESCRIPTION=A collection of several tools related to OpenPGP
-EAPI=3
+EAPI=5
HOMEPAGE=http://pgp-tools.alioth.debian.org/
-KEYWORDS=amd64 ppc x86 ~ppc-macos
+KEYWORDS=~amd64 ~ppc ~x86 ~ppc-macos
LICENSE=GPL-2
-RDEPEND=>=app-crypt/gnupg-1.3.92 dev-perl/GnuPG-Interface dev-perl/text-template dev-perl/MIME-tools net-mail/qprint >=dev-perl/MailTools-1.62 virtual/mailx virtual/mta dev-lang/perl || ( dev-perl/libintl-perl dev-perl/Text-Iconv app-text/recode )
+RDEPEND=dev-lang/perl >=app-crypt/gnupg-1.3.92 dev-perl/GnuPG-Interface dev-perl/text-template dev-perl/MIME-tools net-mail/qprint >=dev-perl/MailTools-1.62 virtual/mailx virtual/mta || ( dev-perl/libintl-perl dev-perl/Text-Iconv app-text/recode )
SLOT=0
-SRC_URI=mirror://debian/pool/main/s/signing-party/signing-party_1.1.3.orig.tar.gz
+SRC_URI=mirror://debian/pool/main/s/signing-party/signing-party_1.1.8.orig.tar.gz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=7de3fdb92dc51eb1b111180221a42fcf
+_md5_=ff962d3a75dcd98c9357a5f7ddf35f14
diff --git a/metadata/md5-cache/app-editors/mg-20140414 b/metadata/md5-cache/app-editors/mg-20140414
index 83044b8d43b0..a2654b3d2c8b 100644
--- a/metadata/md5-cache/app-editors/mg-20140414
+++ b/metadata/md5-cache/app-editors/mg-20140414
@@ -4,10 +4,10 @@ DESCRIPTION=MicroGnuEmacs, a port from the BSDs
EAPI=5
HOMEPAGE=http://homepage.boetes.org/software/mg/
IUSE=livecd
-KEYWORDS=amd64 arm hppa ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~x86 ~amd64-fbsd ~x86-fbsd
LICENSE=public-domain
RDEPEND=sys-libs/ncurses !elibc_FreeBSD? ( dev-libs/libbsd )
SLOT=0
SRC_URI=http://homepage.boetes.org/software/mg/mg-20140414.tar.gz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=3cf9d59a99770bfe0a22439a518342e4
+_md5_=903a5912ea6cabcb38a102d2dd1c5816
diff --git a/metadata/md5-cache/app-editors/retext-4.1.3 b/metadata/md5-cache/app-editors/retext-4.1.3
new file mode 100644
index 000000000000..6c52535525f6
--- /dev/null
+++ b/metadata/md5-cache/app-editors/retext-4.1.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,-python_single_target_python3_3(-)]
+DESCRIPTION=A Qt-based text editor for Markdown and reStructuredText
+EAPI=5
+HOMEPAGE=http://sourceforge.net/p/retext/home/ReText/
+IUSE=+spell python_targets_python3_3 linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_es linguas_et linguas_eu linguas_fr linguas_it linguas_ja linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_uk linguas_zh_CN linguas_zh_TW
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-python/docutils[python_targets_python3_3(-)?,-python_single_target_python3_3(-)] dev-python/markdown[python_targets_python3_3(-)?,-python_single_target_python3_3(-)] dev-python/markups[python_targets_python3_3(-)?,-python_single_target_python3_3(-)] dev-python/PyQt4[webkit,python_targets_python3_3(-)?,-python_single_target_python3_3(-)] spell? ( dev-python/pyenchant[python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,-python_single_target_python3_3(-)]
+REQUIRED_USE=|| ( python_targets_python3_3 )
+SLOT=0
+SRC_URI=mirror://sourceforge/retext/ReText-4.1.3.tar.gz
+_eclasses_=distutils-r1 d48d51c220f1678179fc4ab13b534ec1 eutils 06133990e861be0fe60c2b428fd025d9 l10n 33bde4fb0cfd3a21a277b66bfd837e19 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=a814c40d53692e5e60b737022f8ce0da
diff --git a/metadata/md5-cache/app-editors/retext-9999 b/metadata/md5-cache/app-editors/retext-9999
index ceaf7e4a1ebe..9d5783ad8a8e 100644
--- a/metadata/md5-cache/app-editors/retext-9999
+++ b/metadata/md5-cache/app-editors/retext-9999
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) dev-lang/python-exec:=[python_targets_python3_2(-)?,-python_single_target_python3_2(-)] dev-vcs/git
+DEPEND=python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,-python_single_target_python3_3(-)] dev-vcs/git
DESCRIPTION=A Qt-based text editor for Markdown and reStructuredText
EAPI=5
HOMEPAGE=http://sourceforge.net/p/retext/home/ReText/
-IUSE=+spell python_targets_python3_2 linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_es linguas_et linguas_eu linguas_fr linguas_it linguas_ja linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_uk linguas_zh_CN linguas_zh_TW
+IUSE=+spell python_targets_python3_3 linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_es linguas_et linguas_eu linguas_fr linguas_it linguas_ja linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_uk linguas_zh_CN linguas_zh_TW
LICENSE=GPL-2
-RDEPEND=dev-python/docutils[python_targets_python3_2(-)?,-python_single_target_python3_2(-)] dev-python/markdown[python_targets_python3_2(-)?,-python_single_target_python3_2(-)] dev-python/markups[python_targets_python3_2(-)?,-python_single_target_python3_2(-)] dev-python/PyQt4[webkit,python_targets_python3_2(-)?,-python_single_target_python3_2(-)] spell? ( dev-python/pyenchant[python_targets_python3_2(-)?,-python_single_target_python3_2(-)] ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) dev-lang/python-exec:=[python_targets_python3_2(-)?,-python_single_target_python3_2(-)]
-REQUIRED_USE=|| ( python_targets_python3_2 )
+RDEPEND=dev-python/docutils[python_targets_python3_3(-)?,-python_single_target_python3_3(-)] dev-python/markdown[python_targets_python3_3(-)?,-python_single_target_python3_3(-)] dev-python/markups[python_targets_python3_3(-)?,-python_single_target_python3_3(-)] dev-python/PyQt4[webkit,python_targets_python3_3(-)?,-python_single_target_python3_3(-)] spell? ( dev-python/pyenchant[python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,-python_single_target_python3_3(-)]
+REQUIRED_USE=|| ( python_targets_python3_3 )
SLOT=0
_eclasses_=distutils-r1 d48d51c220f1678179fc4ab13b534ec1 eutils 06133990e861be0fe60c2b428fd025d9 git-2 2027b81a576527fa16bece425941e094 git-r3 49fc3d60d7bcd6f8913ad6ec0cb4c67b l10n 33bde4fb0cfd3a21a277b66bfd837e19 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=8d8855e93579a1d6b211b7e66edc2cef
+_md5_=6c966daad9d7f0709500fecc1fa5dcc9
diff --git a/metadata/md5-cache/app-editors/xemacs-21.4.22-r3 b/metadata/md5-cache/app-editors/xemacs-21.4.22-r3
index 80e37959a7a0..af3e09243765 100644
--- a/metadata/md5-cache/app-editors/xemacs-21.4.22-r3
+++ b/metadata/md5-cache/app-editors/xemacs-21.4.22-r3
@@ -4,11 +4,11 @@ DESCRIPTION=highly customizable open source text editor and application developm
EAPI=5
HOMEPAGE=http://www.xemacs.org/
IUSE=eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb
-KEYWORDS=~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 hppa ~ppc ~ppc64 ~sparc x86
LICENSE=GPL-2+
PDEPEND=app-xemacs/xemacs-base mule? ( app-xemacs/mule-base )
RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql-base ) ldap? ( net-nds/openldap ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0 ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff ) png? ( >=media-libs/libpng-1.2 ) jpeg? ( virtual/jpeg ) canna? ( app-i18n/canna ) !amd64? ( freewnn? ( app-i18n/freewnn ) ) >=sys-libs/ncurses-5.2 >=app-admin/eselect-emacs-1.15
SLOT=0
SRC_URI=http://ftp.xemacs.org/xemacs-21.4/xemacs-21.4.22.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=2e20022dbb749f86ac9675630aa13461
+_md5_=d2a6962f6c8c310d05ad0e1c071d1417
diff --git a/metadata/md5-cache/app-editors/zile-2.4.11 b/metadata/md5-cache/app-editors/zile-2.4.11
index 3c00a64bd652..dfee7b3949b4 100644
--- a/metadata/md5-cache/app-editors/zile-2.4.11
+++ b/metadata/md5-cache/app-editors/zile-2.4.11
@@ -4,9 +4,9 @@ DESCRIPTION=Zile is a small Emacs clone
EAPI=5
HOMEPAGE=http://www.gnu.org/software/zile/
IUSE=acl test
-KEYWORDS=~alpha amd64 arm ~ppc ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~ppc ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
LICENSE=GPL-3+
RDEPEND=>=dev-libs/boehm-gc-7.2 sys-libs/ncurses acl? ( virtual/acl )
SLOT=0
SRC_URI=mirror://gnu/zile/zile-2.4.11.tar.gz
-_md5_=2af92e13d60ebd92afd150c8843f46b6
+_md5_=041c42c44b182483e72f191c2f84317a
diff --git a/metadata/md5-cache/app-emacs/apel-10.8-r1 b/metadata/md5-cache/app-emacs/apel-10.8-r1
index bee53e2c8a9f..dd8352c3bd46 100644
--- a/metadata/md5-cache/app-emacs/apel-10.8-r1
+++ b/metadata/md5-cache/app-emacs/apel-10.8-r1
@@ -3,10 +3,10 @@ DEPEND=>=virtual/emacs-23
DESCRIPTION=A Portable Emacs Library is a library for making portable Emacs Lisp programs.
EAPI=4
HOMEPAGE=http://cvs.m17n.org/elisp/APEL/
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
LICENSE=GPL-2
RDEPEND=>=virtual/emacs-23
SLOT=0
SRC_URI=ftp://ftp.jpl.org/pub/elisp/apel/apel-10.8.tar.gz http://dev.gentoo.org/~gienah/2big4tree/app-emacs/apel/apel-10.8-030_Use-new-style-backquotes.patch.gz
_eclasses_=elisp b7ff113c97bf466ace6f3235f80af600 elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=1b6fcbb64bf1b3874909eb5f92481f4d
+_md5_=f65ab535e3884ef17d992aae470ca5b1
diff --git a/metadata/md5-cache/app-emacs/auctex-11.87 b/metadata/md5-cache/app-emacs/auctex-11.87
deleted file mode 100644
index 717ee687f9d7..000000000000
--- a/metadata/md5-cache/app-emacs/auctex-11.87
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=virtual/emacs-23 virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=Extended support for writing, formatting and using (La)TeX, Texinfo and BibTeX files
-EAPI=5
-HOMEPAGE=http://www.gnu.org/software/auctex/
-IUSE=preview-latex
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=GPL-3+ FDL-1.3+
-RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=virtual/emacs-23 virtual/latex-base
-SLOT=0
-SRC_URI=mirror://gnu/auctex/auctex-11.87.tar.gz
-_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 elisp b7ff113c97bf466ace6f3235f80af600 elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 06133990e861be0fe60c2b428fd025d9 latex-package 999c52f495ebb8dd3b69bda982bb2817 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=5bce8198456090c5bd99e8d006f685be
diff --git a/metadata/md5-cache/app-emacs/auctex-11.87-r1 b/metadata/md5-cache/app-emacs/auctex-11.87-r1
index 06c8d0cfad65..60e96239c823 100644
--- a/metadata/md5-cache/app-emacs/auctex-11.87-r1
+++ b/metadata/md5-cache/app-emacs/auctex-11.87-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Extended support for writing, formatting and using (La)TeX, Texinfo
EAPI=5
HOMEPAGE=http://www.gnu.org/software/auctex/
IUSE=preview-latex
-KEYWORDS=amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
LICENSE=GPL-3+ FDL-1.3+
RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=virtual/emacs-23 virtual/latex-base
SLOT=0
SRC_URI=mirror://gnu/auctex/auctex-11.87.tar.gz
_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 elisp b7ff113c97bf466ace6f3235f80af600 elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 06133990e861be0fe60c2b428fd025d9 latex-package 999c52f495ebb8dd3b69bda982bb2817 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=4f081bbc2963b43e63984a8313eea4d4
+_md5_=9b0124f42b5b75727b938c864e1a9570
diff --git a/metadata/md5-cache/app-emacs/gnuplot-mode-0.7.0 b/metadata/md5-cache/app-emacs/gnuplot-mode-0.7.0
index b76eb4d22023..6c607c454229 100644
--- a/metadata/md5-cache/app-emacs/gnuplot-mode-0.7.0
+++ b/metadata/md5-cache/app-emacs/gnuplot-mode-0.7.0
@@ -4,10 +4,10 @@ DESCRIPTION=Gnuplot mode for Emacs
EAPI=5
HOMEPAGE=http://xafs.org/BruceRavel/GnuplotMode
IUSE=doc
-KEYWORDS=amd64 arm hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=GPL-2+
RDEPEND=sci-visualization/gnuplot[-emacs(-)] >=virtual/emacs-23
SLOT=0
SRC_URI=https://github.com/bruceravel/gnuplot-mode/archive/0.7.0.tar.gz -> gnuplot-mode-0.7.0.tar.gz
_eclasses_=elisp b7ff113c97bf466ace6f3235f80af600 elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf readme.gentoo 106edea5533517715013de909a333abd toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=0d92b1310ceaeac9b59bd07a81fb91ea
+_md5_=cee6709a724d9b296427ecff00b34b7d
diff --git a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20130619 b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20130619
index a0a8d900f30a..a0b0aa2f23b3 100644
--- a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20130619
+++ b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20130619
@@ -4,10 +4,10 @@ DESCRIPTION=Yet Another Message Interface on Emacsen
EAPI=5
HOMEPAGE=https://github.com/wanderlust/wanderlust http://emacswiki.org/emacs/WanderLust
IUSE=bbdb ssl linguas_ja
-KEYWORDS=~alpha amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
LICENSE=GPL-2+
RDEPEND=>=app-emacs/apel-10.6 virtual/emacs-flim app-emacs/semi bbdb? ( app-emacs/bbdb ) >=virtual/emacs-23
SLOT=0
SRC_URI=http://dev.gentoo.org/~ulm/distfiles/wanderlust-2.15.9_p20130619.tar.xz
_eclasses_=elisp b7ff113c97bf466ace6f3235f80af600 elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=35f47729b2e35cbb511c4cfdae3478fc
+_md5_=5c9fe0342623ccd515fe9482a08db8d5
diff --git a/metadata/md5-cache/app-emulation/virtualbox-4.2.22 b/metadata/md5-cache/app-emulation/virtualbox-4.2.26
similarity index 86%
rename from metadata/md5-cache/app-emulation/virtualbox-4.2.22
rename to metadata/md5-cache/app-emulation/virtualbox-4.2.26
index 73bf83294d2e..78f04e412629 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-4.2.22
+++ b/metadata/md5-cache/app-emulation/virtualbox-4.2.26
@@ -1,15 +1,15 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.2.22 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 media-libs/libpng sys-libs/zlib >=virtual/udev-171 !headless? ( qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 opengl? ( dev-qt/qtopengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl:0[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) ) >=dev-util/kbuild-0.1.9998_pre20120806 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-power/iasl pam? ( sys-libs/pam ) sys-libs/libcap doc? ( dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( || ( virtual/jdk:1.7 virtual/jdk:1.6 ) ) virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama ) pulseaudio? ( media-sound/pulseaudio ) vboxwebsrv? ( =dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] java? ( >=dev-java/java-config-2.1.9-r1 ) virtual/pkgconfig
+DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.2.26 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 media-libs/libpng sys-libs/zlib >=virtual/udev-171 !headless? ( qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 opengl? ( dev-qt/qtopengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl:0[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) ) >=dev-util/kbuild-0.1.9998_pre20120806 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-power/iasl pam? ( sys-libs/pam ) sys-libs/libcap doc? ( dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( || ( virtual/jdk:1.7 virtual/jdk:1.6 ) ) virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama ) pulseaudio? ( media-sound/pulseaudio ) vboxwebsrv? ( =dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] java? ( >=dev-java/java-config-2.1.9-r1 ) virtual/pkgconfig
DESCRIPTION=Family of powerful x86 virtualization products for enterprise as well as home use
EAPI=5
HOMEPAGE=http://www.virtualbox.org/
IUSE=+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc elibc_FreeBSD java python_targets_python2_7 python_single_target_python2_7
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
-PDEPEND=additions? ( ~app-emulation/virtualbox-additions-4.2.22 ) extensions? ( ~app-emulation/virtualbox-extpack-oracle-4.2.22 )
-RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.2.22 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 media-libs/libpng sys-libs/zlib >=virtual/udev-171 !headless? ( qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 opengl? ( dev-qt/qtopengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl:0[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
+PDEPEND=additions? ( ~app-emulation/virtualbox-additions-4.2.26 ) extensions? ( =app-emulation/virtualbox-extpack-oracle-4.2.26* )
+RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.2.26 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 media-libs/libpng sys-libs/zlib >=virtual/udev-171 !headless? ( qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 opengl? ( dev-qt/qtopengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl:0[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
REQUIRED_USE=java? ( sdk ) python? ( ( sdk ) ) vboxwebsrv? ( java ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 )
SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.2.22/VirtualBox-4.2.22.tar.bz2 http://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.2.18-patches-01.tar.xz
+SRC_URI=http://download.virtualbox.org/virtualbox/4.2.26/VirtualBox-4.2.26.tar.bz2 http://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.2.26-patches-01.tar.xz
_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 linux-info 2b8c53f6065bdee2d757472215a3088f multilib 3bf24e6abb9b76d9f6c20600f0b716bf pax-utils 51ad5130f4a69b1a118ca5296de276ae python-single-r1 a71a169a881e0a11d04a7fe12dc39f6e python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b qmake-utils dd0375da11f79aa416ff97913c59d01c qt4-r2 b40473dafd07d7c5fe4aef1c1b902f39 toolchain-funcs 0f1760274637a138b99bb649202ea402 udev 8cd692457c1524c7be9af69831698a78 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=34afdfe2b84794d505e217dd55bc2691
+_md5_=5906ea71275c2f7b4c4cdad8f3cd3a50
diff --git a/metadata/md5-cache/app-emulation/virtualbox-4.3.10-r2 b/metadata/md5-cache/app-emulation/virtualbox-4.3.14
similarity index 87%
rename from metadata/md5-cache/app-emulation/virtualbox-4.3.10-r2
rename to metadata/md5-cache/app-emulation/virtualbox-4.3.14
index 51a1b621154d..dbed40a8d502 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-4.3.10-r2
+++ b/metadata/md5-cache/app-emulation/virtualbox-4.3.14
@@ -1,15 +1,15 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.3.10 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 media-libs/libpng media-libs/libvpx sys-libs/zlib >=virtual/udev-171 !headless? ( qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 opengl? ( dev-qt/qtopengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl:0[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) ) >=dev-util/kbuild-0.1.9998_pre20131130 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-power/iasl pam? ( sys-libs/pam ) sys-libs/libcap doc? ( dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( || ( virtual/jdk:1.7 virtual/jdk:1.6 ) ) virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama ) pulseaudio? ( media-sound/pulseaudio ) vboxwebsrv? ( net-libs/gsoap[-gnutls] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] java? ( >=dev-java/java-config-2.1.9-r1 ) virtual/pkgconfig
+DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.3.14 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 media-libs/libpng media-libs/libvpx sys-libs/zlib >=virtual/udev-171 !headless? ( qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 opengl? ( dev-qt/qtopengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl:0[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) ) >=dev-util/kbuild-0.1.9998_pre20131130 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-power/iasl pam? ( sys-libs/pam ) sys-libs/libcap doc? ( dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( || ( virtual/jdk:1.7 virtual/jdk:1.6 ) ) virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama ) pulseaudio? ( media-sound/pulseaudio ) vboxwebsrv? ( net-libs/gsoap[-gnutls] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] java? ( >=dev-java/java-config-2.1.9-r1 ) virtual/pkgconfig
DESCRIPTION=Family of powerful x86 virtualization products for enterprise as well as home use
EAPI=5
HOMEPAGE=http://www.virtualbox.org/
IUSE=+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc elibc_FreeBSD java python_targets_python2_7 python_single_target_python2_7
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
-PDEPEND=additions? ( ~app-emulation/virtualbox-additions-4.3.10 ) extensions? ( =app-emulation/virtualbox-extpack-oracle-4.3.10* )
-RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.3.10 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 media-libs/libpng media-libs/libvpx sys-libs/zlib >=virtual/udev-171 !headless? ( qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 opengl? ( dev-qt/qtopengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl:0[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
+PDEPEND=additions? ( ~app-emulation/virtualbox-additions-4.3.14 ) extensions? ( =app-emulation/virtualbox-extpack-oracle-4.3.14* )
+RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.3.14 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 media-libs/libpng media-libs/libvpx sys-libs/zlib >=virtual/udev-171 !headless? ( qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 opengl? ( dev-qt/qtopengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl:0[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
REQUIRED_USE=java? ( sdk ) python? ( ( sdk ) ) vboxwebsrv? ( java ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 )
SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.3.10/VirtualBox-4.3.10.tar.bz2 http://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.3.10-patches-01.tar.xz
+SRC_URI=http://download.virtualbox.org/virtualbox/4.3.14/VirtualBox-4.3.14.tar.bz2 http://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.3.14-patches-02.tar.xz
_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 linux-info 2b8c53f6065bdee2d757472215a3088f multilib 3bf24e6abb9b76d9f6c20600f0b716bf pax-utils 51ad5130f4a69b1a118ca5296de276ae python-single-r1 a71a169a881e0a11d04a7fe12dc39f6e python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b qmake-utils dd0375da11f79aa416ff97913c59d01c qt4-r2 b40473dafd07d7c5fe4aef1c1b902f39 toolchain-funcs 0f1760274637a138b99bb649202ea402 udev 8cd692457c1524c7be9af69831698a78 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1920df63fbc0cf5416503ae9bfa31b39
+_md5_=d1193cd5650cfe3dcb112729cb0954a8
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-4.3.10-r1 b/metadata/md5-cache/app-emulation/virtualbox-additions-4.2.26
similarity index 77%
rename from metadata/md5-cache/app-emulation/virtualbox-additions-4.3.10-r1
rename to metadata/md5-cache/app-emulation/virtualbox-additions-4.2.26
index 618dc70f446f..7093768ae169 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-4.3.10-r1
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-4.2.26
@@ -7,6 +7,6 @@ LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
RESTRICT=mirror
SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.3.10/VBoxGuestAdditions_4.3.10.iso
+SRC_URI=http://download.virtualbox.org/virtualbox/4.2.26/VBoxGuestAdditions_4.2.26.iso
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=c4437e91b91e80381c4ce1454d46af89
+_md5_=d7c3f21b35528b93571c7c86ea52e2bc
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-4.2.22 b/metadata/md5-cache/app-emulation/virtualbox-additions-4.3.14
similarity index 73%
rename from metadata/md5-cache/app-emulation/virtualbox-additions-4.2.22
rename to metadata/md5-cache/app-emulation/virtualbox-additions-4.3.14
index a2ea1f1533b7..3c2d5d79b267 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-4.2.22
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-4.3.14
@@ -2,11 +2,11 @@ DEFINED_PHASES=install unpack
DESCRIPTION=CD image containing guest additions for VirtualBox
EAPI=5
HOMEPAGE=http://www.virtualbox.org/
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
RESTRICT=mirror
SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.2.22/VBoxGuestAdditions_4.2.22.iso
+SRC_URI=http://download.virtualbox.org/virtualbox/4.3.14/VBoxGuestAdditions_4.3.14.iso
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=020ccdf65233456ab415b20012d571a5
+_md5_=bec517490bc24a162219a64b542be4d9
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-4.2.22 b/metadata/md5-cache/app-emulation/virtualbox-bin-4.2.26.95022
similarity index 70%
rename from metadata/md5-cache/app-emulation/virtualbox-bin-4.2.22
rename to metadata/md5-cache/app-emulation/virtualbox-bin-4.2.26.95022
index ddbe1b7e84eb..d9472b0ef32b 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-4.2.22
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-4.2.26.95022
@@ -3,12 +3,12 @@ DEPEND=app-arch/unzip app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig
DESCRIPTION=Family of powerful x86 virtualization products for enterprise as well as home use
EAPI=5
HOMEPAGE=http://www.virtualbox.org/
-IUSE=+additions +chm headless python sdk vboxwebsrv rdesktop-vrdp debug
-KEYWORDS=amd64 x86
+IUSE=+additions +chm headless python vboxwebsrv rdesktop-vrdp sdk debug
+KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 PUEL
-RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-4.2.22 !headless? ( x11-libs/libXcursor media-libs/libsdl[X] x11-libs/libXrender x11-libs/libXfixes media-libs/libpng x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-libs/libXft media-libs/freetype media-libs/fontconfig x11-libs/libXext dev-libs/glib chm? ( dev-libs/expat ) ) x11-libs/libXt dev-libs/libxml2 x11-libs/libXau x11-libs/libX11 x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) )
+RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-4.2.26 !headless? ( x11-libs/libXcursor media-libs/libsdl[X] x11-libs/libXrender x11-libs/libXfixes media-libs/libpng x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-libs/libXft media-libs/freetype media-libs/fontconfig x11-libs/libXext dev-libs/glib chm? ( dev-libs/expat ) ) x11-libs/libXt dev-libs/libxml2 x11-libs/libXau x11-libs/libX11 x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) )
RESTRICT=mirror
SLOT=0
-SRC_URI=amd64? ( http://download.virtualbox.org/virtualbox/4.2.22/VirtualBox-4.2.22-91556-Linux_amd64.run ) x86? ( http://download.virtualbox.org/virtualbox/4.2.22/VirtualBox-4.2.22-91556-Linux_x86.run ) sdk? ( http://download.virtualbox.org/virtualbox/4.2.22/VirtualBoxSDK-4.2.22-91556.zip ) http://download.virtualbox.org/virtualbox/4.2.22/Oracle_VM_VirtualBox_Extension_Pack-4.2.22-91556.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.2.22-91556.tar.gz
+SRC_URI=amd64? ( http://download.virtualbox.org/virtualbox/4.2.26/VirtualBox-4.2.26-95022-Linux_amd64.run ) x86? ( http://download.virtualbox.org/virtualbox/4.2.26/VirtualBox-4.2.26-95022-Linux_x86.run ) http://download.virtualbox.org/virtualbox/4.2.26/Oracle_VM_VirtualBox_Extension_Pack-4.2.26-95022.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.2.26-95022.tar.gz sdk? ( http://download.virtualbox.org/virtualbox/4.2.26/VirtualBoxSDK-4.2.26-95022.zip )
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 9637c29fc715b17a6328f24251129557 gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf pax-utils 51ad5130f4a69b1a118ca5296de276ae toolchain-funcs 0f1760274637a138b99bb649202ea402 udev 8cd692457c1524c7be9af69831698a78 unpacker f300a7ca9131b1024a79762e8edd3c52 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=80a02dbc50458f7227874ce2c6b06662
+_md5_=b0d46aecba8de4198d56245d59d1d2f9
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-4.3.10.93012 b/metadata/md5-cache/app-emulation/virtualbox-bin-4.3.14.95030
similarity index 75%
rename from metadata/md5-cache/app-emulation/virtualbox-bin-4.3.10.93012
rename to metadata/md5-cache/app-emulation/virtualbox-bin-4.3.14.95030
index 7a3861c3b5a2..85fa47f6d9d9 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-4.3.10.93012
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-4.3.14.95030
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.virtualbox.org/
IUSE=+additions +chm headless python vboxwebsrv rdesktop-vrdp sdk debug
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 PUEL
-RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-4.3.10 !headless? ( x11-libs/libXcursor media-libs/libsdl[X] x11-libs/libXrender x11-libs/libXfixes media-libs/libpng x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-libs/libXft media-libs/freetype media-libs/fontconfig x11-libs/libXext dev-libs/glib chm? ( dev-libs/expat ) ) x11-libs/libXt dev-libs/libxml2 x11-libs/libXau x11-libs/libX11 x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) )
+RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-4.3.14 !headless? ( x11-libs/libXcursor media-libs/libsdl[X] x11-libs/libXrender x11-libs/libXfixes media-libs/libpng x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-libs/libXft media-libs/freetype media-libs/fontconfig x11-libs/libXext dev-libs/glib chm? ( dev-libs/expat ) ) x11-libs/libXt dev-libs/libxml2 x11-libs/libXau x11-libs/libX11 x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) )
RESTRICT=mirror
SLOT=0
-SRC_URI=amd64? ( http://download.virtualbox.org/virtualbox/4.3.10/VirtualBox-4.3.10-93012-Linux_amd64.run ) x86? ( http://download.virtualbox.org/virtualbox/4.3.10/VirtualBox-4.3.10-93012-Linux_x86.run ) http://download.virtualbox.org/virtualbox/4.3.10/Oracle_VM_VirtualBox_Extension_Pack-4.3.10-93012.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.3.10-93012.tar.gz sdk? ( http://download.virtualbox.org/virtualbox/4.3.10/VirtualBoxSDK-4.3.10-93012.zip )
+SRC_URI=amd64? ( http://download.virtualbox.org/virtualbox/4.3.14/VirtualBox-4.3.14-95030-Linux_amd64.run ) x86? ( http://download.virtualbox.org/virtualbox/4.3.14/VirtualBox-4.3.14-95030-Linux_x86.run ) http://download.virtualbox.org/virtualbox/4.3.14/Oracle_VM_VirtualBox_Extension_Pack-4.3.14-95030.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.3.14-95030.tar.gz sdk? ( http://download.virtualbox.org/virtualbox/4.3.14/VirtualBoxSDK-4.3.14-95030.zip )
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 9637c29fc715b17a6328f24251129557 gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf pax-utils 51ad5130f4a69b1a118ca5296de276ae toolchain-funcs 0f1760274637a138b99bb649202ea402 udev 8cd692457c1524c7be9af69831698a78 unpacker f300a7ca9131b1024a79762e8edd3c52 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f72a22a928a2864d68c833f5e0432324
+_md5_=0b2f70221ee3c43ed6fc1918bf59560e
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.2.22 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.2.22
deleted file mode 100644
index cd0f74c33c46..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.2.22
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PUEL extensions for VirtualBox
-EAPI=5
-HOMEPAGE=http://www.virtualbox.org/
-KEYWORDS=amd64 x86
-LICENSE=PUEL
-RDEPEND=~app-emulation/virtualbox-4.2.22
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.2.22/Oracle_VM_VirtualBox_Extension_Pack-4.2.22-91556.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.2.22-91556.tar.gz
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=852deb466e91660ce3786ab11c6fe03f
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.3.10.93012 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.2.26.95022
similarity index 58%
rename from metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.3.10.93012
rename to metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.2.26.95022
index 3637b9b09fa4..fb9002651bb6 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.3.10.93012
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.2.26.95022
@@ -4,9 +4,9 @@ EAPI=5
HOMEPAGE=http://www.virtualbox.org/
KEYWORDS=~amd64 ~x86
LICENSE=PUEL
-RDEPEND=~app-emulation/virtualbox-4.3.10
+RDEPEND=~app-emulation/virtualbox-4.2.26
RESTRICT=mirror strip
SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.3.10/Oracle_VM_VirtualBox_Extension_Pack-4.3.10-93012.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.3.10-93012.tar.gz
+SRC_URI=http://download.virtualbox.org/virtualbox/4.2.26/Oracle_VM_VirtualBox_Extension_Pack-4.2.26-95022.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.2.26-95022.tar.gz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=edd1a49d9f5752296e7fd01f0dd51ce3
+_md5_=792d6d0615706f83ee8111ac3ae70aaf
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.3.14.95030 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.3.14.95030
new file mode 100644
index 000000000000..c0f6fcb09a3d
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.3.14.95030
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=PUEL extensions for VirtualBox
+EAPI=5
+HOMEPAGE=http://www.virtualbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=PUEL
+RDEPEND=~app-emulation/virtualbox-4.3.14
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://download.virtualbox.org/virtualbox/4.3.14/Oracle_VM_VirtualBox_Extension_Pack-4.3.14-95030.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.3.14-95030.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=864a6fd87cb24cc4e17b63f47eee829a
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.2.22 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.2.26
similarity index 83%
rename from metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.2.22
rename to metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.2.26
index ebd850018d44..b010f6749afb 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.2.22
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.2.26
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.2.22 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE x11-proto/glproto ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.9998_pre20120806 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
+DEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.2.26 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE x11-proto/glproto ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.9998_pre20120806 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
EAPI=5
HOMEPAGE=http://www.virtualbox.org/
IUSE=X kernel_linux
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
-RDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.2.22 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE x11-proto/glproto ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
+RDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.2.26 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE x11-proto/glproto ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.2.22/VirtualBox-4.2.22.tar.bz2
+SRC_URI=http://download.virtualbox.org/virtualbox/4.2.26/VirtualBox-4.2.26.tar.bz2
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 linux-info 2b8c53f6065bdee2d757472215a3088f linux-mod 101302d4b7b694ea9622bbffb187d0de multilib 3bf24e6abb9b76d9f6c20600f0b716bf systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=763687e7cdc8f8d0cef0847ef9335d30
+_md5_=53b20ba3a9208911a89f8eaf01bf80fc
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.3.10 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.3.14
similarity index 84%
rename from metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.3.10
rename to metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.3.14
index 5bc460514999..6d7a288428e8 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.3.10
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.3.14
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.3.10 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE x11-proto/glproto ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.9998_pre20131130 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
+DEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.3.14 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE x11-proto/glproto ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.9998_pre20131130 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
EAPI=5
HOMEPAGE=http://www.virtualbox.org/
IUSE=X kernel_linux
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
-RDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.3.10 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE x11-proto/glproto ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
+RDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.3.14 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE x11-proto/glproto ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.3.10/VirtualBox-4.3.10.tar.bz2
+SRC_URI=http://download.virtualbox.org/virtualbox/4.3.14/VirtualBox-4.3.14.tar.bz2
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 linux-info 2b8c53f6065bdee2d757472215a3088f linux-mod 101302d4b7b694ea9622bbffb187d0de multilib 3bf24e6abb9b76d9f6c20600f0b716bf systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ef249909b78722f69b1cef715772e402
+_md5_=55afbf002a41354541ebaae583ee919f
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-4.3.10 b/metadata/md5-cache/app-emulation/virtualbox-modules-4.2.26
similarity index 92%
rename from metadata/md5-cache/app-emulation/virtualbox-modules-4.3.10
rename to metadata/md5-cache/app-emulation/virtualbox-modules-4.2.26
index c33108b8d3eb..00071b0d81fb 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-4.3.10
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-4.2.26
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
SLOT=0
-SRC_URI=http://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-4.3.10.tar.xz
+SRC_URI=http://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-4.2.26.tar.xz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 linux-info 2b8c53f6065bdee2d757472215a3088f linux-mod 101302d4b7b694ea9622bbffb187d0de multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=04f1eb7f0f62d813180e2c63354fb475
+_md5_=e64480a397098296afb5c5eca706b52c
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-4.2.22 b/metadata/md5-cache/app-emulation/virtualbox-modules-4.3.14
similarity index 89%
rename from metadata/md5-cache/app-emulation/virtualbox-modules-4.2.22
rename to metadata/md5-cache/app-emulation/virtualbox-modules-4.3.14
index bfc48071fcc7..f796c2a87f8e 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-4.2.22
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-4.3.14
@@ -4,10 +4,10 @@ DESCRIPTION=Kernel Modules for Virtualbox
EAPI=5
HOMEPAGE=http://www.virtualbox.org/
IUSE=pax_kernel kernel_linux
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
SLOT=0
-SRC_URI=http://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-4.2.22.tar.xz
+SRC_URI=http://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-4.3.14.tar.xz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 linux-info 2b8c53f6065bdee2d757472215a3088f linux-mod 101302d4b7b694ea9622bbffb187d0de multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9876274825124d1e2140da81664b8e26
+_md5_=050c23b04c2038cc650a1051fddeada0
diff --git a/metadata/md5-cache/app-misc/banner-1.3.3 b/metadata/md5-cache/app-misc/banner-1.3.3
index 84eae2961087..6f183bdd3ede 100644
--- a/metadata/md5-cache/app-misc/banner-1.3.3
+++ b/metadata/md5-cache/app-misc/banner-1.3.3
@@ -1,4 +1,4 @@
-DEFINED_PHASES=-
+DEFINED_PHASES=prepare
DEPEND=!games-misc/bsd-games
DESCRIPTION=The well known banner program for Linux
EAPI=5
@@ -7,4 +7,5 @@ KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebs
LICENSE=GPL-2
SLOT=0
SRC_URI=http://cedar-solutions.com/ftp/software/banner-1.3.3.tar.gz
-_md5_=1ccee9c23452396a4dac0d5bde2decd3
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=21f781d8b7d165c9183f45d62db95939
diff --git a/metadata/md5-cache/app-misc/logitech-applet-0.4_pre1-r2 b/metadata/md5-cache/app-misc/logitech-applet-0.4_pre1-r2
deleted file mode 100644
index a778018973d4..000000000000
--- a/metadata/md5-cache/app-misc/logitech-applet-0.4_pre1-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND==virtual/libusb-0*
-DESCRIPTION=Control utility for some special features of some special Logitech USB mice!
-HOMEPAGE=http://www.gentoo.org/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND==virtual/libusb-0*
-SLOT=0
-SRC_URI=mirror://gentoo/logitech_applet-0.4test1.tar.gz
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=457c1c751c39cef14165b67d9268eb84
diff --git a/metadata/md5-cache/app-misc/logitech-applet-0.4_pre1-r3 b/metadata/md5-cache/app-misc/logitech-applet-0.4_pre1-r3
index adbdd5d6c94c..19066ce2d119 100644
--- a/metadata/md5-cache/app-misc/logitech-applet-0.4_pre1-r3
+++ b/metadata/md5-cache/app-misc/logitech-applet-0.4_pre1-r3
@@ -1,12 +1,12 @@
DEFINED_PHASES=install prepare
DEPEND=virtual/libusb:0
DESCRIPTION=Control utility for some special features of some special Logitech USB mice!
-EAPI=2
+EAPI=5
HOMEPAGE=http://www.gentoo.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=virtual/libusb:0
SLOT=0
SRC_URI=mirror://gentoo/logitech_applet-0.4test1.tar.gz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=801e0e2f056df11a2473cb7b84cb1867
+_md5_=0d428fe8e8ede5d24f5dfa37c57d2940
diff --git a/metadata/md5-cache/app-misc/oneko-1.2-r2 b/metadata/md5-cache/app-misc/oneko-1.2-r2
index 687d7aeb07d2..ad9d5175c745 100644
--- a/metadata/md5-cache/app-misc/oneko-1.2-r2
+++ b/metadata/md5-cache/app-misc/oneko-1.2-r2
@@ -1,7 +1,7 @@
DEFINED_PHASES=compile configure install postinst prepare
DEPEND=x11-libs/libX11 x11-libs/libXext x11-misc/gccmakedep x11-misc/imake app-text/rman x11-proto/xextproto
DESCRIPTION=A cat, dog and others which chase the mouse or windows around the screen
-EAPI=2
+EAPI=5
HOMEPAGE=http://www.daidouji.com/oneko/
KEYWORDS=amd64 ~ppc ~ppc64 x86
LICENSE=public-domain
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext
SLOT=0
SRC_URI=http://www.daidouji.com/oneko/distfiles/oneko-1.2.sakura.5.tar.gz mirror://gentoo/oneko-1.2-cat.png mirror://gentoo/oneko-1.2-dog.png mirror://gentoo/oneko-1.2-sakura-nobsd.patch.bz2
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=9b766afb870a9975ca4cce7bbd463d9e
+_md5_=80e55a36627ec1f35eefe2baa91f9d6c
diff --git a/metadata/md5-cache/app-misc/remind-03.01.12 b/metadata/md5-cache/app-misc/remind-03.01.12
deleted file mode 100644
index 62766cd6e785..000000000000
--- a/metadata/md5-cache/app-misc/remind-03.01.12
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install test unpack
-DESCRIPTION=Ridiculously functional reminder program
-HOMEPAGE=http://www.roaringpenguin.com/products/remind
-IUSE=tk
-KEYWORDS=amd64 ppc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=tk? ( dev-lang/tk dev-tcltk/tcllib )
-SLOT=0
-SRC_URI=http://www.roaringpenguin.com/files/download/remind-03.01.12.tar.gz
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=296aedad4360a3fe959716a4637c6edd
diff --git a/metadata/md5-cache/app-office/rubrica-2.1.6-r1 b/metadata/md5-cache/app-office/rubrica-2.1.6-r1
index 1dce2824fef0..78ddee334db0 100644
--- a/metadata/md5-cache/app-office/rubrica-2.1.6-r1
+++ b/metadata/md5-cache/app-office/rubrica-2.1.6-r1
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 dev-libs/libxml2 >=gnome-base/libglade-2 gnome-base/gconf:2 x11-libs/gtk+:2 x11-libs/libnotify dev-util/intltool virtual/pkgconfig linguas_hu? ( >=sys-devel/gettext-0.16.1 ) >=sys-apps/sed-4
+DEPEND=dev-libs/glib:2 dev-libs/libxml2 >=gnome-base/libglade-2 gnome-base/gconf:2 x11-libs/gtk+:2 x11-libs/libnotify >=sys-devel/gettext-0.16.1 dev-util/intltool virtual/pkgconfig !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
DESCRIPTION=A contact database for Gnome
-EAPI=2
+EAPI=5
HOMEPAGE=http://rubrica.berlios.de/
-IUSE=linguas_hu debug
-KEYWORDS=x86
+IUSE=debug
+KEYWORDS=~amd64 x86
LICENSE=GPL-3
RDEPEND=dev-libs/glib:2 dev-libs/libxml2 >=gnome-base/libglade-2 gnome-base/gconf:2 x11-libs/gtk+:2 x11-libs/libnotify
SLOT=0
-SRC_URI=mirror://berlios/rubrica/rubrica2-2.1.6.tar.bz2 linguas_hu? ( mirror://gentoo/rubrica-2.1.6-hu.po.bz2 )
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 9637c29fc715b17a6328f24251129557 gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=14bc283d360286c54a03ac7d4258df26
+SRC_URI=mirror://berlios/rubrica/rubrica2-2.1.6.tar.bz2 mirror://gentoo/rubrica-2.1.6-hu.po.bz2
+_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 9637c29fc715b17a6328f24251129557 gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=d05ad402ee177f57bd5892880fcdf07e
diff --git a/metadata/md5-cache/dev-cpp/gmock-1.7.0 b/metadata/md5-cache/dev-cpp/gmock-1.7.0
index de52da97866f..0efe5d1b0bf5 100644
--- a/metadata/md5-cache/dev-cpp/gmock-1.7.0
+++ b/metadata/md5-cache/dev-cpp/gmock-1.7.0
@@ -4,10 +4,10 @@ DESCRIPTION=Google's C++ mocking framework
EAPI=4
HOMEPAGE=http://code.google.com/p/googlemock/
IUSE=static-libs
-KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
LICENSE=BSD
RDEPEND==dev-cpp/gtest-1.7.0*
SLOT=0
SRC_URI=http://googlemock.googlecode.com/files/gmock-1.7.0.zip
_eclasses_=libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=d1aba3b99fe943794dd46e8ef5d8b926
+_md5_=402311a650e965a9f2ea2bbe531f5d9b
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.7.0 b/metadata/md5-cache/dev-cpp/gtest-1.7.0
index a93afc3d7a33..a688d29f6d88 100644
--- a/metadata/md5-cache/dev-cpp/gtest-1.7.0
+++ b/metadata/md5-cache/dev-cpp/gtest-1.7.0
@@ -4,9 +4,9 @@ DESCRIPTION=Google C++ Testing Framework
EAPI=5
HOMEPAGE=http://code.google.com/p/googletest/
IUSE=examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=BSD
SLOT=0
SRC_URI=http://googletest.googlecode.com/files/gtest-1.7.0.zip
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 autotools-multilib 037c4046d25f29e78dd44dccabd5d66b autotools-utils fb74970befc9b65ceec689d2ccff3022 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build fbb9baa0b4039304643e36e9820fdecf multilib-minimal 5bbdc77877c1aa3c6bd89ca3f9196d11 multiprocessing d7f2985a2c76c365ee20269db5261414 python-any-r1 4560effd96d3d2a82e50af7cf87166da python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=2c33ad92fe26ac5e590ac4701735cd80
+_md5_=c96c57b9c78613274ea10b0ab5027bc6
diff --git a/metadata/md5-cache/dev-db/lmdb-0.9.13 b/metadata/md5-cache/dev-db/lmdb-0.9.13
new file mode 100644
index 000000000000..5bf06d9b47f3
--- /dev/null
+++ b/metadata/md5-cache/dev-db/lmdb-0.9.13
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=An ultra-fast, ultra-compact key-value embedded data store
+EAPI=5
+HOMEPAGE=http://symas.com/mdb/
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~x86
+LICENSE=OPENLDAP
+SLOT=0
+SRC_URI=https://gitorious.org/mdb/mdb/archive/59d30a49c3ad403235ba30f65e074eddf1c125f0.tar.gz -> lmdb-0.9.13.tar.gz
+_eclasses_=multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=1b279b0eb5e7f28dad5cf08753dd02e6
diff --git a/metadata/md5-cache/dev-db/mariadb-5.1.67 b/metadata/md5-cache/dev-db/mariadb-5.1.67
index 7a808a1ee22b..aff6475373ae 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.1.67
+++ b/metadata/md5-cache/dev-db/mariadb-5.1.67
@@ -11,5 +11,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps )
REQUIRED_USE=minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded )
SLOT=0
SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.1.67/kvm-tarbake-jaunty-x86/mariadb-5.1.67.tar.gz http://ftp.osuosl.org/pub/mariadb/mariadb-5.1.67/source/mariadb-5.1.67.tar.gz http://mirror.jmu.edu/pub/mariadb/mariadb-5.1.67/kvm-tarbake-jaunty-x86/mariadb-5.1.67.tar.gz http://mirrors.coreix.net/mariadb/mariadb-5.1.67/kvm-tarbake-jaunty-x86/mariadb-5.1.67.tar.gz http://mirrors.syringanetworks.net/mariadb/mariadb-5.1.67/kvm-tarbake-jaunty-x86/mariadb-5.1.67.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.1.67/kvm-tarbake-jaunty-x86/mariadb-5.1.67.tar.gz http://mirror2.hs-esslingen.de/mariadb/mariadb-5.1.67/kvm-tarbake-jaunty-x86/mariadb-5.1.67.tar.gz mirror://gentoo/mysql-extras-20121101-2319Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20121101-2319Z.tar.bz2
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 mysql-autotools a8fb1b6cc04b4818cad19ef1777e7c5a mysql-v2 389a05c7213fcf9cba192a368b941786 mysql_fx 7ca18294fb424cbf90e647a46b7eebdd prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 mysql-autotools ac01f374ec26dd66e9a4142f1dce36d6 mysql-v2 11446b42522a9a302ac1ea47e6d870b1 mysql_fx 7ca18294fb424cbf90e647a46b7eebdd prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
_md5_=81dbbd2b8294ed732092d6a69c52ecfb
diff --git a/metadata/md5-cache/dev-db/mariadb-5.2.14 b/metadata/md5-cache/dev-db/mariadb-5.2.14
index cfebf92ccc9d..8419cfbfb32f 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.2.14
+++ b/metadata/md5-cache/dev-db/mariadb-5.2.14
@@ -11,5 +11,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps )
REQUIRED_USE=minimal? ( !oqgraph ) minimal? ( !sphinx ) minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded )
SLOT=0
SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.2.14/kvm-tarbake-jaunty-x86/mariadb-5.2.14.tar.gz http://ftp.osuosl.org/pub/mariadb/mariadb-5.2.14/source/mariadb-5.2.14.tar.gz http://mirror.jmu.edu/pub/mariadb/mariadb-5.2.14/kvm-tarbake-jaunty-x86/mariadb-5.2.14.tar.gz http://mirrors.coreix.net/mariadb/mariadb-5.2.14/kvm-tarbake-jaunty-x86/mariadb-5.2.14.tar.gz http://mirrors.syringanetworks.net/mariadb/mariadb-5.2.14/kvm-tarbake-jaunty-x86/mariadb-5.2.14.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.2.14/kvm-tarbake-jaunty-x86/mariadb-5.2.14.tar.gz http://mirror2.hs-esslingen.de/mariadb/mariadb-5.2.14/kvm-tarbake-jaunty-x86/mariadb-5.2.14.tar.gz mirror://gentoo/mysql-extras-20121101-2319Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20121101-2319Z.tar.bz2
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 mysql-autotools a8fb1b6cc04b4818cad19ef1777e7c5a mysql-v2 389a05c7213fcf9cba192a368b941786 mysql_fx 7ca18294fb424cbf90e647a46b7eebdd prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 mysql-autotools ac01f374ec26dd66e9a4142f1dce36d6 mysql-v2 11446b42522a9a302ac1ea47e6d870b1 mysql_fx 7ca18294fb424cbf90e647a46b7eebdd prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
_md5_=eb3a149860c2363cc9e1fa3856a365a0
diff --git a/metadata/md5-cache/dev-db/mariadb-5.3.12 b/metadata/md5-cache/dev-db/mariadb-5.3.12
index 24b4c1613f88..edaa38d04933 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.3.12
+++ b/metadata/md5-cache/dev-db/mariadb-5.3.12
@@ -11,5 +11,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps )
REQUIRED_USE=minimal? ( !oqgraph ) minimal? ( !sphinx ) minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded )
SLOT=0
SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.3.12/kvm-tarbake-jaunty-x86/mariadb-5.3.12.tar.gz http://ftp.osuosl.org/pub/mariadb/mariadb-5.3.12/source/mariadb-5.3.12.tar.gz http://mirror.jmu.edu/pub/mariadb/mariadb-5.3.12/kvm-tarbake-jaunty-x86/mariadb-5.3.12.tar.gz http://mirrors.coreix.net/mariadb/mariadb-5.3.12/kvm-tarbake-jaunty-x86/mariadb-5.3.12.tar.gz http://mirrors.syringanetworks.net/mariadb/mariadb-5.3.12/kvm-tarbake-jaunty-x86/mariadb-5.3.12.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.3.12/kvm-tarbake-jaunty-x86/mariadb-5.3.12.tar.gz http://mirror2.hs-esslingen.de/mariadb/mariadb-5.3.12/kvm-tarbake-jaunty-x86/mariadb-5.3.12.tar.gz mirror://gentoo/mysql-extras-20121101-2319Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20121101-2319Z.tar.bz2
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 mysql-autotools a8fb1b6cc04b4818cad19ef1777e7c5a mysql-v2 389a05c7213fcf9cba192a368b941786 mysql_fx 7ca18294fb424cbf90e647a46b7eebdd prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 mysql-autotools ac01f374ec26dd66e9a4142f1dce36d6 mysql-v2 11446b42522a9a302ac1ea47e6d870b1 mysql_fx 7ca18294fb424cbf90e647a46b7eebdd prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
_md5_=83d6d6b3ea04c29e09796b88b50541d0
diff --git a/metadata/md5-cache/dev-db/mariadb-5.5.37-r1 b/metadata/md5-cache/dev-db/mariadb-5.5.37-r1
index 896d2d15b967..2ee9cbcf532f 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.5.37-r1
+++ b/metadata/md5-cache/dev-db/mariadb-5.5.37-r1
@@ -11,5 +11,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps )
REQUIRED_USE=minimal? ( !oqgraph ) minimal? ( !sphinx ) tokudb? ( jemalloc ) tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )
SLOT=0
SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.5.37/kvm-tarbake-jaunty-x86/mariadb-5.5.37.tar.gz http://ftp.osuosl.org/pub/mariadb/mariadb-5.5.37/source/mariadb-5.5.37.tar.gz http://mirror.jmu.edu/pub/mariadb/mariadb-5.5.37/kvm-tarbake-jaunty-x86/mariadb-5.5.37.tar.gz http://mirrors.coreix.net/mariadb/mariadb-5.5.37/kvm-tarbake-jaunty-x86/mariadb-5.5.37.tar.gz http://mirrors.syringanetworks.net/mariadb/mariadb-5.5.37/kvm-tarbake-jaunty-x86/mariadb-5.5.37.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.5.37/kvm-tarbake-jaunty-x86/mariadb-5.5.37.tar.gz http://mirror2.hs-esslingen.de/mariadb/mariadb-5.5.37/kvm-tarbake-jaunty-x86/mariadb-5.5.37.tar.gz mirror://gentoo/mysql-extras-20140426-0232Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20140426-0232Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20140426-0232Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20140426-0232Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20140426-0232Z.tar.bz2
-_eclasses_=cmake-utils 10b6a99f9058ac1b830d00b3421f04e4 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnuconfig ee02e61d6c68cee478e2e69214b7caef multilib 3bf24e6abb9b76d9f6c20600f0b716bf mysql-cmake bb5c9161c64fce1cdc29711898594d7f mysql-v2 389a05c7213fcf9cba192a368b941786 mysql_fx 7ca18294fb424cbf90e647a46b7eebdd prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils 10b6a99f9058ac1b830d00b3421f04e4 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnuconfig ee02e61d6c68cee478e2e69214b7caef multilib 3bf24e6abb9b76d9f6c20600f0b716bf mysql-cmake f148d5a528d98cb01460017e906b5f0b mysql-v2 11446b42522a9a302ac1ea47e6d870b1 mysql_fx 7ca18294fb424cbf90e647a46b7eebdd prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
_md5_=02e0a9921236dd83a64349226f360d54
diff --git a/metadata/md5-cache/dev-db/mariadb-5.5.38 b/metadata/md5-cache/dev-db/mariadb-5.5.38
index 6ccf1e637328..26719918fab5 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.5.38
+++ b/metadata/md5-cache/dev-db/mariadb-5.5.38
@@ -11,5 +11,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps )
REQUIRED_USE=minimal? ( !oqgraph ) minimal? ( !sphinx ) tokudb? ( jemalloc ) tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )
SLOT=0
SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.5.38/kvm-tarbake-jaunty-x86/mariadb-5.5.38.tar.gz http://ftp.osuosl.org/pub/mariadb/mariadb-5.5.38/source/mariadb-5.5.38.tar.gz http://mirror.jmu.edu/pub/mariadb/mariadb-5.5.38/kvm-tarbake-jaunty-x86/mariadb-5.5.38.tar.gz http://mirrors.coreix.net/mariadb/mariadb-5.5.38/kvm-tarbake-jaunty-x86/mariadb-5.5.38.tar.gz http://mirrors.syringanetworks.net/mariadb/mariadb-5.5.38/kvm-tarbake-jaunty-x86/mariadb-5.5.38.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.5.38/kvm-tarbake-jaunty-x86/mariadb-5.5.38.tar.gz http://mirror2.hs-esslingen.de/mariadb/mariadb-5.5.38/kvm-tarbake-jaunty-x86/mariadb-5.5.38.tar.gz mirror://gentoo/mysql-extras-20140426-0232Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20140426-0232Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20140426-0232Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20140426-0232Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20140426-0232Z.tar.bz2
-_eclasses_=cmake-utils 10b6a99f9058ac1b830d00b3421f04e4 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnuconfig ee02e61d6c68cee478e2e69214b7caef multilib 3bf24e6abb9b76d9f6c20600f0b716bf mysql-cmake bb5c9161c64fce1cdc29711898594d7f mysql-v2 389a05c7213fcf9cba192a368b941786 mysql_fx 7ca18294fb424cbf90e647a46b7eebdd prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils 10b6a99f9058ac1b830d00b3421f04e4 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnuconfig ee02e61d6c68cee478e2e69214b7caef multilib 3bf24e6abb9b76d9f6c20600f0b716bf mysql-cmake f148d5a528d98cb01460017e906b5f0b mysql-v2 11446b42522a9a302ac1ea47e6d870b1 mysql_fx 7ca18294fb424cbf90e647a46b7eebdd prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
_md5_=3c6271aa2410f91a5e1c3725ac335f9f
diff --git a/metadata/md5-cache/dev-db/mysql++-2.3.2 b/metadata/md5-cache/dev-db/mysql++-2.3.2
index 4857cd80bc89..d39c06a8abf4 100644
--- a/metadata/md5-cache/dev-db/mysql++-2.3.2
+++ b/metadata/md5-cache/dev-db/mysql++-2.3.2
@@ -1,6 +1,7 @@
-DEFINED_PHASES=compile install unpack
+DEFINED_PHASES=configure install prepare
DEPEND=>=virtual/mysql-4.0 >=sys-devel/gcc-3
DESCRIPTION=C++ API interface to the MySQL database
+EAPI=5
HOMEPAGE=http://tangentsoft.net/mysql++/
KEYWORDS=alpha amd64 hppa ~mips ppc sparc x86
LICENSE=LGPL-2
@@ -8,4 +9,4 @@ RDEPEND=>=virtual/mysql-4.0
SLOT=0
SRC_URI=http://www.tangentsoft.net/mysql++/releases/mysql++-2.3.2.tar.gz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=e073fc69f510b28e72ac8da3cc344cbe
+_md5_=139b76c8cff4ac872a59960c457b374e
diff --git a/metadata/md5-cache/dev-db/mysql-4.0.27-r1 b/metadata/md5-cache/dev-db/mysql-4.0.27-r1
index 7deb6ab5b85c..61e30eba9616 100644
--- a/metadata/md5-cache/dev-db/mysql-4.0.27-r1
+++ b/metadata/md5-cache/dev-db/mysql-4.0.27-r1
@@ -9,5 +9,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-4.0
RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
SLOT=0
SRC_URI=mirror://mysql/Downloads/MySQL-4.0/mysql-4.0.27.tar.gz mirror://gentoo/mysql-extras-20070105.tar.bz2 http://g3nt8.org/patches/mysql-extras-20070105.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20070105.tar.bz2
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 mysql ffde551c5b8f1b539a1e23a827e636ad mysql_fx 7ca18294fb424cbf90e647a46b7eebdd toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 mysql 0ae359b3e8afe008f743f6b506d5d5ca mysql_fx 7ca18294fb424cbf90e647a46b7eebdd toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
_md5_=33d4ff394bcdd03f4f5f14a46173a4fa
diff --git a/metadata/md5-cache/dev-db/mysql-4.1.22-r1 b/metadata/md5-cache/dev-db/mysql-4.1.22-r1
index 9f6fdd45ad93..11ff32fd1955 100644
--- a/metadata/md5-cache/dev-db/mysql-4.1.22-r1
+++ b/metadata/md5-cache/dev-db/mysql-4.1.22-r1
@@ -9,5 +9,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-4.1
RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
SLOT=0
SRC_URI=mirror://mysql/Downloads/MySQL-4.1/mysql-4.1.22.tar.gz mirror://gentoo/mysql-extras-20090228-2228Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20090228-2228Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20090228-2228Z.tar.bz2
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 mysql ffde551c5b8f1b539a1e23a827e636ad mysql_fx 7ca18294fb424cbf90e647a46b7eebdd toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 mysql 0ae359b3e8afe008f743f6b506d5d5ca mysql_fx 7ca18294fb424cbf90e647a46b7eebdd toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
_md5_=62889e866961d648ba9a08e270ef13f5
diff --git a/metadata/md5-cache/dev-db/mysql-5.0.96 b/metadata/md5-cache/dev-db/mysql-5.0.96
index b69fe58ae895..6ddf6f0f319c 100644
--- a/metadata/md5-cache/dev-db/mysql-5.0.96
+++ b/metadata/md5-cache/dev-db/mysql-5.0.96
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.0
RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
SLOT=0
SRC_URI=http://downloads.mysql.com/archives/mysql-5.0/mysql-5.0.96.tar.gz mirror://mysql/Downloads/MySQL-5.0/mysql-5.0.96.tar.gz mirror://gentoo/mysql-extras-20120401-2131Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20120401-2131Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20120401-2131Z.tar.bz2
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 mysql ffde551c5b8f1b539a1e23a827e636ad mysql_fx 7ca18294fb424cbf90e647a46b7eebdd toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 mysql 0ae359b3e8afe008f743f6b506d5d5ca mysql_fx 7ca18294fb424cbf90e647a46b7eebdd toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
_md5_=6ded32b90ac13c5ff676c484cc7a2778
diff --git a/metadata/md5-cache/dev-db/mysql-5.1.70 b/metadata/md5-cache/dev-db/mysql-5.1.70
index f1f26ff917e3..67781fc869df 100644
--- a/metadata/md5-cache/dev-db/mysql-5.1.70
+++ b/metadata/md5-cache/dev-db/mysql-5.1.70
@@ -11,5 +11,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps )
REQUIRED_USE=minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded ) xtradb? ( !embedded )
SLOT=0
SRC_URI=http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.70.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.70.tar.gz mirror://gentoo/mysql-extras-20130626-0127Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20130626-0127Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20130626-0127Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20130626-0127Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20130626-0127Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz )
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 mysql-autotools a8fb1b6cc04b4818cad19ef1777e7c5a mysql-v2 389a05c7213fcf9cba192a368b941786 mysql_fx 7ca18294fb424cbf90e647a46b7eebdd prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 mysql-autotools ac01f374ec26dd66e9a4142f1dce36d6 mysql-v2 11446b42522a9a302ac1ea47e6d870b1 mysql_fx 7ca18294fb424cbf90e647a46b7eebdd prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
_md5_=91d4acfe5af1fc18ffcbebcda091c02d
diff --git a/metadata/md5-cache/dev-db/mysql-5.1.73-r1 b/metadata/md5-cache/dev-db/mysql-5.1.73-r1
index c823199b8e7d..d7f001508bbf 100644
--- a/metadata/md5-cache/dev-db/mysql-5.1.73-r1
+++ b/metadata/md5-cache/dev-db/mysql-5.1.73-r1
@@ -11,5 +11,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps )
REQUIRED_USE=minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded ) xtradb? ( !embedded )
SLOT=0
SRC_URI=http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.73.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.73.tar.gz mirror://gentoo/mysql-extras-20140514-0124Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20140514-0124Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20140514-0124Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20140514-0124Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20140514-0124Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz )
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 mysql-autotools a8fb1b6cc04b4818cad19ef1777e7c5a mysql-v2 389a05c7213fcf9cba192a368b941786 mysql_fx 7ca18294fb424cbf90e647a46b7eebdd prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 mysql-autotools ac01f374ec26dd66e9a4142f1dce36d6 mysql-v2 11446b42522a9a302ac1ea47e6d870b1 mysql_fx 7ca18294fb424cbf90e647a46b7eebdd prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
_md5_=884be531d673b3220fa559409a965d38
diff --git a/metadata/md5-cache/dev-db/mysql-5.5.37-r1 b/metadata/md5-cache/dev-db/mysql-5.5.37-r1
index ff58a5260b0b..f498c1cf2440 100644
--- a/metadata/md5-cache/dev-db/mysql-5.5.37-r1
+++ b/metadata/md5-cache/dev-db/mysql-5.5.37-r1
@@ -11,5 +11,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps )
REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )
SLOT=0
SRC_URI=http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.37.tar.gz mirror://mysql/Downloads/MySQL-5.5/mysql-5.5.37.tar.gz mirror://gentoo/mysql-extras-20140426-0232Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20140426-0232Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20140426-0232Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20140426-0232Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20140426-0232Z.tar.bz2
-_eclasses_=cmake-utils 10b6a99f9058ac1b830d00b3421f04e4 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnuconfig ee02e61d6c68cee478e2e69214b7caef multilib 3bf24e6abb9b76d9f6c20600f0b716bf mysql-cmake bb5c9161c64fce1cdc29711898594d7f mysql-v2 389a05c7213fcf9cba192a368b941786 mysql_fx 7ca18294fb424cbf90e647a46b7eebdd prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils 10b6a99f9058ac1b830d00b3421f04e4 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnuconfig ee02e61d6c68cee478e2e69214b7caef multilib 3bf24e6abb9b76d9f6c20600f0b716bf mysql-cmake f148d5a528d98cb01460017e906b5f0b mysql-v2 11446b42522a9a302ac1ea47e6d870b1 mysql_fx 7ca18294fb424cbf90e647a46b7eebdd prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
_md5_=3d4398bd930e297f98c279c3d3fe64c1
diff --git a/metadata/md5-cache/dev-db/mysql-5.5.38 b/metadata/md5-cache/dev-db/mysql-5.5.38
index 07102055926a..5bdf1f8c9ac6 100644
--- a/metadata/md5-cache/dev-db/mysql-5.5.38
+++ b/metadata/md5-cache/dev-db/mysql-5.5.38
@@ -4,12 +4,12 @@ DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
EAPI=5
HOMEPAGE=http://www.mysql.com/
IUSE=bindist debug embedded minimal +perl selinux ssl static static-libs test latin1 extraengine cluster max-idx-128 +community profiling jemalloc tcmalloc systemtap
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
LICENSE=GPL-2
PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-5.5
RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3 !bindist? ( >=sys-libs/readline-4.1 ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster jemalloc? ( dev-libs/jemalloc[static-libs?] ) tcmalloc? ( dev-util/google-perftools ) >=sys-libs/zlib-1.2.3[static-libs?] ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )
SLOT=0
SRC_URI=http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.38.tar.gz mirror://mysql/Downloads/MySQL-5.5/mysql-5.5.38.tar.gz mirror://gentoo/mysql-extras-20140426-0232Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20140426-0232Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20140426-0232Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20140426-0232Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20140426-0232Z.tar.bz2
-_eclasses_=cmake-utils 10b6a99f9058ac1b830d00b3421f04e4 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnuconfig ee02e61d6c68cee478e2e69214b7caef multilib 3bf24e6abb9b76d9f6c20600f0b716bf mysql-cmake bb5c9161c64fce1cdc29711898594d7f mysql-v2 389a05c7213fcf9cba192a368b941786 mysql_fx 7ca18294fb424cbf90e647a46b7eebdd prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3312ef8ca9b7dc245be18a11047f8e9c
+_eclasses_=cmake-utils 10b6a99f9058ac1b830d00b3421f04e4 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnuconfig ee02e61d6c68cee478e2e69214b7caef multilib 3bf24e6abb9b76d9f6c20600f0b716bf mysql-cmake f148d5a528d98cb01460017e906b5f0b mysql-v2 11446b42522a9a302ac1ea47e6d870b1 mysql_fx 7ca18294fb424cbf90e647a46b7eebdd prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=10a42fc968ac6068195585e172f974e7
diff --git a/metadata/md5-cache/dev-haskell/feed-0.3.8-r1 b/metadata/md5-cache/dev-haskell/feed-0.3.8-r1
deleted file mode 100644
index 9cf27cdd781f..000000000000
--- a/metadata/md5-cache/dev-haskell/feed-0.3.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prerm setup test
-DEPEND=dev-haskell/utf8-string:=[profile?] >=dev-haskell/xml-1.2.6:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.2 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
-DESCRIPTION=Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.
-EAPI=5
-HOMEPAGE=http://hackage.haskell.org/package/feed
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/utf8-string:=[profile?] >=dev-haskell/xml-1.2.6:=[profile?] >=dev-lang/ghc-6.10.4:=
-SLOT=0/0.3.8
-SRC_URI=mirror://hackage/packages/archive/feed/0.3.8/feed-0.3.8.tar.gz
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 ghc-package 9dd58db252d8252779bb74ed015196e3 haskell-cabal b6154aeaa4dfbbc6d8a66d7f739c22d1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=20450af0a9de36b88ebb039391c9fa14
diff --git a/metadata/md5-cache/dev-java/javolution-6.0.0 b/metadata/md5-cache/dev-java/javolution-6.0.0
index bbd6e6babba9..bc561e02c02f 100644
--- a/metadata/md5-cache/dev-java/javolution-6.0.0
+++ b/metadata/md5-cache/dev-java/javolution-6.0.0
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.5 dev-java/osgi-core-api:0 dev-java/osgi-compendium:0 >=
SLOT=6
SRC_URI=http://dev.gentoo.org/~tomwij/files/dist/javolution-6.0.0.tar.xz http://dev.gentoo.org/~tomwij/files/dist/javolution-6.0.0-build.xml.tar.xz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 java-ant-2 5f5bada6517ed26bc25083134e42b146 java-pkg-2 65bbb59987d777c1106ae8aa4bf36e7b java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 unpacker f300a7ca9131b1024a79762e8edd3c52 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8d1d39a6684c7aab78ab592260e0d582
+_md5_=3e80f5f92f5a57e69e4a415ebe7b084f
diff --git a/metadata/md5-cache/dev-lang/erlang-16.3.1 b/metadata/md5-cache/dev-lang/erlang-16.3.1
index 71f99481ef7c..1c15c896121a 100644
--- a/metadata/md5-cache/dev-lang/erlang-16.3.1
+++ b/metadata/md5-cache/dev-lang/erlang-16.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=Erlang programming language, runtime environment, and large collecti
EAPI=4
HOMEPAGE=http://www.erlang.org/
IUSE=compat-ethread doc emacs halfword hipe java kpoll odbc smp sctp ssl tk wxwidgets elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
LICENSE=ErlPL-1.1
RDEPEND=>=dev-lang/perl-5.6.1 ssl? ( >=dev-libs/openssl-0.9.7d ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2 ) odbc? ( dev-db/unixODBC ) java? ( >=dev-java/java-config-2.1.9-r1 )
SLOT=0
SRC_URI=http://www.erlang.org/download/otp_src_R16B03-1.tar.gz http://erlang.org/download/otp_doc_man_R16B03-1.tar.gz doc? ( http://erlang.org/download/otp_doc_html_R16B03-1.tar.gz )
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 06133990e861be0fe60c2b428fd025d9 java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f wxwidgets 6d6eec2685256d35511e7b6d5461bec9
-_md5_=684c51edea3adea82709962f011d434a
+_md5_=77615e1d68673c567019c64002965737
diff --git a/metadata/md5-cache/dev-lang/go-1.3 b/metadata/md5-cache/dev-lang/go-1.3
index ac29691bd002..29a3d01da021 100644
--- a/metadata/md5-cache/dev-lang/go-1.3
+++ b/metadata/md5-cache/dev-lang/go-1.3
@@ -3,10 +3,10 @@ DESCRIPTION=A concurrent garbage collected and typesafe programming language
EAPI=5
HOMEPAGE=http://www.golang.org
IUSE=bash-completion emacs vim-syntax zsh-completion
-KEYWORDS=-* ~amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
+KEYWORDS=-* amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
LICENSE=BSD
RDEPEND=bash-completion? ( app-shells/bash-completion ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) zsh-completion? ( app-shells/zsh-completion )
SLOT=0
SRC_URI=https://storage.googleapis.com/golang/go1.3.src.tar.gz
_eclasses_=bash-completion-r1 db412e427e3317ffd3e15f17df269c5e elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=486be83619f6d963ab1d53491438ff7a
+_md5_=5225db6cab3aa6c2810081024adab60e
diff --git a/metadata/md5-cache/dev-lang/go-9999 b/metadata/md5-cache/dev-lang/go-9999
index 464f701c4223..5abfb8b2a479 100644
--- a/metadata/md5-cache/dev-lang/go-9999
+++ b/metadata/md5-cache/dev-lang/go-9999
@@ -6,4 +6,4 @@ HOMEPAGE=http://www.golang.org
LICENSE=BSD
SLOT=0
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 mercurial 6bb94b704fb44f17b02994ca3fa756a9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=45485edfa05c550487111410209c0711
+_md5_=9a5003e836c36f2619c273bb6236e354
diff --git a/metadata/md5-cache/dev-lang/python-2.7.6 b/metadata/md5-cache/dev-lang/python-2.7.6
index 8de004f6722b..402db4509fe1 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.6
+++ b/metadata/md5-cache/dev-lang/python-2.7.6
@@ -4,11 +4,11 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
EAPI=4
HOMEPAGE=http://www.python.org/
IUSE=-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
-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
LICENSE=PSF-2
PDEPEND=app-admin/eselect-python app-admin/python-updater
RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !!=dev-libs/yajl-2.0.2 net-libs/http-parser ) virtual/pkgconfig
+DESCRIPTION=Takes node.js' architecture and dependencies and fits it in the Lua language
+EAPI=5
+HOMEPAGE=http://luvit.io/
+IUSE=bundled-libs examples
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 bundled-libs? ( BSD MIT )
+RDEPEND=dev-libs/openssl:0 sys-libs/zlib !bundled-libs? ( dev-lang/luajit:2[lua52compat] >=dev-libs/yajl-2.0.2 net-libs/http-parser )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://luvit.io/dist/latest/luvit-0.8.2.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=1bfdd3eaaa9647b74401a208b73f9734
diff --git a/metadata/md5-cache/dev-python/bpython-0.13 b/metadata/md5-cache/dev-python/bpython-0.13
index 6730c1cac810..baef38d95926 100644
--- a/metadata/md5-cache/dev-python/bpython-0.13
+++ b/metadata/md5-cache/dev-python/bpython-0.13
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] gtk? ( dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/urwid[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[ncurses] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
+DEPEND=dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] gtk? ( dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/urwid[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[ncurses] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
DESCRIPTION=Syntax highlighting and autocompletion for the Python interpreter
EAPI=5
HOMEPAGE=http://www.bpython-interpreter.org/ https://bitbucket.org/bobf/bpython/ http://pypi.python.org/pypi/bpython
IUSE=doc gtk python_targets_python2_7 python_targets_python3_3
KEYWORDS=~amd64 ~x86
LICENSE=MIT
-RDEPEND=dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] gtk? ( dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/urwid[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[ncurses] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
+RDEPEND=dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] gtk? ( dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/urwid[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[ncurses] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 )
SLOT=0
SRC_URI=http://www.bpython-interpreter.org/releases/bpython-0.13.tar.gz
_eclasses_=distutils-r1 d48d51c220f1678179fc4ab13b534ec1 eutils 06133990e861be0fe60c2b428fd025d9 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=3bdae0f55be562aeb3ae016c4b284b05
+_md5_=bb4059a1e1778c999ae9cbefb9e9521a
diff --git a/metadata/md5-cache/dev-python/cython-0.19.1-r1 b/metadata/md5-cache/dev-python/cython-0.19.1-r1
index aa74f0f9392e..ac6ce02863f1 100644
--- a/metadata/md5-cache/dev-python/cython-0.19.1-r1
+++ b/metadata/md5-cache/dev-python/cython-0.19.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Python to C compiler
EAPI=5
HOMEPAGE=http://www.cython.org/ http://pypi.python.org/pypi/Cython
IUSE=doc test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris ~x64-solaris
+KEYWORDS=alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy )
SLOT=0
SRC_URI=http://www.cython.org/release/Cython-0.19.1.tar.gz
_eclasses_=distutils-r1 d48d51c220f1678179fc4ab13b534ec1 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=ff0841b0c06edf7ad16ddb62b3923502
+_md5_=34c8186a6d2e454ad33c30f2395c03ff
diff --git a/metadata/md5-cache/dev-python/extras-0.0.3 b/metadata/md5-cache/dev-python/extras-0.0.3
index 8d8206c85188..c519ed17eec4 100644
--- a/metadata/md5-cache/dev-python/extras-0.0.3
+++ b/metadata/md5-cache/dev-python/extras-0.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=Useful extra bits for Python that should be in the standard library
EAPI=5
HOMEPAGE=https://github.com/testing-cabal/extras/ http://pypi.python.org/pypi/extras/
IUSE=test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=MIT
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
SLOT=0
SRC_URI=mirror://pypi/e/extras/extras-0.0.3.tar.gz
_eclasses_=distutils-r1 d48d51c220f1678179fc4ab13b534ec1 eutils 06133990e861be0fe60c2b428fd025d9 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=2739698606add76ebbe85eaa50f936b6
+_md5_=89cc141c8872e2f247deab2cd81a467f
diff --git a/metadata/md5-cache/dev-python/mimeparse-0.1.4-r1 b/metadata/md5-cache/dev-python/mimeparse-0.1.4-r1
index 982ea0255293..f08a880223ea 100644
--- a/metadata/md5-cache/dev-python/mimeparse-0.1.4-r1
+++ b/metadata/md5-cache/dev-python/mimeparse-0.1.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Basic functions for handling mime-types in python
EAPI=5
HOMEPAGE=http://code.google.com/p/mimeparse https://github.com/dbtsai/python-mimeparse
IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux
+KEYWORDS=alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
LICENSE=MIT
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
SLOT=0
SRC_URI=mirror://pypi/p/python-mimeparse/python-mimeparse-0.1.4.tar.gz
_eclasses_=distutils-r1 d48d51c220f1678179fc4ab13b534ec1 eutils 06133990e861be0fe60c2b428fd025d9 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=fb0f70ac04b1578b3f95b4e0e7b62d02
+_md5_=a7bf8caf6461386adfeebe40c9873653
diff --git a/metadata/md5-cache/dev-python/pexpect-3.0 b/metadata/md5-cache/dev-python/pexpect-3.0
index c74e591e15c4..a5c05d9de787 100644
--- a/metadata/md5-cache/dev-python/pexpect-3.0
+++ b/metadata/md5-cache/dev-python/pexpect-3.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python module for spawning child applications and responding to expe
EAPI=5
HOMEPAGE=http://pexpect.sourceforge.net/ http://pypi.python.org/pypi/pexpect
IUSE=doc examples python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~alpha ~amd64 ~amd64-fbsd ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=MIT
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
SLOT=0
SRC_URI=mirror://pypi/p/pexpect/pexpect-3.0.tar.gz
_eclasses_=distutils-r1 d48d51c220f1678179fc4ab13b534ec1 eutils 06133990e861be0fe60c2b428fd025d9 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=3e517bda853cdf93196278010ebb5249
+_md5_=27661a0bc7035c153ef3333d970c747b
diff --git a/metadata/md5-cache/dev-python/py-1.4.20 b/metadata/md5-cache/dev-python/py-1.4.20
index ac15a72c10bd..7674886a7201 100644
--- a/metadata/md5-cache/dev-python/py-1.4.20
+++ b/metadata/md5-cache/dev-python/py-1.4.20
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] test? ( >=dev-python/pytest-2[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] test? ( >=dev-python/pytest-2.4.2[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
DESCRIPTION=library with cross-python path, ini-parsing, io, code, log facilities
EAPI=5
HOMEPAGE=http://pylib.readthedocs.org/ http://pypi.python.org/pypi/py
IUSE=doc test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha ~amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=MIT
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
SLOT=0
SRC_URI=mirror://pypi/p/py/py-1.4.20.tar.gz
_eclasses_=distutils-r1 d48d51c220f1678179fc4ab13b534ec1 eutils 06133990e861be0fe60c2b428fd025d9 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=26375b57275e68e14c27947452b57780
+_md5_=bc30f3fb80196819b6f013b24be662b7
diff --git a/metadata/md5-cache/dev-python/pytest-2.4.2 b/metadata/md5-cache/dev-python/pytest-2.4.2
index a61e54eca5c2..64885aaa920c 100644
--- a/metadata/md5-cache/dev-python/pytest-2.4.2
+++ b/metadata/md5-cache/dev-python/pytest-2.4.2
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/py-1.4.17[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] test? ( dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
+DEPEND=>=dev-python/py-1.4.17[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] test? ( python_targets_python2_7? ( dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python3_2? ( dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python3_3? ( dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
DESCRIPTION=py.test: simple powerful testing with Python
EAPI=5
HOMEPAGE=http://pytest.org/ http://pypi.python.org/pypi/pytest
IUSE=doc test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=MIT
RDEPEND=>=dev-python/py-1.4.17[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy )
SLOT=0
SRC_URI=mirror://pypi/p/pytest/pytest-2.4.2.tar.gz
_eclasses_=distutils-r1 d48d51c220f1678179fc4ab13b534ec1 eutils 06133990e861be0fe60c2b428fd025d9 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=8f9d311611c3a93fa42d1812ca7a3a95
+_md5_=53f9f6d815f036e891cc8d22e21fcd6e
diff --git a/metadata/md5-cache/dev-python/pytest-2.5.2 b/metadata/md5-cache/dev-python/pytest-2.5.2
index 15ee9fe2f743..9fa368e9016d 100644
--- a/metadata/md5-cache/dev-python/pytest-2.5.2
+++ b/metadata/md5-cache/dev-python/pytest-2.5.2
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/py-1.4.20[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] test? ( dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+DEPEND=>=dev-python/py-1.4.20[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] test? ( python_targets_python2_7? ( dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_2? ( dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_3? ( dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
DESCRIPTION=py.test: simple powerful testing with Python
EAPI=5
HOMEPAGE=http://pytest.org/ http://pypi.python.org/pypi/pytest
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targe
SLOT=0
SRC_URI=mirror://pypi/p/pytest/pytest-2.5.2.tar.gz
_eclasses_=distutils-r1 d48d51c220f1678179fc4ab13b534ec1 eutils 06133990e861be0fe60c2b428fd025d9 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=9a110ec6ab4e006f8e028d991d36f073
+_md5_=f8cd77c415e19f7ac69526fdda61e4c0
diff --git a/metadata/md5-cache/dev-python/pyyaml-3.10-r1 b/metadata/md5-cache/dev-python/pyyaml-3.10-r1
index 4d774eb23398..9c8220ff1560 100644
--- a/metadata/md5-cache/dev-python/pyyaml-3.10-r1
+++ b/metadata/md5-cache/dev-python/pyyaml-3.10-r1
@@ -4,11 +4,11 @@ DESCRIPTION=YAML parser and emitter for Python
EAPI=5
HOMEPAGE=http://pyyaml.org/wiki/PyYAML http://pypi.python.org/pypi/PyYAML
IUSE=examples libyaml python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
LICENSE=MIT
RDEPEND=libyaml? ( dev-libs/libyaml ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy )
SLOT=0
SRC_URI=http://pyyaml.org/download/pyyaml/PyYAML-3.10.tar.gz
_eclasses_=distutils-r1 d48d51c220f1678179fc4ab13b534ec1 eutils 06133990e861be0fe60c2b428fd025d9 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=438d4fa314d403b42080031caa6306f9
+_md5_=80791ce262c8cadc2bb01536bed0f446
diff --git a/metadata/md5-cache/dev-python/qscintilla-python-2.8 b/metadata/md5-cache/dev-python/qscintilla-python-2.8.3
similarity index 75%
rename from metadata/md5-cache/dev-python/qscintilla-python-2.8
rename to metadata/md5-cache/dev-python/qscintilla-python-2.8.3
index 6c605178788b..bd7c2622c38c 100644
--- a/metadata/md5-cache/dev-python/qscintilla-python-2.8
+++ b/metadata/md5-cache/dev-python/qscintilla-python-2.8.3
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/sip-4.12:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/PyQt4-4.8[X,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-qt/qtcore:4 dev-qt/qtgui:4 ~x11-libs/qscintilla-2.8:=
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/sip-4.16:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/PyQt4-4.11[X,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-qt/qtcore:4 dev-qt/qtgui:4 ~x11-libs/qscintilla-2.8.3:=
DESCRIPTION=Python bindings for Qscintilla
EAPI=5
HOMEPAGE=http://www.riverbankcomputing.co.uk/software/qscintilla/intro
IUSE=debug python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/sip-4.12:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/PyQt4-4.8[X,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-qt/qtcore:4 dev-qt/qtgui:4 ~x11-libs/qscintilla-2.8:=
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/sip-4.16:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/PyQt4-4.11[X,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-qt/qtcore:4 dev-qt/qtgui:4 ~x11-libs/qscintilla-2.8.3:=
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
SLOT=0
-SRC_URI=mirror://sourceforge/pyqt/QScintilla-gpl-2.8.tar.gz
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=58fa3fbf8a32f62e906e1ce805766d93
+SRC_URI=mirror://sourceforge/pyqt/QScintilla-gpl-2.8.3.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b qmake-utils dd0375da11f79aa416ff97913c59d01c toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=eb8a96416f7d539a43ee63529e2fe829
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-0.9.2 b/metadata/md5-cache/dev-python/sqlalchemy-0.9.2
index 090bac6c786d..54388e79c6b0 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-0.9.2
+++ b/metadata/md5-cache/dev-python/sqlalchemy-0.9.2
@@ -4,11 +4,11 @@ DESCRIPTION=Python SQL toolkit and Object Relational Mapper
EAPI=5
HOMEPAGE=http://www.sqlalchemy.org/ http://pypi.python.org/pypi/SQLAlchemy
IUSE=doc examples +sqlite test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy
-KEYWORDS=~alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=MIT
RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] sqlite? ( >=dev-db/sqlite-3.3.13 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy )
SLOT=0
SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-0.9.2.tar.gz
_eclasses_=distutils-r1 d48d51c220f1678179fc4ab13b534ec1 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=0fed3ee25f5be33d80f808260125889d
+_md5_=df16b95d9d90b970eef3f74727481771
diff --git a/metadata/md5-cache/dev-python/subunit-0.0.16 b/metadata/md5-cache/dev-python/subunit-0.0.16
index 69bee02b0c24..a6bfa0934f3c 100644
--- a/metadata/md5-cache/dev-python/subunit-0.0.16
+++ b/metadata/md5-cache/dev-python/subunit-0.0.16
@@ -4,11 +4,11 @@ DESCRIPTION=A streaming protocol for test results
EAPI=5
HOMEPAGE=https://launchpad.net/subunit http://pypi.python.org/pypi/python-subunit
IUSE=static-libs python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~x86-fbsd
+KEYWORDS=alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~x86-fbsd
LICENSE=Apache-2.0 BSD
RDEPEND=>=dev-python/testtools-0.9.34[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] dev-python/extras[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy )
SLOT=0
SRC_URI=http://launchpad.net/subunit/trunk/0.0.16/+download/subunit-0.0.16.tar.gz
_eclasses_=distutils-r1 d48d51c220f1678179fc4ab13b534ec1 eutils 06133990e861be0fe60c2b428fd025d9 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=69a66e881e677735a7a9fb487207a2a5
+_md5_=761e31902dc0f6c526cdfb2be2a29751
diff --git a/metadata/md5-cache/dev-python/testscenarios-0.4-r4 b/metadata/md5-cache/dev-python/testscenarios-0.4-r4
index 8a7179d40987..5b99dc99a72d 100644
--- a/metadata/md5-cache/dev-python/testscenarios-0.4-r4
+++ b/metadata/md5-cache/dev-python/testscenarios-0.4-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Testscenarios, a pyunit extension for dependency injection
EAPI=5
HOMEPAGE=https://launchpad.net/testscenarios
IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux
LICENSE=Apache-2.0
RDEPEND=dev-python/testtools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy )
SLOT=0
SRC_URI=mirror://pypi/t/testscenarios/testscenarios-0.4.tar.gz
_eclasses_=distutils-r1 d48d51c220f1678179fc4ab13b534ec1 eutils 06133990e861be0fe60c2b428fd025d9 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=09ded0dcdf143f25840577ec11c19d97
+_md5_=fecc84960c5413cfa004ef2505255df2
diff --git a/metadata/md5-cache/dev-python/testtools-0.9.34 b/metadata/md5-cache/dev-python/testtools-0.9.34
index 4bc130a360f3..3fdf786fcf85 100644
--- a/metadata/md5-cache/dev-python/testtools-0.9.34
+++ b/metadata/md5-cache/dev-python/testtools-0.9.34
@@ -4,11 +4,11 @@ DESCRIPTION=Extensions to the Python unittest library
EAPI=5
HOMEPAGE=https://launchpad.net/testtools http://pypi.python.org/pypi/testtools
IUSE=test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
LICENSE=MIT
RDEPEND=dev-python/mimeparse[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] dev-python/extras[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy )
SLOT=0
SRC_URI=http://launchpad.net/testtools/trunk/0.9.34/+download/testtools-0.9.34.tar.gz
_eclasses_=distutils-r1 d48d51c220f1678179fc4ab13b534ec1 eutils 06133990e861be0fe60c2b428fd025d9 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3f3d37b0410b2cab119240c50f911c3d
+_md5_=9e3066e92f03f4e52a996864ba186482
diff --git a/metadata/md5-cache/dev-python/unidecode-0.04.16 b/metadata/md5-cache/dev-python/unidecode-0.04.16
index 097369bc9d41..0b269d6e729a 100644
--- a/metadata/md5-cache/dev-python/unidecode-0.04.16
+++ b/metadata/md5-cache/dev-python/unidecode-0.04.16
@@ -4,11 +4,11 @@ DESCRIPTION=Module providing ASCII transliterations of Unicode text
EAPI=5
HOMEPAGE=http://pypi.python.org/pypi/Unidecode
IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~amd64 ~arm ~hppa ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~x86
LICENSE=GPL-2
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
SLOT=0
SRC_URI=mirror://pypi/U/Unidecode/Unidecode-0.04.16.tar.gz
_eclasses_=distutils-r1 d48d51c220f1678179fc4ab13b534ec1 eutils 06133990e861be0fe60c2b428fd025d9 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=1d0d48ced4ef824e6113f81142470dde
+_md5_=6a5dcefec3bba82c67083c62af0f0b2d
diff --git a/metadata/md5-cache/dev-ruby/capybara-2.1.0 b/metadata/md5-cache/dev-ruby/capybara-2.1.0
deleted file mode 100644
index c283afb069d9..000000000000
--- a/metadata/md5-cache/dev-ruby/capybara-2.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby19] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby19] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby19] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-DESCRIPTION=Capybara aims to simplify the process of integration testing Rack applications.
-EAPI=5
-HOMEPAGE=http://github.com/jnicklas/capybara
-IUSE=test test elibc_FreeBSD ruby_targets_ruby19 test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby19] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby19] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 )
-RESTRICT=test
-SLOT=2
-SRC_URI=mirror://rubygems/capybara-2.1.0.gem
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem 738ee4b7f8b16d4a734b4d37717db89b ruby-ng 14f0490e24cbad7c17cece628b3d111e toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ec42d848def95beef59d62b7066ff7e6
diff --git a/metadata/md5-cache/dev-ruby/capybara-2.2.0 b/metadata/md5-cache/dev-ruby/capybara-2.2.0
deleted file mode 100644
index 14af0f3572f9..000000000000
--- a/metadata/md5-cache/dev-ruby/capybara-2.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( www-client/firefox ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] dev-ruby/launchy[ruby_targets_ruby19] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] dev-ruby/launchy[ruby_targets_ruby20] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby20] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby19] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby19] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby20] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby20] >=dev-ruby/rack-1.0.0[ruby_targets_ruby20] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby20] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby20] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
-DESCRIPTION=Capybara aims to simplify the process of integration testing Rack applications.
-EAPI=5
-HOMEPAGE=http://github.com/jnicklas/capybara
-IUSE=test test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby19] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby19] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby20] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby20] >=dev-ruby/rack-1.0.0[ruby_targets_ruby20] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby20] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
-SLOT=2
-SRC_URI=mirror://rubygems/capybara-2.2.0.gem
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem 738ee4b7f8b16d4a734b4d37717db89b ruby-ng 14f0490e24cbad7c17cece628b3d111e toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d15f6966e369e8af8776907b35d0a0f8
diff --git a/metadata/md5-cache/dev-ruby/color-1.7.1 b/metadata/md5-cache/dev-ruby/color-1.7.1
new file mode 100644
index 000000000000..83e1221063a1
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/color-1.7.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/minitest-5.0[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rdoc[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DESCRIPTION=Colour management with Ruby
+EAPI=5
+HOMEPAGE=http://color.rubyforge.org/
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+SLOT=0
+SRC_URI=https://github.com/halostatue/color/archive/v1.7.1.tar.gz -> color-1.7.1.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem 738ee4b7f8b16d4a734b4d37717db89b ruby-ng 14f0490e24cbad7c17cece628b3d111e toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=8ff0e28a75e9f73d70e71d22f3e83b0a
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.3.3 b/metadata/md5-cache/dev-ruby/minitest-5.3.3
index 3a62ed8b25ab..37787030c48f 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.3.3
+++ b/metadata/md5-cache/dev-ruby/minitest-5.3.3
@@ -4,11 +4,11 @@ DESCRIPTION=minitest/unit is a small and fast replacement for ruby's huge and sl
EAPI=5
HOMEPAGE=https://github.com/seattlerb/minitest
IUSE=doc test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
-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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
SLOT=5
SRC_URI=mirror://rubygems/minitest-5.3.3.gem
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem 738ee4b7f8b16d4a734b4d37717db89b ruby-ng 14f0490e24cbad7c17cece628b3d111e toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=220694c2483af652fee4efec416308fd
+_md5_=dd9b929f8c92552d813de7728da134cb
diff --git a/metadata/md5-cache/dev-ruby/rest-client-1.7.2 b/metadata/md5-cache/dev-ruby/rest-client-1.7.2
new file mode 100644
index 000000000000..ee69fb53fc8e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rest-client-1.7.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/webmock[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/webmock[ruby_targets_ruby20] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby19] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby20] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DESCRIPTION=Simple Simple HTTP and REST client for Ruby
+EAPI=5
+HOMEPAGE=http://github.com/archiloque/rest-client
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby19] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby20] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+SLOT=0
+SRC_URI=mirror://rubygems/rest-client-1.7.2.gem
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem 738ee4b7f8b16d4a734b4d37717db89b ruby-ng 14f0490e24cbad7c17cece628b3d111e toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=66a284a7dd40185cc732440d7a5783c2
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8
index dbf5c14090ca..2106d0886ae0 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=net-analyzer/rrdtool[graph] ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
+DEPEND=net-analyzer/rrdtool[graph] ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
DESCRIPTION=Ruby bindings for rrdtool.
EAPI=5
HOMEPAGE=http://oss.oetiker.ch/rrdtool/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris
LICENSE=GPL-2
-RDEPEND=net-analyzer/rrdtool[graph] !!=dev-ruby/rr-0.10.2[ruby_targets_ruby19] dev-ruby/activesupport[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/rr-0.10.2[ruby_targets_ruby20] dev-ruby/activesupport[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rr-0.10.2[ruby_targets_ruby21] dev-ruby/activesupport[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/polyglot-0.3.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/polyglot-0.3.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/polyglot-0.3.1[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DESCRIPTION=Treetop is a language for describing languages.
+EAPI=5
+HOMEPAGE=http://treetop.rubyforge.org/
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/polyglot-0.3.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/polyglot-0.3.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/polyglot-0.3.1[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+SLOT=0
+SRC_URI=mirror://rubygems/treetop-1.4.15.gem
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem 738ee4b7f8b16d4a734b4d37717db89b ruby-ng 14f0490e24cbad7c17cece628b3d111e toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=43394308bc62737f222b4279318ffe3b
diff --git a/metadata/md5-cache/dev-ruby/uuidtools-2.1.3 b/metadata/md5-cache/dev-ruby/uuidtools-2.1.3
index 19f4eede02bd..ae999d01a0b1 100644
--- a/metadata/md5-cache/dev-ruby/uuidtools-2.1.3
+++ b/metadata/md5-cache/dev-ruby/uuidtools-2.1.3
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/yard[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
DESCRIPTION=Simple library to generate UUIDs
EAPI=2
HOMEPAGE=http://uuidtools.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby doc test test
KEYWORDS=amd64 x86 ~x86-macos
LICENSE=MIT
RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
SLOT=0
SRC_URI=mirror://rubyforge/uuidtools/uuidtools-2.1.3.tgz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem 738ee4b7f8b16d4a734b4d37717db89b ruby-ng 14f0490e24cbad7c17cece628b3d111e toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=02a9ef44f37841b16aa3166dff62048e
+_md5_=8b10c974f5ee2901ec7aa8ea20a07e0e
diff --git a/metadata/md5-cache/dev-ruby/uuidtools-2.1.4-r1 b/metadata/md5-cache/dev-ruby/uuidtools-2.1.4-r1
index 5b0c6504c636..cc1363215157 100644
--- a/metadata/md5-cache/dev-ruby/uuidtools-2.1.4-r1
+++ b/metadata/md5-cache/dev-ruby/uuidtools-2.1.4-r1
@@ -1,9 +1,9 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/yard[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
DESCRIPTION=Simple library to generate UUIDs
EAPI=5
HOMEPAGE=http://uuidtools.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
KEYWORDS=~amd64 ~x86 ~x86-macos
LICENSE=MIT
RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
SLOT=0
SRC_URI=mirror://rubygems/uuidtools-2.1.4.gem
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem 738ee4b7f8b16d4a734b4d37717db89b ruby-ng 14f0490e24cbad7c17cece628b3d111e toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1b4e517ef4daf0124e9ca3d63b797fed
+_md5_=4d6bf8d2432a5c49e5ed655aeccc2bbd
diff --git a/metadata/md5-cache/dev-ruby/uuidtools-2.1.4-r3 b/metadata/md5-cache/dev-ruby/uuidtools-2.1.4-r3
index c44574f7da7a..4d2c9ada5fa0 100644
--- a/metadata/md5-cache/dev-ruby/uuidtools-2.1.4-r3
+++ b/metadata/md5-cache/dev-ruby/uuidtools-2.1.4-r3
@@ -1,9 +1,9 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/yard[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
DESCRIPTION=Simple library to generate UUIDs
EAPI=5
HOMEPAGE=http://uuidtools.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
KEYWORDS=~amd64 ~x86 ~x86-macos
LICENSE=MIT
RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
SLOT=0
SRC_URI=mirror://rubygems/uuidtools-2.1.4.gem
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem 738ee4b7f8b16d4a734b4d37717db89b ruby-ng 14f0490e24cbad7c17cece628b3d111e toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=0f8f75fa1b5f6a399c4fd17d76012bb8
+_md5_=68d997447e929113a0947b96821f2b0b
diff --git a/metadata/md5-cache/dev-ruby/webmock-1.18.0 b/metadata/md5-cache/dev-ruby/webmock-1.18.0
index be776c589e7e..9d0886b81fa1 100644
--- a/metadata/md5-cache/dev-ruby/webmock-1.18.0
+++ b/metadata/md5-cache/dev-ruby/webmock-1.18.0
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby19] >=dev-ruby/crack-0.3.2[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby20] >=dev-ruby/crack-0.3.2[ruby_targets_ruby20] ) ruby_targets_jruby? ( >=dev-ruby/addressable-2.3.6[ruby_targets_jruby] >=dev-ruby/crack-0.3.2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/httpclient-2.2.4[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/httpclient-2.2.4[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] >=dev-ruby/httpclient-2.2.4[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/patron-0.4.18[ruby_targets_ruby19] >=dev-ruby/http-0.5.0[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/patron-0.4.18[ruby_targets_ruby20] >=dev-ruby/http-0.5.0[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rdoc[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby19] >=dev-ruby/crack-0.3.2[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby20] >=dev-ruby/crack-0.3.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby21] >=dev-ruby/crack-0.3.2[ruby_targets_ruby21] ) ruby_targets_jruby? ( >=dev-ruby/addressable-2.3.6[ruby_targets_jruby] >=dev-ruby/crack-0.3.2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/httpclient-2.2.4[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/httpclient-2.2.4[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/httpclient-2.2.4[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] >=dev-ruby/httpclient-2.2.4[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/patron-0.4.18[ruby_targets_ruby19] >=dev-ruby/http-0.5.0[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/patron-0.4.18[ruby_targets_ruby20] >=dev-ruby/http-0.5.0[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rdoc[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
DESCRIPTION=Allows stubbing HTTP requests and setting expectations on HTTP requests
EAPI=5
HOMEPAGE=http://github.com/bblimke/webmock
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
KEYWORDS=~amd64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby19] >=dev-ruby/crack-0.3.2[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby20] >=dev-ruby/crack-0.3.2[ruby_targets_ruby20] ) ruby_targets_jruby? ( >=dev-ruby/addressable-2.3.6[ruby_targets_jruby] >=dev-ruby/crack-0.3.2[ruby_targets_jruby] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby19] >=dev-ruby/crack-0.3.2[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby20] >=dev-ruby/crack-0.3.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby21] >=dev-ruby/crack-0.3.2[ruby_targets_ruby21] ) ruby_targets_jruby? ( >=dev-ruby/addressable-2.3.6[ruby_targets_jruby] >=dev-ruby/crack-0.3.2[ruby_targets_jruby] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
SLOT=0
SRC_URI=mirror://rubygems/webmock-1.18.0.gem
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem 738ee4b7f8b16d4a734b4d37717db89b ruby-ng 14f0490e24cbad7c17cece628b3d111e toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=384ba1d859a7d82a2dde6a67f6340c9c
+_md5_=cbaba26d3661831e78cb0a044c8ce9ce
diff --git a/metadata/md5-cache/dev-ruby/zentest-4.10.1 b/metadata/md5-cache/dev-ruby/zentest-4.10.1
index 2b727fe451ad..ae7d107fce94 100644
--- a/metadata/md5-cache/dev-ruby/zentest-4.10.1
+++ b/metadata/md5-cache/dev-ruby/zentest-4.10.1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby19] dev-ruby/hoe-seattlerb[ruby_targets_ruby19] virtual/ruby-minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby20] dev-ruby/hoe-seattlerb[ruby_targets_ruby20] virtual/ruby-minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby21] dev-ruby/hoe-seattlerb[ruby_targets_ruby21] virtual/ruby-minitest[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/hoe-2.10[ruby_targets_jruby] dev-ruby/hoe-seattlerb[ruby_targets_jruby] virtual/ruby-minitest[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rdoc[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby19] dev-ruby/hoe-seattlerb[ruby_targets_ruby19] dev-ruby/minitest:5[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby20] dev-ruby/hoe-seattlerb[ruby_targets_ruby20] dev-ruby/minitest:5[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby21] dev-ruby/hoe-seattlerb[ruby_targets_ruby21] dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/hoe-2.10[ruby_targets_jruby] dev-ruby/hoe-seattlerb[ruby_targets_jruby] dev-ruby/minitest:5[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rdoc[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
DESCRIPTION=ZenTest provides tools to support testing: zentest, unit_diff, autotest, multiruby, and Test::Rails
EAPI=5
HOMEPAGE=https://github.com/seattlerb/zentest
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
SLOT=0
SRC_URI=mirror://rubygems/ZenTest-4.10.1.gem
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem 738ee4b7f8b16d4a734b4d37717db89b ruby-ng 14f0490e24cbad7c17cece628b3d111e toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d69613c4665e63153e0053cb1e26e316
+_md5_=2259f7ae3ab88dce2428a4622ed5f230
diff --git a/metadata/md5-cache/dev-ruby/zentest-4.9.5 b/metadata/md5-cache/dev-ruby/zentest-4.9.5
index 104dac2a153c..4e1eb68f9e7f 100644
--- a/metadata/md5-cache/dev-ruby/zentest-4.9.5
+++ b/metadata/md5-cache/dev-ruby/zentest-4.9.5
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( doc? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby19] dev-ruby/hoe-seattlerb[ruby_targets_ruby19] ) test? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby19] dev-ruby/hoe-seattlerb[ruby_targets_ruby19] virtual/ruby-minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby20] dev-ruby/hoe-seattlerb[ruby_targets_ruby20] ) test? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby20] dev-ruby/hoe-seattlerb[ruby_targets_ruby20] virtual/ruby-minitest[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( >=dev-ruby/hoe-2.10[ruby_targets_jruby] dev-ruby/hoe-seattlerb[ruby_targets_jruby] ) test? ( >=dev-ruby/hoe-2.10[ruby_targets_jruby] dev-ruby/hoe-seattlerb[ruby_targets_jruby] virtual/ruby-minitest[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( doc? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby19] dev-ruby/hoe-seattlerb[ruby_targets_ruby19] ) test? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby19] dev-ruby/hoe-seattlerb[ruby_targets_ruby19] dev-ruby/minitest:5[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby20] dev-ruby/hoe-seattlerb[ruby_targets_ruby20] ) test? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby20] dev-ruby/hoe-seattlerb[ruby_targets_ruby20] dev-ruby/minitest:5[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( >=dev-ruby/hoe-2.10[ruby_targets_jruby] dev-ruby/hoe-seattlerb[ruby_targets_jruby] ) test? ( >=dev-ruby/hoe-2.10[ruby_targets_jruby] dev-ruby/hoe-seattlerb[ruby_targets_jruby] dev-ruby/minitest:5[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
DESCRIPTION=ZenTest provides tools to support testing: zentest, unit_diff, autotest, multiruby, and Test::Rails
EAPI=5
HOMEPAGE=https://github.com/seattlerb/zentest
IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
-KEYWORDS=alpha ~amd64 arm hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Ruby
RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
SLOT=0
SRC_URI=mirror://rubygems/ZenTest-4.9.5.gem
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem 738ee4b7f8b16d4a734b4d37717db89b ruby-ng 14f0490e24cbad7c17cece628b3d111e toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=cd8f1653bf457eceb06806763000e8b0
+_md5_=15ec5764ae66786ca8d5840fbbc8e8fa
diff --git a/metadata/md5-cache/dev-util/debhelper-9.20140228 b/metadata/md5-cache/dev-util/debhelper-9.20140228
index c49bc6ce0714..f1a22cc69219 100644
--- a/metadata/md5-cache/dev-util/debhelper-9.20140228
+++ b/metadata/md5-cache/dev-util/debhelper-9.20140228
@@ -4,10 +4,10 @@ DESCRIPTION=Collection of programs that can be used to automate common tasks in
EAPI=5
HOMEPAGE=http://packages.qa.debian.org/d/debhelper.html http://joeyh.name/code/debhelper/
IUSE=test linguas_de linguas_es linguas_fr
-KEYWORDS=~alpha amd64 arm hppa ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
LICENSE=GPL-2
RDEPEND=>=dev-lang/perl-5.10 >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
SLOT=0
SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_9.20140228.tar.gz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=cd487be0f395c76fdc12e04c661a3df1
+_md5_=1b5cdc244de58a33176d9e09aa3e0f8f
diff --git a/metadata/md5-cache/dev-util/debootstrap-1.0.59 b/metadata/md5-cache/dev-util/debootstrap-1.0.59
index 261968d544ed..49da222f1c59 100644
--- a/metadata/md5-cache/dev-util/debootstrap-1.0.59
+++ b/metadata/md5-cache/dev-util/debootstrap-1.0.59
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils
DESCRIPTION=Debian/Ubuntu bootstrap scripts
EAPI=5
HOMEPAGE=http://packages.qa.debian.org/d/debootstrap.html
-KEYWORDS=~alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
LICENSE=MIT
RDEPEND=app-arch/dpkg net-misc/wget sys-devel/binutils
SLOT=0
SRC_URI=mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.59.tar.xz mirror://gentoo/devices.tar.gz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=56fbac05721cc18fb043e83433a3d299
+_md5_=b97f36d91c9709ca9ace6512ae70efe3
diff --git a/metadata/md5-cache/dev-util/perf-3.13.1-r1 b/metadata/md5-cache/dev-util/perf-3.13.1-r1
index b9852b3ff523..d5e9972eeff7 100644
--- a/metadata/md5-cache/dev-util/perf-3.13.1-r1
+++ b/metadata/md5-cache/dev-util/perf-3.13.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Userland tools for Linux Performance Counters
EAPI=5
HOMEPAGE=http://perf.wiki.kernel.org/
IUSE=audit +demangle +doc gtk perl python slang unwind python_targets_python2_7 python_single_target_python2_7
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~x86
LICENSE=GPL-2
RDEPEND=audit? ( sys-process/audit ) demangle? ( sys-devel/binutils ) gtk? ( x11-libs/gtk+:2 ) perl? ( || ( >=dev-lang/perl-5.10 sys-devel/libperl ) ) slang? ( dev-libs/newt ) unwind? ( sys-libs/libunwind ) dev-libs/elfutils
REQUIRED_USE=python? ( python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 ) )
SLOT=0
SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.13.1.xz mirror://kernel/linux/kernel/v3.x/linux-3.13.tar.xz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 linux-info 2b8c53f6065bdee2d757472215a3088f multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-single-r1 a71a169a881e0a11d04a7fe12dc39f6e python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=37dddd4866672e35984eee5aeb3ff356
+_md5_=571035edf357fb0fb97e3c36ffce040a
diff --git a/metadata/md5-cache/dev-util/pkgconfig-0.28-r1 b/metadata/md5-cache/dev-util/pkgconfig-0.28-r1
index 705d6d6fb9ca..43fd5b4a7cc1 100644
--- a/metadata/md5-cache/dev-util/pkgconfig-0.28-r1
+++ b/metadata/md5-cache/dev-util/pkgconfig-0.28-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Package config system that manages compile/link flags
EAPI=5
HOMEPAGE=http://pkgconfig.freedesktop.org/wiki/
IUSE=elibc_FreeBSD elibc_glibc hardened internal-glib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=!internal-glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config]
SLOT=0
SRC_URI=http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build fbb9baa0b4039304643e36e9820fdecf multilib-minimal 5bbdc77877c1aa3c6bd89ca3f9196d11 multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=05fd54c47529d7838b9efadb150dd02a
+_md5_=047b08f6b0b958161966200d218d8a01
diff --git a/metadata/md5-cache/dev-util/rbtools-0.5.3 b/metadata/md5-cache/dev-util/rbtools-0.5.3
deleted file mode 100644
index f66d7c936e2c..000000000000
--- a/metadata/md5-cache/dev-util/rbtools-0.5.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Command line tools for use with Review Board
-EAPI=5
-HOMEPAGE=http://www.reviewboard.org/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://downloads.reviewboard.org/releases/RBTools/0.5/RBTools-0.5.3.tar.gz
-_eclasses_=distutils-r1 d48d51c220f1678179fc4ab13b534ec1 eutils 06133990e861be0fe60c2b428fd025d9 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=701f50c7afa30ddcfdc7614e40978820
diff --git a/metadata/md5-cache/dev-util/rbtools-0.6.1 b/metadata/md5-cache/dev-util/rbtools-0.6.1
deleted file mode 100644
index 6c09dc67894b..000000000000
--- a/metadata/md5-cache/dev-util/rbtools-0.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Command line tools for use with Review Board
-EAPI=5
-HOMEPAGE=http://www.reviewboard.org/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://downloads.reviewboard.org/releases/RBTools/0.6/RBTools-0.6.1.tar.gz
-_eclasses_=distutils-r1 d48d51c220f1678179fc4ab13b534ec1 eutils 06133990e861be0fe60c2b428fd025d9 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=26188c00ce3141d83e46ca429390777c
diff --git a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r10 b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r10
index 0e47f3a1b9d4..9fa955252cfe 100644
--- a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r10
+++ b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r10
@@ -4,11 +4,11 @@ DESCRIPTION=Concurrent Versions System - source code revision control tools
EAPI=3
HOMEPAGE=http://www.nongnu.org/cvs/
IUSE=crypt doc kerberos nls pam server
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2 LGPL-2
RDEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( virtual/pam )
RESTRICT=test
SLOT=0
SRC_URI=mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cvs-1.12.12.tar.bz2 doc? ( mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.html.tar.bz2 mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.pdf mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.ps )
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be multilib 3bf24e6abb9b76d9f6c20600f0b716bf pam aa1ebb3ab720ea04dbbdd6eaaf9554ed toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=360fcb7969de68e257046e2de89fbb5c
+_md5_=d090b6a9f91ce8fe5c30451a1095c735
diff --git a/metadata/md5-cache/dev-vcs/git-2.0.0 b/metadata/md5-cache/dev-vcs/git-2.0.0
deleted file mode 100644
index c2d4e873f01f..000000000000
--- a/metadata/md5-cache/dev-vcs/git-2.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
-EAPI=5
-HOMEPAGE=http://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 python_single_target_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 ) )
-SLOT=0
-SRC_URI=http://git-core.googlecode.com/files/git-2.0.0.tar.gz mirror://kernel/software/scm/git/git-2.0.0.tar.gz http://git-core.googlecode.com/files/git-manpages-2.0.0.tar.gz mirror://kernel/software/scm/git/git-manpages-2.0.0.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.0.0.tar.gz http://git-core.googlecode.com/files/git-htmldocs-2.0.0.tar.gz )
-_eclasses_=bash-completion-r1 db412e427e3317ffd3e15f17df269c5e elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module a6a2d5c77bdaeba2794b167689cafb7a python-single-r1 a71a169a881e0a11d04a7fe12dc39f6e python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402 unpacker f300a7ca9131b1024a79762e8edd3c52
-_md5_=6ea219f2bf6754f86634bec2c8e39e9f
diff --git a/metadata/md5-cache/dev-vcs/git-2.0.0-r1 b/metadata/md5-cache/dev-vcs/git-2.0.0-r1
deleted file mode 100644
index 8562f612252a..000000000000
--- a/metadata/md5-cache/dev-vcs/git-2.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
-EAPI=5
-HOMEPAGE=http://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 python_single_target_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 ) )
-SLOT=0
-SRC_URI=http://git-core.googlecode.com/files/git-2.0.0.tar.gz mirror://kernel/software/scm/git/git-2.0.0.tar.gz http://git-core.googlecode.com/files/git-manpages-2.0.0.tar.gz mirror://kernel/software/scm/git/git-manpages-2.0.0.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.0.0.tar.gz http://git-core.googlecode.com/files/git-htmldocs-2.0.0.tar.gz )
-_eclasses_=bash-completion-r1 db412e427e3317ffd3e15f17df269c5e elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module a6a2d5c77bdaeba2794b167689cafb7a python-single-r1 a71a169a881e0a11d04a7fe12dc39f6e python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402 unpacker f300a7ca9131b1024a79762e8edd3c52
-_md5_=f9e6f86033d50e627fac52956d05f51a
diff --git a/metadata/md5-cache/dev-vcs/git-1.9.2 b/metadata/md5-cache/dev-vcs/git-2.0.1
similarity index 87%
rename from metadata/md5-cache/dev-vcs/git-1.9.2
rename to metadata/md5-cache/dev-vcs/git-2.0.1
index 67723ee68ac2..c28d219e6b2b 100644
--- a/metadata/md5-cache/dev-vcs/git-1.9.2
+++ b/metadata/md5-cache/dev-vcs/git-2.0.1
@@ -9,6 +9,6 @@ LICENSE=GPL-2
RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] )
REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 ) )
SLOT=0
-SRC_URI=http://git-core.googlecode.com/files/git-1.9.2.tar.gz mirror://kernel/software/scm/git/git-1.9.2.tar.gz http://git-core.googlecode.com/files/git-manpages-1.9.2.tar.gz mirror://kernel/software/scm/git/git-manpages-1.9.2.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.9.2.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.9.2.tar.gz )
+SRC_URI=http://git-core.googlecode.com/files/git-2.0.1.tar.xz mirror://kernel/software/scm/git/git-2.0.1.tar.xz http://git-core.googlecode.com/files/git-manpages-2.0.1.tar.xz mirror://kernel/software/scm/git/git-manpages-2.0.1.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.0.1.tar.xz http://git-core.googlecode.com/files/git-htmldocs-2.0.1.tar.xz )
_eclasses_=bash-completion-r1 db412e427e3317ffd3e15f17df269c5e elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module a6a2d5c77bdaeba2794b167689cafb7a python-single-r1 a71a169a881e0a11d04a7fe12dc39f6e python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402 unpacker f300a7ca9131b1024a79762e8edd3c52
-_md5_=055b4436bc0e7f2485c43c8b36923b03
+_md5_=82bd71670ee8215444d205cd26bc7ccb
diff --git a/metadata/md5-cache/dev-vcs/git-annex-5.20140717 b/metadata/md5-cache/dev-vcs/git-annex-5.20140717
new file mode 100644
index 000000000000..bb5e7baa81b3
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-annex-5.20140717
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=dev-vcs/git dev-haskell/async dev-haskell/bloomfilter >=dev-haskell/cabal-1.8 dev-haskell/case-insensitive dev-haskell/dataenc dev-haskell/data-default dev-haskell/dlist dev-haskell/edit-distance >=dev-haskell/exceptions-0.5 dev-haskell/extensible-exceptions dev-haskell/hslogger dev-haskell/http dev-haskell/ifelse dev-haskell/json[generic] dev-haskell/missingh dev-haskell/monad-control >=dev-haskell/mtl-2 >=dev-haskell/network-2.0 >=dev-haskell/quickcheck-2.1:2 dev-haskell/random dev-haskell/safesemaphore dev-haskell/sha >=dev-haskell/stm-2.3 dev-haskell/text dev-haskell/unix-compat dev-haskell/utf8-string dev-haskell/uuid >=dev-lang/ghc-7.4.1 android? ( dev-haskell/data-endian ) assistant? ( >=dev-haskell/stm-2.3 inotify? ( dev-haskell/hinotify ) ) cryptohash? ( >=dev-haskell/cryptohash-0.10.0 ) dbus? ( >=dev-haskell/dbus-0.10.3 ) dns? ( dev-haskell/dns ) ekg? ( dev-haskell/aeson dev-haskell/ekg dev-haskell/http-types ) feed? ( dev-haskell/feed ) pairing? ( dev-haskell/network-info dev-haskell/network-multicast ) quvi? ( dev-haskell/aeson ) s3? ( dev-haskell/hs3 ) tdfa? ( dev-haskell/regex-tdfa ) tahoe? ( dev-haskell/aeson ) testsuite? ( >=dev-haskell/tasty-0.7 dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck dev-haskell/tasty-rerun dev-haskell/optparse-applicative ) webapp? ( dev-haskell/blaze-builder dev-haskell/aeson dev-haskell/clientsession dev-haskell/crypto-api dev-haskell/hamlet dev-haskell/http-types dev-haskell/path-pieces dev-haskell/transformers dev-haskell/shakespeare dev-haskell/wai dev-haskell/wai-extra dev-haskell/warp dev-haskell/warp-tls dev-haskell/yesod dev-haskell/yesod-core dev-haskell/yesod-default dev-haskell/yesod-form dev-haskell/yesod-static webapp-secure? ( dev-haskell/warp-tls dev-haskell/securemem dev-haskell/byteable ) ) webdav? ( >=dev-haskell/dav-0.3 dev-haskell/http-conduit dev-haskell/http-client dev-haskell/http-types dev-haskell/lifted-base dev-haskell/xml-conduit ) xmpp? ( >=dev-haskell/gnutls-0.1.4 dev-haskell/network-protocol-xmpp dev-haskell/xml-types ) dev-lang/perl doc? ( www-apps/ikiwiki net-misc/rsync ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=manage files with git, without checking their contents into git
+EAPI=5
+HOMEPAGE=http://git-annex.branchable.com/
+IUSE=android androidsplice +assistant +cryptohash +dbus +dns doc +desktop-notify ekg +feed +inotify +pairing +production +quvi +s3 +tahoe +tdfa +testsuite +webapp +webapp-secure +webdav +xmpp
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=GPL-3
+RDEPEND=dev-vcs/git
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/git-annex/5.20140717/git-annex-5.20140717.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 ghc-package 9dd58db252d8252779bb74ed015196e3 haskell-cabal b6154aeaa4dfbbc6d8a66d7f739c22d1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=1b7cb2d8025dac5ea3150d292af5b91e
diff --git a/metadata/md5-cache/games-action/maelstrom-3.0.6-r2 b/metadata/md5-cache/games-action/maelstrom-3.0.6-r2
index eeb3fcd120d7..59f9583ff5ed 100644
--- a/metadata/md5-cache/games-action/maelstrom-3.0.6-r2
+++ b/metadata/md5-cache/games-action/maelstrom-3.0.6-r2
@@ -3,10 +3,10 @@ DEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-net !=media-libs/plib-1.8.4 sys-libs/zlib virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXrandr x11-libs/libXt x11-proto/xf86vidmodeproto !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/freealut media-libs/freeglut media-libs/libpng:0 media-libs/libvorbis media-libs/openal >=media-libs/plib-1.8.4 sys-libs/zlib virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXrandr x11-proto/xf86vidmodeproto !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=The Open Racing Car Simulator
EAPI=5
HOMEPAGE=http://torcs.sourceforge.net/
KEYWORDS=amd64 x86
LICENSE=GPL-2 FreeArt
-RDEPEND=media-libs/freealut media-libs/freeglut media-libs/libpng:0 media-libs/libvorbis media-libs/openal >=media-libs/plib-1.8.4 sys-libs/zlib virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXrandr x11-libs/libXt games-misc/games-envd
+RDEPEND=media-libs/freealut media-libs/freeglut media-libs/libpng:0 media-libs/libvorbis media-libs/openal >=media-libs/plib-1.8.4 sys-libs/zlib virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXrandr games-misc/games-envd
SLOT=0
SRC_URI=mirror://sourceforge/torcs/torcs-1.3.4.tar.bz2
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 06133990e861be0fe60c2b428fd025d9 games e221fed675714bd5545b7488aed9f822 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747
-_md5_=17f318010d9c4f7a249a4c9aca9d16e8
+_md5_=2b60212f77f7177fd4908662a2094f2a
diff --git a/metadata/md5-cache/mail-mta/postfix-2.10.3 b/metadata/md5-cache/mail-mta/postfix-2.10.3
index 2ab4f4deb1b2..905108e9a307 100644
--- a/metadata/md5-cache/mail-mta/postfix-2.10.3
+++ b/metadata/md5-cache/mail-mta/postfix-2.10.3
@@ -4,11 +4,11 @@ DESCRIPTION=A fast and secure drop-in replacement for sendmail.
EAPI=5
HOMEPAGE=http://www.postfix.org/
IUSE=+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda ssl
-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
LICENSE=IBM
RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase selinux? ( sec-policy/selinux-postfix ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward
REQUIRED_USE=ldap-bind? ( ldap sasl )
SLOT=0
SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.10.3.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v13-2.10.0.patch )
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be multilib 3bf24e6abb9b76d9f6c20600f0b716bf pam aa1ebb3ab720ea04dbbdd6eaaf9554ed ssl-cert b53367370fde96e19beca78050a47c61 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=697ad670b4f8b6d573019f9a3b13af13
+_md5_=3f1268e11c1000e2e9a6b0dcb5e79e0a
diff --git a/metadata/md5-cache/media-gfx/eog-plugins-3.12.1 b/metadata/md5-cache/media-gfx/eog-plugins-3.12.1
index fd10d346d48a..0d06b79896db 100644
--- a/metadata/md5-cache/media-gfx/eog-plugins-3.12.1
+++ b/metadata/md5-cache/media-gfx/eog-plugins-3.12.1
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/libpeas-0.7.4:= >=media-gfx/eog-3.11.4
DESCRIPTION=Eye of GNOME plugins
EAPI=5
HOMEPAGE=https://live.gnome.org/EyeOfGnome/Plugins
-IUSE=+exif +flickr map +picasa +python python_targets_python3_2 python_targets_python3_3 python_single_target_python3_2 python_single_target_python3_3
+IUSE=+exif +flickr map +picasa +python python_single_target_python3_2 +python_single_target_python3_3 python_targets_python3_2 python_targets_python3_3 python_single_target_python3_2 python_single_target_python3_3
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/libpeas-0.7.4:= >=media-gfx/eog-3.11.4 >=x11-libs/gtk+-3.3.8:3 exif? ( >=media-libs/libexif-0.6.16 ) flickr? ( media-gfx/postr ) map? ( media-libs/libchamplain:0.12[gtk] >=media-libs/clutter-1.9.4:1.0 >=media-libs/clutter-gtk-1.1.2:1.0 ) picasa? ( >=dev-libs/libgdata-0.9.1:= ) python? ( python_single_target_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] dev-libs/libpeas:=[gtk,python,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] dev-python/pygobject:3[python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] gnome-base/gsettings-desktop-schemas media-gfx/eog[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] )
@@ -11,4 +11,4 @@ REQUIRED_USE=map? ( exif ) python? ( python_single_target_python3_2? ( python_ta
SLOT=0
SRC_URI=mirror://gnome/sources/eog-plugins/3.12/eog-plugins-3.12.1.tar.xz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 9637c29fc715b17a6328f24251129557 gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-single-r1 a71a169a881e0a11d04a7fe12dc39f6e python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7988d04deba7351d0c98c07e5a4889ce
+_md5_=be061f3125c467f1eda834afd771dccd
diff --git a/metadata/md5-cache/media-libs/giflib-4.1.6-r3 b/metadata/md5-cache/media-libs/giflib-4.1.6-r3
index 92d80310dfac..b58e12845ce7 100644
--- a/metadata/md5-cache/media-libs/giflib-4.1.6-r3
+++ b/metadata/md5-cache/media-libs/giflib-4.1.6-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Library to handle, display and manipulate GIF images
EAPI=5
HOMEPAGE=http://sourceforge.net/projects/giflib/
IUSE=rle static-libs X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=rle? ( media-libs/urt ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
SLOT=0
SRC_URI=mirror://sourceforge/giflib/giflib-4.1.6.tar.bz2
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build fbb9baa0b4039304643e36e9820fdecf multilib-minimal 5bbdc77877c1aa3c6bd89ca3f9196d11 multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=fb44826efd5d941b5813babd1183f7eb
+_md5_=901a71ea78369f327a97726f65d8415d
diff --git a/metadata/md5-cache/media-libs/imlib2-1.4.6-r2 b/metadata/md5-cache/media-libs/imlib2-1.4.6-r2
index 393aaacf9a0d..3a0d2af3027b 100644
--- a/metadata/md5-cache/media-libs/imlib2-1.4.6-r2
+++ b/metadata/md5-cache/media-libs/imlib2-1.4.6-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Version 2 of an advanced replacement library for libraries like libX
EAPI=4
HOMEPAGE=http://www.enlightenment.org/
IUSE=bzip2 gif jpeg mmx mp3 png static-libs tiff X zlib nls doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
LICENSE=BSD
RDEPEND==media-libs/freetype-2*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gif? ( >=media-libs/giflib-4.1.6-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-4.0.3-r6:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-libs/libid3tag-0.15.1b-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext )
SLOT=0
SRC_URI=mirror://sourceforge/enlightenment/imlib2-1.4.6.tar.gz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 enlightenment 98392d364f7f4c6cde8a516cbc298472 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build fbb9baa0b4039304643e36e9820fdecf multilib-minimal 5bbdc77877c1aa3c6bd89ca3f9196d11 multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=d603333f41e9c77904325d973f2ff107
+_md5_=cb0cd2240e854f7f8e8ef8af25486bdc
diff --git a/metadata/md5-cache/media-libs/libid3tag-0.15.1b-r4 b/metadata/md5-cache/media-libs/libid3tag-0.15.1b-r4
index 6c173fd24f97..e041d781f8c5 100644
--- a/metadata/md5-cache/media-libs/libid3tag-0.15.1b-r4
+++ b/metadata/md5-cache/media-libs/libid3tag-0.15.1b-r4
@@ -4,10 +4,10 @@ DESCRIPTION=The MAD id3tag library
EAPI=5
HOMEPAGE=http://www.underbit.com/products/mad/
IUSE=debug static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r6 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
SLOT=0
SRC_URI=mirror://sourceforge/mad/libid3tag-0.15.1b.tar.gz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build fbb9baa0b4039304643e36e9820fdecf multilib-minimal 5bbdc77877c1aa3c6bd89ca3f9196d11 multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=21dd06250beb4784122e624e6434eb10
+_md5_=128274e68c77c07062db30d8f6671564
diff --git a/metadata/md5-cache/media-libs/mesa-10.2.4 b/metadata/md5-cache/media-libs/mesa-10.2.4
new file mode 100644
index 000000000000..dcb83eb6754f
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-10.2.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test unpack
+DEPEND=!=app-admin/eselect-opengl-1.2.7 >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gbm? ( >=virtual/udev-208-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dri3? ( >=virtual/udev-208-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm? ( video_cards_radeonsi? ( || ( >=dev-libs/elfutils-0.155-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( || ( >=dev-libs/elfutils-0.155-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !video_cards_r600? ( video_cards_radeon? ( || ( >=dev-libs/elfutils-0.155-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) >=sys-devel/llvm-3.3-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( app-admin/eselect-opencl dev-libs/libclc ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.54[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_i915? ( >=x11-libs/libdrm-2.4.54[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.54[video_cards_intel] ) video_cards_ilo? ( >=x11-libs/libdrm-2.4.54[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.54[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.54[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.54[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.54[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.54[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.54[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.54[video_cards_radeon] ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) llvm? ( r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] ) video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) ) opencl? ( >=sys-devel/llvm-3.3-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/clang-3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig >=x11-proto/dri2proto-2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dri3? ( >=x11-proto/dri3proto-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/presentproto-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-proto/glproto-1.4.16-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xextproto-7.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xf86driproto-2.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xf86vidmodeproto-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=5
+HOMEPAGE=http://mesa3d.sourceforge.net/
+IUSE=video_cards_i915 video_cards_i965 video_cards_ilo video_cards_intel video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_nouveau video_cards_vmware bindist +classic debug +dri3 +egl +gallium gbm gles1 gles2 +llvm +nptl opencl openvg osmesa pax_kernel openmax pic r600-llvm-compiler selinux vdpau wayland xvmc xa kernel_FreeBSD abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT SGI-B-2.0
+RDEPEND=!=app-admin/eselect-opengl-1.2.7 >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gbm? ( >=virtual/udev-208-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dri3? ( >=virtual/udev-208-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm? ( video_cards_radeonsi? ( || ( >=dev-libs/elfutils-0.155-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( || ( >=dev-libs/elfutils-0.155-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !video_cards_r600? ( video_cards_radeon? ( || ( >=dev-libs/elfutils-0.155-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) >=sys-devel/llvm-3.3-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( app-admin/eselect-opencl dev-libs/libclc ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.54[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_i915? ( >=x11-libs/libdrm-2.4.54[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.54[video_cards_intel] ) video_cards_ilo? ( >=x11-libs/libdrm-2.4.54[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.54[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.54[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.54[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.54[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.54[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.54[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.54[video_cards_radeon] )
+REQUIRED_USE=llvm? ( gallium ) openvg? ( egl gallium ) opencl? ( gallium video_cards_r600? ( r600-llvm-compiler ) video_cards_radeon? ( r600-llvm-compiler ) video_cards_radeonsi? ( r600-llvm-compiler ) ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi video_cards_radeon ) ) wayland? ( egl gbm ) xa? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( || ( classic gallium ) ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_ilo? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vmware? ( gallium )
+SLOT=0
+SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/10.2.4/MesaLib-10.2.4.tar.bz2
+_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build fbb9baa0b4039304643e36e9820fdecf multilib-minimal 5bbdc77877c1aa3c6bd89ca3f9196d11 multiprocessing d7f2985a2c76c365ee20269db5261414 pax-utils 51ad5130f4a69b1a118ca5296de276ae python-any-r1 4560effd96d3d2a82e50af7cf87166da python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=8dd8e31bd5750531c32f0ff04fa0c585
diff --git a/metadata/md5-cache/media-libs/opusfile-0.5 b/metadata/md5-cache/media-libs/opusfile-0.5
index 169e93fd4d2a..d68e27de0394 100644
--- a/metadata/md5-cache/media-libs/opusfile-0.5
+++ b/metadata/md5-cache/media-libs/opusfile-0.5
@@ -4,10 +4,10 @@ DESCRIPTION=A high-level decoding and seeking API for .opus files
EAPI=5
HOMEPAGE=http://www.opus-codec.org/
IUSE=doc fixed-point +float +http static-libs
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~x86
LICENSE=BSD
RDEPEND=media-libs/libogg media-libs/opus http? ( dev-libs/openssl )
REQUIRED_USE=^^ ( fixed-point float )
SLOT=0
SRC_URI=http://downloads.xiph.org/releases/opus/opusfile-0.5.tar.gz
-_md5_=b5c8be1f8d35d0ab8e5fedd5e55badaa
+_md5_=4cb7c0abb1ee716290d45071ff9b81a3
diff --git a/metadata/md5-cache/media-libs/portaudio-19_pre20140130 b/metadata/md5-cache/media-libs/portaudio-19_pre20140130
index 889c227022b3..3b894ad4605c 100644
--- a/metadata/md5-cache/media-libs/portaudio-19_pre20140130
+++ b/metadata/md5-cache/media-libs/portaudio-19_pre20140130
@@ -4,10 +4,10 @@ DESCRIPTION=A free, cross-platform, open-source, audio I/O library
EAPI=5
HOMEPAGE=http://www.portaudio.com/
IUSE=alsa +cxx debug jack oss static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
LICENSE=MIT
RDEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( media-sound/jack-audio-connection-kit[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r8 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
SLOT=0
SRC_URI=http://www.portaudio.com/archives/pa_stable_v19_20140130.tgz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 autotools-multilib 037c4046d25f29e78dd44dccabd5d66b autotools-utils fb74970befc9b65ceec689d2ccff3022 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build fbb9baa0b4039304643e36e9820fdecf multilib-minimal 5bbdc77877c1aa3c6bd89ca3f9196d11 multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=f2729b7577520e9871155c38d6d7a200
+_md5_=02ec283546dc313bce2dc75a10050afb
diff --git a/metadata/md5-cache/media-sound/easytag-2.2.2 b/metadata/md5-cache/media-sound/easytag-2.2.2
index 4467df7eb98a..894ad5c650cd 100644
--- a/metadata/md5-cache/media-sound/easytag-2.2.2
+++ b/metadata/md5-cache/media-sound/easytag-2.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media ta
EAPI=5
HOMEPAGE=https://wiki.gnome.org/Apps/EasyTAG
IUSE=flac gtk2 +gtk3 mp3 mp4 opus speex test vorbis wavpack
-KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
LICENSE=GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+
RDEPEND=>=dev-libs/glib-2.32:2 flac? ( >=media-libs/flac-1.3 ) gtk2? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.4:3 ) mp3? ( >=media-libs/id3lib-3.8.3-r8 >=media-libs/libid3tag-0.15.1b-r4 ) mp4? ( >=media-libs/taglib-1.9.1[mp4] ) opus? ( >=media-libs/opus-1.1 >=media-libs/opusfile-0.4 ) speex? ( >=media-libs/speex-1.2_rc1 ) vorbis? ( >=media-libs/libogg-1.3.1 >=media-libs/libvorbis-1.3.4 ) wavpack? ( >=media-sound/wavpack-4.70 )
REQUIRED_USE=|| ( gtk2 gtk3 ) opus? ( vorbis ) speex? ( vorbis )
SLOT=0
SRC_URI=mirror://gnome/sources/easytag/2.2/easytag-2.2.2.tar.xz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2-utils f658eba3cc594a21cf6eef4af47daa90 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=93eb5bbaac7f06b62fb1e608016bc174
+_md5_=9f60b05952aef0d77fa8ae14ac3b9e3d
diff --git a/metadata/md5-cache/media-sound/lilypond-2.19.10 b/metadata/md5-cache/media-sound/lilypond-2.19.10
new file mode 100644
index 000000000000..f7afb16b3818
--- /dev/null
+++ b/metadata/md5-cache/media-sound/lilypond-2.19.10
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2[deprecated,regex] media-fonts/urw-fonts media-libs/fontconfig media-libs/freetype:2 >=x11-libs/pango-1.12.3 emacs? ( virtual/emacs ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] app-text/t1utils dev-lang/perl || ( ( >=dev-texlive/texlive-metapost-2013 >=dev-tex/metapost-1.803 ) =sys-apps/texinfo-4.11 >=sys-devel/bison-2.0 sys-devel/flex sys-devel/gettext sys-devel/make !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=GNU Music Typesetter
+EAPI=5
+HOMEPAGE=http://lilypond.org/
+IUSE=debug emacs profile vim-syntax linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_eo linguas_es linguas_fi linguas_fr linguas_it linguas_ja linguas_nl linguas_ru linguas_sv linguas_tr linguas_uk linguas_vi linguas_zh_TW python_targets_python2_7 python_single_target_python2_7
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=GPL-3 FDL-1.3
+RDEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2[deprecated,regex] media-fonts/urw-fonts media-libs/fontconfig media-libs/freetype:2 >=x11-libs/pango-1.12.3 emacs? ( virtual/emacs ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?]
+REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://download.linuxaudio.org/lilypond/sources/v2.19/lilypond-2.19.10.tar.gz
+_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-single-r1 a71a169a881e0a11d04a7fe12dc39f6e python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=f369302ec99db791150b1cb0391f1a27
diff --git a/metadata/md5-cache/media-sound/tomahawk-0.6.1 b/metadata/md5-cache/media-sound/tomahawk-0.6.1
index 5d8c7343838a..05ecc8d1cce6 100644
--- a/metadata/md5-cache/media-sound/tomahawk-0.6.1
+++ b/metadata/md5-cache/media-sound/tomahawk-0.6.1
@@ -1,6 +1,6 @@
DEFINED_PHASES=compile configure install prepare test unpack
DEPEND=app-crypt/qca:2 >=dev-cpp/clucene-2.3.3.4 >=dev-libs/boost-1.41 >=dev-libs/libattica-0.4.0 dev-libs/qjson dev-libs/quazip >=dev-qt/qtcore-4.7.0:4 >=dev-qt/qtdbus-4.7.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) =dev-qt/qtsql-4.7.0:4[sqlite] >=dev-qt/qtsvg-4.7.0:4 >=dev-qt/qtwebkit-4.7.0:4 >=media-libs/liblastfm-1.0.1 >=media-libs/libechonest-2.0.1 >=media-libs/phonon-4.5.0 >=media-libs/taglib-1.6.0 x11-libs/libX11 jabber? ( >=net-libs/jreen-1.1.1 ) twitter? ( net-libs/qtweetlib ) sys-devel/make >=dev-util/cmake-2.8.6 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Qt playdar social music player
+DESCRIPTION=Multi-source social music player
EAPI=5
HOMEPAGE=http://tomahawk-player.org/
IUSE=debug jabber twitter
@@ -10,4 +10,4 @@ RDEPEND=app-crypt/qca:2 >=dev-cpp/clucene-2.3.3.4 >=dev-libs/boost-1.41 >=dev-li
SLOT=0
SRC_URI=http://download.tomahawk-player.org/tomahawk-0.6.1.tar.bz2
_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 cmake-utils 10b6a99f9058ac1b830d00b3421f04e4 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be multilib 3bf24e6abb9b76d9f6c20600f0b716bf qmake-utils dd0375da11f79aa416ff97913c59d01c qt4-r2 b40473dafd07d7c5fe4aef1c1b902f39 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=71ec13f49ab56a57d9f1e54e4d94cfd8
+_md5_=4fc829871ceb0da98f07ad75ca0e6652
diff --git a/metadata/md5-cache/media-sound/tomahawk-0.7.0 b/metadata/md5-cache/media-sound/tomahawk-0.7.0
index d1dca1124611..e994cc464a67 100644
--- a/metadata/md5-cache/media-sound/tomahawk-0.7.0
+++ b/metadata/md5-cache/media-sound/tomahawk-0.7.0
@@ -1,6 +1,6 @@
DEFINED_PHASES=compile configure install prepare test unpack
DEPEND=app-crypt/qca:2 >=dev-cpp/clucene-2.3.3.4 >=dev-libs/boost-1.41 >=dev-libs/libattica-0.4.0 dev-libs/qjson dev-libs/quazip >=dev-qt/qtcore-4.7.0:4 >=dev-qt/qtdbus-4.7.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) =dev-qt/qtsql-4.7.0:4[sqlite] >=dev-qt/qtsvg-4.7.0:4 >=dev-qt/qtwebkit-4.7.0:4 >=media-libs/liblastfm-1.0.1 >=media-libs/libechonest-2.0.3 >=media-libs/phonon-4.5.0 >=media-libs/taglib-1.6.0 x11-libs/libX11 jabber? ( >=net-libs/jreen-1.1.1 ) twitter? ( net-libs/qtweetlib ) sys-devel/make >=dev-util/cmake-2.8.6 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Qt playdar social music player
+DESCRIPTION=Multi-source social music player
EAPI=5
HOMEPAGE=http://tomahawk-player.org/
IUSE=debug jabber twitter
@@ -10,4 +10,4 @@ RDEPEND=app-crypt/qca:2 >=dev-cpp/clucene-2.3.3.4 >=dev-libs/boost-1.41 >=dev-li
SLOT=0
SRC_URI=http://download.tomahawk-player.org/tomahawk-0.7.0.tar.bz2
_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 cmake-utils 10b6a99f9058ac1b830d00b3421f04e4 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be multilib 3bf24e6abb9b76d9f6c20600f0b716bf qmake-utils dd0375da11f79aa416ff97913c59d01c qt4-r2 b40473dafd07d7c5fe4aef1c1b902f39 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=5a3290d75eb44d19731cb73af37ce7ee
+_md5_=f05009f76b48968c27d9acdc4281114e
diff --git a/metadata/md5-cache/media-sound/tomahawk-9999 b/metadata/md5-cache/media-sound/tomahawk-9999
index 53f5626c7498..dd31b41335e4 100644
--- a/metadata/md5-cache/media-sound/tomahawk-9999
+++ b/metadata/md5-cache/media-sound/tomahawk-9999
@@ -1,6 +1,6 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
DEPEND=app-crypt/qca:2 >=dev-cpp/clucene-2.3.3.4 >=dev-libs/boost-1.41 dev-libs/qjson dev-libs/quazip dev-libs/qtkeychain >=media-libs/libechonest-2.2.0:= >=media-libs/liblastfm-1.0.1 >=media-libs/phonon-4.5.0 >=media-libs/taglib-1.6.0 x11-libs/libX11 jabber? ( >=net-libs/jreen-1.1.1 ) !qt5? ( >=dev-libs/libattica-0.4.0 dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsql:4[sqlite] dev-qt/qtsvg:4 dev-qt/qtwebkit:4 ) qt5? ( >=dev-libs/libattica-0.4.0[qt5] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 ) telepathy? ( net-libs/telepathy-qt ) >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=] )
-DESCRIPTION=Qt playdar social music player
+DESCRIPTION=Multi-source social music player
EAPI=5
HOMEPAGE=http://tomahawk-player.org/
IUSE=debug jabber kde qt5 telepathy aqua kde
@@ -9,4 +9,4 @@ RDEPEND=app-crypt/qca:2 >=dev-cpp/clucene-2.3.3.4 >=dev-libs/boost-1.41 dev-libs
REQUIRED_USE=telepathy? ( kde )
SLOT=0
_eclasses_=cmake-utils 10b6a99f9058ac1b830d00b3421f04e4 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be git-r3 49fc3d60d7bcd6f8913ad6ec0cb4c67b gnome2-utils f658eba3cc594a21cf6eef4af47daa90 kde4-base 9f3084f58fc936e3f01c6e9ba21962bc kde4-functions 492237eb2823bdc02bc769530501f0ea multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ad1b600933df8b91c0278b7783ac23ec
+_md5_=e865a81fdfbb290a69eb5850b0e3a99d
diff --git a/metadata/md5-cache/net-analyzer/mtr-0.85_p20140126 b/metadata/md5-cache/net-analyzer/mtr-0.85_p20140126
index 1fade74ae966..593d48eb1b03 100644
--- a/metadata/md5-cache/net-analyzer/mtr-0.85_p20140126
+++ b/metadata/md5-cache/net-analyzer/mtr-0.85_p20140126
@@ -4,10 +4,10 @@ DESCRIPTION=My TraceRoute, an Excellent network diagnostic tool
EAPI=5
HOMEPAGE=http://www.bitwizard.nl/mtr/
IUSE=gtk ipv6 suid
-KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
SLOT=0
SRC_URI=http://dev.gentoo.org/~jer/mtr-0.85_p20140126.tar.bz2
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=ae17453145b8cdc76efba4bde8cb3332
+_md5_=c860b3df3fee57999c79fef5f2028809
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.4.8-r1 b/metadata/md5-cache/net-analyzer/rrdtool-1.4.8-r1
index 1ae4490c3d65..557aa86525ea 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.4.8-r1
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.4.8-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A system to store and display time-series data
EAPI=5
HOMEPAGE=http://oss.oetiker.ch/rrdtool/
IUSE=dbi doc +graph lua perl python rrdcgi static-libs tcl tcpd python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris
LICENSE=GPL-2
RDEPEND=>=dev-libs/glib-2.28.7[static-libs(+)?] >=dev-libs/libxml2-2.7.8[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua[deprecated] ) perl? ( dev-lang/perl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) tcl? ( dev-lang/tcl ) tcpd? ( sys-apps/tcp-wrappers )
SLOT=0
SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.8.tar.gz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 distutils-r1 d48d51c220f1678179fc4ab13b534ec1 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module a6a2d5c77bdaeba2794b167689cafb7a python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402 unpacker f300a7ca9131b1024a79762e8edd3c52
-_md5_=da3c86bd56c634a6d9131b1df28580d5
+_md5_=469ebbde77c6df396da9381600dc64ed
diff --git a/metadata/md5-cache/net-analyzer/synscan-5.01 b/metadata/md5-cache/net-analyzer/synscan-5.01
index a1cce3381df3..8124eeac80e1 100644
--- a/metadata/md5-cache/net-analyzer/synscan-5.01
+++ b/metadata/md5-cache/net-analyzer/synscan-5.01
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile install prepare
DEPEND=net-libs/libpcap !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=A fast asynchronous half-open TCP portscanner
-EAPI=3
+EAPI=5
HOMEPAGE=http://www.digit-labs.org/files/tools/synscan/
IUSE=kernel_FreeBSD kernel_linux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=net-libs/libpcap
SLOT=0
SRC_URI=http://www.digit-labs.org/files/tools/synscan/releases/synscan-5.01.tar.gz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=3ba5a675a7e3cd34dada2734f9cc1288
+_md5_=8acdbee1893eeb4e1632faefa69ec77c
diff --git a/metadata/md5-cache/net-dialup/mgetty-1.1.37-r1 b/metadata/md5-cache/net-dialup/mgetty-1.1.37-r1
index 1d45c86f2d29..9eeb4b88f082 100644
--- a/metadata/md5-cache/net-dialup/mgetty-1.1.37-r1
+++ b/metadata/md5-cache/net-dialup/mgetty-1.1.37-r1
@@ -4,10 +4,10 @@ DESCRIPTION=fax and voice modem programs
EAPI=5
HOMEPAGE=http://mgetty.greenie.net/
IUSE=doc +fax fidonet
-KEYWORDS=~alpha ~amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha ~amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
LICENSE=GPL-2
RDEPEND=doc? ( virtual/latex-base virtual/texi2dvi ) >=sys-apps/sed-4 sys-apps/groff dev-lang/perl sys-apps/texinfo virtual/awk fax? ( !net-misc/efax !net-misc/hylafax ) fax? ( media-libs/netpbm app-text/ghostscript-gpl )
SLOT=0
SRC_URI=ftp://mgetty.greenie.net/pub/mgetty/source/1.1/mgetty1.1.37-Jun05.tar.gz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747
-_md5_=289bc6ddca932f5b594ca166f19f6ec7
+_md5_=62945af6dcced0b23a0b9a0da49bc1d9
diff --git a/metadata/md5-cache/net-dns/bind-9.9.5-r3 b/metadata/md5-cache/net-dns/bind-9.9.5-r3
index 8fc3fcc5fad8..c35882bb1294 100644
--- a/metadata/md5-cache/net-dns/bind-9.9.5-r3
+++ b/metadata/md5-cache/net-dns/bind-9.9.5-r3
@@ -4,7 +4,7 @@ DESCRIPTION=BIND - Berkeley Internet Name Domain - Name Server
EAPI=5
HOMEPAGE=http://www.isc.org/software/bind
IUSE=berkdb caps dlz doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6 ldap mysql odbc postgres python rpz rrl sdb-ldap selinux ssl static-libs threads urandom xml
-KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2 ISC BSD BSD-2 HPND JNIC openssl
RDEPEND=ssl? ( dev-libs/openssl:0[-bindist] ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( net-dns/idnkit ) postgres? ( dev-db/postgresql-base ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) sdb-ldap? ( net-nds/openldap ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) selinux? ( sec-policy/selinux-bind ) || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) python? ( || ( =dev-lang/python-3* =dev-lang/python-2.7* ) )
REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz !threads ) odbc? ( dlz ) ldap? ( dlz ) sdb-ldap? ( dlz ) gost? ( ssl ) threads? ( caps )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=ftp://ftp.isc.org/isc/bind9/9.9.5/bind-9.9.5.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 ) geoip? ( http://bind-geoip.googlecode.com//files/bind-geoip-1.3-readme.txt http://dev.gentoo.org/~idl0r/bind-9.9.5-geoip.patch ) sdb-ldap? ( http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-1.1.0-fc14.patch.bz2 )
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 db-use 1c719875d6599536f956fafea9e1f404 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python be9965681d83c3980660a2660ac95e95 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ca3a538cf0dc1c222a0e80b9d4688d66
+_md5_=6997c08b12cc014d5b8efa3084e3c537
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.9.5 b/metadata/md5-cache/net-dns/bind-tools-9.9.5
index 4b84b22f0bfe..51b8d0cf4ae3 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.9.5
+++ b/metadata/md5-cache/net-dns/bind-tools-9.9.5
@@ -4,7 +4,7 @@ DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
EAPI=5
HOMEPAGE=http://www.isc.org/software/bind
IUSE=doc gost gssapi idn ipv6 readline ssl urandom xml
-KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=ISC BSD BSD-2 HPND JNIC RSA openssl
RDEPEND=ssl? ( dev-libs/openssl:0 ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline )
REQUIRED_USE=gost? ( ssl )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=ftp://ftp.isc.org/isc/bind9/9.9.5/bind-9.9.5.tar.gz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=b5b6167649e36b5da99138d8b76d440c
+_md5_=064e2c721e6ad1c8011874a63b38f66d
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.21-r1 b/metadata/md5-cache/net-firewall/iptables-1.4.21-r1
index e28774f9734b..77bd19b35874 100644
--- a/metadata/md5-cache/net-firewall/iptables-1.4.21-r1
+++ b/metadata/md5-cache/net-firewall/iptables-1.4.21-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
EAPI=5
HOMEPAGE=http://www.netfilter.org/projects/iptables/
IUSE=ipv6 netlink static-libs
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86
LICENSE=GPL-2
RDEPEND=netlink? ( net-libs/libnfnetlink )
SLOT=0
SRC_URI=http://www.netfilter.org/projects/iptables/files/iptables-1.4.21.tar.bz2
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=d9fefb0ab6e1f3305eea9a38ee8980d9
+_md5_=d685c7eb268f050e9758c25ef73d1a84
diff --git a/metadata/md5-cache/net-firewall/lutelwall-0.99 b/metadata/md5-cache/net-firewall/lutelwall-0.99
index 0f6736c00fdb..3f7978fb69e4 100644
--- a/metadata/md5-cache/net-firewall/lutelwall-0.99
+++ b/metadata/md5-cache/net-firewall/lutelwall-0.99
@@ -1,10 +1,10 @@
DEFINED_PHASES=install postinst
-DEPEND=>=net-firewall/iptables-1.2.6 sys-apps/iproute2 >=sys-apps/gawk-3.1
-DESCRIPTION=High-level tool for firewall configuration
-HOMEPAGE=http://firewall.lutel.pl
+DESCRIPTION=IPTables firewall setup script
+EAPI=5
+HOMEPAGE=http://www.lutel.pl/lutelwall/
KEYWORDS=alpha ~amd64 ~ppc ~sparc x86
LICENSE=GPL-2
-RDEPEND=>=net-firewall/iptables-1.2.6 sys-apps/iproute2 >=sys-apps/gawk-3.1
+RDEPEND=>=net-firewall/iptables-1.2.6 >=sys-apps/gawk-3.1 sys-apps/iproute2
SLOT=0
-SRC_URI=http://firewall.lutel.pl/download/0.99/lutelwall-0.99.tar.gz
-_md5_=1b84f9592c3e8fe1cf454bd6e8b527bd
+SRC_URI=http://www.lutel.pl/wp-content/uploads/0.99/lutelwall-0.99.tar.gz
+_md5_=4359c674bccdea7ecbf314d8e86b6ffa
diff --git a/metadata/md5-cache/net-firewall/nufw-2.2.22 b/metadata/md5-cache/net-firewall/nufw-2.2.22
deleted file mode 100644
index fe0498dc6896..000000000000
--- a/metadata/md5-cache/net-firewall/nufw-2.2.22
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst test unpack
-DEPEND=>=dev-libs/glib-2 dev-libs/libgcrypt:0 >=dev-libs/cyrus-sasl-2 net-firewall/iptables >=net-libs/gnutls-1.1 ldap? ( >=net-nds/openldap-2 ) mysql? ( virtual/mysql ) pam? ( sys-libs/pam ) pam_nuauth? ( sys-libs/pam ) postgres? ( dev-db/postgresql-server ) nfqueue? ( net-libs/libnfnetlink net-libs/libnetfilter_queue ) nfconntrack? ( net-libs/libnetfilter_conntrack ) prelude? ( dev-libs/libprelude ) dev-python/ipy dev-libs/openssl
-DESCRIPTION=An enterprise grade authenticating firewall based on netfilter
-EAPI=1
-HOMEPAGE=http://www.nufw.org/
-IUSE=debug ldap mysql pam pam_nuauth plaintext postgres prelude unicode nfqueue nfconntrack static syslog test
-KEYWORDS=~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2 dev-libs/libgcrypt:0 >=dev-libs/cyrus-sasl-2 net-firewall/iptables >=net-libs/gnutls-1.1 ldap? ( >=net-nds/openldap-2 ) mysql? ( virtual/mysql ) pam? ( sys-libs/pam ) pam_nuauth? ( sys-libs/pam ) postgres? ( dev-db/postgresql-server ) nfqueue? ( net-libs/libnfnetlink net-libs/libnetfilter_queue ) nfconntrack? ( net-libs/libnetfilter_conntrack ) prelude? ( dev-libs/libprelude ) dev-python/ipy
-SLOT=0
-SRC_URI=http://www.nufw.org/attachments/download/39/nufw-2.2.22.tar.bz2
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be multilib 3bf24e6abb9b76d9f6c20600f0b716bf pam aa1ebb3ab720ea04dbbdd6eaaf9554ed ssl-cert b53367370fde96e19beca78050a47c61 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=5bc7f7a9eafa87c0dd04abe0872ac1ac
diff --git a/metadata/md5-cache/net-firewall/nufw-2.2.22-r1 b/metadata/md5-cache/net-firewall/nufw-2.2.22-r1
new file mode 100644
index 000000000000..89da5daff8f1
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/nufw-2.2.22-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=dev-libs/cyrus-sasl dev-libs/glib:2 dev-libs/libgcrypt:0 dev-python/ipy net-firewall/iptables net-libs/gnutls ldap? ( >=net-nds/openldap-2 ) mysql? ( virtual/mysql ) nfconntrack? ( net-libs/libnetfilter_conntrack ) nfqueue? ( net-libs/libnfnetlink net-libs/libnetfilter_queue ) pam? ( sys-libs/pam ) pam_nuauth? ( sys-libs/pam ) postgres? ( dev-db/postgresql-server ) prelude? ( dev-libs/libprelude ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-libs/openssl
+DESCRIPTION=An enterprise grade authenticating firewall based on netfilter
+EAPI=5
+HOMEPAGE=http://www.nufw.org/
+IUSE=debug ldap mysql pam pam_nuauth plaintext postgres prelude unicode nfqueue nfconntrack static syslog test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/cyrus-sasl dev-libs/glib:2 dev-libs/libgcrypt:0 dev-python/ipy net-firewall/iptables net-libs/gnutls ldap? ( >=net-nds/openldap-2 ) mysql? ( virtual/mysql ) nfconntrack? ( net-libs/libnetfilter_conntrack ) nfqueue? ( net-libs/libnfnetlink net-libs/libnetfilter_queue ) pam? ( sys-libs/pam ) pam_nuauth? ( sys-libs/pam ) postgres? ( dev-db/postgresql-server ) prelude? ( dev-libs/libprelude )
+REQUIRED_USE=pam_nuauth? ( plaintext )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.nufw.org/attachments/download/39/nufw-2.2.22.tar.bz2
+_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 pam aa1ebb3ab720ea04dbbdd6eaaf9554ed ssl-cert b53367370fde96e19beca78050a47c61 toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=31bb5ef5e188da3be762366497d12334
diff --git a/metadata/md5-cache/net-firewall/psad-2.2.3 b/metadata/md5-cache/net-firewall/psad-2.2.3
index c2c9d01fc9dd..d2637a64d65e 100644
--- a/metadata/md5-cache/net-firewall/psad-2.2.3
+++ b/metadata/md5-cache/net-firewall/psad-2.2.3
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=virtual/perl-ExtUtils-MakeMaker || ( >=dev-lang/perl-5.16 =dev-lang/perl-5.16 =net-nds/rpcbind-0.2.0-r1 net-libs/libtirpc libmount? ( sys-apps/util-linux ) nfsdcld? ( >=dev-db/sqlite-3.3 ) nfsv4? ( >=dev-libs/libevent-1.0b >=net-libs/libnfsidmap-0.21-r1 kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) nfsidmap? ( >=net-libs/libnfsidmap-0.24 sys-apps/keyutils ) ) nfsv41? ( sys-fs/lvm2 ) selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind ) uuid? ( sys-apps/util-linux ) !net-nds/portmap
REQUIRED_USE=kerberos? ( nfsv4 )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/nfs/nfs-utils-1.2.9.tar.bz2
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=11b38de399ec425ce4284debbb642f5d
+_md5_=9b8c795bf2c8f833bd54d5ae36b68f9d
diff --git a/metadata/md5-cache/net-libs/daq-2.0.2 b/metadata/md5-cache/net-libs/daq-2.0.2
index 20bce066eb62..59bc3f1dce38 100644
--- a/metadata/md5-cache/net-libs/daq-2.0.2
+++ b/metadata/md5-cache/net-libs/daq-2.0.2
@@ -1,13 +1,13 @@
DEFINED_PHASES=configure install postinst prepare
-DEPEND=pcap? ( >=net-libs/libpcap-1.0.0 ) dump? ( >=net-libs/libpcap-1.0.0 ) nfq? ( dev-libs/libdnet >=net-firewall/iptables-1.4.10 net-libs/libnetfilter_queue ) ipq? ( dev-libs/libdnet >=net-firewall/iptables-1.4.10 net-libs/libnetfilter_queue ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dump? ( >=net-libs/libpcap-1.0.0 ) ipq? ( >=net-firewall/iptables-1.4.10 dev-libs/libdnet net-libs/libnetfilter_queue ) nfq? ( >=net-firewall/iptables-1.4.10 dev-libs/libdnet net-libs/libnetfilter_queue ) pcap? ( >=net-libs/libpcap-1.0.0 ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Data Acquisition library, for packet I/O
-EAPI=4
+EAPI=5
HOMEPAGE=http://www.snort.org/
IUSE=ipv6 +afpacket +dump +pcap nfq ipq static-libs
KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86
LICENSE=GPL-2
-RDEPEND=pcap? ( >=net-libs/libpcap-1.0.0 ) dump? ( >=net-libs/libpcap-1.0.0 ) nfq? ( dev-libs/libdnet >=net-firewall/iptables-1.4.10 net-libs/libnetfilter_queue ) ipq? ( dev-libs/libdnet >=net-firewall/iptables-1.4.10 net-libs/libnetfilter_queue )
+RDEPEND=dump? ( >=net-libs/libpcap-1.0.0 ) ipq? ( >=net-firewall/iptables-1.4.10 dev-libs/libdnet net-libs/libnetfilter_queue ) nfq? ( >=net-firewall/iptables-1.4.10 dev-libs/libdnet net-libs/libnetfilter_queue ) pcap? ( >=net-libs/libpcap-1.0.0 )
SLOT=0
SRC_URI=http://www.snort.org/downloads/2778 -> daq-2.0.2.tar.gz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=e302bb6900b90ae6edd8f5d8c71b6b3c
+_md5_=08379ae8b65ec6b65c0c7b58fa77bec2
diff --git a/metadata/md5-cache/net-libs/jreen-1.1.1 b/metadata/md5-cache/net-libs/jreen-1.1.1
deleted file mode 100644
index f16814f5f1b0..000000000000
--- a/metadata/md5-cache/net-libs/jreen-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=app-crypt/qca-2.0.3 >=net-dns/libidn-1.20 >=dev-qt/qtcore-4.6.0:4 >=dev-qt/qtgui-4.6.0:4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Qt XMPP library
-EAPI=5
-HOMEPAGE=https://github.com/euroelessar/jreen
-IUSE=debug
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=app-crypt/qca-2.0.3 >=net-dns/libidn-1.20 >=dev-qt/qtcore-4.6.0:4 >=dev-qt/qtgui-4.6.0:4
-SLOT=0
-SRC_URI=https://github.com/euroelessar/jreen/archive/v1.1.1.tar.gz -> jreen-1.1.1.tar.gz
-_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 cmake-utils 10b6a99f9058ac1b830d00b3421f04e4 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be multilib 3bf24e6abb9b76d9f6c20600f0b716bf qmake-utils dd0375da11f79aa416ff97913c59d01c qt4-r2 b40473dafd07d7c5fe4aef1c1b902f39 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=07d0eda9277cab14771bd7d285e57f45
diff --git a/metadata/md5-cache/net-libs/libesmtp-1.0.6-r1 b/metadata/md5-cache/net-libs/libesmtp-1.0.6-r1
new file mode 100644
index 000000000000..f4c22c905e3a
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libesmtp-1.0.6-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=ssl? ( dev-libs/openssl )
+DESCRIPTION=lib that implements the client side of the SMTP protocol
+EAPI=5
+HOMEPAGE=http://www.stafford.uklinux.net/libesmtp/
+IUSE=debug ntlm ssl static-libs threads
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=LGPL-2.1 GPL-2
+RDEPEND=ssl? ( dev-libs/openssl )
+SLOT=0
+SRC_URI=http://www.stafford.uklinux.net/libesmtp/libesmtp-1.0.6.tar.bz2
+_eclasses_=libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=79c575fa1ecb964022be886109708b38
diff --git a/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.0 b/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.0
deleted file mode 100644
index 79f93e4a8870..000000000000
--- a/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=net-libs/libmnl virtual/pkgconfig
-DESCRIPTION=Userspace library providing interface to extended accounting infrastructure of NetFilter
-EAPI=4
-HOMEPAGE=http://netfilter.org/projects/libnetfilter_acct
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=net-libs/libmnl
-SLOT=0
-SRC_URI=http://www.netfilter.org/projects/libnetfilter_acct/files/libnetfilter_acct-1.0.0.tar.bz2
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 linux-info 2b8c53f6065bdee2d757472215a3088f multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=20483f4d8da8830343bce126d469c41f
diff --git a/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.1 b/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.1
deleted file mode 100644
index 2e66ebfcfafa..000000000000
--- a/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=net-libs/libmnl virtual/pkgconfig
-DESCRIPTION=Userspace library providing interface to extended accounting infrastructure of NetFilter
-EAPI=5
-HOMEPAGE=http://netfilter.org/projects/libnetfilter_acct
-IUSE=examples
-KEYWORDS=amd64 ~arm ~ppc x86 ~amd64-linux
-LICENSE=LGPL-2.1
-RDEPEND=net-libs/libmnl
-SLOT=0
-SRC_URI=http://www.netfilter.org/projects/libnetfilter_acct/files/libnetfilter_acct-1.0.1.tar.bz2
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 linux-info 2b8c53f6065bdee2d757472215a3088f multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a7acaabfc80f201a2e89bd16b6308ab4
diff --git a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.0 b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.0
deleted file mode 100644
index 7971495b35e2..000000000000
--- a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=net-libs/libnfnetlink-1.0.0 virtual/pkgconfig
-DESCRIPTION=programming interface (API) to the in-kernel connection tracking state table
-EAPI=4
-HOMEPAGE=http://www.netfilter.org/projects/libnetfilter_conntrack/
-IUSE=static-libs
-KEYWORDS=amd64 hppa ia64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=>=net-libs/libnfnetlink-1.0.0
-SLOT=0
-SRC_URI=http://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.0.tar.bz2
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 autotools-utils fb74970befc9b65ceec689d2ccff3022 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 linux-info 2b8c53f6065bdee2d757472215a3088f multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=493d517bbb63fe21598dc2d34be3abe2
diff --git a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.1 b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.1
deleted file mode 100644
index 760580006960..000000000000
--- a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=net-libs/libnfnetlink-1.0.0 virtual/pkgconfig
-DESCRIPTION=programming interface (API) to the in-kernel connection tracking state table
-EAPI=4
-HOMEPAGE=http://www.netfilter.org/projects/libnetfilter_conntrack/
-IUSE=static-libs
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=net-libs/libnfnetlink-1.0.0
-SLOT=0
-SRC_URI=http://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.1.tar.bz2
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 autotools-utils fb74970befc9b65ceec689d2ccff3022 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 linux-info 2b8c53f6065bdee2d757472215a3088f multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c24d2f0f21bdb3bec0a47e07fbcda962
diff --git a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.2 b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.2
deleted file mode 100644
index 077e389188f6..000000000000
--- a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-1.0.0 virtual/pkgconfig
-DESCRIPTION=programming interface (API) to the in-kernel connection tracking state table
-EAPI=5
-HOMEPAGE=http://www.netfilter.org/projects/libnetfilter_conntrack/
-IUSE=static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-1.0.0
-SLOT=0
-SRC_URI=http://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.2.tar.bz2
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 autotools-utils fb74970befc9b65ceec689d2ccff3022 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 linux-info 2b8c53f6065bdee2d757472215a3088f multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=713c000175a333d63662dff29c6e7d01
diff --git a/metadata/md5-cache/net-libs/libnetfilter_log-1.0.1 b/metadata/md5-cache/net-libs/libnetfilter_log-1.0.1
index 2f819b7f2cb8..dd8f0d326323 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_log-1.0.1
+++ b/metadata/md5-cache/net-libs/libnetfilter_log-1.0.1
@@ -10,4 +10,4 @@ RDEPEND=>=net-libs/libnfnetlink-1.0.0
SLOT=0
SRC_URI=http://www.netfilter.org/projects/libnetfilter_log/files/libnetfilter_log-1.0.1.tar.bz2
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 autotools-utils fb74970befc9b65ceec689d2ccff3022 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 linux-info 2b8c53f6065bdee2d757472215a3088f multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=699d5c8dbc462dcdcbdf207410909c86
+_md5_=1ef0f14b4eba7c14865fd5746e9a118c
diff --git a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.1 b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.1
deleted file mode 100644
index 1b9bd1fd6fc3..000000000000
--- a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=net-libs/libnfnetlink-0.0.41 virtual/pkgconfig
-DESCRIPTION=API to packets that have been queued by the kernel packet filter
-EAPI=4
-HOMEPAGE=http://www.netfilter.org/projects/libnetfilter_queue/
-IUSE=static-libs
-KEYWORDS=amd64 ~arm ~ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=net-libs/libnfnetlink-0.0.41
-SLOT=0
-SRC_URI=http://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-1.0.1.tar.bz2
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 autotools-utils fb74970befc9b65ceec689d2ccff3022 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 linux-info 2b8c53f6065bdee2d757472215a3088f multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=29041b11574ba692f90146908757c37b
diff --git a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.2 b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.2
index aa830684f12f..aba14f17d45f 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.2
+++ b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.2
@@ -4,10 +4,10 @@ DESCRIPTION=API to packets that have been queued by the kernel packet filter
EAPI=5
HOMEPAGE=http://www.netfilter.org/projects/libnetfilter_queue/
IUSE=static-libs
-KEYWORDS=amd64 ~arm hppa ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86
LICENSE=GPL-2
RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-0.0.41
SLOT=0
SRC_URI=http://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-1.0.2.tar.bz2
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 autotools-utils fb74970befc9b65ceec689d2ccff3022 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 linux-info 2b8c53f6065bdee2d757472215a3088f multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=443774026fbfaf869d439b1c8ab9a9f0
+_md5_=9450baed31bd0f188ec6f3e5bf69ee99
diff --git a/metadata/md5-cache/net-libs/libnfnetlink-1.0.0-r1 b/metadata/md5-cache/net-libs/libnfnetlink-1.0.0-r1
deleted file mode 100644
index 67535436057f..000000000000
--- a/metadata/md5-cache/net-libs/libnfnetlink-1.0.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install setup
-DESCRIPTION=the low-level library for netfilter related kernel/userspace communication
-EAPI=4
-HOMEPAGE=http://www.netfilter.org/projects/libnfnetlink/
-IUSE=static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-1.0.0.tar.bz2
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 linux-info 2b8c53f6065bdee2d757472215a3088f multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=182afb861e173e14c40043abb88ca4f2
diff --git a/metadata/md5-cache/net-libs/libnids-1.24-r4 b/metadata/md5-cache/net-libs/libnids-1.24-r4
deleted file mode 100644
index bb9feedc9cdc..000000000000
--- a/metadata/md5-cache/net-libs/libnids-1.24-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=net-libs/libpcap glib? ( dev-libs/glib ) libnet? ( >=net-libs/libnet-1.1.0-r3 )
-DESCRIPTION=an implementation of an E-component of Network Intrusion Detection System
-EAPI=5
-HOMEPAGE=http://libnids.sourceforge.net/
-IUSE=+glib +libnet static-libs
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap glib? ( dev-libs/glib ) libnet? ( >=net-libs/libnet-1.1.0-r3 ) !net-libs/libnids:1.1
-SLOT=1.2
-SRC_URI=mirror://sourceforge/libnids/libnids-1.24.tar.gz
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=277a2772aab190bf9385c11c65eb2783
diff --git a/metadata/md5-cache/net-libs/libpcapnav-0.8 b/metadata/md5-cache/net-libs/libpcapnav-0.8
index 71201697e908..ffa0634a9a4b 100644
--- a/metadata/md5-cache/net-libs/libpcapnav-0.8
+++ b/metadata/md5-cache/net-libs/libpcapnav-0.8
@@ -1,11 +1,14 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=compile configure install prepare
DEPEND=net-libs/libpcap
DESCRIPTION=Libpcap wrapper library to navigate to arbitrary packets in a tcpdump trace file
+EAPI=5
HOMEPAGE=http://netdude.sourceforge.net/
-IUSE=doc
+IUSE=doc static-libs
KEYWORDS=amd64 ~sparc ~x86
LICENSE=BSD
RDEPEND=net-libs/libpcap
+RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/netdude/libpcapnav-0.8.tar.gz
-_md5_=ca7f73dc318d166063626a54af3e97f1
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=36ae0c5a332f9df768c50ddc14cf497e
diff --git a/metadata/md5-cache/net-libs/libprotoident-2.0.6 b/metadata/md5-cache/net-libs/libprotoident-2.0.6
deleted file mode 100644
index 7fb0eb55cd28..000000000000
--- a/metadata/md5-cache/net-libs/libprotoident-2.0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-libs/libtrace-3.0.7 tools? ( net-libs/libflowmanager )
-DESCRIPTION=A library that performs application layer protocol identification for flows
-EAPI=5
-HOMEPAGE=http://research.wand.net.nz/software/libprotoident.php
-IUSE=static-libs +tools
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=net-libs/libtrace-3.0.7 tools? ( net-libs/libflowmanager )
-SLOT=0/2
-SRC_URI=http://research.wand.net.nz/software/libprotoident/libprotoident-2.0.6.tar.gz
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 autotools-utils fb74970befc9b65ceec689d2ccff3022 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=cfc81d259c97ac2339292c39e5e8d717
diff --git a/metadata/md5-cache/net-libs/libprotoident-2.0.7 b/metadata/md5-cache/net-libs/libprotoident-2.0.7
index b3d23eac7052..cafbb83b63b0 100644
--- a/metadata/md5-cache/net-libs/libprotoident-2.0.7
+++ b/metadata/md5-cache/net-libs/libprotoident-2.0.7
@@ -10,4 +10,4 @@ RDEPEND=>=net-libs/libtrace-3.0.7 tools? ( net-libs/libflowmanager )
SLOT=0/2
SRC_URI=http://research.wand.net.nz/software/libprotoident/libprotoident-2.0.7.tar.gz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 autotools-utils fb74970befc9b65ceec689d2ccff3022 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=b1a07214e3625a3f29357a8b2e80c386
+_md5_=9fc5e4de96b0325fd5f7a08adea9b07a
diff --git a/metadata/md5-cache/net-libs/libsmi-0.4.8-r1 b/metadata/md5-cache/net-libs/libsmi-0.4.8-r1
index 7341b9d49500..fd79f2f2ac4a 100644
--- a/metadata/md5-cache/net-libs/libsmi-0.4.8-r1
+++ b/metadata/md5-cache/net-libs/libsmi-0.4.8-r1
@@ -1,10 +1,11 @@
DEFINED_PHASES=configure install prepare test
DESCRIPTION=A Library to Access SMI MIB Information
-EAPI=2
+EAPI=5
HOMEPAGE=http://www.ibr.cs.tu-bs.de/projects/libsmi
+IUSE=static-libs
KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
LICENSE=BSD
SLOT=0
SRC_URI=ftp://ftp.ibr.cs.tu-bs.de/pub/local/libsmi/libsmi-0.4.8.tar.gz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=74bc94941b840a168c9ca26c54760d65
+_md5_=45b98d991625c4b93abeaa2bab9c3d6a
diff --git a/metadata/md5-cache/net-libs/libssh-0.6.3-r1 b/metadata/md5-cache/net-libs/libssh-0.6.3-r1
index bf163301d0a6..3eb626ce1d30 100644
--- a/metadata/md5-cache/net-libs/libssh-0.6.3-r1
+++ b/metadata/md5-cache/net-libs/libssh-0.6.3-r1
@@ -10,4 +10,4 @@ RDEPEND=zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
SLOT=0/4
SRC_URI=https://red.libssh.org/attachments/download/87/libssh-0.6.3.tar.xz -> libssh-0.6.3.tar.xz
_eclasses_=cmake-multilib ca4c6ecda3062bf851d951987568fdae cmake-utils 10b6a99f9058ac1b830d00b3421f04e4 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build fbb9baa0b4039304643e36e9820fdecf multilib-minimal 5bbdc77877c1aa3c6bd89ca3f9196d11 multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=90e0564e3da30b2a27380ed56d5ba08c
+_md5_=999dea4d04ea8483f82008c6569ea16b
diff --git a/metadata/md5-cache/net-libs/libssh2-1.4.2 b/metadata/md5-cache/net-libs/libssh2-1.4.2
deleted file mode 100644
index b57d78d84d1e..000000000000
--- a/metadata/md5-cache/net-libs/libssh2-1.4.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!gcrypt? ( dev-libs/openssl ) gcrypt? ( dev-libs/libgcrypt:0 ) zlib? ( sys-libs/zlib )
-DESCRIPTION=Library implementing the SSH2 protocol
-EAPI=4
-HOMEPAGE=http://www.libssh2.org/
-IUSE=gcrypt static-libs test zlib
-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-solaris
-LICENSE=BSD
-RDEPEND=!gcrypt? ( dev-libs/openssl ) gcrypt? ( dev-libs/libgcrypt:0 ) zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=http://www.libssh2.org/download/libssh2-1.4.2.tar.gz
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 autotools-utils fb74970befc9b65ceec689d2ccff3022 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=f7ea91fa0a6a57c8f49f59682c3de6d1
diff --git a/metadata/md5-cache/net-libs/libtirpc-0.2.4-r1 b/metadata/md5-cache/net-libs/libtirpc-0.2.4-r1
index 12887ff8be63..6dff03f7135c 100644
--- a/metadata/md5-cache/net-libs/libtirpc-0.2.4-r1
+++ b/metadata/md5-cache/net-libs/libtirpc-0.2.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Transport Independent RPC library (SunRPC replacement)
EAPI=4
HOMEPAGE=http://libtirpc.sourceforge.net/
IUSE=ipv6 kerberos static-libs
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
LICENSE=GPL-2
RDEPEND=kerberos? ( virtual/krb5 )
SLOT=0
SRC_URI=mirror://sourceforge/libtirpc/libtirpc-0.2.4.tar.bz2 mirror://gentoo/libtirpc-glibc-nfs.tar.xz
_eclasses_=multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=f6283dafb5b82f45d33ac854762fafae
+_md5_=c61cf6c5445408c722fe04ee82fb2120
diff --git a/metadata/md5-cache/net-libs/netwib-5.39.0 b/metadata/md5-cache/net-libs/netwib-5.39.0
index 8ed1134e280a..fee193ad0ade 100644
--- a/metadata/md5-cache/net-libs/netwib-5.39.0
+++ b/metadata/md5-cache/net-libs/netwib-5.39.0
@@ -1,13 +1,13 @@
DEFINED_PHASES=configure install prepare
-DEPEND=>=net-libs/libnet-1.1.1 net-libs/libpcap
+DEPEND=net-libs/libnet:1.1 net-libs/libpcap
DESCRIPTION=Library of Ethernet, IP, UDP, TCP, ICMP, ARP and RARP protocols
-EAPI=4
+EAPI=5
HOMEPAGE=http://www.laurentconstantin.com/en/netw/netwib/ http://ntwib.sourceforge.net/
IUSE=doc
KEYWORDS=~amd64 ~hppa ~ppc x86
LICENSE=GPL-3
-RDEPEND=>=net-libs/libnet-1.1.1 net-libs/libpcap
+RDEPEND=net-libs/libnet:1.1 net-libs/libpcap
SLOT=0
SRC_URI=mirror://sourceforge/ntwib/netwib-5.39.0-src.tgz doc? ( mirror://sourceforge/ntwib/netwib-5.39.0-doc_html.tgz )
_eclasses_=multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=4b5a6367253d291a7db3222e42aa6302
+_md5_=1e320163571409cbb3e19bdca7cf987f
diff --git a/metadata/md5-cache/net-libs/polarssl-1.3.8 b/metadata/md5-cache/net-libs/polarssl-1.3.8
index ce09c9c63d16..63e2f33fcd6a 100644
--- a/metadata/md5-cache/net-libs/polarssl-1.3.8
+++ b/metadata/md5-cache/net-libs/polarssl-1.3.8
@@ -4,10 +4,10 @@ DESCRIPTION=Cryptographic library for embedded systems
EAPI=5
HOMEPAGE=http://polarssl.org/
IUSE=doc havege programs sse2 static-libs test threads zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
LICENSE=GPL-2
RDEPEND=programs? ( dev-libs/openssl:0 ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
SLOT=0/7
SRC_URI=http://polarssl.org/download/polarssl-1.3.8-gpl.tgz
_eclasses_=cmake-utils 10b6a99f9058ac1b830d00b3421f04e4 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build fbb9baa0b4039304643e36e9820fdecf multilib-minimal 5bbdc77877c1aa3c6bd89ca3f9196d11 multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=53286b9bd9645940d32b9dd89c033f56
+_md5_=e56ca2e536411d4997069c8a73c78d94
diff --git a/metadata/md5-cache/net-mail/qmrtg-2.1-r1 b/metadata/md5-cache/net-mail/qmrtg-2.1-r1
index 589bbee1d190..b3029fee9069 100644
--- a/metadata/md5-cache/net-mail/qmrtg-2.1-r1
+++ b/metadata/md5-cache/net-mail/qmrtg-2.1-r1
@@ -1,6 +1,6 @@
DEFINED_PHASES=install postinst prepare
-DESCRIPTION=A tool to analyze qmail's activity with the goal to graph everything through MRTG.
-EAPI=2
+DESCRIPTION=A tool to analyze qmail activity with the goal to graph everything through MRTG
+EAPI=5
HOMEPAGE=http://dev.publicshout.org/qmrtg
IUSE=doc
KEYWORDS=~amd64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=net-analyzer/mrtg
SLOT=0
SRC_URI=http://dev.publicshout.org/qmrtg/download/qmrtg-2.1.tar.gz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=42eb5da6b0a32b38744da9f3f060d29e
+_md5_=ebba13cff6b2aac26dd30f8105de64a8
diff --git a/metadata/md5-cache/net-misc/apt-cacher-ng-0.7.27 b/metadata/md5-cache/net-misc/apt-cacher-ng-0.7.27
new file mode 100644
index 000000000000..726d4dd3dc8d
--- /dev/null
+++ b/metadata/md5-cache/net-misc/apt-cacher-ng-0.7.27
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib dev-util/cmake sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Yet another implementation of an HTTP proxy for Debian/Ubuntu software packages written in C++
+EAPI=5
+HOMEPAGE=http://www.unix-ag.uni-kl.de/~bloch/acng/ http://packages.qa.debian.org/a/apt-cacher-ng.html
+IUSE=doc fuse tcpd
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-4 ZLIB public-domain
+RDEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib dev-lang/perl fuse? ( sys-fs/fuse ) tcpd? ( sys-apps/tcp-wrappers )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_0.7.27.orig.tar.xz
+_eclasses_=cmake-utils 10b6a99f9058ac1b830d00b3421f04e4 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747
+_md5_=e9b9dd6abcd80cb95829a674d5836e16
diff --git a/metadata/md5-cache/net-misc/apt-cacher-ng-0.8.0_pre1 b/metadata/md5-cache/net-misc/apt-cacher-ng-0.8.0_pre1
new file mode 100644
index 000000000000..bcc1a26f2deb
--- /dev/null
+++ b/metadata/md5-cache/net-misc/apt-cacher-ng-0.8.0_pre1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib dev-util/cmake sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Yet another implementation of an HTTP proxy for Debian/Ubuntu software packages written in C++
+EAPI=5
+HOMEPAGE=http://www.unix-ag.uni-kl.de/~bloch/acng/ http://packages.qa.debian.org/a/apt-cacher-ng.html
+IUSE=doc fuse tcpd
+LICENSE=BSD-4 ZLIB public-domain
+RDEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib dev-lang/perl fuse? ( sys-fs/fuse ) tcpd? ( sys-apps/tcp-wrappers )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_0.8.0~pre1.orig.tar.xz
+_eclasses_=cmake-utils 10b6a99f9058ac1b830d00b3421f04e4 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747
+_md5_=dd8838162a0ecea5e7720b35b7f6a1e7
diff --git a/metadata/md5-cache/net-misc/dahdi-2.9.0-r1 b/metadata/md5-cache/net-misc/dahdi-2.9.0-r1
new file mode 100644
index 000000000000..f5e60607481b
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dahdi-2.9.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DESCRIPTION=Kernel modules for Digium compatible hardware (formerly known as Zaptel).
+EAPI=5
+HOMEPAGE=http://www.asterisk.org
+IUSE=flash kernel_linux
+KEYWORDS=amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=kernel_linux? ( virtual/modutils )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-2.9.0.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-b0017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1d0017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-780017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-e0017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz mirror://gentoo/gentoo-dahdi-patchset-1.1.8.tar.bz2 http://www.junghanns.net/downloads/jnet-dahdi-drivers-1.0.14.tar.gz
+_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be linux-info 2b8c53f6065bdee2d757472215a3088f linux-mod 101302d4b7b694ea9622bbffb187d0de multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=4a0efd65452ecb729acf032caa1ab756
diff --git a/metadata/md5-cache/net-misc/dahdi-tools-2.9.0.1 b/metadata/md5-cache/net-misc/dahdi-tools-2.9.0.1
index ae81385a3ed9..d45eb6bf0789 100644
--- a/metadata/md5-cache/net-misc/dahdi-tools-2.9.0.1
+++ b/metadata/md5-cache/net-misc/dahdi-tools-2.9.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Userspace tools to configure the kernel modules from net-misc/dahdi
EAPI=5
HOMEPAGE=http://www.asterisk.org
IUSE=ppp
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=LGPL-2.1
RDEPEND=dev-libs/newt ppp? ( net-dialup/ppp ) >=net-misc/dahdi-2.5.0 !net-misc/zaptel >=sys-kernel/linux-headers-2.6.35 virtual/libusb:0
SLOT=0
SRC_URI=http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/dahdi-tools-2.9.0.1.tar.gz mirror://gentoo/gentoo-dahdi-tools-patchset-0.4.tar.bz2
_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=97fb151f58137369e9c05a5175e66f57
+_md5_=7bc954fa0651567bec91d25d2b9a24f9
diff --git a/metadata/md5-cache/net-misc/freerdp-9999.1 b/metadata/md5-cache/net-misc/freerdp-9999.1
index 39832e8983a1..c79cbdbf0f31 100644
--- a/metadata/md5-cache/net-misc/freerdp-9999.1
+++ b/metadata/md5-cache/net-misc/freerdp-9999.1
@@ -1,11 +1,11 @@
DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/openssl sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) client? ( X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ) directfb? ( dev-libs/DirectFB ) ffmpeg? ( virtual/ffmpeg ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 x11-libs/libXrandr ) jpeg? ( virtual/jpeg ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) X? ( x11-libs/libX11 x11-libs/libxkbfile ) client? ( X? ( doc? ( app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) ) ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-vcs/git
+DEPEND=dev-libs/openssl sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) client? ( X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ) directfb? ( dev-libs/DirectFB ) ffmpeg? ( virtual/ffmpeg ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) X? ( x11-libs/libX11 x11-libs/libxkbfile ) client? ( X? ( doc? ( app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) ) ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-vcs/git
DESCRIPTION=Free implementation of the Remote Desktop Protocol
EAPI=5
HOMEPAGE=http://www.freerdp.com/
IUSE=alsa +channels +client cups debug directfb doc ffmpeg gstreamer jpeg pulseaudio server smartcard sse2 test X xinerama xv
LICENSE=Apache-2.0
-RDEPEND=dev-libs/openssl sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) client? ( X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ) directfb? ( dev-libs/DirectFB ) ffmpeg? ( virtual/ffmpeg ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 x11-libs/libXrandr ) jpeg? ( virtual/jpeg ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
+RDEPEND=dev-libs/openssl sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) client? ( X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ) directfb? ( dev-libs/DirectFB ) ffmpeg? ( virtual/ffmpeg ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
SLOT=0
_eclasses_=cmake-utils 10b6a99f9058ac1b830d00b3421f04e4 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be git-2 2027b81a576527fa16bece425941e094 git-r3 49fc3d60d7bcd6f8913ad6ec0cb4c67b multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 vcs-snapshot 58b766562c9fbfb3268b04e33cdf2f66
-_md5_=37618c4e6dbfa35a6ef1e238344fda21
+_md5_=3c207489aff58733e9e2d5312b7561f8
diff --git a/metadata/md5-cache/net-misc/httptype-1.3.9 b/metadata/md5-cache/net-misc/httptype-1.3.9
deleted file mode 100644
index e99ffc9be3a9..000000000000
--- a/metadata/md5-cache/net-misc/httptype-1.3.9
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/perl
-DESCRIPTION=Returns the http host software of a website
-HOMEPAGE=http://httptype.sourceforge.net
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-1
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=mirror://sourceforge/httptype/httptype-1.3.9.tar.gz
-_md5_=193371df60e9f8880ba64797b6f18895
diff --git a/metadata/md5-cache/net-misc/httptype-1.3.9-r1 b/metadata/md5-cache/net-misc/httptype-1.3.9-r1
index 92b536e1b5e0..f98c7901034c 100644
--- a/metadata/md5-cache/net-misc/httptype-1.3.9-r1
+++ b/metadata/md5-cache/net-misc/httptype-1.3.9-r1
@@ -7,4 +7,4 @@ LICENSE=GPL-1
RDEPEND=dev-lang/perl
SLOT=0
SRC_URI=mirror://sourceforge/httptype/httptype-1.3.9.tar.gz
-_md5_=39e716d2c2765b5230766001637ca3ac
+_md5_=078e36d9ba6aa1d89c79e2ca1ed0ca84
diff --git a/metadata/md5-cache/net-misc/iodine-0.7.0 b/metadata/md5-cache/net-misc/iodine-0.7.0
new file mode 100644
index 000000000000..754f9a0e0b09
--- /dev/null
+++ b/metadata/md5-cache/net-misc/iodine-0.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare setup
+DEPEND=sys-libs/zlib test? ( dev-libs/check )
+DESCRIPTION=IP over DNS tunnel
+EAPI=5
+HOMEPAGE=http://code.kryo.se/iodine/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC GPL-2
+RDEPEND=sys-libs/zlib
+SLOT=0
+SRC_URI=http://code.kryo.se/iodine/iodine-0.7.0.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 linux-info 2b8c53f6065bdee2d757472215a3088f multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=616c4aa71acb66ddde6738c1a5527685
diff --git a/metadata/md5-cache/net-misc/ip-sentinel-0.12 b/metadata/md5-cache/net-misc/ip-sentinel-0.12
index 39a08907ae01..b3bddda3042e 100644
--- a/metadata/md5-cache/net-misc/ip-sentinel-0.12
+++ b/metadata/md5-cache/net-misc/ip-sentinel-0.12
@@ -1,9 +1,10 @@
DEFINED_PHASES=config install postinst setup
DESCRIPTION=Prevent unauthorized usage of IPs in the local ethernet broadcastdomain by answering ARP-requests
+EAPI=5
HOMEPAGE=http://www.nongnu.org/ip-sentinel/
KEYWORDS=x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://savannah.nongnu.org/download/ip-sentinel/ip-sentinel-0.12.tar.bz2
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747
-_md5_=2b1f71d053b1e63b1ec1e8577ba474c7
+_md5_=3bfa462a86512a3012a1aa8512df46a1
diff --git a/metadata/md5-cache/net-misc/ipcalc-0.41 b/metadata/md5-cache/net-misc/ipcalc-0.41
index 5e50d8178554..1f25be8e0f72 100644
--- a/metadata/md5-cache/net-misc/ipcalc-0.41
+++ b/metadata/md5-cache/net-misc/ipcalc-0.41
@@ -1,9 +1,10 @@
DEFINED_PHASES=install
DESCRIPTION=calculates broadcast/network/etc... from an IP address and netmask
+EAPI=5
HOMEPAGE=http://jodies.de/ipcalc
KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
LICENSE=GPL-2+
RDEPEND=>=dev-lang/perl-5.6.0
SLOT=0
SRC_URI=http://jodies.de/ipcalc-archive/ipcalc-0.41.tar.gz
-_md5_=f11ca17074557dbec9e602a6c202c431
+_md5_=63724571be50d284710af718dc6603aa
diff --git a/metadata/md5-cache/net-misc/iperf-2.0.5 b/metadata/md5-cache/net-misc/iperf-2.0.5
index 706a6a33802c..1631eec2694f 100644
--- a/metadata/md5-cache/net-misc/iperf-2.0.5
+++ b/metadata/md5-cache/net-misc/iperf-2.0.5
@@ -5,6 +5,6 @@ HOMEPAGE=http://iperf.sourceforge.net/
IUSE=ipv6 threads debug
KEYWORDS=amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint
LICENSE=HPND
-SLOT=0
+SLOT=2
SRC_URI=mirror://sourceforge/iperf/iperf-2.0.5.tar.gz
-_md5_=fa3d1635cce8283289cd948c3878b130
+_md5_=c01d11efb767caf8765ba1dc4c560219
diff --git a/metadata/md5-cache/net-misc/iperf-2.0.5-r1 b/metadata/md5-cache/net-misc/iperf-2.0.5-r1
index 7e93ff903fa6..9f3100e2abbf 100644
--- a/metadata/md5-cache/net-misc/iperf-2.0.5-r1
+++ b/metadata/md5-cache/net-misc/iperf-2.0.5-r1
@@ -5,7 +5,7 @@ HOMEPAGE=http://iperf.sourceforge.net/
IUSE=ipv6 threads debug
KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint
LICENSE=HPND
-SLOT=0
+SLOT=2
SRC_URI=mirror://sourceforge/iperf/iperf-2.0.5.tar.gz
_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=259ac1a08c185f03f30fc50ba5236337
+_md5_=bbced21c178fceab1085bfcc4f1e4e10
diff --git a/metadata/md5-cache/net-misc/iperf-2.0.5-r2 b/metadata/md5-cache/net-misc/iperf-2.0.5-r2
index 1394b752a936..0010a30fc75a 100644
--- a/metadata/md5-cache/net-misc/iperf-2.0.5-r2
+++ b/metadata/md5-cache/net-misc/iperf-2.0.5-r2
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile configure install postinst prepare unpack
+DEFINED_PHASES=compile configure install prepare unpack
DESCRIPTION=Tool to measure IP bandwidth using UDP or TCP
EAPI=5
HOMEPAGE=http://iperf.sourceforge.net/
IUSE=ipv6 threads debug
KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint
LICENSE=HPND
-SLOT=0
+SLOT=2
SRC_URI=mirror://sourceforge/iperf/iperf-2.0.5.tar.gz
_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=be447c3a46ed4fb4c07c26480e53fde5
+_md5_=1a0016345b089ef2f980ebda7655ac0d
diff --git a/metadata/md5-cache/net-misc/iperf-3.0.5 b/metadata/md5-cache/net-misc/iperf-3.0.5
new file mode 100644
index 000000000000..f95ab436d8d5
--- /dev/null
+++ b/metadata/md5-cache/net-misc/iperf-3.0.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=!=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=A TCP, UDP, and SCTP network bandwidth measurement tool
+EAPI=5
+HOMEPAGE=https://github.com/esnet/iperf/
+IUSE=static-libs
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint
+LICENSE=BSD
+SLOT=3
+SRC_URI=https://codeload.github.com/esnet/iperf/tar.gz/3.0.5 -> iperf-3.0.5.tar.gz
+_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=1d6e75e3a093ddaffe84e59a305cd596
diff --git a/metadata/md5-cache/net-misc/lanmap-81-r1 b/metadata/md5-cache/net-misc/lanmap-81-r1
index 492fe5aab1ac..aa71bd9e712c 100644
--- a/metadata/md5-cache/net-misc/lanmap-81-r1
+++ b/metadata/md5-cache/net-misc/lanmap-81-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile install prepare
-DEPEND=net-libs/libpcap media-gfx/graphviz app-arch/unzip
+DEPEND=net-libs/libpcap app-arch/unzip !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=lanmap sits quietly on a network and builds a picture of what it sees
EAPI=5
HOMEPAGE=http://www.parseerror.com/lanmap
@@ -8,5 +8,5 @@ LICENSE=GPL-2
RDEPEND=net-libs/libpcap media-gfx/graphviz
SLOT=0
SRC_URI=http://www.parseerror.com/lanmap/rev/lanmap-2006-03-07-rev81.zip
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=6bcb55c314e079ad57c13a461a79e149
+_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=68b4514c9780008166cbb467278365d6
diff --git a/metadata/md5-cache/net-misc/netkit-rwho-0.17-r3 b/metadata/md5-cache/net-misc/netkit-rwho-0.17-r3
deleted file mode 100644
index 05148fe14dfc..000000000000
--- a/metadata/md5-cache/net-misc/netkit-rwho-0.17-r3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=Netkit - ruptime/rwho/rwhod
-HOMEPAGE=http://www.hcs.harvard.edu/~dholland/computers/netkit.html
-KEYWORDS=alpha amd64 arm ~mips ppc s390 sh sparc x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rwho-0.17.tar.gz mirror://gentoo/netkit-rwho-0.17-patches.tar.gz
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=76114c74326df82569c34a86444df993
diff --git a/metadata/md5-cache/net-misc/netkit-rwho-0.17-r4 b/metadata/md5-cache/net-misc/netkit-rwho-0.17-r4
index 6abab1266f37..2845be6bcb2b 100644
--- a/metadata/md5-cache/net-misc/netkit-rwho-0.17-r4
+++ b/metadata/md5-cache/net-misc/netkit-rwho-0.17-r4
@@ -1,10 +1,10 @@
DEFINED_PHASES=configure install prepare
DESCRIPTION=Netkit - ruptime/rwho/rwhod
-EAPI=2
+EAPI=5
HOMEPAGE=http://www.hcs.harvard.edu/~dholland/computers/netkit.html
KEYWORDS=alpha amd64 arm ~mips ppc s390 sh sparc x86
LICENSE=BSD
SLOT=0
-SRC_URI=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rwho-0.17.tar.gz mirror://gentoo/netkit-rwho-0.17-patches.tar.gz
+SRC_URI=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rwho-0.17.tar.gz https://dev.gentoo.org/~jer/netkit-rwho-0.17-patches.tar.bz2
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=77d9f3b15ea2562f99eb6338cafc885f
+_md5_=cde2847212c90c3b71f36620488f6953
diff --git a/metadata/md5-cache/net-misc/netpipes-4.2-r1 b/metadata/md5-cache/net-misc/netpipes-4.2-r1
deleted file mode 100644
index 134b89445924..000000000000
--- a/metadata/md5-cache/net-misc/netpipes-4.2-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=netpipes - a package to manipulate BSD TCP/IP stream sockets
-EAPI=2
-HOMEPAGE=http://web.purplefrog.com/~thoth/netpipes/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://web.purplefrog.com/~thoth/netpipes/ftp/netpipes-4.2-export.tar.gz
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=07e3bba3453660725292bc8df56608d0
diff --git a/metadata/md5-cache/net-misc/netpipes-4.2-r2 b/metadata/md5-cache/net-misc/netpipes-4.2-r2
index e5744cd3d327..c13c546020f1 100644
--- a/metadata/md5-cache/net-misc/netpipes-4.2-r2
+++ b/metadata/md5-cache/net-misc/netpipes-4.2-r2
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile install prepare
-DESCRIPTION=netpipes - a package to manipulate BSD TCP/IP stream sockets
+DESCRIPTION=a package to manipulate BSD TCP/IP stream sockets
EAPI=5
HOMEPAGE=http://web.purplefrog.com/~thoth/netpipes/
KEYWORDS=amd64 x86
@@ -7,4 +7,4 @@ LICENSE=GPL-2
SLOT=0
SRC_URI=http://web.purplefrog.com/~thoth/netpipes/ftp/netpipes-4.2-export.tar.gz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=2ceea9994279aec9aa8376dd8755aebd
+_md5_=9cdc4b1918fa35acd50ef4107b83348d
diff --git a/metadata/md5-cache/net-misc/netstat-nat-1.4.10 b/metadata/md5-cache/net-misc/netstat-nat-1.4.10
index 66fbdc98befa..135eb9ba8386 100644
--- a/metadata/md5-cache/net-misc/netstat-nat-1.4.10
+++ b/metadata/md5-cache/net-misc/netstat-nat-1.4.10
@@ -1,11 +1,11 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=prepare
DEPEND=!=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Display NAT connections
-EAPI=2
+EAPI=5
HOMEPAGE=http://tweegy.nl/projects/netstat-nat/index.html
KEYWORDS=amd64 ~arm ppc sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://tweegy.nl/download/netstat-nat-1.4.10.tar.gz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=caf5dbc2a496156b5e23b8574ae69a13
+_md5_=21fb6e3dbdf194458c2fd47cc6deaabc
diff --git a/metadata/md5-cache/net-misc/netstat-nat-1.4.9 b/metadata/md5-cache/net-misc/netstat-nat-1.4.9
deleted file mode 100644
index 024115cb15d8..000000000000
--- a/metadata/md5-cache/net-misc/netstat-nat-1.4.9
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=!=sys-devel/automake-1.13 >=sys-devel/automake-1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Display NAT connections
-HOMEPAGE=http://tweegy.demon.nl/projects/netstat-nat/index.html
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://tweegy.demon.nl/download/netstat-nat-1.4.9.tar.gz
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=10aba1e469b5c579063e90505d5bdb0d
diff --git a/metadata/md5-cache/net-misc/packETH-1.7.1 b/metadata/md5-cache/net-misc/packETH-1.7.1
deleted file mode 100644
index ec86f3e10c8e..000000000000
--- a/metadata/md5-cache/net-misc/packETH-1.7.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=virtual/pkgconfig x11-libs/gtk+:2 x11-libs/gdk-pixbuf !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Packet generator tool for ethernet
-EAPI=2
-HOMEPAGE=http://packeth.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=x11-libs/gtk+:2 x11-libs/gdk-pixbuf
-SLOT=0
-SRC_URI=mirror://sourceforge/packeth/packETH-1.7.1.tar.bz2
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=6c7a961a5fe6910d1268637d330f5bb2
diff --git a/metadata/md5-cache/net-misc/packETH-1.7.3 b/metadata/md5-cache/net-misc/packETH-1.7.3
new file mode 100644
index 000000000000..234c67afef07
--- /dev/null
+++ b/metadata/md5-cache/net-misc/packETH-1.7.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare
+DEPEND=virtual/pkgconfig dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2 !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Packet generator tool for ethernet
+EAPI=5
+HOMEPAGE=http://packeth.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2
+SLOT=0
+SRC_URI=mirror://sourceforge/packeth/packETH-1.7.3.tar.gz
+_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=cd531314e4b51094085ffd9e14845c9f
diff --git a/metadata/md5-cache/net-misc/pipes-1.16.1 b/metadata/md5-cache/net-misc/pipes-1.16.1
index 03a0668a4434..8600482b037b 100644
--- a/metadata/md5-cache/net-misc/pipes-1.16.1
+++ b/metadata/md5-cache/net-misc/pipes-1.16.1
@@ -1,11 +1,10 @@
DEFINED_PHASES=compile install prepare
-DEPEND=>=sys-apps/sed-4
DESCRIPTION=Very versatile TCP pipes
-EAPI=3
+EAPI=5
HOMEPAGE=http://bisqwit.iki.fi/source/pipes.html
KEYWORDS=~amd64 ~ppc ~s390 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://bisqwit.iki.fi/src/arch/pipes-1.16.1.tar.bz2
-_eclasses_=multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=6dea659f77885ce7c80ec85c79c19144
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=01e1e793a705b3dce9cf234bd9297ad1
diff --git a/metadata/md5-cache/net-misc/switzerland-0.0.5 b/metadata/md5-cache/net-misc/switzerland-0.0.5
deleted file mode 100644
index 0a01f5ba0460..000000000000
--- a/metadata/md5-cache/net-misc/switzerland-0.0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=net-libs/libpcap =dev-lang/python-2*
-DESCRIPTION=Switzerland Network Testing Tool
-EAPI=3
-HOMEPAGE=http://www.eff.org/testyourisp/switzerland/
-KEYWORDS=~x86 ~amd64
-LICENSE=GPL-3
-RDEPEND=net-libs/libpcap =dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://sourceforge/switzerland/switzerland-0.0.5.tgz
-_eclasses_=distutils 34e0f373c466bb0e97ba194735f1acf2 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python be9965681d83c3980660a2660ac95e95 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=28eb2254be4c9b19cad5c261d9316a0b
diff --git a/metadata/md5-cache/net-misc/switzerland-0.1.0 b/metadata/md5-cache/net-misc/switzerland-0.1.0
index 759fa6b66b7a..35caef510680 100644
--- a/metadata/md5-cache/net-misc/switzerland-0.1.0
+++ b/metadata/md5-cache/net-misc/switzerland-0.1.0
@@ -1,12 +1,14 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=net-libs/libpcap =dev-lang/python-2*
-DESCRIPTION=Switzerland Network Testing Tool
-EAPI=3
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-libs/libpcap python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Network Testing Tool
+EAPI=5
HOMEPAGE=http://www.eff.org/testyourisp/switzerland/
+IUSE=python_targets_python2_7
KEYWORDS=~x86 ~amd64
LICENSE=GPL-3
-RDEPEND=net-libs/libpcap =dev-lang/python-2*
+RDEPEND=net-libs/libpcap python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://sourceforge/switzerland/switzerland-0.1.0.tgz
-_eclasses_=distutils 34e0f373c466bb0e97ba194735f1acf2 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python be9965681d83c3980660a2660ac95e95 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=2e86e35a9cc85e62975042a99dfd97be
+_eclasses_=distutils-r1 d48d51c220f1678179fc4ab13b534ec1 eutils 06133990e861be0fe60c2b428fd025d9 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=21b9640208cf835974b52dd9d9e8e676
diff --git a/metadata/md5-cache/net-misc/tcpsound-0.3.1 b/metadata/md5-cache/net-misc/tcpsound-0.3.1
deleted file mode 100644
index 059a0eab3ef2..000000000000
--- a/metadata/md5-cache/net-misc/tcpsound-0.3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=net-analyzer/tcpdump media-libs/libsdl dev-libs/libmba
-DESCRIPTION=Play sounds in response to network traffic
-EAPI=2
-HOMEPAGE=http://www.ioplex.com/~miallen/tcpsound/
-KEYWORDS=~amd64 x86
-LICENSE=BSD
-RDEPEND=net-analyzer/tcpdump media-libs/libsdl dev-libs/libmba
-SLOT=0
-SRC_URI=http://www.ioplex.com/~miallen/tcpsound/dl/tcpsound-0.3.1.tar.gz
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=27220897af332faae1d2c5c2a7d0d139
diff --git a/metadata/md5-cache/net-misc/tcpsound-0.3.1-r1 b/metadata/md5-cache/net-misc/tcpsound-0.3.1-r1
index 2ec09da58012..5ae6a66a5c03 100644
--- a/metadata/md5-cache/net-misc/tcpsound-0.3.1-r1
+++ b/metadata/md5-cache/net-misc/tcpsound-0.3.1-r1
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=net-analyzer/tcpdump media-libs/libsdl dev-libs/libmba
+DEFINED_PHASES=compile prepare
+DEPEND=dev-libs/libmba media-libs/libsdl net-analyzer/tcpdump
DESCRIPTION=Play sounds in response to network traffic
-EAPI=4
+EAPI=5
HOMEPAGE=http://www.ioplex.com/~miallen/tcpsound/
KEYWORDS=amd64 x86
LICENSE=BSD
-RDEPEND=net-analyzer/tcpdump media-libs/libsdl dev-libs/libmba
+RDEPEND=dev-libs/libmba media-libs/libsdl net-analyzer/tcpdump
SLOT=0
SRC_URI=http://www.ioplex.com/~miallen/tcpsound/dl/tcpsound-0.3.1.tar.gz
-_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=b5f0a704a26f0cf8ca424855b707e4ce
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=fdfc0534417257dd5080dd0ed31014c3
diff --git a/metadata/md5-cache/net-misc/tightvnc-1.3.10-r2 b/metadata/md5-cache/net-misc/tightvnc-1.3.10-r2
index a19f1b8e44c6..70d206683f4b 100644
--- a/metadata/md5-cache/net-misc/tightvnc-1.3.10-r2
+++ b/metadata/md5-cache/net-misc/tightvnc-1.3.10-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A great client/server software package allowing remote network acces
EAPI=5
HOMEPAGE=http://www.tightvnc.com/
IUSE=java tcpd server elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 arm ~mips ~ppc ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=alpha ~amd64 arm ~mips ~ppc ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=media-fonts/font-misc-misc virtual/jpeg server? ( media-fonts/font-cursor-misc x11-apps/rgb x11-apps/xauth x11-apps/xsetroot ) x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXp x11-libs/libXt tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
SLOT=0
SRC_URI=mirror://sourceforge/vnc-tight/tightvnc-1.3.10_unixsrc.tar.bz2 mirror://gentoo/tightvnc.png java? ( mirror://sourceforge/vnc-tight/tightvnc-1.3.10_javasrc.tar.gz )
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=bbd00aeb24836e96f52798d206767584
+_md5_=14c31f7442615d536507d065549bc6f2
diff --git a/metadata/md5-cache/net-misc/udpcast-20110710 b/metadata/md5-cache/net-misc/udpcast-20110710
deleted file mode 100644
index f744eac7f106..000000000000
--- a/metadata/md5-cache/net-misc/udpcast-20110710
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-lang/perl
-DESCRIPTION=Multicast file transfer tool
-EAPI=4
-HOMEPAGE=http://udpcast.linux.lu/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 BSD
-SLOT=0
-SRC_URI=http://udpcast.linux.lu/download/udpcast-20110710.tar.bz2
-_md5_=f853c160d080ffe649a384aa1eccffbe
diff --git a/metadata/md5-cache/net-misc/udpcast-20120424 b/metadata/md5-cache/net-misc/udpcast-20120424
index 00d7aca7f8bc..392a4e607a5c 100644
--- a/metadata/md5-cache/net-misc/udpcast-20120424
+++ b/metadata/md5-cache/net-misc/udpcast-20120424
@@ -1,11 +1,11 @@
DEFINED_PHASES=install prepare
DEPEND=dev-lang/perl
DESCRIPTION=Multicast file transfer tool
-EAPI=4
+EAPI=5
HOMEPAGE=http://www.udpcast.linux.lu/
KEYWORDS=amd64 x86
LICENSE=GPL-2 BSD
SLOT=0
SRC_URI=http://www.udpcast.linux.lu/download/udpcast-20120424.tar.bz2
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=e119489569ffab015dc57a0ab7ae6e97
+_md5_=5d2c5d81429ce1e14ab3ed4ecf0b3956
diff --git a/metadata/md5-cache/net-misc/vinagre-3.12.1 b/metadata/md5-cache/net-misc/vinagre-3.12.1
index d26265e5ed5f..b987ac4c8808 100644
--- a/metadata/md5-cache/net-misc/vinagre-3.12.1
+++ b/metadata/md5-cache/net-misc/vinagre-3.12.1
@@ -4,10 +4,10 @@ DESCRIPTION=VNC client for the GNOME desktop
EAPI=5
HOMEPAGE=https://wiki.gnome.org/Vinagre
IUSE=avahi rdp +ssh spice +telepathy
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
LICENSE=GPL-3+
RDEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.9.6:3 app-crypt/libsecret >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3] x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-themes/gnome-icon-theme avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] ) rdp? ( net-misc/freerdp ) ssh? ( >=x11-libs/vte-0.20:2.90 ) spice? ( >=net-misc/spice-gtk-0.5[gtk3] ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 )
SLOT=0
SRC_URI=mirror://gnome/sources/vinagre/3.12/vinagre-3.12.1.tar.xz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 9637c29fc715b17a6328f24251129557 gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 vala d8f392783fdc2395fc64af046f2ca961 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=dbbabadcd0be4c5f6236070743b90faa
+_md5_=ce97c5d9ed7f141e281ca1bec6a2b292
diff --git a/metadata/md5-cache/net-misc/vinagre-3.12.2 b/metadata/md5-cache/net-misc/vinagre-3.12.2
index 5ffa82509042..0c2035dc60c0 100644
--- a/metadata/md5-cache/net-misc/vinagre-3.12.2
+++ b/metadata/md5-cache/net-misc/vinagre-3.12.2
@@ -4,10 +4,10 @@ DESCRIPTION=VNC client for the GNOME desktop
EAPI=5
HOMEPAGE=https://wiki.gnome.org/Apps/Vinagre
IUSE=avahi rdp +ssh spice +telepathy
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
LICENSE=GPL-3+
RDEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.9.6:3 app-crypt/libsecret >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3] x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-themes/gnome-icon-theme avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] ) rdp? ( net-misc/freerdp ) ssh? ( >=x11-libs/vte-0.20:2.90 ) spice? ( >=net-misc/spice-gtk-0.5[gtk3] ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 )
SLOT=0
SRC_URI=mirror://gnome/sources/vinagre/3.12/vinagre-3.12.2.tar.xz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 9637c29fc715b17a6328f24251129557 gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 vala d8f392783fdc2395fc64af046f2ca961 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3e890cbb3d08c003e651cac415c0fd5a
+_md5_=405df4dcb320a7290b6441e6e84c84cc
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2014.02.10 b/metadata/md5-cache/net-misc/youtube-dl-2014.02.10
deleted file mode 100644
index 0aa0f5f98761..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2014.02.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] test? ( dev-python/nose[coverage(+)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?]
-DESCRIPTION=Download videos from YouTube.com (and mores sites...)
-EAPI=5
-HOMEPAGE=http://rg3.github.com/youtube-dl/
-IUSE=offensive test python_targets_python2_7 python_targets_python3_3 python_single_target_python2_7 python_single_target_python3_3
-KEYWORDS=amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=public-domain
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?]
-REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) ^^ ( python_single_target_python2_7 python_single_target_python3_3 )
-SLOT=0
-SRC_URI=http://youtube-dl.org/downloads/2014.02.10/youtube-dl-2014.02.10.tar.gz
-_eclasses_=bash-completion-r1 db412e427e3317ffd3e15f17df269c5e distutils-r1 d48d51c220f1678179fc4ab13b534ec1 eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-single-r1 a71a169a881e0a11d04a7fe12dc39f6e python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=3ac12d3880f7f04ea18f0c91f904ec66
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2014.04.13 b/metadata/md5-cache/net-misc/youtube-dl-2014.04.13
deleted file mode 100644
index cc2b034caf94..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2014.04.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] test? ( dev-python/nose[coverage(+)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?]
-DESCRIPTION=Download videos from YouTube.com (and mores sites...)
-EAPI=5
-HOMEPAGE=http://rg3.github.com/youtube-dl/
-IUSE=offensive test python_targets_python2_7 python_targets_python3_3 python_single_target_python2_7 python_single_target_python3_3
-KEYWORDS=~amd64 ~arm hppa ~ppc ~ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=public-domain
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?]
-REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) ^^ ( python_single_target_python2_7 python_single_target_python3_3 )
-SLOT=0
-SRC_URI=http://youtube-dl.org/downloads/2014.04.13/youtube-dl-2014.04.13.tar.gz
-_eclasses_=bash-completion-r1 db412e427e3317ffd3e15f17df269c5e distutils-r1 d48d51c220f1678179fc4ab13b534ec1 eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-single-r1 a71a169a881e0a11d04a7fe12dc39f6e python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=f6c90f7fa490171e408d29d739fca6ff
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2014.06.19 b/metadata/md5-cache/net-misc/youtube-dl-2014.06.19
deleted file mode 100644
index 06bd8dcf0c82..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2014.06.19
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] test? ( dev-python/nose[coverage(+)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?]
-DESCRIPTION=Download videos from YouTube.com (and mores sites...)
-EAPI=5
-HOMEPAGE=http://rg3.github.com/youtube-dl/
-IUSE=offensive test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4
-KEYWORDS=amd64 ~arm hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=public-domain
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?]
-REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) ^^ ( python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4 )
-SLOT=0
-SRC_URI=http://youtube-dl.org/downloads/2014.06.19/youtube-dl-2014.06.19.tar.gz
-_eclasses_=bash-completion-r1 db412e427e3317ffd3e15f17df269c5e distutils-r1 d48d51c220f1678179fc4ab13b534ec1 eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-single-r1 a71a169a881e0a11d04a7fe12dc39f6e python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=33f1401f42ee38a32c1dbeb0a454d24f
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2014.07.15 b/metadata/md5-cache/net-misc/youtube-dl-2014.07.15
index 3dd426800049..af98c4ec39a6 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2014.07.15
+++ b/metadata/md5-cache/net-misc/youtube-dl-2014.07.15
@@ -4,11 +4,11 @@ DESCRIPTION=Download videos from YouTube.com (and mores sites...)
EAPI=5
HOMEPAGE=http://rg3.github.com/youtube-dl/
IUSE=offensive test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
LICENSE=public-domain
RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?]
REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) ^^ ( python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4 )
SLOT=0
SRC_URI=http://youtube-dl.org/downloads/2014.07.15/youtube-dl-2014.07.15.tar.gz
_eclasses_=bash-completion-r1 db412e427e3317ffd3e15f17df269c5e distutils-r1 d48d51c220f1678179fc4ab13b534ec1 eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-single-r1 a71a169a881e0a11d04a7fe12dc39f6e python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=3b3bd59459eee1f80f7995fd81e82e8d
+_md5_=2b005891a4050005836cacc91a18d3bf
diff --git a/metadata/md5-cache/net-print/cups-1.7.1-r2 b/metadata/md5-cache/net-print/cups-1.7.4
similarity index 94%
rename from metadata/md5-cache/net-print/cups-1.7.1-r2
rename to metadata/md5-cache/net-print/cups-1.7.4
index 579707a9ff3d..d2c352654226 100644
--- a/metadata/md5-cache/net-print/cups-1.7.1-r2
+++ b/metadata/md5-cache/net-print/cups-1.7.4
@@ -3,7 +3,7 @@ DEPEND=app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) d
DESCRIPTION=The Common Unix Printing System
EAPI=5
HOMEPAGE=http://www.cups.org/
-IUSE=acl dbus debug gnutls java kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf +linguas_ca +linguas_es +linguas_fr +linguas_it +linguas_ja +linguas_ru abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7 python_single_target_python2_7 elibc_FreeBSD java
+IUSE=acl dbus debug gnutls java kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf +linguas_ca +linguas_es +linguas_fr +linguas_it +linguas_ja +linguas_pt_BR +linguas_ru abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7 python_single_target_python2_7 elibc_FreeBSD java
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint
LICENSE=GPL-2
PDEPEND=app-text/ghostscript-gpl[cups] app-text/poppler[utils] >=net-print/cups-filters-1.0.43
@@ -11,6 +11,6 @@ RDEPEND=app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
REQUIRED_USE=gnutls? ( ssl ) python? ( python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 ) ) usb? ( threads )
RESTRICT=test
SLOT=0
-SRC_URI=http://www.cups.org/software/1.7.1/cups-1.7.1-source.tar.bz2
+SRC_URI=http://www.cups.org/software/1.7.4/cups-1.7.4-source.tar.bz2
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnome2-utils f658eba3cc594a21cf6eef4af47daa90 java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 libtool 52d0e17251d04645ffaa61bfdd858944 linux-info 2b8c53f6065bdee2d757472215a3088f multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build fbb9baa0b4039304643e36e9820fdecf multilib-minimal 5bbdc77877c1aa3c6bd89ca3f9196d11 multiprocessing d7f2985a2c76c365ee20269db5261414 pam aa1ebb3ab720ea04dbbdd6eaaf9554ed python-single-r1 a71a169a881e0a11d04a7fe12dc39f6e python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=5bd321af96a3b781c68e537d76496190
+_md5_=772fc5f52d4f9355e8d496a597a84357
diff --git a/metadata/md5-cache/net-wireless/airtraf-1.1-r1 b/metadata/md5-cache/net-wireless/airtraf-1.1-r2
similarity index 71%
rename from metadata/md5-cache/net-wireless/airtraf-1.1-r1
rename to metadata/md5-cache/net-wireless/airtraf-1.1-r2
index c77733b151bc..1ab3f79813bd 100644
--- a/metadata/md5-cache/net-wireless/airtraf-1.1-r1
+++ b/metadata/md5-cache/net-wireless/airtraf-1.1-r2
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile install prepare
-DEPEND=net-libs/libpcap
+DEPEND=net-libs/libpcap sys-libs/ncurses virtual/pkgconfig
DESCRIPTION=AirTraf 802.11b Wireless traffic sniffer
-EAPI=2
+EAPI=5
HOMEPAGE=http://www.elixar.com/
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
-RDEPEND=net-libs/libpcap
+RDEPEND=net-libs/libpcap sys-libs/ncurses
SLOT=0
SRC_URI=http://www.elixar.com/airtraf-1.1.tar.gz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=59454cd6b25f629bbb597a3363b5c78e
+_md5_=250925dd432d2b797ca8ef4f4712ea45
diff --git a/metadata/md5-cache/net-wireless/wavemon-0.7.6 b/metadata/md5-cache/net-wireless/wavemon-0.7.6
index c1e6da2f72d8..812d9b72b8bb 100644
--- a/metadata/md5-cache/net-wireless/wavemon-0.7.6
+++ b/metadata/md5-cache/net-wireless/wavemon-0.7.6
@@ -4,10 +4,10 @@ DESCRIPTION=Ncurses based monitor for IEEE 802.11 wireless LAN cards
EAPI=5
HOMEPAGE=http://eden-feed.erg.abdn.ac.uk/wavemon/
IUSE=caps
-KEYWORDS=amd64 arm ~hppa ppc ~sparc x86
+KEYWORDS=amd64 arm hppa ppc ~sparc x86
LICENSE=GPL-3
RDEPEND=sys-libs/ncurses caps? ( sys-libs/libcap )
SLOT=0
SRC_URI=http://eden-feed.erg.abdn.ac.uk/wavemon/stable-releases/wavemon-0.7.6.tar.bz2
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 autotools-utils fb74970befc9b65ceec689d2ccff3022 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=e382bd0a784eb94c4e5ad3fa2c339f4a
+_md5_=db5e163bbedcf7d66fc782c5185a6df0
diff --git a/metadata/md5-cache/net-wireless/wepattack-0.1.3-r3 b/metadata/md5-cache/net-wireless/wepattack-0.1.3-r3
index 204d2c7a4119..7ed5d496d868 100644
--- a/metadata/md5-cache/net-wireless/wepattack-0.1.3-r3
+++ b/metadata/md5-cache/net-wireless/wepattack-0.1.3-r3
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=sys-libs/zlib net-libs/libpcap dev-libs/openssl
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/openssl net-libs/libpcap sys-libs/zlib
DESCRIPTION=WLAN tool for breaking 802.11 WEP keys
+EAPI=5
HOMEPAGE=http://wepattack.sourceforge.net/
IUSE=john
KEYWORDS=amd64 x86
LICENSE=GPL-2
-RDEPEND=sys-libs/zlib net-libs/libpcap dev-libs/openssl john? ( app-crypt/johntheripper )
+RDEPEND=dev-libs/openssl net-libs/libpcap sys-libs/zlib john? ( app-crypt/johntheripper )
SLOT=0
SRC_URI=mirror://sourceforge/wepattack/WepAttack-0.1.3.tar.gz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=10206a9a4f6cc7064684a2a809392ecd
+_md5_=bf6481b236019e274f4eb170d3e93751
diff --git a/metadata/md5-cache/perl-core/AutoLoader-5.720.0 b/metadata/md5-cache/perl-core/AutoLoader-5.720.0
deleted file mode 100644
index 130098dd6992..000000000000
--- a/metadata/md5-cache/perl-core/AutoLoader-5.720.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=dev-lang/perl-5.16 =dev-lang/perl-5.16 =virtual/perl-CPAN-Meta-YAML-0.2.0 >=virtual/perl-Parse-CPAN-Meta-1.440 >=virtual/perl-JSON-PP-2.271.30 virtual/perl-Scalar-List-Utils >=virtual/perl-version-0.82 virtual/perl-File-Spec >=virtual/perl-File-Temp-0.20 virtual/perl-IO >=virtual/perl-Test-Simple-0.88 >=virtual/perl-ExtUtils-MakeMaker-6.56 || ( >=dev-lang/perl-5.16 =virtual/perl-CPAN-Meta-YAML-0.2.0 >=virtual/perl-Parse-CPAN-Meta-1.440 >=virtual/perl-JSON-PP-2.271.30 virtual/perl-Scalar-List-Utils >=virtual/perl-version-0.82 || ( >=dev-lang/perl-5.16 =dev-lang/perl-5.16 =dev-lang/perl-5.16 =dev-lang/perl-5.16 =dev-lang/perl-5.16 =sys-libs/readline-4.1-r2 units_cur? ( dev-lang/python-exec:2 ) units_cur? ( dev-python/unidecode[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] )
SLOT=0
SRC_URI=mirror://gnu/units/units-2.11.tar.gz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=a1255097dbd6e8616ec77a61cb279b8e
+_md5_=cb8dbb6b5983c9ad32dccdfa8deb1289
diff --git a/metadata/md5-cache/sci-electronics/cirkuit-0.4.3 b/metadata/md5-cache/sci-electronics/cirkuit-0.4.3
deleted file mode 100644
index 28abd4f36aa0..000000000000
--- a/metadata/md5-cache/sci-electronics/cirkuit-0.4.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-text/poppler-0.12.3-r3[qt4] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-DESCRIPTION=An application to generate publication-ready figures
-EAPI=5
-HOMEPAGE=http://wwwu.uni-klu.ac.at/magostin/cirkuit.html
-IUSE=debug aqua
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/poppler-0.12.3-r3[qt4] virtual/latex-base media-libs/netpbm dev-texlive/texlive-pstricks app-text/ghostscript-gpl app-text/ps2eps media-gfx/pdf2svg >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-SLOT=4
-SRC_URI=http://wwwu.uni-klu.ac.at/magostin/src/cirkuit-0.4.3.tar.bz2
-_eclasses_=cmake-utils 10b6a99f9058ac1b830d00b3421f04e4 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnome2-utils f658eba3cc594a21cf6eef4af47daa90 kde4-base 9f3084f58fc936e3f01c6e9ba21962bc kde4-functions 492237eb2823bdc02bc769530501f0ea multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=cea735d35f091e42bf053b7f08fbb686
diff --git a/metadata/md5-cache/sci-electronics/cirkuit-0.4.3-r1 b/metadata/md5-cache/sci-electronics/cirkuit-0.4.3-r1
index 68dd203ce8fe..1f53c335a1fc 100644
--- a/metadata/md5-cache/sci-electronics/cirkuit-0.4.3-r1
+++ b/metadata/md5-cache/sci-electronics/cirkuit-0.4.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=An application to generate publication-ready figures
EAPI=5
HOMEPAGE=http://wwwu.uni-klu.ac.at/magostin/cirkuit.html
IUSE=debug aqua
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=>=app-text/poppler-0.12.3-r3[qt4] virtual/latex-base media-libs/netpbm dev-texlive/texlive-pstricks app-text/ghostscript-gpl app-text/ps2eps media-gfx/pdf2svg >=kde-base/oxygen-icons-4.12.0:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.12.0:4[aqua=]
SLOT=4
SRC_URI=http://wwwu.uni-klu.ac.at/magostin/src/cirkuit-0.4.3.tar.bz2
_eclasses_=cmake-utils 10b6a99f9058ac1b830d00b3421f04e4 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnome2-utils f658eba3cc594a21cf6eef4af47daa90 kde4-base 9f3084f58fc936e3f01c6e9ba21962bc kde4-functions 492237eb2823bdc02bc769530501f0ea multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4c2a562ad83e01c4b0e2055b98d8bed1
+_md5_=1a217f8d5cc2383a4dd4244a3f1bd624
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-4.6.4-r2 b/metadata/md5-cache/sci-visualization/gnuplot-4.6.4-r2
index 336a37894363..92c89eeee21c 100644
--- a/metadata/md5-cache/sci-visualization/gnuplot-4.6.4-r2
+++ b/metadata/md5-cache/sci-visualization/gnuplot-4.6.4-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Command-line driven interactive plotting program
EAPI=5
HOMEPAGE=http://www.gnuplot.info/
IUSE=aqua bitmap cairo doc examples +gd ggi latex lua plotutils qt4 readline svga thin-splines wxwidgets X
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=gnuplot bitmap? ( free-noncomm )
RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) lua? ( dev-lang/lua ) plotutils? ( media-libs/plotutils ) qt4? ( >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 >=dev-qt/qtsvg-4.5:4 ) readline? ( sys-libs/readline ) svga? ( media-libs/svgalib ) wxwidgets? ( x11-libs/wxGTK:2.8[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:2 ) X? ( x11-libs/libXaw )
SLOT=0
SRC_URI=mirror://sourceforge/gnuplot/gnuplot-4.6.4.tar.gz mirror://gentoo/gnuplot.info-4.6.2.tar.xz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be multilib 3bf24e6abb9b76d9f6c20600f0b716bf readme.gentoo 106edea5533517715013de909a333abd toolchain-funcs 0f1760274637a138b99bb649202ea402 wxwidgets 6d6eec2685256d35511e7b6d5461bec9
-_md5_=6794fd0fedfc2a61172672c934774107
+_md5_=a75663ac8fd70fd68f85aff5e3c90e6f
diff --git a/metadata/md5-cache/sys-apps/acl-2.2.52-r1 b/metadata/md5-cache/sys-apps/acl-2.2.52-r1
index d4dcbe4727b1..d3888671a934 100644
--- a/metadata/md5-cache/sys-apps/acl-2.2.52-r1
+++ b/metadata/md5-cache/sys-apps/acl-2.2.52-r1
@@ -4,10 +4,10 @@ DESCRIPTION=access control list utilities, libraries and headers
EAPI=4
HOMEPAGE=http://savannah.nongnu.org/projects/acl
IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux
LICENSE=LGPL-2.1
RDEPEND=>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
SLOT=0
SRC_URI=http://download.savannah.gnu.org/releases/acl/acl-2.2.52.src.tar.gz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build fbb9baa0b4039304643e36e9820fdecf multilib-minimal 5bbdc77877c1aa3c6bd89ca3f9196d11 multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=21c9f304b5ebd0a9a1e11e297d353f16
+_md5_=f62327f49c2cf0857d89c4954b69f220
diff --git a/metadata/md5-cache/sys-apps/net-tools-1.60_p20130513023548 b/metadata/md5-cache/sys-apps/net-tools-1.60_p20130513023548
index 7ad6e34a6067..f431672703f2 100644
--- a/metadata/md5-cache/sys-apps/net-tools-1.60_p20130513023548
+++ b/metadata/md5-cache/sys-apps/net-tools-1.60_p20130513023548
@@ -4,10 +4,10 @@ DESCRIPTION=Standard Linux networking tools
EAPI=3
HOMEPAGE=http://net-tools.sourceforge.net/
IUSE=nls old-output selinux static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=!=sys-libs/ncurses-5.7-r7:= opensslcrypt? ( dev-libs/openssl:0= ) crypt? ( >=dev-libs/libgcrypt-1.2.1:0= ) directfb? ( >=dev-libs/DirectFB-1.4.2[fbcon,jpeg,png,truetype] ) emacs? ( virtual/emacs ) pam? ( >=sys-libs/pam-0.75-r11 ) X? ( x11-libs/libX11:= x11-libs/libXScrnSaver:= x11-proto/scrnsaverproto ) >=sys-apps/sed-4.1.4-r1 virtual/pkgconfig !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DESCRIPTION=a DirectFB getty replacement
+EAPI=5
+HOMEPAGE=http://qingy.sourceforge.net/
+IUSE=consolekit crypt directfb emacs gpm opensslcrypt pam static X
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/ncurses-5.7-r7:= opensslcrypt? ( dev-libs/openssl:0= ) crypt? ( >=dev-libs/libgcrypt-1.2.1:0= ) directfb? ( >=dev-libs/DirectFB-1.4.2[fbcon,jpeg,png,truetype] ) emacs? ( virtual/emacs ) pam? ( >=sys-libs/pam-0.75-r11 ) X? ( x11-libs/libX11:= x11-libs/libXScrnSaver:= x11-proto/scrnsaverproto ) consolekit? ( sys-auth/consolekit sys-apps/dbus ) pam? ( sys-auth/pambase )
+SLOT=0
+SRC_URI=mirror://sourceforge/qingy/qingy-1.0.0.tar.bz2 mirror://gentoo/qingy-gentoo-theme-2.1.tar.bz2 http://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/qingy-1.0.0-screensavers.patch.gz http://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/qingy-1.0.0-consolekit-pam.patch.gz
+_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 pam aa1ebb3ab720ea04dbbdd6eaaf9554ed systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=0a39b07aca74e5605b0b8ff41defe862
diff --git a/metadata/md5-cache/sys-block/fio-2.1.11 b/metadata/md5-cache/sys-block/fio-2.1.11
new file mode 100644
index 000000000000..d52888a7c69b
--- /dev/null
+++ b/metadata/md5-cache/sys-block/fio-2.1.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=aio? ( dev-libs/libaio ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) zlib? ( sys-libs/zlib )
+DESCRIPTION=Jens Axboe's Flexible IO tester
+EAPI=5
+HOMEPAGE=http://brick.kernel.dk/snaps/
+IUSE=aio gnuplot gtk numa zlib python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=aio? ( dev-libs/libaio ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) zlib? ( sys-libs/zlib ) gnuplot? ( sci-visualization/gnuplot python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+SLOT=0
+SRC_URI=http://brick.kernel.dk/snaps/fio-2.1.11.tar.bz2
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=d24ecdc0c6f701a57beac7d9bd593221
diff --git a/metadata/md5-cache/sys-fs/eudev-1.9-r1 b/metadata/md5-cache/sys-fs/eudev-1.9-r1
index 38a4983784c0..308b73c62af5 100644
--- a/metadata/md5-cache/sys-fs/eudev-1.9-r1
+++ b/metadata/md5-cache/sys-fs/eudev-1.9-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace de
EAPI=5
HOMEPAGE=https://github.com/gentoo/eudev
IUSE=doc gudev +hwdb +kmod introspection +keymap +modutils +openrc +rule-generator selinux static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm ~hppa ~mips ppc ppc64 x86
+KEYWORDS=amd64 arm hppa ~mips ppc ppc64 x86
LICENSE=LGPL-2.1 MIT GPL-2
PDEPEND=hwdb? ( >=sys-apps/hwids-20140304[udev] ) keymap? ( >=sys-apps/hwids-20140304[udev] ) openrc? ( >=sys-fs/udev-init-scripts-26 )
RDEPEND=>=sys-apps/util-linux-2.20 gudev? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !=sys-apps/util-linux-2.16
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://kernel/linux/utils/raid/mdadm/mdadm-3.3.tar.xz mirror://debian/pool/main/m/mdadm/mdadm_3.3-2.debian.tar.gz
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be multilib 3bf24e6abb9b76d9f6c20600f0b716bf systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=1d73611e90de94e28a8abf160c9f8bf0
diff --git a/metadata/md5-cache/sys-fs/mdadm-3.3.1-r1 b/metadata/md5-cache/sys-fs/mdadm-3.3.1-r2
similarity index 89%
rename from metadata/md5-cache/sys-fs/mdadm-3.3.1-r1
rename to metadata/md5-cache/sys-fs/mdadm-3.3.1-r2
index dab7b2fd7c31..3280bef251f2 100644
--- a/metadata/md5-cache/sys-fs/mdadm-3.3.1-r1
+++ b/metadata/md5-cache/sys-fs/mdadm-3.3.1-r2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install postinst test
+DEFINED_PHASES=compile install postinst prepare test
DEPEND=virtual/pkgconfig app-arch/xz-utils virtual/pkgconfig virtual/pkgconfig
DESCRIPTION=A useful tool for running RAID systems - it can be used as a replacement for the raidtools
EAPI=4
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://kernel/linux/utils/raid/mdadm/mdadm-3.3.1.tar.xz mirror://debian/pool/main/m/mdadm/mdadm_3.3-2.debian.tar.gz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be multilib 3bf24e6abb9b76d9f6c20600f0b716bf systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402 udev 8cd692457c1524c7be9af69831698a78
-_md5_=e56deb14689b3044aac771f00a9beb16
+_md5_=0fc82e317e266d10d8fd010b4df3ef17
diff --git a/metadata/md5-cache/sys-kernel/genkernel-3.4.49 b/metadata/md5-cache/sys-kernel/genkernel-3.4.49
index b6733b9d37ca..9c025db7aa49 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-3.4.49
+++ b/metadata/md5-cache/sys-kernel/genkernel-3.4.49
@@ -4,10 +4,10 @@ DESCRIPTION=Gentoo automatic kernel building scripts
EAPI=3
HOMEPAGE=http://www.gentoo.org
IUSE=crypt cryptsetup ibm selinux
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86
LICENSE=GPL-2
RDEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux ) cryptsetup? ( sys-fs/cryptsetup ) app-arch/cpio >=app-misc/pax-utils-0.2.1 !=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=TuxOnIce + Gentoo patchset sources
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel
+IUSE=experimental symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 freedist
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.10.49
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz mirror://gentoo/genpatches-3.10-57.base.tar.xz mirror://gentoo/genpatches-3.10-57.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-57.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.10.45-2014-06-27.patch.bz2
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 kernel-2 6fb31411472936acc8287129d3df7f43 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-any-r1 4560effd96d3d2a82e50af7cf87166da python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=307f1e4220c8ddb4160e72b1c9814426
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.13 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.13
new file mode 100644
index 000000000000..cc2608413c15
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.13
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=TuxOnIce + Gentoo patchset sources
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel
+IUSE=experimental symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 freedist
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.14.13
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz mirror://gentoo/genpatches-3.14-17.base.tar.xz mirror://gentoo/genpatches-3.14-17.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-17.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.14.9-2014-06-27.patch.bz2
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 kernel-2 6fb31411472936acc8287129d3df7f43 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-any-r1 4560effd96d3d2a82e50af7cf87166da python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=e18b655d0cfea2c7c831974beac5c18e
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.15.6 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.15.6
new file mode 100644
index 000000000000..ac3549ac2635
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.15.6
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=TuxOnIce + Gentoo patchset sources
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel
+IUSE=experimental symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 freedist
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.15.6
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.15.tar.xz mirror://gentoo/genpatches-3.15-8.base.tar.xz mirror://gentoo/genpatches-3.15-8.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.15-8.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.15.2-2014-06-27.patch.bz2
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 kernel-2 6fb31411472936acc8287129d3df7f43 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-any-r1 4560effd96d3d2a82e50af7cf87166da python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=816359309bc392f3d637fbac43bacfdd
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.99 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.99
new file mode 100644
index 000000000000..f0e27c97b13e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.99
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=TuxOnIce + Gentoo patchset sources
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel
+IUSE=symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 freedist
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.4.99
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz mirror://gentoo/genpatches-3.4-82.base.tar.xz mirror://gentoo/genpatches-3.4-82.extras.tar.xz http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.4.95-2014-06-27.patch.bz2
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 kernel-2 6fb31411472936acc8287129d3df7f43 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-any-r1 4560effd96d3d2a82e50af7cf87166da python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=31bfa78d87e0c01938ce128b5d6bfafb
diff --git a/metadata/md5-cache/sys-libs/libfaketime-0.9.5 b/metadata/md5-cache/sys-libs/libfaketime-0.9.5
deleted file mode 100644
index ecc05e2d4e90..000000000000
--- a/metadata/md5-cache/sys-libs/libfaketime-0.9.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Report faked system time to programs
-EAPI=5
-HOMEPAGE=http://www.code-wizards.com/projects/libfaketime/ https://github.com/wolfcw/libfaketime/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.code-wizards.com/projects/libfaketime/libfaketime-0.9.5.tar.gz
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=4fde5027a19087cc7fab226df0f6db2c
diff --git a/metadata/md5-cache/sys-libs/libfaketime-0.9.6 b/metadata/md5-cache/sys-libs/libfaketime-0.9.6-r1
similarity index 82%
rename from metadata/md5-cache/sys-libs/libfaketime-0.9.6
rename to metadata/md5-cache/sys-libs/libfaketime-0.9.6-r1
index cb7b0c67143e..ff1a95c4788c 100644
--- a/metadata/md5-cache/sys-libs/libfaketime-0.9.6
+++ b/metadata/md5-cache/sys-libs/libfaketime-0.9.6-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=compile install prepare
DESCRIPTION=Report faked system time to programs
EAPI=5
HOMEPAGE=http://www.code-wizards.com/projects/libfaketime/ https://github.com/wolfcw/libfaketime/
@@ -7,4 +7,4 @@ LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.code-wizards.com/projects/libfaketime/libfaketime-0.9.6.tar.gz
_eclasses_=multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=ceaf87b2eca5abad0a0a5976af0ead6f
+_md5_=764caaa21eb2b9a85b1e7e99de2e42cd
diff --git a/metadata/md5-cache/virtual/perl-AutoLoader-5.720.0-r1 b/metadata/md5-cache/virtual/perl-AutoLoader-5.720.0-r1
deleted file mode 100644
index c9638cd97597..000000000000
--- a/metadata/md5-cache/virtual/perl-AutoLoader-5.720.0-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for AutoLoader
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.16* ~perl-core/AutoLoader-5.720.0 )
-SLOT=0
-_md5_=048aac274d0474b51b7f9da1195a2afd
diff --git a/metadata/md5-cache/virtual/perl-AutoLoader-5.730.0-r1 b/metadata/md5-cache/virtual/perl-AutoLoader-5.730.0-r2
similarity index 60%
rename from metadata/md5-cache/virtual/perl-AutoLoader-5.730.0-r1
rename to metadata/md5-cache/virtual/perl-AutoLoader-5.730.0-r2
index 59d34e2b0e60..a75989fcc835 100644
--- a/metadata/md5-cache/virtual/perl-AutoLoader-5.730.0-r1
+++ b/metadata/md5-cache/virtual/perl-AutoLoader-5.730.0-r2
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for AutoLoader
EAPI=5
KEYWORDS=amd64 ~ppc x86 ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/AutoLoader-5.730.0 )
+RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/AutoLoader-5.730.0 ) !perl-core/AutoLoader-5.730.0-r999
SLOT=0
-_md5_=1d44d11a1b391d247a77639d791977d7
+_md5_=215bc5abc0cb0a872c7a05ebbf394869
diff --git a/metadata/md5-cache/virtual/perl-AutoLoader-5.740.0 b/metadata/md5-cache/virtual/perl-AutoLoader-5.740.0
index 2b0f7df4631e..18b2a922d7e1 100644
--- a/metadata/md5-cache/virtual/perl-AutoLoader-5.740.0
+++ b/metadata/md5-cache/virtual/perl-AutoLoader-5.740.0
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for AutoLoader
EAPI=5
KEYWORDS=~amd64 ~ppc ~x86 ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/AutoLoader-5.740.0 )
+RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/AutoLoader-5.740.0 ) !perl-core/AutoLoader-5.740.0-r999
SLOT=0
-_md5_=e0bdb2c1b611b904eb635359c6200d14
+_md5_=636d26331b46878456a93dfe8ba83ac6
diff --git a/metadata/md5-cache/virtual/perl-B-Debug-1.180.0-r1 b/metadata/md5-cache/virtual/perl-B-Debug-1.180.0-r2
similarity index 64%
rename from metadata/md5-cache/virtual/perl-B-Debug-1.180.0-r1
rename to metadata/md5-cache/virtual/perl-B-Debug-1.180.0-r2
index 83115ae90563..7dfabbf43b1d 100644
--- a/metadata/md5-cache/virtual/perl-B-Debug-1.180.0-r1
+++ b/metadata/md5-cache/virtual/perl-B-Debug-1.180.0-r2
@@ -1,7 +1,7 @@
DEFINED_PHASES=-
-DESCRIPTION=Virtual for B::Debug
+DESCRIPTION=Virtual for B-Debug
EAPI=5
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/B-Debug-1.180.0 )
+RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/B-Debug-1.180.0 ) !perl-core/B-Debug-1.180.0-r999
SLOT=0
-_md5_=19ae4079d4619926e5b94e778fd5bbfe
+_md5_=d96f73bff4c8523bf112fdce7a556f5a
diff --git a/metadata/md5-cache/virtual/perl-B-Debug-1.190.0 b/metadata/md5-cache/virtual/perl-B-Debug-1.190.0
index fa0fcafa13d7..ca07d8958eba 100644
--- a/metadata/md5-cache/virtual/perl-B-Debug-1.190.0
+++ b/metadata/md5-cache/virtual/perl-B-Debug-1.190.0
@@ -1,7 +1,7 @@
DEFINED_PHASES=-
-DESCRIPTION=Virtual for B::Debug
+DESCRIPTION=Virtual for B-Debug
EAPI=5
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/B-Debug-1.190.0 )
+RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/B-Debug-1.190.0 ) !perl-core/B-Debug-1.190.0-r999
SLOT=0
-_md5_=3618e31656b113a72e712b7ff145e4dd
+_md5_=3130437629779ec68e809930a617bcec
diff --git a/metadata/md5-cache/virtual/perl-CGI-3.630.0-r1 b/metadata/md5-cache/virtual/perl-CGI-3.630.0-r2
similarity index 59%
rename from metadata/md5-cache/virtual/perl-CGI-3.630.0-r1
rename to metadata/md5-cache/virtual/perl-CGI-3.630.0-r2
index 250eb8d2fed2..6df30a6efa8e 100644
--- a/metadata/md5-cache/virtual/perl-CGI-3.630.0-r1
+++ b/metadata/md5-cache/virtual/perl-CGI-3.630.0-r2
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for CGI
EAPI=5
KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos
-RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/CGI-3.630.0 )
+RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/CGI-3.630.0 ) !perl-core/CGI-3.630.0-r999
SLOT=0
-_md5_=bf01b6d58c52c205a001842feb816f1b
+_md5_=5b5eb58c6786300aa9ef77d13e5ecbed
diff --git a/metadata/md5-cache/virtual/perl-CGI-3.650.0 b/metadata/md5-cache/virtual/perl-CGI-3.650.0
index 53c987a24e18..26dfe3cc46b0 100644
--- a/metadata/md5-cache/virtual/perl-CGI-3.650.0
+++ b/metadata/md5-cache/virtual/perl-CGI-3.650.0
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for CGI
EAPI=5
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos
-RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/CGI-3.650.0 )
+RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/CGI-3.650.0 ) !perl-core/CGI-3.650.0-r999
SLOT=0
-_md5_=20e2e9e85eaf4cc09f508a68efefd65a
+_md5_=52b68ec947945f1777f4b67d45537274
diff --git a/metadata/md5-cache/virtual/perl-CPAN-2.0.0 b/metadata/md5-cache/virtual/perl-CPAN-2.0.0
deleted file mode 100644
index bd9b6cd2be96..000000000000
--- a/metadata/md5-cache/virtual/perl-CPAN-2.0.0
+++ /dev/null
@@ -1,6 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for CPAN
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/CPAN-2.0.0 )
-SLOT=0
-_md5_=5d34af164e7b2f455977849a8e089963
diff --git a/metadata/md5-cache/virtual/perl-CPAN-2.0.0-r1 b/metadata/md5-cache/virtual/perl-CPAN-2.0.0-r1
new file mode 100644
index 000000000000..abe2e7d03735
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-CPAN-2.0.0-r1
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for CPAN
+EAPI=5
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/CPAN-2.0.0 ) !perl-core/CPAN-2.0.0-r999
+SLOT=0
+_md5_=c9d2ed81061d63aebfd3c770a7cb37ea
diff --git a/metadata/md5-cache/virtual/perl-CPAN-2.0.5 b/metadata/md5-cache/virtual/perl-CPAN-2.0.5
index 6b3f7fd25aeb..3c2b47090800 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-2.0.5
+++ b/metadata/md5-cache/virtual/perl-CPAN-2.0.5
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for CPAN
EAPI=5
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/CPAN-2.0.5 )
+RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/CPAN-2.0.5 ) !perl-core/CPAN-2.0.5-r999
SLOT=0
-_md5_=4001d27e777f4faa43afa689e9bf783b
+_md5_=0ea4941019bbddff5d2a8df786291287
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-2.120.630-r1 b/metadata/md5-cache/virtual/perl-CPAN-Meta-2.120.630-r1
deleted file mode 100644
index 4e48477704f1..000000000000
--- a/metadata/md5-cache/virtual/perl-CPAN-Meta-2.120.630-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for CPAN-Meta
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.16* ~perl-core/CPAN-Meta-2.120.630 )
-SLOT=0
-_md5_=82b39c694cb4668815f49a6f3bea2f6f
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-2.120.921-r1 b/metadata/md5-cache/virtual/perl-CPAN-Meta-2.120.921-r2
similarity index 79%
rename from metadata/md5-cache/virtual/perl-CPAN-Meta-2.120.921-r1
rename to metadata/md5-cache/virtual/perl-CPAN-Meta-2.120.921-r2
index ba999b205c62..97e567319944 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-Meta-2.120.921-r1
+++ b/metadata/md5-cache/virtual/perl-CPAN-Meta-2.120.921-r2
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for CPAN-Meta
EAPI=5
KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/CPAN-Meta-2.120.921 )
+RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/CPAN-Meta-2.120.921 ) !perl-core/CPAN-Meta-2.120.921-r999
SLOT=0
-_md5_=e055781fdf31c356d47e7569fbcae13e
+_md5_=61da380795641d331bdc6959ef965cff
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-2.140.640 b/metadata/md5-cache/virtual/perl-CPAN-Meta-2.140.640
index 902137886042..98fa02dd4e74 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-Meta-2.140.640
+++ b/metadata/md5-cache/virtual/perl-CPAN-Meta-2.140.640
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for CPAN-Meta
EAPI=5
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/CPAN-Meta-2.140.640 )
+RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/CPAN-Meta-2.140.640 ) !perl-core/CPAN-Meta-2.140.640-r999
SLOT=0
-_md5_=1173ec93f2013ba5af389662200b09e5
+_md5_=441d3de19ba9248ea595c05224e278f5
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.122.0-r1 b/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.122.0-r2
similarity index 75%
rename from metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.122.0-r1
rename to metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.122.0-r2
index cd6abc6e2f95..b9c9d47a89d5 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.122.0-r1
+++ b/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.122.0-r2
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for CPAN-Meta-Requirements
EAPI=5
KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/CPAN-Meta-Requirements-2.122.0 )
+RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/CPAN-Meta-Requirements-2.122.0 ) !perl-core/CPAN-Meta-Requirements-2.122.0-r999
SLOT=0
-_md5_=a75ac8e30da3a90a1096bf2bef8d4878
+_md5_=e7cd9e442157a4383549a3db59bdeba2
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.125.0 b/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.125.0-r1
similarity index 74%
rename from metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.125.0
rename to metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.125.0-r1
index 68df1a308b25..7ecfea47664f 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.125.0
+++ b/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.125.0-r1
@@ -1,6 +1,7 @@
DEFINED_PHASES=-
DESCRIPTION=Virtual for CPAN-Meta-Requirements
+EAPI=5
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/CPAN-Meta-Requirements-2.125.0 )
+RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/CPAN-Meta-Requirements-2.125.0 ) !perl-core/CPAN-Meta-Requirements-2.125.0-r999
SLOT=0
-_md5_=7afce94c7eff0f964c6643561f4df6eb
+_md5_=ec0fe2c73ac65c25fc14f1f61a41b273
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.12.0 b/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.12.0
index 66003216b756..d2856ae5800a 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.12.0
+++ b/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.12.0
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for CPAN-Meta-YAML
EAPI=5
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/CPAN-Meta-YAML-0.12.0 )
+RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/CPAN-Meta-YAML-0.12.0 ) !perl-core/CPAN-Meta-YAML-0.12.0-r999
SLOT=0
-_md5_=1ff909582cb8ed7dabc1289f5787a713
+_md5_=ceda7a17d7ae57a3e4e7831bae855862
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.7.0-r1 b/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.7.0-r1
deleted file mode 100644
index e01522e6213d..000000000000
--- a/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.7.0-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for CPAN-Meta-YAML
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.16* ~perl-core/CPAN-Meta-YAML-0.7.0 )
-SLOT=0
-_md5_=44567cd3fa6050cf9020bec6cabbfa35
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.8.0-r1 b/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.8.0-r2
similarity index 79%
rename from metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.8.0-r1
rename to metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.8.0-r2
index d7cd766167e5..161566e98052 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.8.0-r1
+++ b/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.8.0-r2
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for CPAN-Meta-YAML
EAPI=5
KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/CPAN-Meta-YAML-0.8.0 )
+RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/CPAN-Meta-YAML-0.8.0 ) !perl-core/CPAN-Meta-YAML-0.8.0-r999
SLOT=0
-_md5_=51ee88eabd9692fa85092a1855113719
+_md5_=b4958459f825d1b74c0a6e7f69205908
diff --git a/metadata/md5-cache/virtual/perl-Carp-1.290.0 b/metadata/md5-cache/virtual/perl-Carp-1.290.0-r1
similarity index 90%
rename from metadata/md5-cache/virtual/perl-Carp-1.290.0
rename to metadata/md5-cache/virtual/perl-Carp-1.290.0-r1
index 594241c6bd31..247bb513b4cf 100644
--- a/metadata/md5-cache/virtual/perl-Carp-1.290.0
+++ b/metadata/md5-cache/virtual/perl-Carp-1.290.0-r1
@@ -1,6 +1,7 @@
DEFINED_PHASES=-
DESCRIPTION=Virtual for Carp
+EAPI=5
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
RDEPEND==dev-lang/perl-5.18* !perl-core/Carp
SLOT=0
-_md5_=3e9fdbadba0d7d9a10ec59c84cb31816
+_md5_=cf0faaf5b40f03e132160e2c77f06623
diff --git a/metadata/md5-cache/virtual/perl-Carp-1.330.100 b/metadata/md5-cache/virtual/perl-Carp-1.330.100
index 2faff3c6dc94..f2afafa6a3c4 100644
--- a/metadata/md5-cache/virtual/perl-Carp-1.330.100
+++ b/metadata/md5-cache/virtual/perl-Carp-1.330.100
@@ -4,4 +4,4 @@ EAPI=5
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
RDEPEND==dev-lang/perl-5.20* !perl-core/Carp
SLOT=0
-_md5_=b5ebc73c794b9472c63884b436c19e7c
+_md5_=f367d5caadaebb52811ce28cd368a5e7
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.60.0-r1 b/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.60.0-r2
similarity index 77%
rename from metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.60.0-r1
rename to metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.60.0-r2
index 41c44dfe5903..0f0509801f13 100644
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.60.0-r1
+++ b/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.60.0-r2
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for Compress-Raw-Bzip2
EAPI=5
KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/Compress-Raw-Bzip2-2.60.0 )
+RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/Compress-Raw-Bzip2-2.60.0 ) !perl-core/Compress-Raw-Bzip2-2.60.0-r999
SLOT=0
-_md5_=bc0bb523c2a019ea37265d62c61d21bf
+_md5_=05747fbc2e762ba2d02dd0da12e75c56
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.64.0 b/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.64.0
index aa39b6d26194..5c06edfc39d7 100644
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.64.0
+++ b/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.64.0
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for Compress-Raw-Bzip2
EAPI=5
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Compress-Raw-Bzip2-2.64.0 )
+RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Compress-Raw-Bzip2-2.64.0 ) !perl-core/Compress-Raw-Bzip2-2.64.0-r999
SLOT=0
-_md5_=83709b5b2c81d85f370630ad8fe9c3af
+_md5_=6737ad8f19c4424ec8941831e5991d7e
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.60.0-r1 b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.60.0-r2
similarity index 77%
rename from metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.60.0-r1
rename to metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.60.0-r2
index 8b0b14bf20fb..fb69837f4d2e 100644
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.60.0-r1
+++ b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.60.0-r2
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for Compress-Raw-Zlib
EAPI=5
KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/Compress-Raw-Zlib-2.60.0 )
+RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/Compress-Raw-Zlib-2.60.0 ) !perl-core/Compress-Raw-Zlib-2.60.0-r999
SLOT=0
-_md5_=4726b34856b03d3fca8f2388cf2a6749
+_md5_=d92bebbac8164979de010c24b52ac29d
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.65.0 b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.65.0
index e616db46a12d..5ce25a31c07b 100644
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.65.0
+++ b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.65.0
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for Compress-Raw-Zlib
EAPI=5
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Compress-Raw-Zlib-2.65.0 )
+RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Compress-Raw-Zlib-2.65.0 ) !perl-core/Compress-Raw-Zlib-2.65.0-r999
SLOT=0
-_md5_=cf8f66ee3c62ba738b16829ab3274604
+_md5_=5012e5fd82da42f3a9085667d89f9610
diff --git a/metadata/md5-cache/virtual/perl-DB_File-1.826.0-r2 b/metadata/md5-cache/virtual/perl-DB_File-1.826.0-r2
deleted file mode 100644
index a11400b5ee5e..000000000000
--- a/metadata/md5-cache/virtual/perl-DB_File-1.826.0-r2
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for DB_File
-EAPI=2
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
-RDEPEND=|| ( =dev-lang/perl-5.16*[berkdb] ~perl-core/DB_File-1.826.0 )
-SLOT=0
-_md5_=f9097a01ab5a3a3e27eb4ff3877b1373
diff --git a/metadata/md5-cache/virtual/perl-DB_File-1.827.0-r1 b/metadata/md5-cache/virtual/perl-DB_File-1.827.0-r2
similarity index 69%
rename from metadata/md5-cache/virtual/perl-DB_File-1.827.0-r1
rename to metadata/md5-cache/virtual/perl-DB_File-1.827.0-r2
index 48f0ae229802..612156a3248f 100644
--- a/metadata/md5-cache/virtual/perl-DB_File-1.827.0-r1
+++ b/metadata/md5-cache/virtual/perl-DB_File-1.827.0-r2
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for DB_File
EAPI=5
KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
-RDEPEND=|| ( =dev-lang/perl-5.18*[berkdb] ~perl-core/DB_File-1.827.0 )
+RDEPEND=|| ( =dev-lang/perl-5.18*[berkdb] ~perl-core/DB_File-1.827.0 ) !perl-core/DB_File-1.827.0-r999
SLOT=0
-_md5_=7e80e5ed3faca8e5c30cfdda78cdc062
+_md5_=1726f464baabc9e4e3713a61586d159f
diff --git a/metadata/md5-cache/virtual/perl-DB_File-1.831.0 b/metadata/md5-cache/virtual/perl-DB_File-1.831.0
index 559c6b894d8d..78327440d43e 100644
--- a/metadata/md5-cache/virtual/perl-DB_File-1.831.0
+++ b/metadata/md5-cache/virtual/perl-DB_File-1.831.0
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for DB_File
EAPI=5
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
-RDEPEND=|| ( =dev-lang/perl-5.20*[berkdb] ~perl-core/DB_File-1.831.0 )
+RDEPEND=|| ( =dev-lang/perl-5.20*[berkdb] ~perl-core/DB_File-1.831.0 ) !perl-core/DB_File-1.831.0-r999
SLOT=0
-_md5_=a157367b67ef50d76bfa60179df8c99e
+_md5_=45fd0fa61a53600918e4245374483813
diff --git a/metadata/md5-cache/virtual/perl-Data-Dumper-2.145.0-r1 b/metadata/md5-cache/virtual/perl-Data-Dumper-2.145.0-r2
similarity index 63%
rename from metadata/md5-cache/virtual/perl-Data-Dumper-2.145.0-r1
rename to metadata/md5-cache/virtual/perl-Data-Dumper-2.145.0-r2
index 8181056813c2..605087653bac 100644
--- a/metadata/md5-cache/virtual/perl-Data-Dumper-2.145.0-r1
+++ b/metadata/md5-cache/virtual/perl-Data-Dumper-2.145.0-r2
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for Data-Dumper
EAPI=5
KEYWORDS=~amd64 ~arm ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux
-RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/Data-Dumper-2.145.0 )
+RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/Data-Dumper-2.145.0 ) !perl-core/Data-Dumper-2.145.0-r999
SLOT=0
-_md5_=972989fc82f93972b0656ae10d58cb75
+_md5_=6bdc957f87bec84bd02a21a07c4e74c4
diff --git a/metadata/md5-cache/virtual/perl-Data-Dumper-2.151.0 b/metadata/md5-cache/virtual/perl-Data-Dumper-2.151.0
index 5607664046ac..864c8d63c7ba 100644
--- a/metadata/md5-cache/virtual/perl-Data-Dumper-2.151.0
+++ b/metadata/md5-cache/virtual/perl-Data-Dumper-2.151.0
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for Data-Dumper
EAPI=5
KEYWORDS=~amd64 ~arm ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux
-RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Data-Dumper-2.151.0 )
+RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Data-Dumper-2.151.0 ) !perl-core/Data-Dumper-2.151.0-r999
SLOT=0
-_md5_=0c799eb6c2f400a21e77a577dff575ae
+_md5_=b0a49881342751f6cab30be4cdf6b35c
diff --git a/metadata/md5-cache/virtual/perl-Devel-PPPort-3.200.0-r2 b/metadata/md5-cache/virtual/perl-Devel-PPPort-3.200.0-r2
deleted file mode 100644
index b8ac522d1bb6..000000000000
--- a/metadata/md5-cache/virtual/perl-Devel-PPPort-3.200.0-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Devel-PPPort
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-RDEPEND=|| ( =dev-lang/perl-5.18* =dev-lang/perl-5.16* ~perl-core/Devel-PPPort-3.200.0 )
-SLOT=0
-_md5_=81eeb1ef53b32a35ad1f47ef1abc552b
diff --git a/metadata/md5-cache/virtual/perl-Devel-PPPort-3.200.0-r3 b/metadata/md5-cache/virtual/perl-Devel-PPPort-3.200.0-r3
new file mode 100644
index 000000000000..b50c0f7d23f1
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-Devel-PPPort-3.200.0-r3
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Devel-PPPort
+EAPI=5
+KEYWORDS=alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86
+RDEPEND=|| ( =dev-lang/perl-5.18* =dev-lang/perl-5.16* ~perl-core/Devel-PPPort-3.200.0 ) !perl-core/Devel-PPPort-3.200.0-r999
+SLOT=0
+_md5_=8c6ca30466014d973c046d920997c09b
diff --git a/metadata/md5-cache/virtual/perl-Devel-PPPort-3.210.0 b/metadata/md5-cache/virtual/perl-Devel-PPPort-3.210.0
index 39c11d260eec..6746ea64c84d 100644
--- a/metadata/md5-cache/virtual/perl-Devel-PPPort-3.210.0
+++ b/metadata/md5-cache/virtual/perl-Devel-PPPort-3.210.0
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for Devel-PPPort
EAPI=5
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Devel-PPPort-3.210.0 )
+RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Devel-PPPort-3.210.0 ) !perl-core/Devel-PPPort-3.210.0-r999
SLOT=0
-_md5_=02d95f35134ac189082963a2b1056f28
+_md5_=4e6553519c75a6626a21485a29278a2c
diff --git a/metadata/md5-cache/virtual/perl-Digest-MD5-2.520.0-r1 b/metadata/md5-cache/virtual/perl-Digest-MD5-2.520.0-r2
similarity index 79%
rename from metadata/md5-cache/virtual/perl-Digest-MD5-2.520.0-r1
rename to metadata/md5-cache/virtual/perl-Digest-MD5-2.520.0-r2
index a361e49f3a7b..55b1681a44dd 100644
--- a/metadata/md5-cache/virtual/perl-Digest-MD5-2.520.0-r1
+++ b/metadata/md5-cache/virtual/perl-Digest-MD5-2.520.0-r2
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for Digest-MD5
EAPI=5
KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/Digest-MD5-2.520.0 )
+RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/Digest-MD5-2.520.0 ) !perl-core/Digest-MD5-2.520.0-r999
SLOT=0
-_md5_=0ce242edd10ce3407ac2ea2fcda4e96e
+_md5_=a1729ce3cb4ce1b8a477a9c0e43b9449
diff --git a/metadata/md5-cache/virtual/perl-Digest-MD5-2.530.0-r1 b/metadata/md5-cache/virtual/perl-Digest-MD5-2.530.0-r2
similarity index 80%
rename from metadata/md5-cache/virtual/perl-Digest-MD5-2.530.0-r1
rename to metadata/md5-cache/virtual/perl-Digest-MD5-2.530.0-r2
index 321cf7822069..73894863079e 100644
--- a/metadata/md5-cache/virtual/perl-Digest-MD5-2.530.0-r1
+++ b/metadata/md5-cache/virtual/perl-Digest-MD5-2.530.0-r2
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for Digest-MD5
EAPI=5
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Digest-MD5-2.530.0 )
+RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Digest-MD5-2.530.0 ) !perl-core/Digest-MD5-2.530.0-r999
SLOT=0
-_md5_=4d7d3aa0dc9943c4a43cd86c5e782ff6
+_md5_=3a929dfae79fa1e9cf69e7a3b5657fad
diff --git a/metadata/md5-cache/virtual/perl-Digest-SHA-5.880.0 b/metadata/md5-cache/virtual/perl-Digest-SHA-5.880.0
index fd9489a14e6f..4e8c2d37fe5a 100644
--- a/metadata/md5-cache/virtual/perl-Digest-SHA-5.880.0
+++ b/metadata/md5-cache/virtual/perl-Digest-SHA-5.880.0
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for Digest-SHA
EAPI=5
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Digest-SHA-5.880.0 )
+RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Digest-SHA-5.880.0 ) !perl-core/Digest-SHA-5.880.0-r999
SLOT=0
-_md5_=d4fa3d63cf4c7343a5ed17b1f31a80ff
+_md5_=2495b818befa391b0c5bbf1218ca7261
diff --git a/metadata/md5-cache/virtual/perl-Dumpvalue-1.170.0-r2 b/metadata/md5-cache/virtual/perl-Dumpvalue-1.170.0-r2
deleted file mode 100644
index 0a616152c0fd..000000000000
--- a/metadata/md5-cache/virtual/perl-Dumpvalue-1.170.0-r2
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for perl-core/Dumpvalue
-EAPI=5
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-RDEPEND=|| ( =dev-lang/perl-5.20* =dev-lang/perl-5.18* =dev-lang/perl-5.16* ~perl-core/Dumpvalue-1.170.0 )
-SLOT=0
-_md5_=674df10a3fd43ccf46c81670613891bd
diff --git a/metadata/md5-cache/virtual/perl-Dumpvalue-1.170.0-r3 b/metadata/md5-cache/virtual/perl-Dumpvalue-1.170.0-r3
new file mode 100644
index 000000000000..40af9f075fbd
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-Dumpvalue-1.170.0-r3
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Dumpvalue
+EAPI=5
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+RDEPEND=|| ( =dev-lang/perl-5.20* =dev-lang/perl-5.18* =dev-lang/perl-5.16* ~perl-core/Dumpvalue-1.170.0 ) !perl-core/Dumpvalue-1.170.0-r999
+SLOT=0
+_md5_=23baee8d3d529f3bef5084ec65e9568e
diff --git a/metadata/md5-cache/virtual/perl-Encode-2.490.0-r1 b/metadata/md5-cache/virtual/perl-Encode-2.490.0-r2
similarity index 61%
rename from metadata/md5-cache/virtual/perl-Encode-2.490.0-r1
rename to metadata/md5-cache/virtual/perl-Encode-2.490.0-r2
index a3ac2077879b..e130290d6355 100644
--- a/metadata/md5-cache/virtual/perl-Encode-2.490.0-r1
+++ b/metadata/md5-cache/virtual/perl-Encode-2.490.0-r2
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for Encode
EAPI=5
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/Encode-2.490.0 )
+RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/Encode-2.490.0 ) !perl-core/Encode-2.490.0-r999
SLOT=0
-_md5_=530729081cd9bccaf0befea528934d27
+_md5_=5690d759bee3eebcae34fd263a502ff4
diff --git a/metadata/md5-cache/virtual/perl-Encode-2.600.0 b/metadata/md5-cache/virtual/perl-Encode-2.600.0
index 0b7d77f2cb8c..afad5ee512b8 100644
--- a/metadata/md5-cache/virtual/perl-Encode-2.600.0
+++ b/metadata/md5-cache/virtual/perl-Encode-2.600.0
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for Encode
EAPI=5
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Encode-2.600.0 )
+RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Encode-2.600.0 ) !perl-core/Encode-2.600.0-r999
SLOT=0
-_md5_=f11108dab0e5f2d548ad96739cd18ee3
+_md5_=f2a4dc8b971c047fbad588be221c8575
diff --git a/metadata/md5-cache/virtual/perl-Exporter-5.680.0-r1 b/metadata/md5-cache/virtual/perl-Exporter-5.680.0-r1
deleted file mode 100644
index 3774018716bd..000000000000
--- a/metadata/md5-cache/virtual/perl-Exporter-5.680.0-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for perl-core/Exporter
-EAPI=5
-KEYWORDS=~amd64 ~arm ~x86
-RDEPEND=|| ( ( =dev-lang/perl-5.18* !perl-core/Exporter ) ~perl-core/Exporter-5.680.0 )
-SLOT=0
-_md5_=5d9c5b14e12822c1e54c1835c5f06ffd
diff --git a/metadata/md5-cache/virtual/perl-Exporter-5.680.0-r2 b/metadata/md5-cache/virtual/perl-Exporter-5.680.0-r2
new file mode 100644
index 000000000000..6141b6f8b0d2
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-Exporter-5.680.0-r2
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Exporter
+EAPI=5
+KEYWORDS=~amd64 ~arm ~x86
+RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/Exporter-5.680.0 ) !perl-core/Exporter-5.680.0-r999
+SLOT=0
+_md5_=6faffead3163620c1da7d5f42d711080
diff --git a/metadata/md5-cache/virtual/perl-Exporter-5.700.0 b/metadata/md5-cache/virtual/perl-Exporter-5.700.0
index a8b814248e0a..36533f11716b 100644
--- a/metadata/md5-cache/virtual/perl-Exporter-5.700.0
+++ b/metadata/md5-cache/virtual/perl-Exporter-5.700.0
@@ -1,7 +1,7 @@
DEFINED_PHASES=-
-DESCRIPTION=Virtual for perl-core/Exporter
+DESCRIPTION=Virtual for Exporter
EAPI=5
KEYWORDS=~amd64 ~arm ~x86
-RDEPEND=|| ( ( =dev-lang/perl-5.20* !perl-core/Exporter ) ~perl-core/Exporter-5.700.0 )
+RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Exporter-5.700.0 ) !perl-core/Exporter-5.700.0-r999
SLOT=0
-_md5_=61fdda9d256bf129d1df71f04f697ff6
+_md5_=986134a0d64257872b8a2984ae27e195
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.210 b/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.210-r1
similarity index 75%
rename from metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.210
rename to metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.210-r1
index 36bdbdf8a9ed..553ed96fa95b 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.210
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.210-r1
@@ -1,6 +1,7 @@
DEFINED_PHASES=-
DESCRIPTION=Virtual for ExtUtils-CBuilder
+EAPI=5
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/ExtUtils-CBuilder-0.280.210 )
+RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/ExtUtils-CBuilder-0.280.210 ) !perl-core/ExtUtils-CBuilder-0.280.210-r999
SLOT=0
-_md5_=98072fc85e06bb82767ae77186166c6c
+_md5_=2e7d0dee4f9276ecd48d9b523beb849d
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.216 b/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.216
index 23fa2a73c5d3..f64837047002 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.216
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.216
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for ExtUtils-CBuilder
EAPI=5
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/ExtUtils-CBuilder-0.280.216 )
+RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/ExtUtils-CBuilder-0.280.216 ) !perl-core/ExtUtils-CBuilder-0.280.216-r999
SLOT=0
-_md5_=bf7ec45c32e2001b6b2a75d4576c5e6d
+_md5_=3305351c280b2d17b901bc9963bc1332
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.170.0-r4 b/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.170.0-r5
similarity index 74%
rename from metadata/md5-cache/virtual/perl-ExtUtils-Command-1.170.0-r4
rename to metadata/md5-cache/virtual/perl-ExtUtils-Command-1.170.0-r5
index b5cb5cade816..c709ef88ed02 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.170.0-r4
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.170.0-r5
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for ExtUtils-Command
EAPI=5
KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.16* =dev-lang/perl-5.18* ~perl-core/ExtUtils-Command-1.170.0 )
+RDEPEND=|| ( =dev-lang/perl-5.16* =dev-lang/perl-5.18* ~perl-core/ExtUtils-Command-1.170.0 ) !perl-core/ExtUtils-Command-1.170.0-r999
SLOT=0
-_md5_=436af79bc6647f219e80bd15df7aca4e
+_md5_=98a0ed6f26e2f3f8fc00df91a6c3ed1c
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.180.0-r1 b/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.180.0-r2
similarity index 77%
rename from metadata/md5-cache/virtual/perl-ExtUtils-Command-1.180.0-r1
rename to metadata/md5-cache/virtual/perl-ExtUtils-Command-1.180.0-r2
index b811c2c126fc..1df20f100e48 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.180.0-r1
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.180.0-r2
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for ExtUtils-Command
EAPI=5
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/ExtUtils-Command-1.180.0 )
+RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/ExtUtils-Command-1.180.0 ) !perl-core/ExtUtils-Command-1.180.0-r999
SLOT=0
-_md5_=97d02a3a01a5f2f10e3a546c95626a03
+_md5_=8b05b0dc884af7d8bc173af3fd4ae6da
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.230.0-r4 b/metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.230.0-r4
deleted file mode 100644
index 5b6474cc974c..000000000000
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.230.0-r4
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for ExtUtils-Constant
-EAPI=5
-KEYWORDS=amd64 arm64 hppa ~ppc ~ppc64 x86
-RDEPEND=|| ( =dev-lang/perl-5.20* =dev-lang/perl-5.18* =dev-lang/perl-5.16* =dev-lang/perl-5.14* ~perl-core/ExtUtils-Constant-0.230.0 )
-SLOT=0
-_md5_=5627d05e3925d0794d233bf54406fc94
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.230.0-r5 b/metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.230.0-r5
new file mode 100644
index 000000000000..70123a1acdc6
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.230.0-r5
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for ExtUtils-Constant
+EAPI=5
+KEYWORDS=amd64 arm64 hppa ppc ppc64 x86
+RDEPEND=|| ( =dev-lang/perl-5.20* =dev-lang/perl-5.18* =dev-lang/perl-5.16* ~perl-core/ExtUtils-Constant-0.230.0 ) !perl-core/ExtUtils-Constant-0.230.0-r999
+SLOT=0
+_md5_=9c83706594640a46a3faea244b790e90
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.660.0 b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.660.0-r1
similarity index 77%
rename from metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.660.0
rename to metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.660.0-r1
index a4128623c176..4099a0ec8518 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.660.0
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.660.0-r1
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for ExtUtils-MakeMaker
EAPI=5
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/ExtUtils-MakeMaker-6.660.0 )
+RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/ExtUtils-MakeMaker-6.660.0 ) !perl-core/ExtUtils-MakeMaker-6.660.0-r999
SLOT=0
-_md5_=db601f272c5cf4b53650250511f76e6f
+_md5_=4b370b3f09ea0958b10b784b00875aea
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.980.0 b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.980.0
index 077c802e17b9..616bd806bce4 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.980.0
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.980.0
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for ExtUtils-MakeMaker
EAPI=5
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/ExtUtils-MakeMaker-6.980.0 )
+RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/ExtUtils-MakeMaker-6.980.0 ) !perl-core/ExtUtils-MakeMaker-6.980.0-r999
SLOT=0
-_md5_=3c11735f22c3c6b8167c5f7ea4c07b5c
+_md5_=2da4e3e7d32c23c8595981f7a8c1d12e
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.630.0 b/metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.630.0
deleted file mode 100644
index 51874d9267a2..000000000000
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.630.0
+++ /dev/null
@@ -1,6 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for ExtUtils-Manifest
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=~perl-core/ExtUtils-Manifest-1.630.0
-SLOT=0
-_md5_=e5df69d9e6227ec07bc033cdbf542cb9
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.630.0-r1 b/metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.630.0-r1
index 5dab6371d752..e2a359192775 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.630.0-r1
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.630.0-r1
@@ -1,6 +1,7 @@
DEFINED_PHASES=-
DESCRIPTION=Virtual for ExtUtils-Manifest
+EAPI=5
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.18* =dev-lang/perl-5.20* ~perl-core/ExtUtils-Manifest-1.630.0 )
+RDEPEND=|| ( =dev-lang/perl-5.18* =dev-lang/perl-5.20* ~perl-core/ExtUtils-Manifest-1.630.0 ) !perl-core/ExtUtils-Manifest-1.630.0-r999
SLOT=0
-_md5_=adb9ae0fa28a4769788df1e08211cdd8
+_md5_=3e7b0d0852c1d68aa6346fde6014bbbf
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.180.0-r1 b/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.180.0-r2
similarity index 77%
rename from metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.180.0-r1
rename to metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.180.0-r2
index 342735f8183e..880830cfff3d 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.180.0-r1
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.180.0-r2
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for ExtUtils-ParseXS
EAPI=5
KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/ExtUtils-ParseXS-3.180.0 ) !perl-core/ExtUtils-ParseXS-3.180.0-r999
SLOT=0
-_md5_=a6dafd715c5f488282d97ff9b0029f98
+_md5_=a033f1e1579a975186204866c6afb1a5
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.240.0 b/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.240.0
index f622a3ee8047..f02efbaa78da 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.240.0
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.240.0
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for ExtUtils-ParseXS
EAPI=5
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/ExtUtils-ParseXS-3.240.0 ) !perl-core/ExtUtils-ParseXS-3.240.0-r999
SLOT=0
-_md5_=9faacd82476fa0662acd7f0ee347a5fc
+_md5_=e16a41c6b6da1ed4a0c7b2312c5bc0fd
diff --git a/metadata/md5-cache/virtual/perl-File-Path-2.90.0-r1 b/metadata/md5-cache/virtual/perl-File-Path-2.90.0-r2
similarity index 59%
rename from metadata/md5-cache/virtual/perl-File-Path-2.90.0-r1
rename to metadata/md5-cache/virtual/perl-File-Path-2.90.0-r2
index c0246a25e140..83e09d08feef 100644
--- a/metadata/md5-cache/virtual/perl-File-Path-2.90.0-r1
+++ b/metadata/md5-cache/virtual/perl-File-Path-2.90.0-r2
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for File-Path
EAPI=5
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86 ~ppc-aix
-RDEPEND=|| ( =dev-lang/perl-5.20* =dev-lang/perl-5.18* ~perl-core/File-Path-2.90.0 ) !perl-core/File-Path-2.90.0-r999
SLOT=0
-_md5_=de65f05d7183fc12454a28b966100178
+_md5_=b4ddda72aa8e81e9dd67231edc58d52e
diff --git a/metadata/md5-cache/virtual/pkgconfig-0-r1 b/metadata/md5-cache/virtual/pkgconfig-0-r1
index 835b803d95e4..037590683bfc 100644
--- a/metadata/md5-cache/virtual/pkgconfig-0-r1
+++ b/metadata/md5-cache/virtual/pkgconfig-0-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for the pkg-config implementation
EAPI=5
IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
RDEPEND=|| ( >=dev-util/pkgconfig-0.28-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/pkgconf-0.9.3-r1[pkg-config,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/pkgconfig-openbsd-20130507-r1[pkg-config,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
SLOT=0
_eclasses_=multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build fbb9baa0b4039304643e36e9820fdecf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=34dce2a106e898ff5b36af7a11dbb3d3
+_md5_=90f90fad3aef20b935132a115fe35aa9
diff --git a/metadata/md5-cache/www-client/chromium-36.0.1985.67 b/metadata/md5-cache/www-client/chromium-36.0.1985.67
deleted file mode 100644
index f63dd6d3162c..000000000000
--- a/metadata/md5-cache/www-client/chromium-36.0.1985.67
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= app-arch/snappy:= cups? ( dev-libs/libgcrypt:0= >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/icu:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/harfbuzz:=[icu(+)] media-libs/libexif:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.4.0:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= sys-libs/zlib:=[minizip] virtual/udev x11-libs/libdrm x11-libs/gtk+:2= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium ) !arm? ( dev-lang/yasm ) dev-lang/perl dev-perl/JSON >=dev-util/gperf-3.0.3 dev-util/ninja sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig test? ( dev-libs/openssl:0 ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] test? ( dev-python/pyftpdlib[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=5
-HOMEPAGE=http://chromium.org/
-IUSE=bindist cups gnome gnome-keyring kerberos neon pulseaudio selinux +tcmalloc custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=>=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= app-arch/snappy:= cups? ( dev-libs/libgcrypt:0= >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/icu:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/harfbuzz:=[icu(+)] media-libs/libexif:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.4.0:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= sys-libs/zlib:=[minizip] virtual/udev x11-libs/libdrm x11-libs/gtk+:2= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts tcmalloc? ( !=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= app-arch/snappy:= cups? ( dev-libs/libgcrypt:0= >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/icu:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/harfbuzz:=[icu(+)] media-libs/libexif:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.4.0:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= sys-libs/zlib:=[minizip] virtual/udev x11-libs/libdrm x11-libs/gtk+:2= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium ) !arm? ( dev-lang/yasm ) dev-lang/perl dev-perl/JSON >=dev-util/gperf-3.0.3 dev-util/ninja sys-apps/hwids >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=5
-HOMEPAGE=http://chromium.org/
-IUSE=bindist cups gnome gnome-keyring kerberos neon pic pulseaudio selinux +tcmalloc custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=>=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= app-arch/snappy:= cups? ( dev-libs/libgcrypt:0= >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/icu:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/harfbuzz:=[icu(+)] media-libs/libexif:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.4.0:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= sys-libs/zlib:=[minizip] virtual/udev x11-libs/libdrm x11-libs/gtk+:2= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium ) !=www-client/chromium-9999 !=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= app-arch/snappy:= cups? ( dev-libs/libgcrypt:0= >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:= dev-libs/icu:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( gnome-base/libgnome-keyring:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/fontconfig:= media-libs/freetype:= media-libs/harfbuzz:=[icu(+)] media-libs/libexif:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.4.0:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= sys-libs/zlib:=[minizip] virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:= x11-libs/gtk+:2= x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium ) !arm? ( dev-lang/yasm ) dev-lang/perl dev-perl/JSON >=dev-util/gperf-3.0.3 dev-util/ninja sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=5
+HOMEPAGE=http://chromium.org/
+IUSE=bindist cups gnome gnome-keyring kerberos neon pic pulseaudio selinux +tcmalloc custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=>=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= app-arch/snappy:= cups? ( dev-libs/libgcrypt:0= >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:= dev-libs/icu:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( gnome-base/libgnome-keyring:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/fontconfig:= media-libs/freetype:= media-libs/harfbuzz:=[icu(+)] media-libs/libexif:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.4.0:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= sys-libs/zlib:=[minizip] virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:= x11-libs/gtk+:2= x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium ) !=www-client/chromium-9999 !=dev-vcs/git-1.8.2.1
DESCRIPTION=A minimal web browser that behaves like the Vimperator plugin for Firefox
EAPI=5
HOMEPAGE=http://www.vimprobable.org/
+IUSE=savedconfig
LICENSE=MIT
RDEPEND=net-libs/libsoup:2.4 net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/libX11
SLOT=0
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 git-2 2027b81a576527fa16bece425941e094 git-r3 49fc3d60d7bcd6f8913ad6ec0cb4c67b multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=56d23afe326964118f3cf73fe6170a13
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 git-r3 49fc3d60d7bcd6f8913ad6ec0cb4c67b multilib 3bf24e6abb9b76d9f6c20600f0b716bf portability a45c088f246ef5091e029f6285d7ce42 savedconfig 5313100f525c41f6c72c6e04edeb4f65 toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=5d8a9fc02cc845c9395be5b7ce7bd1d7
diff --git a/metadata/md5-cache/www-client/w3m-0.5.3-r5 b/metadata/md5-cache/www-client/w3m-0.5.3-r5
index 2f9599094b5e..87241c48aa92 100644
--- a/metadata/md5-cache/www-client/w3m-0.5.3-r5
+++ b/metadata/md5-cache/www-client/w3m-0.5.3-r5
@@ -4,10 +4,10 @@ DESCRIPTION=Text based WWW browser, supports tables and frames
EAPI=5
HOMEPAGE=http://w3m.sourceforge.net/
IUSE=X fbcon gpm gtk imlib lynxkeymap migemo nls nntp ssl unicode vanilla xface linguas_ja
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
LICENSE=w3m
RDEPEND=>=sys-libs/ncurses-5.2-r3 >=sys-libs/zlib-1.1.3-r2 >=dev-libs/boehm-gc-6.2 X? ( x11-libs/libXext x11-libs/libXdmcp ) gtk? ( vanilla? ( x11-libs/gtk+:2 ) !vanilla? ( x11-libs/gdk-pixbuf ) ) !gtk? ( imlib? ( >=media-libs/imlib2-1.1.0[X] ) ) xface? ( media-libs/compface ) gpm? ( >=sys-libs/gpm-1.19.3-r5 ) migemo? ( >=app-text/migemo-0.40 ) ssl? ( >=dev-libs/openssl-0.9.6b )
SLOT=0
SRC_URI=mirror://sourceforge/w3m/w3m-0.5.3.tar.gz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=bbab8b94f59427b14357edb0732ab9ab
+_md5_=50c0c3d9a13fa639127c6925c45218dc
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-37.0.2062.20_beta1 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-37.0.2062.20_beta1
index 4d5968407ee5..e8785919a784 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-37.0.2062.20_beta1
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-37.0.2062.20_beta1
@@ -2,7 +2,7 @@ DEFINED_PHASES=install nofetch unpack
DESCRIPTION=Binary plugins -- native API Flash and PDF -- from Google Chrome for use in Chromium.
EAPI=4
HOMEPAGE=http://www.google.com/chrome
-IUSE=+flash +pdf
+IUSE=+flash
KEYWORDS=~amd64 ~x86
LICENSE=google-chrome
RDEPEND=!www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
@@ -10,4 +10,4 @@ RESTRICT=bindist mirror strip
SLOT=beta
SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_37.0.2062.20-1_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_37.0.2062.20-1_i386.deb )
_eclasses_=multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 unpacker f300a7ca9131b1024a79762e8edd3c52
-_md5_=1758a968da780ea985822ffc70e19f20
+_md5_=3bfb9dcae766fcf3d6a4615ecc347e0c
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-304.121 b/metadata/md5-cache/x11-drivers/nvidia-drivers-304.121
deleted file mode 100644
index f243b5d28978..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-304.121
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare prerm pretend setup unpack
-DEPEND=app-admin/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) X? ( >=app-admin/eselect-opengl-1.0.9 ) kernel_linux? ( virtual/linux-sources virtual/pkgconfig ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) sys-apps/pciutils virtual/pkgconfig
-DESCRIPTION=NVIDIA Accelerated Graphics Driver
-EAPI=5
-HOMEPAGE=http://www.nvidia.com/
-IUSE=acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X kernel_linux
-KEYWORDS=-* amd64 x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2 NVIDIA-r1
-PDEPEND=X? ( >=x11-libs/libvdpau-0.3-r1 )
-RDEPEND=app-admin/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) X? ( >=app-admin/eselect-opengl-1.0.9 ) acpi? ( sys-power/acpid ) tools? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/pango[X] || ( x11-libs/pangox-compat =x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=tools? ( X )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/304.121/NVIDIA-FreeBSD-x86_64-304.121.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/304.121/NVIDIA-Linux-x86_64-304.121.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/304.121/NVIDIA-FreeBSD-x86-304.121.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/304.121/NVIDIA-Linux-x86-304.121.run )
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be linux-info 2b8c53f6065bdee2d757472215a3088f linux-mod 101302d4b7b694ea9622bbffb187d0de multilib 3bf24e6abb9b76d9f6c20600f0b716bf nvidia-driver 92e88a2e33d056779baa88f1061c662e portability a45c088f246ef5091e029f6285d7ce42 readme.gentoo 106edea5533517715013de909a333abd toolchain-funcs 0f1760274637a138b99bb649202ea402 udev 8cd692457c1524c7be9af69831698a78 unpacker f300a7ca9131b1024a79762e8edd3c52 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7f6adf83e473ff2127338673e68201f0
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-304.123 b/metadata/md5-cache/x11-drivers/nvidia-drivers-304.123
index 8c5d691e2b6a..2cdb2b175693 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-304.123
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-304.123
@@ -4,7 +4,7 @@ DESCRIPTION=NVIDIA Accelerated Graphics Driver
EAPI=5
HOMEPAGE=http://www.nvidia.com/
IUSE=acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X kernel_linux
-KEYWORDS=-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=-* amd64 x86 ~amd64-fbsd ~x86-fbsd
LICENSE=GPL-2 NVIDIA-r1
PDEPEND=X? ( >=x11-libs/libvdpau-0.3-r1 )
RDEPEND=app-admin/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) X? ( >=app-admin/eselect-opengl-1.0.9 ) acpi? ( sys-power/acpid ) tools? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/pango[X] || ( x11-libs/pangox-compat =x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) ) kernel_linux? ( virtual/modutils )
@@ -13,4 +13,4 @@ RESTRICT=bindist mirror strip
SLOT=0
SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/304.123/NVIDIA-FreeBSD-x86_64-304.123.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/304.123/NVIDIA-Linux-x86_64-304.123.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/304.123/NVIDIA-FreeBSD-x86-304.123.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/304.123/NVIDIA-Linux-x86-304.123.run )
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be linux-info 2b8c53f6065bdee2d757472215a3088f linux-mod 101302d4b7b694ea9622bbffb187d0de multilib 3bf24e6abb9b76d9f6c20600f0b716bf nvidia-driver 92e88a2e33d056779baa88f1061c662e portability a45c088f246ef5091e029f6285d7ce42 readme.gentoo 106edea5533517715013de909a333abd toolchain-funcs 0f1760274637a138b99bb649202ea402 udev 8cd692457c1524c7be9af69831698a78 unpacker f300a7ca9131b1024a79762e8edd3c52 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9c5dfb3b93028c69b9064db7699ff894
+_md5_=ddfba45eddc4631cd4031f46693d97c4
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-331.79 b/metadata/md5-cache/x11-drivers/nvidia-drivers-331.79
deleted file mode 100644
index 628ad3446a9d..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-331.79
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare prerm pretend setup unpack
-DEPEND=app-admin/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) X? ( >=app-admin/eselect-opengl-1.0.9 ) app-arch/xz-utils kernel_linux? ( virtual/linux-sources ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) sys-apps/pciutils virtual/pkgconfig
-DESCRIPTION=NVIDIA Accelerated Graphics Driver
-EAPI=5
-HOMEPAGE=http://www.nvidia.com/
-IUSE=acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X uvm kernel_linux
-KEYWORDS=-* amd64 x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2 NVIDIA-r2
-RDEPEND=app-admin/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) X? ( >=app-admin/eselect-opengl-1.0.9 ) acpi? ( sys-power/acpid ) tools? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/pango[X] ) X? ( =x11-libs/libvdpau-0.3-r1 multilib? ( || ( ( >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=tools? ( X )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/331.79/NVIDIA-FreeBSD-x86_64-331.79.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/331.79/NVIDIA-Linux-x86_64-331.79.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/331.79/NVIDIA-FreeBSD-x86-331.79.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/331.79/NVIDIA-Linux-x86-331.79.run )
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be linux-info 2b8c53f6065bdee2d757472215a3088f linux-mod 101302d4b7b694ea9622bbffb187d0de multilib 3bf24e6abb9b76d9f6c20600f0b716bf nvidia-driver 92e88a2e33d056779baa88f1061c662e portability a45c088f246ef5091e029f6285d7ce42 readme.gentoo 106edea5533517715013de909a333abd toolchain-funcs 0f1760274637a138b99bb649202ea402 udev 8cd692457c1524c7be9af69831698a78 unpacker f300a7ca9131b1024a79762e8edd3c52 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=42707d2aa0766b9151975dfc1da72535
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-331.89 b/metadata/md5-cache/x11-drivers/nvidia-drivers-331.89
index f4d7c976fcd9..e746f1bfab85 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-331.89
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-331.89
@@ -4,7 +4,7 @@ DESCRIPTION=NVIDIA Accelerated Graphics Driver
EAPI=5
HOMEPAGE=http://www.nvidia.com/
IUSE=acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X uvm kernel_linux
-KEYWORDS=-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=-* amd64 x86 ~amd64-fbsd ~x86-fbsd
LICENSE=GPL-2 NVIDIA-r2
RDEPEND=app-admin/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) X? ( >=app-admin/eselect-opengl-1.0.9 ) acpi? ( sys-power/acpid ) tools? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/pango[X] ) X? ( =x11-libs/libvdpau-0.3-r1 multilib? ( || ( ( >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) ) kernel_linux? ( virtual/modutils )
REQUIRED_USE=tools? ( X )
@@ -12,4 +12,4 @@ RESTRICT=bindist mirror strip
SLOT=0
SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/331.89/NVIDIA-FreeBSD-x86_64-331.89.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/331.89/NVIDIA-Linux-x86_64-331.89.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/331.89/NVIDIA-FreeBSD-x86-331.89.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/331.89/NVIDIA-Linux-x86-331.89.run )
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be linux-info 2b8c53f6065bdee2d757472215a3088f linux-mod 101302d4b7b694ea9622bbffb187d0de multilib 3bf24e6abb9b76d9f6c20600f0b716bf nvidia-driver 92e88a2e33d056779baa88f1061c662e portability a45c088f246ef5091e029f6285d7ce42 readme.gentoo 106edea5533517715013de909a333abd toolchain-funcs 0f1760274637a138b99bb649202ea402 udev 8cd692457c1524c7be9af69831698a78 unpacker f300a7ca9131b1024a79762e8edd3c52 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=5d7acb13fe8df1835cfa878a03ecffb1
+_md5_=2c8eda30ede920a5aabdd3ef7260c27a
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-340.24 b/metadata/md5-cache/x11-drivers/nvidia-drivers-340.24
index 039abeb9fd7c..6de861a31657 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-340.24
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-340.24
@@ -4,7 +4,7 @@ DESCRIPTION=NVIDIA Accelerated Graphics Driver
EAPI=5
HOMEPAGE=http://www.nvidia.com/
IUSE=acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X uvm kernel_linux
-KEYWORDS=-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=-* amd64 x86 ~amd64-fbsd ~x86-fbsd
LICENSE=GPL-2 NVIDIA-r2
RDEPEND=app-admin/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) X? ( >=app-admin/eselect-opengl-1.0.9 ) acpi? ( sys-power/acpid ) tools? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.4:2 x11-libs/libX11 x11-libs/libXext x11-libs/pango[X] ) X? ( =x11-libs/libvdpau-0.3-r1 multilib? ( || ( ( >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) ) kernel_linux? ( virtual/modutils )
REQUIRED_USE=tools? ( X )
@@ -12,4 +12,4 @@ RESTRICT=bindist mirror strip
SLOT=0
SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/340.24/NVIDIA-FreeBSD-x86_64-340.24.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/340.24/NVIDIA-Linux-x86_64-340.24.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/340.24/NVIDIA-FreeBSD-x86-340.24.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/340.24/NVIDIA-Linux-x86-340.24.run )
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be linux-info 2b8c53f6065bdee2d757472215a3088f linux-mod 101302d4b7b694ea9622bbffb187d0de multilib 3bf24e6abb9b76d9f6c20600f0b716bf nvidia-driver 92e88a2e33d056779baa88f1061c662e portability a45c088f246ef5091e029f6285d7ce42 readme.gentoo 106edea5533517715013de909a333abd toolchain-funcs 0f1760274637a138b99bb649202ea402 udev 8cd692457c1524c7be9af69831698a78 unpacker f300a7ca9131b1024a79762e8edd3c52 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=47d258247d0536960d7968a871ab3d20
+_md5_=f7b043a1a3e4c1fbbd0c188b15bc9210
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.2.22 b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.2.26
similarity index 91%
rename from metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.2.22
rename to metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.2.26
index 124391547b05..c9ab5ad79684 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.2.22
+++ b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.2.26
@@ -4,11 +4,11 @@ DESCRIPTION=VirtualBox video driver
EAPI=5
HOMEPAGE=http://www.virtualbox.org/
IUSE=dri kernel_linux python_targets_python2_7 python_single_target_python2_7
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=>=x11-base/xorg-server-1.7:=[-minimal] x11-libs/libXcomposite kernel_linux? ( virtual/modutils )
REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 )
SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.2.22/VirtualBox-4.2.22.tar.bz2
+SRC_URI=http://download.virtualbox.org/virtualbox/4.2.26/VirtualBox-4.2.26.tar.bz2
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 linux-info 2b8c53f6065bdee2d757472215a3088f linux-mod 101302d4b7b694ea9622bbffb187d0de multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-single-r1 a71a169a881e0a11d04a7fe12dc39f6e python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=0c4c916888c7e919047515268be11c72
+_md5_=27e7a00ed3b071e802ba8c72ccea901d
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.3.10 b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.3.14
similarity index 92%
rename from metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.3.10
rename to metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.3.14
index fc91a35c2205..db6c757b55bb 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.3.10
+++ b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.3.14
@@ -9,6 +9,6 @@ LICENSE=GPL-2
RDEPEND=>=x11-base/xorg-server-1.7:=[-minimal] x11-libs/libXcomposite kernel_linux? ( virtual/modutils )
REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 )
SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.3.10/VirtualBox-4.3.10.tar.bz2
+SRC_URI=http://download.virtualbox.org/virtualbox/4.3.14/VirtualBox-4.3.14.tar.bz2
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 linux-info 2b8c53f6065bdee2d757472215a3088f linux-mod 101302d4b7b694ea9622bbffb187d0de multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-single-r1 a71a169a881e0a11d04a7fe12dc39f6e python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=960ab63f5afd92c1618c4efbfe21ea56
+_md5_=d837824af1871acddb3fb431d6074f24
diff --git a/metadata/md5-cache/x11-libs/libXfont-1.5.0 b/metadata/md5-cache/x11-libs/libXfont-1.5.0
new file mode 100644
index 000000000000..56feb7fe5dd7
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libXfont-1.5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-libs/xtrans x11-libs/libfontenc truetype? ( >=media-libs/freetype-2 ) bzip2? ( app-arch/bzip2 ) x11-proto/xproto >=x11-proto/fontsproto-2.1.3 !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DESCRIPTION=X.Org Xfont library
+EAPI=5
+HOMEPAGE=http://xorg.freedesktop.org/
+IUSE=bzip2 ipv6 truetype static-libs doc
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=x11-libs/xtrans x11-libs/libfontenc truetype? ( >=media-libs/freetype-2 ) bzip2? ( app-arch/bzip2 ) x11-proto/xproto >=x11-proto/fontsproto-2.1.3 !=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/inputproto-2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xproto-7.0.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xextproto-7.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DESCRIPTION=X.Org Xi library
+EAPI=5
+HOMEPAGE=http://xorg.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs doc
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=MIT
+RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/inputproto-2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xproto-7.0.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xextproto-7.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
+SLOT=0
+SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXi-1.7.4.tar.bz2
+_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 autotools-multilib 037c4046d25f29e78dd44dccabd5d66b autotools-utils fb74970befc9b65ceec689d2ccff3022 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build fbb9baa0b4039304643e36e9820fdecf multilib-minimal 5bbdc77877c1aa3c6bd89ca3f9196d11 multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 xorg-2 69479ff7a35a30e863a475568d29b9be
+_md5_=189553ad394b848d46bead6c675666fb
diff --git a/metadata/md5-cache/x11-libs/qscintilla-2.8-r1 b/metadata/md5-cache/x11-libs/qscintilla-2.8-r1
deleted file mode 100644
index 6c91dc286293..000000000000
--- a/metadata/md5-cache/x11-libs/qscintilla-2.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4 >=dev-qt/qtgui-4.8.5:4
-DESCRIPTION=A Qt port of Neil Hodgson's Scintilla C++ editor class
-EAPI=5
-HOMEPAGE=http://www.riverbankcomputing.co.uk/software/qscintilla/intro
-IUSE=doc
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~amd64-linux
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=>=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4 >=dev-qt/qtgui-4.8.5:4
-SLOT=0/11
-SRC_URI=mirror://sourceforge/pyqt/QScintilla-gpl-2.8.tar.gz
-_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf qmake-utils dd0375da11f79aa416ff97913c59d01c qt4-r2 b40473dafd07d7c5fe4aef1c1b902f39 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=98be6c3f9e878db8d74bd8fbb113f824
diff --git a/metadata/md5-cache/x11-libs/qscintilla-2.8.3 b/metadata/md5-cache/x11-libs/qscintilla-2.8.3
new file mode 100644
index 000000000000..69f36804d34d
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/qscintilla-2.8.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=>=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4 >=dev-qt/qtgui-4.8.5:4
+DESCRIPTION=A Qt port of Neil Hodgson's Scintilla C++ editor class
+EAPI=5
+HOMEPAGE=http://www.riverbankcomputing.co.uk/software/qscintilla/intro
+IUSE=doc
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=>=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4 >=dev-qt/qtgui-4.8.5:4
+SLOT=0/11
+SRC_URI=mirror://sourceforge/pyqt/QScintilla-gpl-2.8.3.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf qmake-utils dd0375da11f79aa416ff97913c59d01c toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=17dbce1ec89b4c12e24e36ee3f756b24
diff --git a/metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r1 b/metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r1
index a78d3c073890..556467e90fe7 100644
--- a/metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r1
+++ b/metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r1
@@ -1,12 +1,12 @@
DEFINED_PHASES=postinst prepare
-DEPEND=media-libs/freeglut >=media-libs/freetype-2 media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm x11-proto/xf86vidmodeproto x11-proto/xproto !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/freetype-2 media-libs/freeglut media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm x11-proto/xf86vidmodeproto x11-proto/xproto !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=OpenGL virtual desktop switching
-EAPI=4
+EAPI=5
HOMEPAGE=http://desk3d.sourceforge.net/
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
-RDEPEND=media-libs/freeglut >=media-libs/freetype-2 media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm
+RDEPEND=>=media-libs/freetype-2 media-libs/freeglut media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm
SLOT=0
SRC_URI=mirror://sourceforge/desk3d/3ddesktop-0.2.9.tar.gz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=1636949b19323a348e491b6198628dd8
+_md5_=a6a9d4f70436e8a2693d70d3d234d3f3
diff --git a/metadata/md5-cache/x11-misc/i3lock-2.6 b/metadata/md5-cache/x11-misc/i3lock-2.6
new file mode 100644
index 000000000000..62923bdf0afc
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/i3lock-2.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=virtual/pam dev-libs/libev >=x11-libs/libxkbcommon-0.3.1[X] x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/cairo[xcb] virtual/pkgconfig
+DESCRIPTION=Simple screen locker
+EAPI=5
+HOMEPAGE=http://i3wm.org/i3lock/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=virtual/pam dev-libs/libev >=x11-libs/libxkbcommon-0.3.1[X] x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/cairo[xcb]
+SLOT=0
+SRC_URI=http://i3wm.org/i3lock/i3lock-2.6.tar.bz2
+_eclasses_=multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=0bb006dbe996ba44e4079bc45eac94ef
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.11.2 b/metadata/md5-cache/x11-misc/lightdm-1.11.4
similarity index 90%
rename from metadata/md5-cache/x11-misc/lightdm-1.11.2
rename to metadata/md5-cache/x11-misc/lightdm-1.11.4
index 809e1baf48a1..0752229776db 100644
--- a/metadata/md5-cache/x11-misc/lightdm-1.11.2
+++ b/metadata/md5-cache/x11-misc/lightdm-1.11.4
@@ -11,6 +11,6 @@ RDEPEND=>=dev-libs/glib-2.32.3:2 dev-libs/libxml2 sys-apps/accountsservice virtu
REQUIRED_USE=|| ( gtk kde razor )
RESTRICT=test
SLOT=0
-SRC_URI=http://launchpad.net/lightdm/1.11/1.11.2/+download/lightdm-1.11.2.tar.xz mirror://gentoo/introspection-20110205.m4.tar.bz2
+SRC_URI=http://launchpad.net/lightdm/1.11/1.11.4/+download/lightdm-1.11.4.tar.xz mirror://gentoo/introspection-20110205.m4.tar.bz2
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 pam aa1ebb3ab720ea04dbbdd6eaaf9554ed readme.gentoo 106edea5533517715013de909a333abd systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=fa8f1fccf1cbca0c31015bfb53bc0184
+_md5_=6766d784afb9a0776b0b2f211a185f3e
diff --git a/metadata/md5-cache/x11-misc/shutter-0.91 b/metadata/md5-cache/x11-misc/shutter-0.91
new file mode 100644
index 000000000000..be5c256f7ac6
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/shutter-0.91
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Feature-rich screenshot program
+EAPI=5
+HOMEPAGE=http://shutter-project.org/
+IUSE=drawing webphoto
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-lang/perl drawing? ( dev-perl/Goo-Canvas ) webphoto? ( gnome-extra/gnome-web-photo ) || ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] ) dev-perl/libxml-perl dev-perl/gnome2-wnck dev-perl/gnome2-canvas dev-perl/gnome2-perl dev-perl/Gtk2-Unique dev-perl/Gtk2-ImageView dev-perl/File-DesktopEntry dev-perl/File-HomeDir dev-perl/File-Which dev-perl/JSON dev-perl/File-Copy-Recursive dev-perl/File-MimeInfo dev-perl/Locale-gettext dev-perl/Net-DBus dev-perl/Proc-Simple dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/WWW-Mechanize dev-perl/X11-Protocol dev-perl/XML-Simple dev-perl/libwww-perl
+SLOT=0
+SRC_URI=http://shutter-project.org/wp-content/uploads/releases/tars/shutter-0.91.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=621fd9891264d38b9ef774568298ea7d
diff --git a/metadata/md5-cache/x11-misc/urxvt-font-size-20140501 b/metadata/md5-cache/x11-misc/urxvt-font-size-20140501-r1
similarity index 80%
rename from metadata/md5-cache/x11-misc/urxvt-font-size-20140501
rename to metadata/md5-cache/x11-misc/urxvt-font-size-20140501-r1
index 4e14f47e5553..b9dc3132301f 100644
--- a/metadata/md5-cache/x11-misc/urxvt-font-size-20140501
+++ b/metadata/md5-cache/x11-misc/urxvt-font-size-20140501-r1
@@ -4,8 +4,8 @@ EAPI=5
HOMEPAGE=https://github.com/majutsushi/urxvt-font-size/
KEYWORDS=~amd64 ~x86
LICENSE=MIT
-RDEPEND=x11-terms/rxvt-unicode[perl]
+RDEPEND=x11-apps/xlsfonts x11-terms/rxvt-unicode[perl]
SLOT=0
SRC_URI=http://dev.gentoo.org/~radhermit/dist/urxvt-font-size-20140501.tar.gz
_eclasses_=multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=5701b064cfda4876372e13500aea9e51
+_md5_=596fd81aa4c4240c95a179e6351867ec
diff --git a/metadata/md5-cache/x11-misc/urxvt-font-size-99999999 b/metadata/md5-cache/x11-misc/urxvt-font-size-99999999
index 8c1adfb6133d..4c87f56b753f 100644
--- a/metadata/md5-cache/x11-misc/urxvt-font-size-99999999
+++ b/metadata/md5-cache/x11-misc/urxvt-font-size-99999999
@@ -4,7 +4,7 @@ DESCRIPTION=Perl extension for rxvt-unicode to change the font size on the fly
EAPI=5
HOMEPAGE=https://github.com/majutsushi/urxvt-font-size/
LICENSE=MIT
-RDEPEND=x11-terms/rxvt-unicode[perl]
+RDEPEND=x11-apps/xlsfonts x11-terms/rxvt-unicode[perl]
SLOT=0
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 git-r3 49fc3d60d7bcd6f8913ad6ec0cb4c67b multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=be4f8dd127b92a1c91e651a5c51c55ca
+_md5_=002808d29919ca6c9d1638fe53ea768f
diff --git a/metadata/md5-cache/x11-misc/virtualgl-2.3.2-r3 b/metadata/md5-cache/x11-misc/virtualgl-2.3.2-r3
deleted file mode 100644
index 7bdf33d54d49..000000000000
--- a/metadata/md5-cache/x11-misc/virtualgl-2.3.2-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=ssl? ( dev-libs/openssl ) media-libs/libjpeg-turbo x11-libs/libX11 x11-libs/libXext x11-libs/libXv amd64? ( abi_x86_32? ( || ( ( >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) app-emulation/emul-linux-x86-baselibs app-emulation/emul-linux-x86-opengl ) ) virtual/glu virtual/opengl sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) virtual/pkgconfig
-DESCRIPTION=Run OpenGL applications remotely with full 3D hardware acceleration
-EAPI=5
-HOMEPAGE=http://www.virtualgl.org/
-IUSE=ssl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1 wxWinLL-3.1 FLTK
-RDEPEND=ssl? ( dev-libs/openssl ) media-libs/libjpeg-turbo x11-libs/libX11 x11-libs/libXext x11-libs/libXv amd64? ( abi_x86_32? ( || ( ( >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) app-emulation/emul-linux-x86-baselibs app-emulation/emul-linux-x86-opengl ) ) virtual/glu virtual/opengl
-SLOT=0
-SRC_URI=mirror://sourceforge/virtualgl/VirtualGL/2.3.2/VirtualGL-2.3.2.tar.gz
-_eclasses_=cmake-multilib ca4c6ecda3062bf851d951987568fdae cmake-utils 10b6a99f9058ac1b830d00b3421f04e4 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build fbb9baa0b4039304643e36e9820fdecf multilib-minimal 5bbdc77877c1aa3c6bd89ca3f9196d11 multiprocessing d7f2985a2c76c365ee20269db5261414 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=259ac9ef1912ecc551a05267d50cb356
diff --git a/metadata/md5-cache/x11-misc/virtualgl-2.3.3 b/metadata/md5-cache/x11-misc/virtualgl-2.3.3
index ed8a6b38fdc6..c09a0907d1af 100644
--- a/metadata/md5-cache/x11-misc/virtualgl-2.3.3
+++ b/metadata/md5-cache/x11-misc/virtualgl-2.3.3
@@ -4,10 +4,10 @@ DESCRIPTION=Run OpenGL applications remotely with full 3D hardware acceleration
EAPI=5
HOMEPAGE=http://www.virtualgl.org/
IUSE=ssl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
LICENSE=LGPL-2.1 wxWinLL-3.1 FLTK
RDEPEND=ssl? ( dev-libs/openssl ) media-libs/libjpeg-turbo x11-libs/libX11 x11-libs/libXext x11-libs/libXv amd64? ( abi_x86_32? ( || ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] app-emulation/emul-linux-x86-baselibs[-abi_x86_32] ) || ( ( >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs[-abi_x86_32] ) || ( ( >=virtual/glu-9.0-r1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) app-emulation/emul-linux-x86-opengl[-abi_x86_32] ) ) ) virtual/glu virtual/opengl
SLOT=0
SRC_URI=mirror://sourceforge/virtualgl/VirtualGL/2.3.3/VirtualGL-2.3.3.tar.gz
_eclasses_=cmake-multilib ca4c6ecda3062bf851d951987568fdae cmake-utils 10b6a99f9058ac1b830d00b3421f04e4 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build fbb9baa0b4039304643e36e9820fdecf multilib-minimal 5bbdc77877c1aa3c6bd89ca3f9196d11 multiprocessing d7f2985a2c76c365ee20269db5261414 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=1a0b604b0939996a45dbd8b4ad0b8ed8
+_md5_=ad8a08a93aed72a3c825bdccab977780
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.29 b/metadata/md5-cache/x11-misc/xscreensaver-5.29
index c007ffa44b1b..b0b44ee59a68 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.29
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.29
@@ -4,10 +4,10 @@ DESCRIPTION=A modular screen saver and locker for the X Window System
EAPI=5
HOMEPAGE=http://www.jwz.org/xscreensaver/
IUSE=gdm jpeg new-login opengl pam +perl selinux suid xinerama
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
LICENSE=BSD
RDEPEND=dev-libs/libxml2 >=gnome-base/libglade-2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm kde-base/kdm ) ) ) opengl? ( virtual/opengl ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-xscreensaver ) xinerama? ( x11-libs/libXinerama ) perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 )
SLOT=0
SRC_URI=http://www.jwz.org/xscreensaver/xscreensaver-5.29.tar.gz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 pam aa1ebb3ab720ea04dbbdd6eaaf9554ed toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=b21ffe07f7bbdd72e4da88991c938ee7
+_md5_=61d5df5df53efb2df4cf7d1d8aaa20d4
diff --git a/metadata/md5-cache/xfce-base/exo-0.10.2 b/metadata/md5-cache/xfce-base/exo-0.10.2
deleted file mode 100644
index b71a3f60b26b..000000000000
--- a/metadata/md5-cache/xfce-base/exo-0.10.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30 dev-perl/URI >=x11-libs/gtk+-2.24:2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=Extensions, widgets and framework library with session support for the Xfce desktop environment
-EAPI=5
-HOMEPAGE=http://www.xfce.org/projects/
-IUSE=debug
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30 dev-perl/URI >=x11-libs/gtk+-2.24:2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10
-SLOT=0
-SRC_URI=mirror://xfce/src/xfce/exo/0.10/exo-0.10.2.tar.bz2
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 xfconf 20671cc91311ca7e3446047c1175cf16
-_md5_=bd98fc2c89def4cbae0db0a81cda4386
diff --git a/metadata/md5-cache/xfce-base/exo-0.10.2-r1 b/metadata/md5-cache/xfce-base/exo-0.10.2-r1
index dc8e5a78b8f6..83c2735dbc6c 100644
--- a/metadata/md5-cache/xfce-base/exo-0.10.2-r1
+++ b/metadata/md5-cache/xfce-base/exo-0.10.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Extensions, widgets and framework library with session support for t
EAPI=5
HOMEPAGE=http://www.xfce.org/projects/
IUSE=debug
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
LICENSE=GPL-2 LGPL-2.1
RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30 dev-perl/URI >=x11-libs/gtk+-2.24:2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10
SLOT=0
SRC_URI=mirror://xfce/src/xfce/exo/0.10/exo-0.10.2.tar.bz2
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 xfconf 20671cc91311ca7e3446047c1175cf16
-_md5_=253dd1668e4964f7d59cb5254de69219
+_md5_=a0e03d373a15e7d3305018eebb849d8e
diff --git a/metadata/md5-cache/xfce-base/xfce4-session-4.10.1-r1 b/metadata/md5-cache/xfce-base/xfce4-session-4.10.1-r1
deleted file mode 100644
index 7293acd221dc..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-session-4.10.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/dbus-glib-0.100 x11-apps/iceauth x11-libs/libSM >=x11-libs/libwnck-2.30:1 x11-libs/libX11 >=xfce-base/libxfce4util-4.10.1 >=xfce-base/libxfce4ui-4.10 >=xfce-base/xfconf-4.10 !xfce-base/xfce-utils systemd? ( >=sys-auth/polkit-0.100 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=A session manager for the Xfce desktop environment
-EAPI=5
-HOMEPAGE=http://docs.xfce.org/xfce/xfce4-session/start
-IUSE=debug nls systemd udev +xscreensaver
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.100 x11-apps/iceauth x11-libs/libSM >=x11-libs/libwnck-2.30:1 x11-libs/libX11 >=xfce-base/libxfce4util-4.10.1 >=xfce-base/libxfce4ui-4.10 >=xfce-base/xfconf-4.10 !xfce-base/xfce-utils systemd? ( >=sys-auth/polkit-0.100 ) x11-apps/xrdb nls? ( x11-misc/xdg-user-dirs ) udev? ( systemd? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) !systemd? ( || ( =x11-misc/xscreensaver-5.26 gnome-extra/gnome-screensaver >=x11-misc/xlockmore-5.43 x11-misc/slock x11-misc/alock[pam] ) )
-SLOT=0
-SRC_URI=mirror://xfce/src/xfce/xfce4-session/4.10/xfce4-session-4.10.1.tar.bz2
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 xfconf 20671cc91311ca7e3446047c1175cf16
-_md5_=92f185e9a79903322eeec1a7147b7034
diff --git a/metadata/md5-cache/xfce-base/xfce4-session-4.10.1-r2 b/metadata/md5-cache/xfce-base/xfce4-session-4.10.1-r2
index c578ae74a1ca..68ee292ec9a5 100644
--- a/metadata/md5-cache/xfce-base/xfce4-session-4.10.1-r2
+++ b/metadata/md5-cache/xfce-base/xfce4-session-4.10.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A session manager for the Xfce desktop environment
EAPI=5
HOMEPAGE=http://docs.xfce.org/xfce/xfce4-session/start
IUSE=debug nls systemd udev +xscreensaver
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.100 x11-apps/iceauth x11-libs/libSM >=x11-libs/libwnck-2.30:1 x11-libs/libX11 >=xfce-base/libxfce4util-4.10.1 >=xfce-base/libxfce4ui-4.10 >=xfce-base/xfconf-4.10 !xfce-base/xfce-utils systemd? ( >=sys-auth/polkit-0.100 ) x11-apps/xrdb nls? ( x11-misc/xdg-user-dirs ) udev? ( systemd? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) !systemd? ( || ( =x11-misc/xscreensaver-5.26 gnome-extra/gnome-screensaver >=x11-misc/xlockmore-5.43 x11-misc/slock x11-misc/alock[pam] ) )
+RDEPEND=>=dev-libs/dbus-glib-0.100 x11-apps/iceauth x11-libs/libSM >=x11-libs/libwnck-2.30:1 x11-libs/libX11 >=xfce-base/libxfce4util-4.10.1 >=xfce-base/libxfce4ui-4.10 >=xfce-base/xfconf-4.10 !xfce-base/xfce-utils systemd? ( >=sys-auth/polkit-0.100 ) x11-apps/xrdb nls? ( x11-misc/xdg-user-dirs ) udev? ( systemd? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) !systemd? ( sys-power/upower-pm-utils ) ) xscreensaver? ( || ( >=x11-misc/xscreensaver-5.26 gnome-extra/gnome-screensaver >=x11-misc/xlockmore-5.43 x11-misc/slock x11-misc/alock[pam] ) )
SLOT=0
SRC_URI=mirror://xfce/src/xfce/xfce4-session/4.10/xfce4-session-4.10.1.tar.bz2
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 xfconf 20671cc91311ca7e3446047c1175cf16
-_md5_=8c51cde9604322ad353702878be8691d
+_md5_=4c512794a3ad26aeffc9a15caaad6b41
diff --git a/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.2.5 b/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.2.5
deleted file mode 100644
index 88ff4170db40..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.2.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.18 dev-libs/libunique:1 >=x11-libs/gtk+-2.14:2 x11-libs/libXtst >=xfce-base/exo-0.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 >=xfce-base/xfconf-4.10 qrcode? ( >=media-gfx/qrencode-3.3.0 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-proto/xproto >=sys-apps/sed-4
-DESCRIPTION=A clipboard manager plug-in for the Xfce panel
-EAPI=5
-HOMEPAGE=http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin
-IUSE=debug qrcode
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.18 dev-libs/libunique:1 >=x11-libs/gtk+-2.14:2 x11-libs/libXtst >=xfce-base/exo-0.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 >=xfce-base/xfconf-4.10 qrcode? ( >=media-gfx/qrencode-3.3.0 )
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-clipman-plugin/1.2/xfce4-clipman-plugin-1.2.5.tar.bz2
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 xfconf 20671cc91311ca7e3446047c1175cf16
-_md5_=bee5c30ac8e4da356ff2a7d6bbb1ab68
diff --git a/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.2.6 b/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.2.6
index 9855ec7fdf49..958276995ac1 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.2.6
+++ b/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.2.6
@@ -4,10 +4,10 @@ DESCRIPTION=A clipboard manager plug-in for the Xfce panel
EAPI=5
HOMEPAGE=http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin
IUSE=debug qrcode
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=>=dev-libs/glib-2.18 dev-libs/libunique:1 >=x11-libs/gtk+-2.14:2 x11-libs/libXtst >=xfce-base/exo-0.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 >=xfce-base/xfconf-4.10 qrcode? ( >=media-gfx/qrencode-3.3.0 )
SLOT=0
SRC_URI=mirror://xfce/src/panel-plugins/xfce4-clipman-plugin/1.2/xfce4-clipman-plugin-1.2.6.tar.bz2
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 xfconf 20671cc91311ca7e3446047c1175cf16
-_md5_=79382fdbc7e03b7e7b45f0f0957e4fe4
+_md5_=32eda40a5f36816deb8620c8f076c79d
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-0.6.4 b/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-0.6.4
deleted file mode 100644
index 216c72606b56..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-0.6.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=xfce-base/libxfce4ui-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=An mount plug-in for the Xfce panel
-EAPI=5
-HOMEPAGE=http://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin
-IUSE=debug
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=xfce-base/libxfce4ui-4.8 >=xfce-base/xfce4-panel-4.8
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-mount-plugin/0.6/xfce4-mount-plugin-0.6.4.tar.bz2
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 xfconf 20671cc91311ca7e3446047c1175cf16
-_md5_=dbeb597a9f966b79593b6e54116fd5d1
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-0.6.7 b/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-0.6.7
index 0698e2cb69bd..c5a7ed15bcc8 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-0.6.7
+++ b/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-0.6.7
@@ -4,10 +4,10 @@ DESCRIPTION=An mount plug-in for the Xfce panel
EAPI=5
HOMEPAGE=http://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin
IUSE=debug
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=>=xfce-base/libxfce4ui-4.10 >=xfce-base/xfce4-panel-4.10
SLOT=0
SRC_URI=mirror://xfce/src/panel-plugins/xfce4-mount-plugin/0.6/xfce4-mount-plugin-0.6.7.tar.bz2
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 xfconf 20671cc91311ca7e3446047c1175cf16
-_md5_=defc2bd3224b91306058ab0d04137420
+_md5_=bf5d9ba06e9d0068570e0089f8261b5b
diff --git a/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.3.0 b/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.3.0
index a95aec317687..b5440d824ebf 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.3.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=Power manager for the Xfce desktop environment
EAPI=5
HOMEPAGE=http://goodies.xfce.org/projects/applications/xfce4-power-manager
IUSE=debug kernel_linux networkmanager policykit +udisks systemd +xfce_plugins_battery +xfce_plugins_brightness
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ppc ppc64 x86
LICENSE=GPL-2
RDEPEND=>=dev-libs/dbus-glib-0.100.2 >=dev-libs/glib-2.30 >=sys-apps/dbus-1.6.18 || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23-r2 ) >=x11-libs/gtk+-2.24:2 >=x11-libs/libnotify-0.7 x11-libs/libX11 >=x11-libs/libXrandr-1.2 x11-libs/libXext >=xfce-base/xfconf-4.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 policykit? ( >=sys-auth/polkit-0.112 ) xfce_plugins_battery? ( >=xfce-base/xfce4-panel-4.10 ) xfce_plugins_brightness? ( >=xfce-base/xfce4-panel-4.10 ) networkmanager? ( net-misc/networkmanager ) udisks? ( sys-fs/udisks:0 ) !systemd? ( || ( sys-power/pm-utils sys-power/upower-pm-utils ) )
SLOT=0
SRC_URI=mirror://xfce/src/apps/xfce4-power-manager/1.3/xfce4-power-manager-1.3.0.tar.bz2
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 linux-info 2b8c53f6065bdee2d757472215a3088f multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f xfconf 20671cc91311ca7e3446047c1175cf16
-_md5_=3d8aa5df773b167c04a01ceb41104c9b
+_md5_=783d5d28c5abb034cdd8783335ce0f0e
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 72893639aada..2f7132610e18 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 18 Jul 2014 13:07:05 +0000
+Sun, 20 Jul 2014 07:07:06 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 281b8017ed29..e88c86e4469c 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Jul 18 13:07:02 UTC 2014
+Sun Jul 20 07:07:03 UTC 2014
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index faa20afe77cb..a833017a9c2d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 18 Jul 2014 13:30:01 +0000
+Sun, 20 Jul 2014 07:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 976f01195cb7..a351857ca39d 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1405688701 Fri 18 Jul 2014 01:05:01 PM UTC UTC
+1405839901 Sun 20 Jul 2014 07:05:01 AM UTC UTC
diff --git a/net-analyzer/mtr/mtr-0.85_p20140126.ebuild b/net-analyzer/mtr/mtr-0.85_p20140126.ebuild
index 107500506c6c..58a4b35e3617 100644
--- a/net-analyzer/mtr/mtr-0.85_p20140126.ebuild
+++ b/net-analyzer/mtr/mtr-0.85_p20140126.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/net-analyzer/mtr/mtr-0.85_p20140126.ebuild,v 1.8 2014/06/22 13:59:47 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.85_p20140126.ebuild,v 1.9 2014/07/18 14:31:29 klausman Exp $
EAPI=5
inherit eutils flag-o-matic
@@ -11,7 +11,7 @@ SRC_URI="http://dev.gentoo.org/~jer/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="gtk ipv6 suid"
RDEPEND="
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild
index e1922a3c7c22..4adbb4cc1048 100644
--- a/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.4.8-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/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild,v 1.2 2014/07/16 11:51:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild,v 1.3 2014/07/19 00:39:10 jer Exp $
EAPI="5"
@@ -15,7 +15,7 @@ SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="dbi doc +graph lua perl python rrdcgi static-libs tcl tcpd"
RDEPEND="
diff --git a/net-analyzer/synscan/Manifest b/net-analyzer/synscan/Manifest
index b10cd2018afd..93263ad067a8 100644
--- a/net-analyzer/synscan/Manifest
+++ b/net-analyzer/synscan/Manifest
@@ -1 +1 @@
-DIST synscan-5.01.tar.gz 61440 RMD160 b66d20e3749a2aace188dc8393dbc76dc7f62a3f SHA1 369f83ca27432429a7a9b1ebeac2809bffa85db7 SHA256 6fca109c82fe407dedaa9152963c7faa7445a998fb0ad1971bd861d7bafcc29f
+DIST synscan-5.01.tar.gz 61440 SHA256 6fca109c82fe407dedaa9152963c7faa7445a998fb0ad1971bd861d7bafcc29f SHA512 6a090ceed5ca0766b63a82fee468459a47cc2bbd97c120d0e0b8708f5ce154116d988a42ff29a9b6fa5fd6d699064b1df0e263795c4dcef0f619797289db88fc WHIRLPOOL e89f094780aac5c0e6443b8cfc95546a5743e5acaf588398d8851ff0507b315660fd572c4f02ef1451098c6e23ff096d758bbe6210bb5f2991e8f6b766a0c931
diff --git a/net-analyzer/synscan/synscan-5.01.ebuild b/net-analyzer/synscan/synscan-5.01.ebuild
index 4df1ab501406..96740df19e2b 100644
--- a/net-analyzer/synscan/synscan-5.01.ebuild
+++ b/net-analyzer/synscan/synscan-5.01.ebuild
@@ -1,8 +1,8 @@
-# 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/net-analyzer/synscan/synscan-5.01.ebuild,v 1.1 2010/06/13 21:46:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/synscan/synscan-5.01.ebuild,v 1.2 2014/07/18 17:16:07 ssuominen Exp $
-EAPI=3
+EAPI=5
inherit autotools eutils
DESCRIPTION="A fast asynchronous half-open TCP portscanner"
@@ -11,10 +11,11 @@ SRC_URI="http://www.digit-labs.org/files/tools/${PN}/releases/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="kernel_FreeBSD kernel_linux"
-DEPEND="net-libs/libpcap"
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}"
src_prepare() {
epatch "${FILESDIR}"/${P}-build.patch
@@ -26,10 +27,10 @@ src_compile() {
use kernel_FreeBSD && _target=freebsd
use kernel_linux && _target=linux
- emake ${_target} || die
+ emake ${_target}
}
src_install() {
- dobin synscan sslog || die
+ dobin synscan sslog
dodoc AUTHORS README
}
diff --git a/net-dialup/mgetty/mgetty-1.1.37-r1.ebuild b/net-dialup/mgetty/mgetty-1.1.37-r1.ebuild
index 23b1e8db3e46..80f2513aa1ab 100644
--- a/net-dialup/mgetty/mgetty-1.1.37-r1.ebuild
+++ b/net-dialup/mgetty/mgetty-1.1.37-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/net-dialup/mgetty/mgetty-1.1.37-r1.ebuild,v 1.2 2014/07/05 14:46:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/mgetty-1.1.37-r1.ebuild,v 1.3 2014/07/19 18:23:33 klausman Exp $
EAPI=5
inherit eutils flag-o-matic toolchain-funcs user
@@ -24,7 +24,7 @@ RDEPEND="${DEPEND}
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="doc +fax fidonet"
pkg_setup() {
diff --git a/net-dns/bind-tools/bind-tools-9.9.5.ebuild b/net-dns/bind-tools/bind-tools-9.9.5.ebuild
index 00197848c282..dbbebfe787c2 100644
--- a/net-dns/bind-tools/bind-tools-9.9.5.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.9.5.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/net-dns/bind-tools/bind-tools-9.9.5.ebuild,v 1.8 2014/07/13 09:58:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.9.5.ebuild,v 1.9 2014/07/19 20:34:40 klausman Exp $
EAPI="5"
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz"
LICENSE="ISC BSD BSD-2 HPND JNIC RSA openssl"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc gost gssapi idn ipv6 readline ssl urandom xml"
# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
diff --git a/net-dns/bind/bind-9.9.5-r3.ebuild b/net-dns/bind/bind-9.9.5-r3.ebuild
index d956a61db312..a9fcf1eb6616 100644
--- a/net-dns/bind/bind-9.9.5-r3.ebuild
+++ b/net-dns/bind/bind-9.9.5-r3.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/net-dns/bind/bind-9.9.5-r3.ebuild,v 1.8 2014/07/14 15:07:08 hparker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.5-r3.ebuild,v 1.9 2014/07/19 20:34:30 klausman Exp $
# Re dlz/mysql and threads, needs to be verified..
# MySQL uses thread local storage in its C api. Thus MySQL
@@ -53,7 +53,7 @@ SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
LICENSE="GPL-2 ISC BSD BSD-2 HPND JNIC openssl"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="berkdb caps dlz doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6
ldap mysql odbc postgres python rpz rrl sdb-ldap selinux ssl static-libs threads
urandom xml"
diff --git a/net-firewall/iptables/iptables-1.4.21-r1.ebuild b/net-firewall/iptables/iptables-1.4.21-r1.ebuild
index 02a9c1135666..a24f3e27314d 100644
--- a/net-firewall/iptables/iptables-1.4.21-r1.ebuild
+++ b/net-firewall/iptables/iptables-1.4.21-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/net-firewall/iptables/iptables-1.4.21-r1.ebuild,v 1.6 2014/07/13 09:59:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.21-r1.ebuild,v 1.7 2014/07/19 20:39:43 klausman Exp $
EAPI="5"
@@ -15,7 +15,7 @@ SRC_URI="http://www.netfilter.org/projects/iptables/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
IUSE="ipv6 netlink static-libs"
RDEPEND="
diff --git a/net-firewall/lutelwall/Manifest b/net-firewall/lutelwall/Manifest
index 70af102cc6a5..2509d88a91c1 100644
--- a/net-firewall/lutelwall/Manifest
+++ b/net-firewall/lutelwall/Manifest
@@ -1 +1 @@
-DIST lutelwall-0.99.tar.gz 29209 SHA256 92ab7ab320cbefd694cd5ba3799e6143244402eac65ffcd4b52528bc31d1a1f8
+DIST lutelwall-0.99.tar.gz 29209 SHA256 92ab7ab320cbefd694cd5ba3799e6143244402eac65ffcd4b52528bc31d1a1f8 SHA512 8812048c9e4ec3beff2214ed3ceb2d980d769ada686a934af22baec76a3670e51ddb171097adbfb78c63ce9bc25554b1da93ec8c86f59457277fd4651cf1068c WHIRLPOOL 842979556cecab887f9f050d5d92e0539c608023a694608d82e77a7d338ca6a6d8fc842dee49aa2def49dfeebc82faf23b12108e0363ec881395ced8279bdb76
diff --git a/net-firewall/lutelwall/lutelwall-0.99.ebuild b/net-firewall/lutelwall/lutelwall-0.99.ebuild
index 424bbd460aed..f655add3435f 100644
--- a/net-firewall/lutelwall/lutelwall-0.99.ebuild
+++ b/net-firewall/lutelwall/lutelwall-0.99.ebuild
@@ -1,23 +1,29 @@
-# 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/net-firewall/lutelwall/lutelwall-0.99.ebuild,v 1.5 2007/05/06 09:57:47 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/lutelwall/lutelwall-0.99.ebuild,v 1.6 2014/07/18 13:03:37 jer Exp $
-DESCRIPTION="High-level tool for firewall configuration"
-HOMEPAGE="http://firewall.lutel.pl"
-SRC_URI="http://firewall.lutel.pl/download/${PV}/${P}.tar.gz"
+EAPI=5
+
+DESCRIPTION="IPTables firewall setup script"
LICENSE="GPL-2"
+HOMEPAGE="http://www.lutel.pl/lutelwall/"
+SRC_URI="http://www.lutel.pl/wp-content/uploads/${PV}/${P}.tar.gz"
SLOT="0"
KEYWORDS="alpha ~amd64 ~ppc ~sparc x86"
-IUSE=""
-DEPEND=">=net-firewall/iptables-1.2.6
+RDEPEND="
+ >=net-firewall/iptables-1.2.6
+ >=sys-apps/gawk-3.1
sys-apps/iproute2
- >=sys-apps/gawk-3.1"
+"
src_install() {
- insinto /etc ; doins lutelwall.conf
+ insinto /etc
+ doins lutelwall.conf
+
dosbin lutelwall
doinitd "${FILESDIR}"/lutelwall
+
dodoc FEATURES ChangeLog
}
diff --git a/net-firewall/nufw/files/nuauth-conf.d b/net-firewall/nufw/files/nuauth-conf.d
index f7f7401b628d..1ac750cf49fd 100644
--- a/net-firewall/nufw/files/nuauth-conf.d
+++ b/net-firewall/nufw/files/nuauth-conf.d
@@ -1,2 +1,2 @@
-
+# configuration file for /etc/init.d/nuauth
NUAUTH_OPTIONS=""
diff --git a/net-firewall/nufw/files/nuauth-init.d b/net-firewall/nufw/files/nuauth-init.d
index 6e2788890e25..21bad8ff132f 100644
--- a/net-firewall/nufw/files/nuauth-init.d
+++ b/net-firewall/nufw/files/nuauth-init.d
@@ -13,6 +13,7 @@ checkconfig() {
}
start() {
+ checkpath -d /run/nuauth
checkconfig || return 1
ebegin "Starting nuauth"
start-stop-daemon --start --quiet --exec /usr/sbin/nuauth -- -D ${NUAUTH_OPTIONS}
@@ -21,6 +22,6 @@ start() {
stop() {
ebegin "Stopping nuauth"
- start-stop-daemon --stop --quiet --pidfile /var/run/nuauth/nuauth.pid
+ start-stop-daemon --stop --quiet --pidfile /run/nuauth/nuauth.pid
eend $?
}
diff --git a/net-firewall/nufw/files/nufw-2.2.21-fix-gnutls.patch b/net-firewall/nufw/files/nufw-2.2.21-fix-gnutls.patch
index 0700c84b06d8..b5e8048cd051 100644
--- a/net-firewall/nufw/files/nufw-2.2.21-fix-gnutls.patch
+++ b/net-firewall/nufw/files/nufw-2.2.21-fix-gnutls.patch
@@ -1,6 +1,5 @@
-diff -ru nufw-2.2.21~/configure.ac nufw-2.2.21/configure.ac
---- nufw-2.2.21~/configure.ac 2009-08-02 19:39:52.000000000 +0200
-+++ nufw-2.2.21/configure.ac 2009-08-02 19:42:38.000000000 +0200
+--- a/configure.ac
++++ b/configure.ac
@@ -87,6 +87,7 @@
#AM_CHECK_PATH([libgcrypt], [gcry_md_open],AC_DEFINE([HAVE_LIBRARY_GCRYPT],[1],[Gcrypt lib flag]), check_gcrypt=no,[-L/usr/local/lib])
#AM_CHECK_PATH(libgnutls], [gnutls_init],AC_DEFINE([HAVE_LIBRARY_GNUTLS],[1],[Gnutls lib flag]), check_gnutls=no)
diff --git a/net-firewall/nufw/files/nufw-2.2.22-var-run.patch b/net-firewall/nufw/files/nufw-2.2.22-var-run.patch
new file mode 100644
index 000000000000..f6bcc95e0006
--- /dev/null
+++ b/net-firewall/nufw/files/nufw-2.2.22-var-run.patch
@@ -0,0 +1,45 @@
+--- a/src/nuauth/auth_srv.h
++++ b/src/nuauth/auth_srv.h
+@@ -162,7 +162,7 @@
+ #ifdef S_SPLINT_S
+ # define NUAUTH_PID_FILE "/usr/local/var/run/nuauth/nuauth.pid"
+ #else
+-# define NUAUTH_PID_FILE LOCAL_STATE_DIR "/run/nuauth/nuauth.pid"
++# define NUAUTH_PID_FILE "/run/nuauth/nuauth.pid"
+ #endif
+
+ /* define the number of threads that will do user check */
+--- a/src/nuauth/command.c
++++ b/src/nuauth/command.c
+@@ -26,7 +26,7 @@
+ #include /* unix socket */
+ #include /* fchmod() */
+
+-#define SOCKET_FILENAME LOCAL_STATE_DIR "/run/nuauth/nuauth-command.socket"
++#define SOCKET_FILENAME "/run/nuauth/nuauth-command.socket"
+
+ const char* COMMAND_HELP =
+ "version: display nuauth version\n"
+--- a/src/nufw/main.c
++++ b/src/nufw/main.c
+@@ -54,7 +54,7 @@
+
+ /*! Name of pid file prefixed by LOCAL_STATE_DIR (variable defined
+ * during compilation/installation) */
+-#define NUFW_PID_FILE LOCAL_STATE_DIR "/run/nufw.pid"
++#define NUFW_PID_FILE "/run/nufw.pid"
+
+ /**
+ * Stop threads and then wait until threads exit.
+--- a/src/nuauth/Makefile.am
++++ b/src/nuauth/Makefile.am
+@@ -26,9 +26,6 @@
+
+ nuauth_LDADD = $(GLIB_LIBS) -lm -lgnutls -lsasl2 -lnufw -L$(top_builddir)/src/include/
+
+-install-exec-local:
+- install -d "$(DESTDIR)$(localstatedir)/run/nuauth/"
+-
+ nuauth$(EXEEXT): $(nuauth_OBJECTS) $(nuauth_DEPENDENCIES)
+ @rm -f nuauth$(EXEEXT)
+ $(LINK) $(nuauth_LDFLAGS) $(nuauth_OBJECTS) $(nuauth_LDADD)
diff --git a/net-firewall/nufw/files/nufw-conf.d b/net-firewall/nufw/files/nufw-conf.d
index f6d1d272e36e..b2ea527744ec 100644
--- a/net-firewall/nufw/files/nufw-conf.d
+++ b/net-firewall/nufw/files/nufw-conf.d
@@ -1,2 +1,2 @@
-
+# configuration file for /etc/init.d/nufw
NUFW_OPTIONS="-k /etc/nufw/nufw.key -c /etc/nufw/nufw.pem -d 127.0.0.1 -p 4129"
diff --git a/net-firewall/nufw/files/nufw-init.d b/net-firewall/nufw/files/nufw-init.d
index c83b6614c02f..6cfcfd793248 100644
--- a/net-firewall/nufw/files/nufw-init.d
+++ b/net-firewall/nufw/files/nufw-init.d
@@ -12,6 +12,6 @@ start() {
stop() {
ebegin "Stopping nufw"
- start-stop-daemon --stop --quiet --pidfile /var/run/nufw.pid
+ start-stop-daemon --stop --quiet --pidfile /run/nufw.pid
eend $?
}
diff --git a/net-firewall/nufw/metadata.xml b/net-firewall/nufw/metadata.xml
index 53e071cc1eda..983d41997af1 100644
--- a/net-firewall/nufw/metadata.xml
+++ b/net-firewall/nufw/metadata.xml
@@ -2,12 +2,10 @@
netmon
-An enterprise grade authenticating firewall based on netfilter
diff --git a/net-firewall/nufw/nufw-2.2.22.ebuild b/net-firewall/nufw/nufw-2.2.22-r1.ebuild
similarity index 75%
rename from net-firewall/nufw/nufw-2.2.22.ebuild
rename to net-firewall/nufw/nufw-2.2.22-r1.ebuild
index ac9fb6c304ae..25668e69f997 100644
--- a/net-firewall/nufw/nufw-2.2.22.ebuild
+++ b/net-firewall/nufw/nufw-2.2.22-r1.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/nufw-2.2.22.ebuild,v 1.4 2014/03/01 22:49:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/nufw-2.2.22-r1.ebuild,v 1.1 2014/07/18 14:06:38 jer Exp $
-EAPI=1
-SSL_CERT_MANDATORY=1
+EAPI=5
-inherit ssl-cert eutils pam
+SSL_CERT_MANDATORY=1
+inherit autotools eutils multilib pam ssl-cert
DESCRIPTION="An enterprise grade authenticating firewall based on netfilter"
HOMEPAGE="http://www.nufw.org/"
@@ -13,69 +13,68 @@ SRC_URI="http://www.nufw.org/attachments/download/39/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~x86"
-IUSE="debug ldap mysql pam pam_nuauth plaintext postgres prelude \
-unicode nfqueue nfconntrack static syslog test"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug ldap mysql pam pam_nuauth plaintext postgres prelude unicode nfqueue nfconntrack static syslog test"
-DEPEND=">=dev-libs/glib-2
+REQUIRED_USE="pam_nuauth? ( plaintext )"
+DEPEND="
+ dev-libs/cyrus-sasl
+ dev-libs/glib:2
dev-libs/libgcrypt:0
- >=dev-libs/cyrus-sasl-2
+ dev-python/ipy
net-firewall/iptables
- >=net-libs/gnutls-1.1
+ net-libs/gnutls
ldap? ( >=net-nds/openldap-2 )
mysql? ( virtual/mysql )
+ nfconntrack? ( net-libs/libnetfilter_conntrack )
+ nfqueue? ( net-libs/libnfnetlink net-libs/libnetfilter_queue )
pam? ( sys-libs/pam )
pam_nuauth? ( sys-libs/pam )
postgres? ( dev-db/postgresql-server )
- nfqueue? ( net-libs/libnfnetlink
- net-libs/libnetfilter_queue )
- nfconntrack? ( net-libs/libnetfilter_conntrack )
prelude? ( dev-libs/libprelude )
- dev-python/ipy"
+"
RDEPEND=${DEPEND}
-src_unpack() {
- unpack ${A}
- cd "${S}"
+RESTRICT="test"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-var-run.patch
sed -i \
-e 's:^#\(nuauth_tls_key="/etc/nufw/\)nuauth-key.pem:\1nuauth.key:' \
-e 's:^#\(nuauth_tls_cert="/etc/nufw/\)nuauth-cert.pem:\1nuauth.pem:' \
- conf/nuauth.conf || die "sed failed"
+ conf/nuauth.conf || die
+ sed -i \
+ -e "/^modulesdir/s|=.*|= /$(get_libdir)/security|g" \
+ src/clients/pam_nufw/Makefile.am || die
+ eautoreconf
}
-src_compile() {
+src_configure() {
econf \
- --with-shared \
- $(use_enable static) \
+ $(use_enable debug) \
$(use_enable pam_nuauth pam-nufw) \
- $(use_with prelude prelude-log) \
- $(use_with mysql mysql-log) \
+ $(use_enable static) \
+ $(use_with ldap) \
$(use_with mysql mysql-auth) \
+ $(use_with mysql mysql-log) \
+ $(use_with nfconntrack) \
+ $(use_with nfqueue) \
+ $(use_with pam system-auth) \
+ $(use_with plaintext plaintext-auth) \
$(use_with postgres pgsql-log) \
+ $(use_with prelude prelude-log) \
$(use_with syslog syslog-log) \
- $(use_with plaintext plaintext-auth) \
- --with-mark-group \
- $(use_with pam system-auth) \
- $(use_with ldap) \
- $(use_with nfqueue) \
- $(use_with nfconntrack) \
$(use_with unicode utf8) \
- $(use_enable debug) \
- --with-user-mark \
- --sysconfdir="/etc/nufw" \
- --localstatedir="/var" \
+ --enable-shared \
--includedir="/usr/include/nufw" \
- || die "econf failed"
- emake || die "emake failed"
-}
-
-src_test() {
- ewarn "Tests are skiped! They require root privileges."
- true
+ --localstatedir="/var" \
+ --sysconfdir="/etc/nufw" \
+ --with-mark-group \
+ --with-user-mark
}
src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
+ default
newinitd "${FILESDIR}"/nufw-init.d nufw
newconfd "${FILESDIR}"/nufw-conf.d nufw
@@ -85,7 +84,6 @@ src_install() {
insinto /etc/nufw
doins conf/nuauth.conf
- keepdir /var/run/nuauth
dodoc AUTHORS ChangeLog NEWS README TODO
docinto scripts
@@ -96,6 +94,8 @@ src_install() {
if use pam; then
pamd_mimic system-auth nufw auth account password session
fi
+
+ prune_libtool_files
}
pkg_postinst() {
diff --git a/net-firewall/psad/psad-2.2.3.ebuild b/net-firewall/psad/psad-2.2.3.ebuild
index 5dc497ea249f..f69445c9bab4 100644
--- a/net-firewall/psad/psad-2.2.3.ebuild
+++ b/net-firewall/psad/psad-2.2.3.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/net-firewall/psad/psad-2.2.3.ebuild,v 1.3 2014/07/15 18:31:24 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-2.2.3.ebuild,v 1.4 2014/07/18 14:32:10 jer Exp $
-EAPI=4
+EAPI=5
#PERL_EXPORT_PHASE_FUNCTIONS=no
inherit eutils perl-module toolchain-funcs
@@ -13,7 +13,6 @@ HOMEPAGE="http://www.cipherdyne.org/psad"
SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
-IUSE=""
DEPEND="virtual/perl-ExtUtils-MakeMaker"
RDEPEND="
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild
index 8effc2d01c6d..374d44d7c875 100644
--- a/net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.2.9-r3.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/net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild,v 1.5 2014/06/28 08:17:11 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild,v 1.6 2014/07/18 13:26:48 klausman Exp $
EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
REQUIRED_USE="kerberos? ( nfsv4 )"
RESTRICT="test" #315573
diff --git a/net-libs/daq/daq-2.0.2.ebuild b/net-libs/daq/daq-2.0.2.ebuild
index 75500cac7b04..d6e4001b6066 100644
--- a/net-libs/daq/daq-2.0.2.ebuild
+++ b/net-libs/daq/daq-2.0.2.ebuild
@@ -1,9 +1,8 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/daq-2.0.2.ebuild,v 1.2 2014/06/03 16:54:59 vapier Exp $
-
-EAPI="4"
+# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/daq-2.0.2.ebuild,v 1.3 2014/07/18 14:40:40 jer Exp $
+EAPI=5
inherit eutils multilib autotools
DESCRIPTION="Data Acquisition library, for packet I/O"
@@ -15,14 +14,19 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="ipv6 +afpacket +dump +pcap nfq ipq static-libs"
-DEPEND="pcap? ( >=net-libs/libpcap-1.0.0 )
- dump? ( >=net-libs/libpcap-1.0.0 )
- nfq? ( dev-libs/libdnet
- >=net-firewall/iptables-1.4.10
- net-libs/libnetfilter_queue )
- ipq? ( dev-libs/libdnet
- >=net-firewall/iptables-1.4.10
- net-libs/libnetfilter_queue )"
+PCAP_DEPEND=">=net-libs/libpcap-1.0.0"
+IPT_DEPEND="
+ >=net-firewall/iptables-1.4.10
+ dev-libs/libdnet
+ net-libs/libnetfilter_queue
+
+"
+DEPEND="
+ dump? ( ${PCAP_DEPEND} )
+ ipq? ( ${IPT_DEPEND} )
+ nfq? ( ${IPT_DEPEND} )
+ pcap? ( ${PCAP_DEPEND} )
+"
RDEPEND="${DEPEND}"
src_prepare() {
@@ -47,16 +51,12 @@ src_configure() {
--disable-bundled-modules
}
+DOCS=( ChangeLog README )
+
src_install() {
- emake DESTDIR="${D}" install
- dodoc ChangeLog README
+ default
- # Remove unneeded .la files
- rm \
- "${ED}"usr/$(get_libdir)/daq/*.la \
- "${ED}"usr/$(get_libdir)/libdaq*.la \
- "${ED}"usr/$(get_libdir)/libsfbpf.la \
- || die
+ prune_libtool_files
# If not using static-libs don't install the static libraries
# This has been bugged upstream
diff --git a/net-libs/jreen/Manifest b/net-libs/jreen/Manifest
index dd723f0f1b8e..9bf027380f89 100644
--- a/net-libs/jreen/Manifest
+++ b/net-libs/jreen/Manifest
@@ -1,2 +1 @@
-DIST jreen-1.1.1.tar.gz 292082 SHA256 0bd81dc10cc1f7abd48ae0bc400e2232c57f4ac890ddbaf47ea4fd7df0c9af07 SHA512 7aaff72a158a89512ed7f233f465dc967ba8f82b3d28d45d79b2afda3a954a49ac3a6bfcf3e3cbf00cdb5df0978ec2a9b8a4e72cc198e4973767669f3c192089 WHIRLPOOL bbca80b56853eecc8ad5d94d347dfc911f0fd20bc410cfc08921fb0223f04f149fd909275b300256be83fbf71c677722f11c31de9e20183b752d043d10fbbc69
DIST jreen-1.2.0.tar.gz 279435 SHA256 cee3762015357bfd88f7f3eb71dd7f90ddf37fdff07c5cf99881fda051c5fe1b SHA512 36b5fb892c16fd113574904671c8d5d3da6b50e0ea128b8e24715cb517c97212adcc8641a2a230ba1edd4c7735f46211ea4729f9e27fbea14e292ad098c78b0c WHIRLPOOL 90f0904e35345a21db8fda314455421762e7e7d5f3150bc94d73a70b4337690e16cc69a70f1a4fc2000507172544813b265c34720d7f292fb4f1537dc9df676f
diff --git a/net-libs/jreen/jreen-1.1.1.ebuild b/net-libs/jreen/jreen-1.1.1.ebuild
deleted file mode 100644
index 7c69faab6fef..000000000000
--- a/net-libs/jreen/jreen-1.1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/jreen/jreen-1.1.1.ebuild,v 1.4 2014/05/22 17:05:29 kensington Exp $
-
-EAPI=5
-
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="https://github.com/euroelessar/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~ppc x86"
-else
- GIT_ECLASS="git-2"
- EGIT_REPO_URI="git://github.com/euroelessar/${PN}"
- KEYWORDS=""
-fi
-
-inherit qt4-r2 cmake-utils ${GIT_ECLASS}
-
-DESCRIPTION="Qt XMPP library"
-HOMEPAGE="https://github.com/euroelessar/jreen"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug"
-
-DEPEND="
- >=app-crypt/qca-2.0.3
- >=net-dns/libidn-1.20
- >=dev-qt/qtcore-4.6.0:4
- >=dev-qt/qtgui-4.6.0:4
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README )
diff --git a/net-libs/libesmtp/libesmtp-1.0.6-r1.ebuild b/net-libs/libesmtp/libesmtp-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..1b16b784aab0
--- /dev/null
+++ b/net-libs/libesmtp/libesmtp-1.0.6-r1.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/net-libs/libesmtp/libesmtp-1.0.6-r1.ebuild,v 1.1 2014/07/19 15:51:01 eras Exp $
+
+EAPI=5
+inherit libtool
+
+DESCRIPTION="lib that implements the client side of the SMTP protocol"
+HOMEPAGE="http://www.stafford.uklinux.net/libesmtp/"
+SRC_URI="http://www.stafford.uklinux.net/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="debug ntlm ssl static-libs threads"
+
+RDEPEND="ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ elibtoolize
+}
+
+src_configure() {
+ econf \
+ --disable-dependency-tracking \
+ $(use_enable static-libs static) \
+ --enable-all \
+ $(use_enable ntlm) \
+ $(use_enable threads pthreads) \
+ $(use_enable debug) \
+ $(use_with ssl openssl)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS ChangeLog NEWS Notes README TODO
+ insinto /usr/share/doc/${PF}/xml
+ doins doc/api.xml
+}
diff --git a/net-libs/libesmtp/metadata.xml b/net-libs/libesmtp/metadata.xml
index 58dc11e62b6a..90c529dd9ca8 100644
--- a/net-libs/libesmtp/metadata.xml
+++ b/net-libs/libesmtp/metadata.xml
@@ -3,10 +3,6 @@
net-mail
diff --git a/net-libs/libnetfilter_acct/Manifest b/net-libs/libnetfilter_acct/Manifest
index 5d10443d28c5..0d9a37709058 100644
--- a/net-libs/libnetfilter_acct/Manifest
+++ b/net-libs/libnetfilter_acct/Manifest
@@ -1,3 +1 @@
-DIST libnetfilter_acct-1.0.0.tar.bz2 282380 SHA256 567ede1f54fbf2ffd752203ea3aea6f430244fb29bd943af58d1d0f4b1796dc9 SHA512 0a38cd94bae8c2cd8de421fdaf0ccbd9902c77e1ba98faa1827ee5b9bd6ee076fcac05fc6738c4c5944c9a4f31a894acaccedf08a6e1b82817ee2de2070339ef WHIRLPOOL 6e3a92d2e9d14b88df4f4475ec7925b3bd7f1c1ed056810cdff36bb2b1d27ea9fe02b217ab96bf49b93c7c4641b529b151edf6a95502f43ab8c7050dc7ef22bb
-DIST libnetfilter_acct-1.0.1.tar.bz2 288830 SHA256 e1b45331f160467fb5b5d659adeb041c095c18a581d45bee8edd9c4971dc001f SHA512 664880fc18f1486fb4d162cc87c8758763ea2afdab96df3dcb46a173d638829d457298c535c2142ae9e50f3c303683e0ed2e6dd67fa18b002c85a7ac5fff4fac WHIRLPOOL 62cfe70bb3b070795fefb64094b9b68c7663fec3503001853d76743c2533b785adbf36a84f0b667392e01215ea6dc1391cb4155719e90686706f8727ac1b2fce
DIST libnetfilter_acct-1.0.2.tar.bz2 292718 SHA256 0128f19c3419fbd84f7e6d46b13a33ef7bda9b9f5e493bc5ae1882d087514b71 SHA512 6bd299d509736ce3335e051137851d7f1a3751eafa380b55e9c73a25afb5d45c904ce9acefd4f934f1d21f2ff85b06faed4b072dc74d74e3a8b93342d59f5cdf WHIRLPOOL 00f178afa4720d0ebfa0af2bce14d386d756940eedced27d4a58c68d6593627e70126f8f65bbe73fd8ace8e4200ebd774237c2fc7fda2029f5f7e4a3738e688a
diff --git a/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.0.ebuild b/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.0.ebuild
deleted file mode 100644
index 641a01f69bb3..000000000000
--- a/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.0.ebuild,v 1.5 2012/12/13 17:36:06 pinkbyte Exp $
-
-EAPI=4
-
-inherit eutils linux-info multilib
-
-DESCRIPTION="Userspace library providing interface to extended accounting infrastructure of NetFilter"
-HOMEPAGE="http://netfilter.org/projects/libnetfilter_acct"
-SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND="net-libs/libmnl"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-CONFIG_CHECK="~NETFILTER_NETLINK_ACCT"
-
-pkg_setup() {
- kernel_is lt 3 3 && ewarn "This package will work with kernel version 3.3 or higher"
- linux-info_pkg_setup
-}
-
-src_configure() {
- econf \
- --libdir="${EPREFIX}"/$(get_libdir)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodir /usr/$(get_libdir)/pkgconfig/
- mv "${ED}"/{,usr/}$(get_libdir)/pkgconfig/${PN}.pc || die
- dodoc README
-
- if use examples; then
- find examples/ -name "Makefile*" -exec rm -f '{}' +
- dodoc -r examples/
- docompress -x /usr/share/doc/${P}/examples
- fi
-
- prune_libtool_files
-}
diff --git a/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.1.ebuild b/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.1.ebuild
deleted file mode 100644
index ec776572832a..000000000000
--- a/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.1.ebuild,v 1.9 2013/02/03 19:25:35 ago Exp $
-
-EAPI=5
-
-inherit eutils linux-info multilib
-
-DESCRIPTION="Userspace library providing interface to extended accounting infrastructure of NetFilter"
-HOMEPAGE="http://netfilter.org/projects/libnetfilter_acct"
-SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux"
-IUSE="examples"
-
-RDEPEND="net-libs/libmnl"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-DOCS=( README )
-CONFIG_CHECK="~NETFILTER_NETLINK_ACCT"
-
-pkg_setup() {
- kernel_is lt 3 3 && ewarn "This package will work with kernel version 3.3 or higher"
- linux-info_pkg_setup
-}
-
-src_configure() {
- econf \
- --libdir="${EPREFIX}"/$(get_libdir)
-}
-
-src_install() {
- default
- dodir /usr/$(get_libdir)/pkgconfig/
- mv "${ED}"/{,usr/}$(get_libdir)/pkgconfig/${PN}.pc || die
-
- if use examples; then
- find examples/ -name "Makefile*" -exec rm -f '{}' +
- dodoc -r examples/
- docompress -x /usr/share/doc/${P}/examples
- fi
-
- prune_libtool_files
-}
diff --git a/net-libs/libnetfilter_acct/metadata.xml b/net-libs/libnetfilter_acct/metadata.xml
index ac4e65c6ff2a..1870437aa8f1 100644
--- a/net-libs/libnetfilter_acct/metadata.xml
+++ b/net-libs/libnetfilter_acct/metadata.xml
@@ -1,6 +1,10 @@
- netmon
- libnetfilter_acct is the userspace library that provides a programming interface (API) to the extended accounting infrastructure. This information can be grabbed, first of all, by nfacct utility
+netmon
+
+libnetfilter_acct is the userspace library that provides a programming
+interface (API) to the extended accounting infrastructure. This information can
+then be used by net-firewall/nfacct
+
diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest
index ff507ab15aaf..132351b653cc 100644
--- a/net-libs/libnetfilter_conntrack/Manifest
+++ b/net-libs/libnetfilter_conntrack/Manifest
@@ -1,5 +1,2 @@
-DIST libnetfilter_conntrack-1.0.0.tar.bz2 380555 SHA256 0a09a61ad26a43190a1858cb0391198ae3c952a9bdc4488e63dcb5c59aa3d608 SHA512 fcceba5a6c3c059f9489af64bd9c2d967e2492813631ce047b5b623d8ab7e8dbd66ab556cbf3d8a227cb26deb206d0c8315572e757a779916c188948dc09a835 WHIRLPOOL 743e3dd87b16f7d34cc5b7abf7e045072ed28b3e2bdaa49855aa5e1da6173be3485b615901f2c67ab4f1a9c76678084dd0808a27967f005bedf891775a70359f
-DIST libnetfilter_conntrack-1.0.1.tar.bz2 377423 SHA256 279090d28a676299cba6e8a6a3def97f1e8560525aee475e7e1e23cc46162f57 SHA512 6ab1325c949dc29dc7cc5d66511d940429dd877e232359cd8453d4530663a9e8075487c9607b75a849a7569ea2edc0808dad742804f4e75d49f5cc56daa96b89 WHIRLPOOL 71643099cf3e44da23855001b372200fbb4bf7dfe3831e876a6f592f696493451cf1a695225534243f4cfaddcbf6745e49b260eb0c3e048ce91b143f222c99c4
-DIST libnetfilter_conntrack-1.0.2.tar.bz2 386929 SHA256 a0bd747dd58ae1513586b43c7125b41e6325f97eb95ac63d53cf5aeb33254d12 SHA512 1c8b7b0889eb264acdd7c48d9b748189d47110d09d58190f2e3a392b9bbdf6516a9f2c2f3950c82667b91bff6adb8ef1e6e6583d8db31ca25af05fdaae440a84 WHIRLPOOL ffd365b07e677381689d96d360a577981e344304abe90568c0365cc10eebe97698525a67fa5393b803d4d67b48c6817a3657ed58ec1e918215b09b2780229225
DIST libnetfilter_conntrack-1.0.3.tar.bz2 390454 SHA256 fc1710854d26d527087dbbefb110193650d9aae1876f90cb64b8d5c0a8dd95a4 SHA512 9949d3b3352e2cad3310128089de024950a1178a2a42c7a0ecec026dfe3b51b9b1b658d291d95d1a7d2ea038608ada4f77b9b8b2c72f9e887fb6211a1e25f628 WHIRLPOOL 4daab5dddf617fc00c6f21796b56a14eebe77e67601bd2fb9a4bd8b178c700ff83746496f6f88fe549ad964e85d31f8c7294b99204adbc2fc19223bdfaa83bac
DIST libnetfilter_conntrack-1.0.4.tar.bz2 428147 SHA256 d9ec4a3caf49417f2b0a2d8d44249133e8c3ec78c757b7eb8c273f1cb6929c7d SHA512 53b5e5b26ca58abd6b9d83979bbb61aac4b24a85aa425c6b4fc4472b8273e30393678d6acd1aec0e959916b919cd561582ddd4b2ee656b6cb774aa9d9819c046 WHIRLPOOL 5028ca559a734019c6796b6ed73b120a1cf84c27748ae640f084ee5f1fd0c9b0f34e485a526761e35eb29c0e65e9126853b489bdb5e7d45b7cbe960113584a82
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.0.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.0.ebuild
deleted file mode 100644
index 0ddc33cb03de..000000000000
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.0.ebuild,v 1.9 2012/09/11 16:10:32 armin76 Exp $
-
-EAPI="4"
-
-inherit autotools-utils linux-info
-
-DESCRIPTION="programming interface (API) to the in-kernel connection tracking state table"
-HOMEPAGE="http://www.netfilter.org/projects/libnetfilter_conntrack/"
-SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ia64 ppc sparc x86"
-IUSE="static-libs"
-
-RDEPEND=">=net-libs/libnfnetlink-1.0.0"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-DOCS=( README )
-
-pkg_setup() {
- linux-info_pkg_setup
-
- if kernel_is lt 2 6 18 ; then
- die "${PN} requires at least 2.6.18 kernel version"
- fi
-
- #netfilter core team has changed some option names with kernel 2.6.20
- if kernel_is lt 2 6 20 ; then
- CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
- else
- CONFIG_CHECK="~NF_CT_NETLINK"
- fi
-
- check_extra_config
-}
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.1.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.1.ebuild
deleted file mode 100644
index 5c2d03bcdabd..000000000000
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.1.ebuild,v 1.2 2012/10/14 20:06:49 maekke Exp $
-
-EAPI="4"
-
-inherit autotools-utils linux-info
-
-DESCRIPTION="programming interface (API) to the in-kernel connection tracking state table"
-HOMEPAGE="http://www.netfilter.org/projects/libnetfilter_conntrack/"
-SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
-IUSE="static-libs"
-
-RDEPEND=">=net-libs/libnfnetlink-1.0.0"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-DOCS=( README )
-
-pkg_setup() {
- linux-info_pkg_setup
-
- if kernel_is lt 2 6 18 ; then
- die "${PN} requires at least 2.6.18 kernel version"
- fi
-
- #netfilter core team has changed some option names with kernel 2.6.20
- if kernel_is lt 2 6 20 ; then
- CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
- else
- CONFIG_CHECK="~NF_CT_NETLINK"
- fi
-
- check_extra_config
-}
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.2.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.2.ebuild
deleted file mode 100644
index 0804509c2d10..000000000000
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.2.ebuild,v 1.14 2013/02/21 16:42:48 jer Exp $
-
-EAPI=5
-inherit autotools-utils linux-info
-
-DESCRIPTION="programming interface (API) to the in-kernel connection tracking state table"
-HOMEPAGE="http://www.netfilter.org/projects/libnetfilter_conntrack/"
-SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="static-libs"
-
-RDEPEND="
- >=net-libs/libmnl-1.0.3
- >=net-libs/libnfnetlink-1.0.0
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-DOCS=( README )
-
-pkg_setup() {
- linux-info_pkg_setup
-
- if kernel_is lt 2 6 18 ; then
- die "${PN} requires at least 2.6.18 kernel version"
- fi
-
- #netfilter core team has changed some option names with kernel 2.6.20
- if kernel_is lt 2 6 20 ; then
- CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
- else
- CONFIG_CHECK="~NF_CT_NETLINK"
- fi
-
- check_extra_config
-}
diff --git a/net-libs/libnetfilter_conntrack/metadata.xml b/net-libs/libnetfilter_conntrack/metadata.xml
index 32c1010292c6..03aa50bab7e3 100644
--- a/net-libs/libnetfilter_conntrack/metadata.xml
+++ b/net-libs/libnetfilter_conntrack/metadata.xml
@@ -2,5 +2,4 @@
netmon
-programming interface (API) to the in-kernel connection tracking state table
diff --git a/net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild b/net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild
index 4edac311ae21..fd0ccc1fd2f4 100644
--- a/net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild
+++ b/net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild
@@ -1,9 +1,8 @@
-# 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/net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild,v 1.7 2013/04/23 08:41:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild,v 1.8 2014/07/18 14:51:18 jer Exp $
EAPI=5
-
inherit linux-info autotools-utils
DESCRIPTION="interface to packets that have been logged by the kernel packet filter"
diff --git a/net-libs/libnetfilter_log/metadata.xml b/net-libs/libnetfilter_log/metadata.xml
index b76a11d31162..03aa50bab7e3 100644
--- a/net-libs/libnetfilter_log/metadata.xml
+++ b/net-libs/libnetfilter_log/metadata.xml
@@ -2,5 +2,4 @@
netmon
-interface to packets that have been logged by the kernel packet filter
diff --git a/net-libs/libnetfilter_queue/Manifest b/net-libs/libnetfilter_queue/Manifest
index 634ce3aeb951..6675bf035d3c 100644
--- a/net-libs/libnetfilter_queue/Manifest
+++ b/net-libs/libnetfilter_queue/Manifest
@@ -1,2 +1 @@
-DIST libnetfilter_queue-1.0.1.tar.bz2 262048 SHA256 cfda0aa4f05b93850df1d29b16b5601e7ceccf000e8ddc1abb7477761c4426aa SHA512 b28210496d32700aa7b7b57badfd4a234cf46291b21394e5841591f13309305ee6f6373d6c7db0fb84f44fac82a9a34e3dcb3e4059fd6e5d4d977bfa24420c0e WHIRLPOOL ce62f1ac2a7d97ea26b389e46b1056e4d95ac7be8ebc59f5a329cb1f6bfaf8fe62cec3ddb03ee6e45fce5e3126d38a3a5a96d22908e7c2379ec46952a2e1aa3a
DIST libnetfilter_queue-1.0.2.tar.bz2 354201 SHA256 838490eb5dbe358f9669823704982f5313a8d397111562373200203f93ac1a32 SHA512 89fec4d943b85f35e7cef3b1b9071b1280c6e1b282b7e5cb97eb17d05b9ddd175194639ead986767d27152540fe8e167383a1f7bbfe3cdf874a5a42a2c096f11 WHIRLPOOL b3a47c01c6250190a5519dc1e6edd9a88cd295c38189752c2e4516676673ec956aec2c2744faa0681700ad251e94cdab146daf4c13260666194bce5b6f207ef7
diff --git a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.1.ebuild b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.1.ebuild
deleted file mode 100644
index e439359c3e60..000000000000
--- a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.1.ebuild,v 1.7 2013/02/08 06:43:05 vapier Exp $
-
-EAPI="4"
-
-inherit autotools-utils linux-info
-
-DESCRIPTION="API to packets that have been queued by the kernel packet filter"
-HOMEPAGE="http://www.netfilter.org/projects/libnetfilter_queue/"
-SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
-IUSE="static-libs"
-
-RDEPEND=">=net-libs/libnfnetlink-0.0.41"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-CONFIG_CHECK="~NETFILTER_NETLINK_QUEUE"
-
-pkg_setup() {
- linux-info_pkg_setup
- kernel_is lt 2 6 14 && ewarn "requires at least 2.6.14 kernel version"
-}
diff --git a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.2.ebuild b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.2.ebuild
index 52f63d3d4169..b967d1e7aa83 100644
--- a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.2.ebuild
+++ b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.2.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/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.2.ebuild,v 1.8 2013/06/26 12:26:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.2.ebuild,v 1.9 2014/07/18 14:53:03 jer Exp $
EAPI=5
inherit autotools-utils linux-info
@@ -11,7 +11,7 @@ SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86"
IUSE="static-libs"
RDEPEND="
diff --git a/net-libs/libnetfilter_queue/metadata.xml b/net-libs/libnetfilter_queue/metadata.xml
index d527b937cdbc..03aa50bab7e3 100644
--- a/net-libs/libnetfilter_queue/metadata.xml
+++ b/net-libs/libnetfilter_queue/metadata.xml
@@ -2,5 +2,4 @@
netmon
-API to packets that have been queued by the kernel packet filter
diff --git a/net-libs/libnfnetlink/Manifest b/net-libs/libnfnetlink/Manifest
index 8f261654c97b..ad35fba0b5ad 100644
--- a/net-libs/libnfnetlink/Manifest
+++ b/net-libs/libnfnetlink/Manifest
@@ -1,2 +1 @@
-DIST libnfnetlink-1.0.0.tar.bz2 239916 SHA256 3752b03a4c09821ee9a2528d69289423a01e7171f1a22dfdd11d5459e03972fb SHA512 8cf2a6e98bcebf99dbcbdf1c512da47a55597a089edfe16bcddc0b83a2cb4e4a9a5d20da06daaa5323d6a2b5075d908d988c60c4ca4b4a80fb29eb0674079410 WHIRLPOOL 2716cb03964d832c35579b0f1220dd4d6b7423cb366b636d0ebf80813e7ef28b8d766619bc5717b30c0099bb3bbfabd854f0a6bdbfd32140a389c1127836af36
DIST libnfnetlink-1.0.1.tar.bz2 320641 SHA256 f270e19de9127642d2a11589ef2ec97ef90a649a74f56cf9a96306b04817b51a SHA512 2ec2cd389c04e21c8a02fb3f6d6f326fc33ca9589577f1739c23d883fe2ee9feaa16e83b6ed09063ad886432e49565dc3256277d035260aca5aab17954b46104 WHIRLPOOL a27bee0e096e695ed4661c50f1ab2fb16e7012f96cc94baae8d5d67224e8b5dcbd869e5001b73fde4c9788f0fd87f85ff6caa3c5b95bae25f3005caed377451c
diff --git a/net-libs/libnfnetlink/libnfnetlink-1.0.0-r1.ebuild b/net-libs/libnfnetlink/libnfnetlink-1.0.0-r1.ebuild
deleted file mode 100644
index f70b4a1039e9..000000000000
--- a/net-libs/libnfnetlink/libnfnetlink-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnfnetlink/libnfnetlink-1.0.0-r1.ebuild,v 1.8 2013/02/08 06:44:16 vapier Exp $
-
-EAPI=4
-inherit linux-info
-
-DESCRIPTION="the low-level library for netfilter related kernel/userspace communication"
-HOMEPAGE="http://www.netfilter.org/projects/libnfnetlink/"
-SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="static-libs"
-
-DOCS=( README )
-
-pkg_setup() {
- linux-info_pkg_setup
-
- if kernel_is lt 2 6 18 ; then
- ewarn "${PN} requires at least 2.6.18 kernel version"
- fi
-
- #netfilter core team has changed some option names with kernel 2.6.20
- error_common=' is not set when it should be. You can activate it in the Core Netfilter Configuration'
- if kernel_is lt 2 6 20 ; then
- CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
- ERROR_IP_NF_CONNTRACK_NETLINK="CONFIG_IP_NF_CONNTRACK_NETLINK:\t${error_common}"
- else
- CONFIG_CHECK="~NF_CT_NETLINK"
- ERROR_NF_CT_NETLINK="CONFIG_NF_CT_NETLINK:\t${error_common}"
- fi
-
- check_extra_config
-}
-
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_install() {
- default
- use static-libs || find "${ED}"/usr -name '*.la' -delete
-}
diff --git a/net-libs/libnfnetlink/metadata.xml b/net-libs/libnfnetlink/metadata.xml
index f1f3c392df9e..03aa50bab7e3 100644
--- a/net-libs/libnfnetlink/metadata.xml
+++ b/net-libs/libnfnetlink/metadata.xml
@@ -2,5 +2,4 @@
netmon
-the low-level library for netfilter related kernel/userspace communication
diff --git a/net-libs/libnids/libnids-1.24-r4.ebuild b/net-libs/libnids/libnids-1.24-r4.ebuild
deleted file mode 100644
index be8a23c9c724..000000000000
--- a/net-libs/libnids/libnids-1.24-r4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.24-r4.ebuild,v 1.1 2014/03/19 15:30:47 jer Exp $
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="an implementation of an E-component of Network Intrusion Detection System"
-HOMEPAGE="http://libnids.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1.2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+glib +libnet static-libs"
-
-DEPEND="
- net-libs/libpcap
- glib? ( dev-libs/glib )
- libnet? ( >=net-libs/libnet-1.1.0-r3 )
-"
-RDEPEND="
- ${DEPEND}
- !net-libs/libnids:1.1
-"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-ldflags.patch"
- epatch "${FILESDIR}/${P}-static-libs.patch"
-}
-
-src_configure() {
- tc-export AR
- econf \
- --enable-shared \
- $(use_enable glib libglib) \
- $(use_enable libnet libnet)
-}
-
-src_compile() {
- emake shared $(usex static-libs static '')
-}
-
-src_install() {
- local tgt
- for tgt in _installshared $(usex static-libs _install ''); do
- emake install_prefix="${D}" ${tgt}
- done
-
- dodoc CHANGES CREDITS MISC README doc/*
-}
diff --git a/net-libs/libpcapnav/Manifest b/net-libs/libpcapnav/Manifest
index b4262d167677..b3ec4cf67786 100644
--- a/net-libs/libpcapnav/Manifest
+++ b/net-libs/libpcapnav/Manifest
@@ -1,2 +1,2 @@
DIST libpcapnav-0.7.tar.gz 390455 SHA256 5860c6ad6ebcd0036a0ed6aadd0c3f2d5232fac3c5da1741a58d51a8e737c8e6
-DIST libpcapnav-0.8.tar.gz 387476 SHA256 11d6a4257cbc5a89aa73ce2aaa5b0fc17430f7279d0abb39ccaf3a411ba7e852
+DIST libpcapnav-0.8.tar.gz 387476 SHA256 11d6a4257cbc5a89aa73ce2aaa5b0fc17430f7279d0abb39ccaf3a411ba7e852 SHA512 bc0357d17228c157de5b480532df37a62459882d5a4fb8d2285fe4e86c1dca301e7cc505f2917bb3421d926bed263d93b2c587311431d9c3a5b02f04c93fdf18 WHIRLPOOL 08552c55bc6d2c80780b333e1ba0c476baa5d783c74309fe6e435cefae551b9d2a27040c66e2f27ee21a8679f48a3fe8f258a9efc64873fbda806656e339a974
diff --git a/net-libs/libpcapnav/files/libpcapnav-0.8-includes.patch b/net-libs/libpcapnav/files/libpcapnav-0.8-includes.patch
new file mode 100644
index 000000000000..cb41bedf4a32
--- /dev/null
+++ b/net-libs/libpcapnav/files/libpcapnav-0.8-includes.patch
@@ -0,0 +1,20 @@
+--- a/test/pcapnav-test1.c
++++ b/test/pcapnav-test1.c
+@@ -1,6 +1,7 @@
+ #include
+ #include
+ #include
++#include /* ctime() */
+
+ #include
+
+--- a/test/pcapnav-jump.c
++++ b/test/pcapnav-jump.c
+@@ -1,6 +1,7 @@
+ #include
+ #include
+ #include
++#include /* strcmp() */
+
+ int
+ main(int argc, char** argv)
diff --git a/net-libs/libpcapnav/libpcapnav-0.8.ebuild b/net-libs/libpcapnav/libpcapnav-0.8.ebuild
index 8e84f898a756..ea0cf7b219ab 100644
--- a/net-libs/libpcapnav/libpcapnav-0.8.ebuild
+++ b/net-libs/libpcapnav/libpcapnav-0.8.ebuild
@@ -1,6 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcapnav/libpcapnav-0.8.ebuild,v 1.3 2014/03/12 03:53:59 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcapnav/libpcapnav-0.8.ebuild,v 1.4 2014/07/18 15:19:46 jer Exp $
+
+EAPI=5
+inherit eutils
DESCRIPTION="Libpcap wrapper library to navigate to arbitrary packets in a tcpdump trace file"
HOMEPAGE="http://netdude.sourceforge.net/"
@@ -9,13 +12,30 @@ SRC_URI="mirror://sourceforge/netdude/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 ~sparc ~x86"
-IUSE="doc"
+IUSE="doc static-libs"
DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-includes.patch
+}
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_compile() {
+ emake SUBDIRS="src docs"
+}
src_install() {
- make DESTDIR="${D}" install || die "make install failed"
+ default
rm -fr "${D}"/usr/share/gtk-doc
- dodoc AUTHORS ChangeLog README
use doc && dohtml -r docs/*.css docs/html/*.html docs/images
+ prune_libtool_files
}
diff --git a/net-libs/libprotoident/Manifest b/net-libs/libprotoident/Manifest
index 31dab7ae6381..d7764bcb65f9 100644
--- a/net-libs/libprotoident/Manifest
+++ b/net-libs/libprotoident/Manifest
@@ -1,2 +1 @@
-DIST libprotoident-2.0.6.tar.gz 466784 SHA256 9fd6f7c4226761dfa46060500320b2fb30c9c3537467c6c64847e057b584a22f SHA512 ec3895ae56d6e2169494229fe4dd239796dc03a9fd774fdc734a3e553e75c8b1851cd1937733237899a474fcb311178f03f073ff431433c1e52a849ba035735a WHIRLPOOL efa8602df66e3dab6c072d9055115b6a371933fe1c338c1ed4c1d1ec6b4dd0e4900169866ed3597b101be0f817ba130c1640fbe541c337aa769b35dc2e28102a
DIST libprotoident-2.0.7.tar.gz 483119 SHA256 5063497274e546b01b0606c8906a292cbe1e2ba8d6f3b6cd25de16a91fef635e SHA512 0491a2c67f1cd43dc82d68f8d6d3d6c423a7ba6ce07141107b9f50c08b858974c504dcf563501b3f33c29e799baa88871444f12ebf5f6c70adc73c08824dced8 WHIRLPOOL 37c9eecd5f3ba81d02d849aebeab05b21e26c0e0e58718a55841c500c9c33faf3cecac5d564a619a2aaf7d5c4e703297997f8e45d575d846ca9c1c6a34e8f6d6
diff --git a/net-libs/libprotoident/libprotoident-2.0.6.ebuild b/net-libs/libprotoident/libprotoident-2.0.6.ebuild
deleted file mode 100644
index 3996faee4eb6..000000000000
--- a/net-libs/libprotoident/libprotoident-2.0.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libprotoident/libprotoident-2.0.6.ebuild,v 1.1 2013/01/27 06:28:09 radhermit Exp $
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="A library that performs application layer protocol identification for flows"
-HOMEPAGE="http://research.wand.net.nz/software/libprotoident.php"
-SRC_URI="http://research.wand.net.nz/software/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/2"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs +tools"
-
-DEPEND=">=net-libs/libtrace-3.0.7
- tools? ( net-libs/libflowmanager )"
-RDEPEND="${DEPEND}"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_configure() {
- local myeconfargs=(
- $(use_with tools)
- )
- autotools-utils_src_configure
-}
diff --git a/net-libs/libprotoident/libprotoident-2.0.7.ebuild b/net-libs/libprotoident/libprotoident-2.0.7.ebuild
index 1d78f0750de9..23f71a90de4f 100644
--- a/net-libs/libprotoident/libprotoident-2.0.7.ebuild
+++ b/net-libs/libprotoident/libprotoident-2.0.7.ebuild
@@ -1,9 +1,8 @@
-# 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/net-libs/libprotoident/libprotoident-2.0.7.ebuild,v 1.1 2013/11/06 06:09:05 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libprotoident/libprotoident-2.0.7.ebuild,v 1.2 2014/07/18 15:24:36 jer Exp $
EAPI=5
-
inherit autotools-utils
DESCRIPTION="A library that performs application layer protocol identification for flows"
diff --git a/net-libs/libsmi/Manifest b/net-libs/libsmi/Manifest
index f0045ede0631..8d3ef932ad04 100644
--- a/net-libs/libsmi/Manifest
+++ b/net-libs/libsmi/Manifest
@@ -1 +1 @@
-DIST libsmi-0.4.8.tar.gz 4104111 SHA256 f048a5270f41bc88b0c3b0a8fe70ca4d716a46b531a0ecaaa87c462f49d74849
+DIST libsmi-0.4.8.tar.gz 4104111 SHA256 f048a5270f41bc88b0c3b0a8fe70ca4d716a46b531a0ecaaa87c462f49d74849 SHA512 c4f5f30c9fbf26c2e0d87e29783794014a518a7494c17112b1970b5434c698d06ffd529ea58eb7856a0f86a30f1059aaf49d4fbdf39db971d9114d427d8a1863 WHIRLPOOL 33523c5aca6792c3ec08be748ce976046693188e61770db99c01a030b66442a387729c99196729efcd5a03c778f0263452a833a40add7173d65c4a9f51a6d842
diff --git a/net-libs/libsmi/files/libsmi-0.4.8-CVE-2010-2891.patch b/net-libs/libsmi/files/libsmi-0.4.8-CVE-2010-2891.patch
index 114431d00e31..8c5e2f97dbf4 100644
--- a/net-libs/libsmi/files/libsmi-0.4.8-CVE-2010-2891.patch
+++ b/net-libs/libsmi/files/libsmi-0.4.8-CVE-2010-2891.patch
@@ -1,7 +1,5 @@
-Index: lib/smi.c
-===================================================================
---- lib/smi.c (revision 29144)
-+++ lib/smi.c (working copy)
+--- a/lib/smi.c
++++ b/lib/smi.c
@@ -1793,10 +1793,15 @@
}
diff --git a/net-libs/libsmi/libsmi-0.4.8-r1.ebuild b/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
index 129bc6289d05..f4a4bce05833 100644
--- a/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
+++ b/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
@@ -1,9 +1,8 @@
-# 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/net-libs/libsmi/libsmi-0.4.8-r1.ebuild,v 1.10 2013/01/22 05:47:42 vapier Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsmi/libsmi-0.4.8-r1.ebuild,v 1.11 2014/07/18 15:31:52 jer Exp $
+EAPI=5
inherit eutils flag-o-matic
DESCRIPTION="A Library to Access SMI MIB Information"
@@ -13,7 +12,7 @@ HOMEPAGE="http://www.ibr.cs.tu-bs.de/projects/libsmi"
LICENSE="BSD"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
+IUSE="static-libs"
src_prepare() {
epatch "${FILESDIR}"/${P}-CVE-2010-2891.patch
@@ -21,18 +20,19 @@ src_prepare() {
src_configure() {
replace-flags -O? -O2
- econf
+ econf $(use_enable static-libs static)
}
src_test() {
# sming test is known to fail and some other fail if LC_ALL!=C:
# http://mail.ibr.cs.tu-bs.de/pipermail/libsmi/2008-March/001014.html
sed -i '/^[[:space:]]*smidump-sming.test \\$/d' test/Makefile
- LC_ALL=C emake -j1 check || die "Make check failed. See above for details."
+ LC_ALL=C emake -j1 check || die
}
src_install () {
- emake DESTDIR="${D}" install || die
+ default
dodoc smi.conf-example ANNOUNCE ChangeLog README THANKS TODO \
doc/{*.txt,smi.dia,smi.dtd,smi.xsd}
+ prune_libtool_files
}
diff --git a/net-libs/libssh/files/libssh-0.5.0-tests.patch b/net-libs/libssh/files/libssh-0.5.0-tests.patch
index ecae9cc5f8b3..dde770ce5b2a 100644
--- a/net-libs/libssh/files/libssh-0.5.0-tests.patch
+++ b/net-libs/libssh/files/libssh-0.5.0-tests.patch
@@ -1,5 +1,5 @@
---- libssh-0.5.0/tests/unittests/torture_misc.c.orig
-+++ libssh-0.5.0/tests/unittests/torture_misc.c
+--- a/tests/unittests/torture_misc.c
++++ b/tests/unittests/torture_misc.c
@@ -195,7 +195,7 @@
#ifdef _WIN32
unit_test(torture_path_expand_tilde_win),
diff --git a/net-libs/libssh/libssh-0.6.3-r1.ebuild b/net-libs/libssh/libssh-0.6.3-r1.ebuild
index 7680fe2fa38b..813ac5450307 100644
--- a/net-libs/libssh/libssh-0.6.3-r1.ebuild
+++ b/net-libs/libssh/libssh-0.6.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/net-libs/libssh/libssh-0.6.3-r1.ebuild,v 1.3 2014/07/07 23:36:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.3-r1.ebuild,v 1.4 2014/07/18 15:35:50 jer Exp $
EAPI=5
@@ -33,7 +33,7 @@ DOCS=( AUTHORS README ChangeLog )
S=${WORKDIR}/${MY_P}
PATCHES=(
- "${FILESDIR}/${PN}-0.5.0-tests.patch"
+ "${FILESDIR}"/${PN}-0.5.0-tests.patch
)
src_prepare() {
diff --git a/net-libs/libssh/metadata.xml b/net-libs/libssh/metadata.xml
index 962cf0114398..61a522ff1ed8 100644
--- a/net-libs/libssh/metadata.xml
+++ b/net-libs/libssh/metadata.xml
@@ -3,7 +3,6 @@
netmon
kde
-access a working SSH implementation by means of a library
diff --git a/net-misc/dahdi-tools/dahdi-tools-2.9.0.1.ebuild b/net-misc/dahdi-tools/dahdi-tools-2.9.0.1.ebuild
index e63b44542e5f..99ab489bd4c3 100644
--- a/net-misc/dahdi-tools/dahdi-tools-2.9.0.1.ebuild
+++ b/net-misc/dahdi-tools/dahdi-tools-2.9.0.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/net-misc/dahdi-tools/dahdi-tools-2.9.0.1.ebuild,v 1.1 2014/02/14 15:14:31 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi-tools/dahdi-tools-2.9.0.1.ebuild,v 1.2 2014/07/19 17:20:01 nimiux Exp $
EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="ppp"
DEPEND="dev-libs/newt
diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index e9ac247c6733..b90d95808753 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -23,4 +23,5 @@ DIST dahdi-linux-2.9.0.tar.gz 2031302 SHA256 0041377aafdfb81be82c6b2478007cd4cd7
DIST gentoo-dahdi-patchset-1.1.5.tar.bz2 105258 SHA256 e779b6155dd48064d30e63c33fbc741f3627a23ad7cf85d08abfa9db3cc6f6ae SHA512 a8471aaaeecf56d996f052cf58e38bc339ec186b8619689cf120a7ea131e37acab449b083744f78a0431618003b8a6c6fd093a51ec7e7728e9a444d446e6bd95 WHIRLPOOL beebfd19105839dddf44f4030420d0118cf539176ae5b80366331a8f7bfc96f55ee5c9f8bb0a8e1468e86a28704469f6833f12ea875067c8c782494dbafb7c5b
DIST gentoo-dahdi-patchset-1.1.6.tar.bz2 103091 SHA256 0cf7d478f772457004d72a6f90bf4a8fdaf036e7da47eb4849d9e6aac76f5fd2 SHA512 921d9b1840b8c36f857723d14f0e7175332df9c486c501f44500c09b88470780a22fa248bdc89dcdd47f2f4293357b22d2e25a25769cde050fa220b84a153161 WHIRLPOOL 3e7bad69bd7f9f23186271170484e3c126707da1b8fb3e0029e9153ec46b46f0c5ad77d44325b3ce6b3d7eca6df405eae1617b2173a1b1acdf080e4163936027
DIST gentoo-dahdi-patchset-1.1.7.tar.bz2 102404 SHA256 c87da7daa1ff4f3a6ad1937c6edcb97ac278bc50f34d3b3fbb2d9fcf07b729b1 SHA512 0e13929a6ab35520959ea40624dc405bbff9b211cc32290f515a587d74b38470595e5280fbafccf96ad7c6e699da4c8053cc79eb3457cee3c93c583f62290e07 WHIRLPOOL a3fe3c747d2ab14b1a77b47c50218659eff21c305ea3b28a16028a861d3e3133ac92569098e90fbd7a5f08abb1c9c4028717b123e93e0b1cec7f27f501ecaaa9
+DIST gentoo-dahdi-patchset-1.1.8.tar.bz2 103897 SHA256 e6129df49a3d217b55745d05cc87a7d4fbab86ee6fd465a26b85f8443f103b87 SHA512 bb5408548e078a4f00bfc8a1d9ab06ff5d33d62fe4669df440e756b6776bd7dcf6a77a978fa6370dea59e2cdd6ac0ac7d093c5670ea4734edc758fe3ef8be964 WHIRLPOOL 7d9fc271b7bc4cdb952434ac0c480b1d48c15618bfeb6dfed58b3d615f80221236db7fc38367e2f42a634097845e773bd703cadfd466b16d9ec41349e7f67a87
DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 SHA256 c71d1ac29c78511b59914cc9aa1798529ae7b344cdc8403a797dbcddbe486974 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66 WHIRLPOOL 15c34f728806f5f94d64c791491b4928342a0df94a336c8c09a26ec020245dd8e13722d73779cce3cd73029c07be68c2d440be51407b83d56ce5a8645b6bfb24
diff --git a/net-misc/dahdi/dahdi-2.9.0-r1.ebuild b/net-misc/dahdi/dahdi-2.9.0-r1.ebuild
new file mode 100644
index 000000000000..aa04a9594645
--- /dev/null
+++ b/net-misc/dahdi/dahdi-2.9.0-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/dahdi-2.9.0-r1.ebuild,v 1.2 2014/07/19 17:19:35 nimiux Exp $
+
+EAPI=5
+
+inherit base linux-mod eutils flag-o-matic toolchain-funcs
+
+MY_P="${P/dahdi/dahdi-linux}"
+JNET=1.0.14
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)."
+HOMEPAGE="http://www.asterisk.org"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-b0017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1d0017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-780017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-e0017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
+mirror://gentoo/gentoo-dahdi-patchset-1.1.8.tar.bz2
+http://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="flash"
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND=""
+
+EPATCH_SUFFIX="diff"
+PATCHES=( "${WORKDIR}/dahdi-patchset" )
+
+CONFIG_CHECK="MODULES ~CRC_CCITT"
+
+src_unpack() {
+ unpack ${A}
+ # Copy the firmware tarballs over, the makefile will try and download them otherwise
+ for file in ${A} ; do
+ cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/
+ done
+ # But without the .bin's it'll still fall over and die, so copy those too.
+ cp *.bin "${MY_P}"/drivers/dahdi/firmware/
+ cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/cwain/*.[ch] "${MY_P}"/drivers/dahdi/
+ cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/qozap/*.[ch] "${MY_P}"/drivers/dahdi/
+ cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/ztgsm/*.[ch] "${MY_P}"/drivers/dahdi/
+}
+
+src_prepare() {
+ if use flash; then
+ sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || die "Failed to define FXSFLASH"
+ sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
+ fi
+ base_src_prepare
+}
+
+src_compile() {
+ unset ARCH
+ emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" all
+}
+
+src_install() {
+ einfo "Installing kernel module"
+ emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" install
+ rm -rf "$D"/lib/modules/*/modules.*
+}
diff --git a/net-misc/freerdp/freerdp-9999.1.ebuild b/net-misc/freerdp/freerdp-9999.1.ebuild
index f7019480c2a7..35b7668e22a9 100644
--- a/net-misc/freerdp/freerdp-9999.1.ebuild
+++ b/net-misc/freerdp/freerdp-9999.1.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/net-misc/freerdp/freerdp-9999.1.ebuild,v 1.17 2013/11/11 16:32:17 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-9999.1.ebuild,v 1.18 2014/07/20 04:59:36 floppym Exp $
EAPI="5"
@@ -44,8 +44,8 @@ RDEPEND="
directfb? ( dev-libs/DirectFB )
ffmpeg? ( virtual/ffmpeg )
gstreamer? (
- media-libs/gstreamer:0.10
- media-libs/gst-plugins-base:0.10
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
x11-libs/libXrandr
)
jpeg? ( virtual/jpeg )
@@ -84,9 +84,9 @@ src_configure() {
$(cmake-utils_use_with doc MANPAGES)
$(cmake-utils_use_with directfb DIRECTFB)
$(cmake-utils_use_with ffmpeg FFMPEG)
- $(cmake-utils_use_with gstreamer GSTREAMER)
+ $(cmake-utils_use_with gstreamer GSTREAMER_1_0)
$(cmake-utils_use_with jpeg JPEG)
- $(cmake-utils_use_with pulseaudio PULSEAUDIO)
+ $(cmake-utils_use_with pulseaudio PULSE)
$(cmake-utils_use_with server SERVER)
$(cmake-utils_use_with smartcard PCSC)
$(cmake-utils_use_with sse2 SSE2)
diff --git a/net-misc/httptype/httptype-1.3.9-r1.ebuild b/net-misc/httptype/httptype-1.3.9-r1.ebuild
index 6e3c625fcac4..e751f1087c11 100644
--- a/net-misc/httptype/httptype-1.3.9-r1.ebuild
+++ b/net-misc/httptype/httptype-1.3.9-r1.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/net-misc/httptype/httptype-1.3.9-r1.ebuild,v 1.6 2013/03/03 18:26:21 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/httptype/httptype-1.3.9-r1.ebuild,v 1.7 2014/07/18 15:59:56 jer Exp $
EAPI=5
@@ -12,9 +12,6 @@ LICENSE="GPL-1"
SLOT="0"
KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux"
-IUSE=""
-
-DEPEND=""
RDEPEND="dev-lang/perl"
src_compile() { :; }
diff --git a/net-misc/httptype/httptype-1.3.9.ebuild b/net-misc/httptype/httptype-1.3.9.ebuild
deleted file mode 100644
index f529f3104bfe..000000000000
--- a/net-misc/httptype/httptype-1.3.9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/httptype/httptype-1.3.9.ebuild,v 1.8 2012/12/25 18:39:40 blueness Exp $
-
-DESCRIPTION="Returns the http host software of a website"
-
-HOMEPAGE="http://httptype.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-1"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
-#S=${WORKDIR}/${P}
-
-src_compile() {
- einfo "Stubbing so Makefile isn't called"
-}
-
-src_install() {
- #make PREFIX=${D}/usr install || die
- dobin httptype || die 'dobin failed'
- doman httptype.1 || die 'doman failed'
- dodoc Changelog README || die 'dodoc failed'
-}
diff --git a/net-misc/iodine/Manifest b/net-misc/iodine/Manifest
index 4de56b7d2ec0..ba44a79fba04 100644
--- a/net-misc/iodine/Manifest
+++ b/net-misc/iodine/Manifest
@@ -1,2 +1,3 @@
DIST iodine-0.5.2.tar.gz 50788 SHA256 cbc14665d325634318ebd6f792f8dc2229101bd5a55232420570538612f6a5e4
DIST iodine-0.6.0-rc1.tar.gz 89827 SHA256 dacf950198b68fd1dae09fe980080155b0c75718f581c08e069eee0c1b6c5e60 SHA512 6bd61c7ae363390af62b78d0b97bf04debee2f19fe96b6a1f274293d7becd13b134bb86facd300a3a400c16d3b574ec7dbfdc775ddc2c00caee1a06507814135 WHIRLPOOL 67fb79b894822eb91ac2fd5d6a025a2e2af833fb5b17d20321926187ab3565b98b9f625e5d2540c177ed6142819c400c0f27acd19b138528cb274f2b5a86bcba
+DIST iodine-0.7.0.tar.gz 96181 SHA256 ad2b40acf1421316ec15800dcde0f587ab31d7d6f891fa8b9967c4ded93c013e SHA512 49fe4f0cf614d3400cbfdade84eb4f50430f8f92004f663a08acc1514e8ff342443a8c3f855828bbca1864a3fafe419b5256f8a80fc4024b364d4c8c953fc0ec WHIRLPOOL ac098f9a409c75768b6b2da0f755560ea932a97855df32aefe860237a28ebf1ef1b576860378575522221214d9dc65c26f0297fafe628ea770e4449217c5d593
diff --git a/net-misc/iodine/files/iodine-0.7.0-TestMessage.patch b/net-misc/iodine/files/iodine-0.7.0-TestMessage.patch
new file mode 100644
index 000000000000..6b814b6f2d74
--- /dev/null
+++ b/net-misc/iodine/files/iodine-0.7.0-TestMessage.patch
@@ -0,0 +1,12 @@
+--- iodine-0.7.0/Makefile
++++ iodine-0.7.0/Makefile
+@@ -35,8 +35,7 @@
+ $(RM) $(RM_FLAGS) $(DESTDIR)$(mandir)/man8/iodine.8
+
+ test: all
+- @echo "!! The check library is required for compiling and running the tests"
+- @echo "!! Get it at http://check.sf.net"
++ @echo "Executing tests target"
+ @(cd tests; $(MAKE) TARGETOS=$(TARGETOS) all)
+
+ clean:
diff --git a/net-misc/iodine/files/iodined-1.init b/net-misc/iodine/files/iodined-1.init
new file mode 100644
index 000000000000..c2ae3367c4f6
--- /dev/null
+++ b/net-misc/iodine/files/iodined-1.init
@@ -0,0 +1,62 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iodine/files/iodined-1.init,v 1.1 2014/07/18 15:53:51 xmw Exp $
+
+PID_FILE="/run/iodined.pid"
+
+depend() {
+ need net
+}
+
+start() {
+ ebegin "Starting iodined"
+ ARGS=""
+ if [ "$IODINED_USER" ]; then
+ ARGS="$ARGS -u $IODINED_USER"
+ fi
+ if [ "$IODINED_CHROOT" ]; then
+ ARGS="$ARGS -t $IODINED_CHROOT"
+ fi
+ if [ "$IODINED_MTU" ]; then
+ ARGS="$ARGS -m $IODINED_MTU"
+ fi
+ if [ "$IODINED_LISTENPORT" ]; then
+ ARGS="$ARGS -p $IODINED_LISTENPORT"
+ fi
+ if [ "$IODINED_EXTERN_IP" ]; then
+ ARGS="$ARGS -n $IODINED_EXTERN_IP"
+ fi
+ if [ "$IODINED_LOCAL_DNS_PORT" ]; then
+ ARGS="$ARGS -b $IODINED_LOCAL_DNS_PORT"
+ fi
+ if [ "$IODINED_LISTENIP" ]; then
+ ARGS="$ARGS -l $IODINED_LISTENIP"
+ fi
+ if [ "$IODINED_PASSWD" ]; then
+ ARGS="$ARGS -P $IODINED_PASSWD"
+ else
+ eerror "Please set a password (IODINED_PASSWD) in /etc/conf.d/iodined!"
+ return 1
+ fi
+ if [ "$IODINED_IP" ]; then
+ ARGS="$ARGS $IODINED_IP"
+ else
+ eerror "Please set an IP (IODINED_IP) in /etc/conf.d/iodined!"
+ return 1
+ fi
+ if [ "$IODINED_DOMAIN" ]; then
+ ARGS="$ARGS $IODINED_DOMAIN"
+ else
+ eerror "Please set a domain (IODINED_DOMAIN) in /etc/conf.d/iodined!"
+ return 1
+ fi
+ start-stop-daemon --start --exec /usr/sbin/iodined --pidfile $PID_FILE -- -F $PID_FILE $ARGS
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping iodined"
+ start-stop-daemon --stop --exec /usr/sbin/iodined --pidfile $PID_FILE
+ eend $?
+}
diff --git a/net-misc/iodine/iodine-0.7.0.ebuild b/net-misc/iodine/iodine-0.7.0.ebuild
new file mode 100644
index 000000000000..271657963c97
--- /dev/null
+++ b/net-misc/iodine/iodine-0.7.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iodine/iodine-0.7.0.ebuild,v 1.1 2014/07/18 15:53:52 xmw Exp $
+
+EAPI=5
+
+inherit linux-info eutils toolchain-funcs
+
+DESCRIPTION="IP over DNS tunnel"
+HOMEPAGE="http://code.kryo.se/iodine/"
+SRC_URI="http://code.kryo.se/${PN}/${P}.tar.gz"
+
+CONFIG_CHECK="~TUN"
+
+LICENSE="ISC GPL-2" #GPL-2 for init script bug #426060
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+ test? ( dev-libs/check )"
+
+src_prepare(){
+ epatch "${FILESDIR}"/${P}-TestMessage.patch
+
+ sed -e '/^\s@echo \(CC\|LD\)/d' \
+ -e 's:^\(\s\)@:\1:' \
+ -i {,src/}Makefile || die
+
+ tc-export CC
+}
+
+src_compile() {
+ #shipped ./Makefiles doesn't pass -j to submake
+ emake -C src TARGETOS=Linux all
+}
+
+src_install() {
+ #don't re-run submake
+ sed -e '/^install:/s: all: :' \
+ -i Makefile || die
+ emake prefix="${EPREFIX}"usr DESTDIR="${D}" install
+
+ dodoc CHANGELOG README TODO
+
+ newinitd "${FILESDIR}"/iodined-1.init iodined
+ newconfd "${FILESDIR}"/iodined.conf iodined
+ keepdir /var/empty
+}
diff --git a/net-misc/ip-sentinel/Manifest b/net-misc/ip-sentinel/Manifest
index f76f60c1dcbc..76c2412e6fea 100644
--- a/net-misc/ip-sentinel/Manifest
+++ b/net-misc/ip-sentinel/Manifest
@@ -1 +1 @@
-DIST ip-sentinel-0.12.tar.bz2 165803 SHA256 1767fe155280361804cf1a62b2f77228bd764452668783050b6309cca888fb22
+DIST ip-sentinel-0.12.tar.bz2 165803 SHA256 1767fe155280361804cf1a62b2f77228bd764452668783050b6309cca888fb22 SHA512 dfa025fd96260073903ffe33dbaa5a146658dee2b8cb9bc04da0894a8de83207971a7f1e731128e42a0421052cdc352ed43a0298916f521d5f230533266e5077 WHIRLPOOL 5e377d38b5a6c5a70bc23044fa5103efdf48a3511df76ab7435e9445e5e85c2b910bd40bb6af2e0e40ab455c78754e7e97954f99a504a14e060086c6fbd27557
diff --git a/net-misc/ip-sentinel/ip-sentinel-0.12.ebuild b/net-misc/ip-sentinel/ip-sentinel-0.12.ebuild
index 713ecc449c03..b15cad6f88a2 100644
--- a/net-misc/ip-sentinel/ip-sentinel-0.12.ebuild
+++ b/net-misc/ip-sentinel/ip-sentinel-0.12.ebuild
@@ -1,24 +1,21 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ip-sentinel/ip-sentinel-0.12.ebuild,v 1.7 2014/03/12 03:44:32 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ip-sentinel/ip-sentinel-0.12.ebuild,v 1.8 2014/07/18 16:02:43 jer Exp $
+EAPI=5
inherit eutils user
DESCRIPTION="Prevent unauthorized usage of IPs in the local ethernet broadcastdomain by answering ARP-requests"
HOMEPAGE="http://www.nongnu.org/ip-sentinel/"
-SRC_URI="http://savannah.nongnu.org/download/ip-sentinel/${P}.tar.bz2"
LICENSE="GPL-2"
-
+SRC_URI="http://savannah.nongnu.org/download/ip-sentinel/${P}.tar.bz2"
SLOT="0"
-
KEYWORDS="x86"
-IUSE=""
-DEPEND=""
+DOCS=( AUTHORS ChangeLog NEWS README THANKS )
src_install() {
- make DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog NEWS README THANKS
+ default
newinitd "${FILESDIR}"/ip-sentinel.init ip-sentinel
newconfd "${FILESDIR}"/ip-sentinel.conf.d ip-sentinel
diff --git a/net-misc/ipcalc/Manifest b/net-misc/ipcalc/Manifest
index f620b09c3117..8912eacb7e6c 100644
--- a/net-misc/ipcalc/Manifest
+++ b/net-misc/ipcalc/Manifest
@@ -1 +1 @@
-DIST ipcalc-0.41.tar.gz 21599 SHA256 dda9c571ce3369e5b6b06e92790434b54bec1f2b03f1c9df054c0988aa4e2e8a
+DIST ipcalc-0.41.tar.gz 21599 SHA256 dda9c571ce3369e5b6b06e92790434b54bec1f2b03f1c9df054c0988aa4e2e8a SHA512 089eb2b9a38b07caa182ff11547a93d86aed570311fc8cd9e636c7546ab4d15acc854b9d79bbba9c797dcfbbedd1d6f4d521aec97bf613905fe5198a29c9889d WHIRLPOOL 7fbc5393d68fed03a5f9fc97d45ab31280d7a0244b78c4874945b675deb06ba5e7c3acae375ed151993da047a15d8c9f93c1e19640cf1a4425b67e05848f70d9
diff --git a/net-misc/ipcalc/ipcalc-0.41.ebuild b/net-misc/ipcalc/ipcalc-0.41.ebuild
index 45844cda3a80..015cb5c8c802 100644
--- a/net-misc/ipcalc/ipcalc-0.41.ebuild
+++ b/net-misc/ipcalc/ipcalc-0.41.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipcalc/ipcalc-0.41.ebuild,v 1.14 2012/12/09 00:13:26 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipcalc/ipcalc-0.41.ebuild,v 1.15 2014/07/18 16:09:03 jer Exp $
+
+EAPI=5
DESCRIPTION="calculates broadcast/network/etc... from an IP address and netmask"
+LICENSE="GPL-2+"
HOMEPAGE="http://jodies.de/ipcalc"
-SRC_URI="http://jodies.de/ipcalc-archive/${P}.tar.gz"
+SRC_URI="${HOMEPAGE}-archive/${P}.tar.gz"
-LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
RDEPEND=">=dev-lang/perl-5.6.0"
src_install () {
- dobin ${PN} || die
- dodoc changelog
+ dobin ${PN}
+ dodoc changelog contributors
}
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index 81220f085759..a07ac29d3713 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -1 +1,2 @@
DIST iperf-2.0.5.tar.gz 248583 SHA256 636b4eff0431cea80667ea85a67ce4c68698760a9837e1e9d13096d20362265b SHA512 da9a0c01dea2a9dd33aa130b11d938d5f44dd6c3ab27526b0a43df5bf2550fede04238a00b7d54037426afe90ac6d8c4f4ae6861aa170ca7835b6664c9d6537f WHIRLPOOL d66b007fad372516c7f7377872b69ea450fa9ff6d1492f2a224a73f2fb3f7616bd2d57a34a815d4d95683d81fd02d76472d4727323e920410034ba725f6476ce
+DIST iperf-3.0.5.tar.gz 397848 SHA256 bb81c724709dbb28462da14bdf9f443e8f38bfc4e3297142b2e4c35beef54f7d SHA512 26aba2f0b1b3d90b1db67277c584fd35c74868e4e0c70a530f9e2723493be9354add80015558c8eab9f26cd6083a2c0552214fa8011cb1efabd8dc104fa122fd WHIRLPOOL 503dca5d385116cccf0c0ecd2803a8936d00b76cbffafa50285784ab69c24729eef3a059339d8546e9cf585efa32bbf280445631fdd25b1bce826dbc183235bb
diff --git a/net-misc/iperf/files/iperf-3.0.5-flags.patch b/net-misc/iperf/files/iperf-3.0.5-flags.patch
new file mode 100644
index 000000000000..9c11c282c339
--- /dev/null
+++ b/net-misc/iperf/files/iperf-3.0.5-flags.patch
@@ -0,0 +1,31 @@
+* Do not inject -g
+* Do not make a profiled build
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,6 +1,6 @@
+ lib_LTLIBRARIES = libiperf.la # Build and install an iperf library
+ bin_PROGRAMS = iperf3 # Build and install an iperf binary
+-noinst_PROGRAMS = t_timer t_units t_uuid iperf3_profile # Build, but don't install the test programs and a profiled version of iperf3
++noinst_PROGRAMS = t_timer t_units t_uuid # Build, but don't install the test programs and a profiled version of iperf3
+ include_HEADERS = iperf_api.h # Defines the headers that get installed with the program
+
+
+@@ -37,14 +37,13 @@
+
+ # Specify the sources and various flags for the iperf binary
+ iperf3_SOURCES = main.c
+-iperf3_CFLAGS = -g
++iperf3_CFLAGS =
+ iperf3_LDADD = libiperf.la
+-iperf3_LDFLAGS = -g
++iperf3_LDFLAGS =
+
+ # Specify the sources and various flags for the profiled iperf binary. This
+ # binary recompiles all the source files to make sure they are all profiled.
+-iperf3_profile_SOURCES = main.c \
+- $(libiperf_la_SOURCES)
++iperf3_profile_SOURCES = main.c
+
+ iperf3_profile_CFLAGS = -pg -g
+ iperf3_profile_LDADD = libiperf.la
diff --git a/net-misc/iperf/files/iperf-bidirectional-tcp-server.patch b/net-misc/iperf/files/iperf-bidirectional-tcp-server.patch
index 571b73c9c664..88a1a4f00c4c 100644
--- a/net-misc/iperf/files/iperf-bidirectional-tcp-server.patch
+++ b/net-misc/iperf/files/iperf-bidirectional-tcp-server.patch
@@ -6,8 +6,8 @@ Author: Roberto Lumbreras
Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=449796
Forwarded: http://sourceforge.net/tracker/?func=detail&aid=1983829&group_id=128336&atid=711371
---- iperf-2.0.5.orig/src/Client.cpp
-+++ iperf-2.0.5/src/Client.cpp
+--- a/src/Client.cpp
++++ b/src/Client.cpp
@@ -212,10 +212,12 @@ void Client::Run( void ) {
char* readAt = mBuf;
diff --git a/net-misc/iperf/files/iperf-cast-to-max_size_t-instead-of-int.patch b/net-misc/iperf/files/iperf-cast-to-max_size_t-instead-of-int.patch
index 8919d81c012b..34d37eef671d 100644
--- a/net-misc/iperf/files/iperf-cast-to-max_size_t-instead-of-int.patch
+++ b/net-misc/iperf/files/iperf-cast-to-max_size_t-instead-of-int.patch
@@ -7,8 +7,8 @@ Author: Roberto Lumbreras
Bug-Debian: http://bugs.debian.org/346099
Forwarded: https://sourceforge.net/tracker/index.php?func=detail&aid=3140391&group_id=128336&atid=711371
---- iperf-2.0.4.orig/src/Settings.cpp.orig 2008-04-08 04:37:54.000000000 +0200
-+++ iperf-2.0.4/src/Settings.cpp 2008-05-07 17:41:03.923942801 +0200
+--- a/src/Settings.cpp
++++ b/src/Settings.cpp
@@ -458,7 +458,7 @@
case 't': // seconds to write for
// time mode (instead of amount mode)
diff --git a/net-misc/iperf/files/iperf-die-on-bind-fail.patch b/net-misc/iperf/files/iperf-die-on-bind-fail.patch
index 4dca6db8d985..1f54cf556d29 100644
--- a/net-misc/iperf/files/iperf-die-on-bind-fail.patch
+++ b/net-misc/iperf/files/iperf-die-on-bind-fail.patch
@@ -6,8 +6,8 @@ Author: Deny IP Any Any
Bug-Debian: http://bugs.debian.org/517239
Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3140400&group_id=128336&atid=711371
---- iperf-2.0.4/src/Listener.cpp 2009-02-23 16:20:31.000000000 -0500
-+++ iperf-2.0.4-fixed/src/Listener.cpp 2009-02-23 16:20:40.000000000 -0500
+--- a/src/Listener.cpp
++++ b/src/Listener.cpp
@@ -333,7 +333,7 @@
#endif
{
diff --git a/net-misc/iperf/files/iperf-fix-bandwidth-limit.patch b/net-misc/iperf/files/iperf-fix-bandwidth-limit.patch
index 12b8fb14e671..eb9df8cd31b3 100644
--- a/net-misc/iperf/files/iperf-fix-bandwidth-limit.patch
+++ b/net-misc/iperf/files/iperf-fix-bandwidth-limit.patch
@@ -5,10 +5,8 @@
low bandwidth limit was specified.
-Index: compat/delay.cpp
-===================================================================
---- compat/delay.cpp (revision 81)
-+++ compat/delay.cpp (working copy)
+--- a/compat/delay.cpp
++++ b/compat/delay.cpp
@@ -63,8 +63,9 @@ void delay_loop(unsigned long usec)
{
struct timespec requested, remaining;
diff --git a/net-misc/iperf/files/iperf-fix-format-security-ftbfs.patch b/net-misc/iperf/files/iperf-fix-format-security-ftbfs.patch
index ee2e67b085d0..2f5b03277209 100644
--- a/net-misc/iperf/files/iperf-fix-format-security-ftbfs.patch
+++ b/net-misc/iperf/files/iperf-fix-format-security-ftbfs.patch
@@ -3,9 +3,8 @@ Description: iperf format string FTBFS with -Werror=format-security
Author: Simon Paillard
Bug-Debian: http://bugs.debian.org/643408
-diff -Nur iperf-2.0.5/compat/Thread.c iperf-2.0.5-nmu/compat/Thread.c
---- iperf-2.0.5/compat/Thread.c 2010-03-31 01:08:24.000000000 +0200
-+++ iperf-2.0.5-nmu/compat/Thread.c 2011-11-15 09:13:32.000000000 +0100
+--- a/compat/Thread.c
++++ b/compat/Thread.c
@@ -381,7 +381,7 @@
Condition_Lock( thread_sNum_cond );
thread_sNum -= nonterminating_num;
@@ -15,9 +14,8 @@ diff -Nur iperf-2.0.5/compat/Thread.c iperf-2.0.5-nmu/compat/Thread.c
}
nonterminating_num = 0;
Condition_Signal( &thread_sNum_cond );
-diff -Nur iperf-2.0.5/src/ReportDefault.c iperf-2.0.5-nmu/src/ReportDefault.c
---- iperf-2.0.5/src/ReportDefault.c 2010-03-31 00:57:17.000000000 +0200
-+++ iperf-2.0.5-nmu/src/ReportDefault.c 2011-11-15 09:16:52.000000000 +0100
+--- a/src/ReportDefault.c
++++ b/src/ReportDefault.c
@@ -78,7 +78,7 @@
if ( stats->mUDP != (char)kMode_Server ) {
// TCP Reporting
@@ -63,9 +61,8 @@ diff -Nur iperf-2.0.5/src/ReportDefault.c iperf-2.0.5-nmu/src/ReportDefault.c
} else {
mtu = inMSS + 40;
net = "unknown interface";
-diff -Nur iperf-2.0.5/src/Reporter.c iperf-2.0.5-nmu/src/Reporter.c
---- iperf-2.0.5/src/Reporter.c 2011-11-15 19:44:41.000000000 +0100
-+++ iperf-2.0.5-nmu/src/Reporter.c 2011-11-15 09:17:14.000000000 +0100
+--- a/src/Reporter.c
++++ b/src/Reporter.c
@@ -896,7 +896,7 @@
} else if ( checkMSS_MTU( inMSS, 576 ) ) {
net = "minimum";
@@ -75,9 +72,8 @@ diff -Nur iperf-2.0.5/src/Reporter.c iperf-2.0.5-nmu/src/Reporter.c
} else {
mtu = inMSS + 40;
net = "unknown interface";
-diff -Nur iperf-2.0.5/src/Settings.cpp iperf-2.0.5-nmu/src/Settings.cpp
---- iperf-2.0.5/src/Settings.cpp 2011-11-15 19:44:41.000000000 +0100
-+++ iperf-2.0.5-nmu/src/Settings.cpp 2011-11-15 09:18:46.000000000 +0100
+--- a/src/Settings.cpp
++++ b/src/Settings.cpp
@@ -375,8 +375,8 @@
break;
diff --git a/net-misc/iperf/files/iperf-ipv6_mcast_check.patch b/net-misc/iperf/files/iperf-ipv6_mcast_check.patch
index cd700a6b67c1..bef05259a4d8 100644
--- a/net-misc/iperf/files/iperf-ipv6_mcast_check.patch
+++ b/net-misc/iperf/files/iperf-ipv6_mcast_check.patch
@@ -9,8 +9,8 @@ Description: Fix improper check for IPv6 family when sending multicast
Author: Luca Bruno
Last-Update: 2012-05-24
---- iperf-2.0.5.orig/src/PerfSocket.cpp
-+++ iperf-2.0.5/src/PerfSocket.cpp
+--- a/src/PerfSocket.cpp
++++ b/src/PerfSocket.cpp
@@ -109,7 +109,7 @@ void SetSocketOptions( thread_Settings *
if ( isMulticast( inSettings ) && ( inSettings->mTTL > 0 ) ) {
int val = inSettings->mTTL;
diff --git a/net-misc/iperf/files/iperf.initd-r1 b/net-misc/iperf/files/iperf.initd-r1
index bc08a4adf00b..fad99653e884 100644
--- a/net-misc/iperf/files/iperf.initd-r1
+++ b/net-misc/iperf/files/iperf.initd-r1
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# 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/net-misc/iperf/files/iperf.initd-r1,v 1.1 2013/09/05 16:04:40 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/files/iperf.initd-r1,v 1.2 2014/07/19 13:45:42 jer Exp $
description="IP bandwidth measurement server"
command="/usr/bin/iperf"
@@ -10,10 +10,6 @@ command_background="yes"
pidfile="/run/${SVCNAME}.pid"
command_args="-s ${IPERF_OPTS}"
-# note: iperf has a daemon flag but we seem to hit a bug
+# note: iperf has a -D/--daemon flag but we seem to hit a bug
# where it starts to eat all CPU after client disconnect,
# see bug #344875
-
-depend() {
- need net
-}
diff --git a/net-misc/iperf/iperf-2.0.5-r1.ebuild b/net-misc/iperf/iperf-2.0.5-r1.ebuild
index ca3a47a256ae..98877b2d8dc9 100644
--- a/net-misc/iperf/iperf-2.0.5-r1.ebuild
+++ b/net-misc/iperf/iperf-2.0.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/iperf-2.0.5-r1.ebuild,v 1.2 2012/10/06 13:43:23 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/iperf-2.0.5-r1.ebuild,v 1.3 2014/07/19 18:08:04 jer Exp $
EAPI="4"
@@ -11,7 +11,7 @@ HOMEPAGE="http://iperf.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="HPND"
-SLOT="0"
+SLOT="2"
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
IUSE="ipv6 threads debug"
diff --git a/net-misc/iperf/iperf-2.0.5-r2.ebuild b/net-misc/iperf/iperf-2.0.5-r2.ebuild
index 2c8ea547bb1b..64a57cabaeae 100644
--- a/net-misc/iperf/iperf-2.0.5-r2.ebuild
+++ b/net-misc/iperf/iperf-2.0.5-r2.ebuild
@@ -1,9 +1,8 @@
-# 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/net-misc/iperf/iperf-2.0.5-r2.ebuild,v 1.1 2013/09/05 16:04:40 dev-zero Exp $
-
-EAPI="5"
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/iperf-2.0.5-r2.ebuild,v 1.3 2014/07/19 18:08:04 jer Exp $
+EAPI=5
inherit base
DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
@@ -11,20 +10,17 @@ HOMEPAGE="http://iperf.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="HPND"
-SLOT="0"
+SLOT="2"
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
IUSE="ipv6 threads debug"
-DEPEND=""
-RDEPEND=""
-
PATCHES=(
- "${FILESDIR}"/"${PN}"-fix-bandwidth-limit.patch
- "${FILESDIR}"/"${PN}"-cast-to-max_size_t-instead-of-int.patch
- "${FILESDIR}"/"${PN}"-die-on-bind-fail.patch
- "${FILESDIR}"/"${PN}"-bidirectional-tcp-server.patch
- "${FILESDIR}"/"${PN}"-fix-format-security-ftbfs.patch
- "${FILESDIR}"/"${PN}"-ipv6_mcast_check.patch
+ "${FILESDIR}"/${PN}-fix-bandwidth-limit.patch
+ "${FILESDIR}"/${PN}-cast-to-max_size_t-instead-of-int.patch
+ "${FILESDIR}"/${PN}-die-on-bind-fail.patch
+ "${FILESDIR}"/${PN}-bidirectional-tcp-server.patch
+ "${FILESDIR}"/${PN}-fix-format-security-ftbfs.patch
+ "${FILESDIR}"/${PN}-ipv6_mcast_check.patch
)
DOCS="INSTALL README"
@@ -41,10 +37,3 @@ src_install() {
newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
newconfd "${FILESDIR}"/${PN}.confd ${PN}
}
-
-pkg_postinst() {
- echo
- einfo "To run iperf in server mode, run:"
- einfo " /etc/init.d/iperf start"
- echo
-}
diff --git a/net-misc/iperf/iperf-2.0.5.ebuild b/net-misc/iperf/iperf-2.0.5.ebuild
index 674d3dd839bb..3e442e655263 100644
--- a/net-misc/iperf/iperf-2.0.5.ebuild
+++ b/net-misc/iperf/iperf-2.0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/iperf-2.0.5.ebuild,v 1.8 2012/10/06 13:43:23 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/iperf-2.0.5.ebuild,v 1.9 2014/07/19 18:08:04 jer Exp $
EAPI="2"
@@ -9,7 +9,7 @@ HOMEPAGE="http://iperf.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="HPND"
-SLOT="0"
+SLOT="2"
KEYWORDS="amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
IUSE="ipv6 threads debug"
diff --git a/net-misc/iperf/iperf-3.0.5.ebuild b/net-misc/iperf/iperf-3.0.5.ebuild
new file mode 100644
index 000000000000..304ea61bf493
--- /dev/null
+++ b/net-misc/iperf/iperf-3.0.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/iperf-3.0.5.ebuild,v 1.3 2014/07/19 18:08:04 jer Exp $
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
+LICENSE="BSD"
+SLOT="3"
+HOMEPAGE="https://github.com/esnet/iperf/"
+SRC_URI="https://codeload.github.com/esnet/${PN}/tar.gz/${PV} -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+IUSE="static-libs"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-flags.patch
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ prune_libtool_files
+}
diff --git a/net-misc/lanmap/files/lanmap-81-make.patch b/net-misc/lanmap/files/lanmap-81-make.patch
new file mode 100644
index 000000000000..b92d6f611f72
--- /dev/null
+++ b/net-misc/lanmap/files/lanmap-81-make.patch
@@ -0,0 +1,66 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -2,8 +2,8 @@
+ # $Id: lanmap-81-make.patch,v 1.1 2014/07/18 17:01:09 jer Exp $
+
+ # complation
+-CFLAGS = -W -Wall -Wno-unused -DLINUX -DLANMAP_DATADIR=$(LANMAP_DATADIR)
+-LDFLAGS = -lpcap -lm
++CFLAGS += -DLINUX -DLANMAP_DATADIR=$(LANMAP_DATADIR)
++LDFLAGS += -lpcap -lm
+ CFLAGS_DEBUG = -D_DEBUG -ggdb
+ LDFLAGS_DEBUG = -pg
+ BINARY = lanmap
+@@ -14,12 +14,12 @@
+ $(CC) $(OBJS) -o $(BINARY) $(LDFLAGS)
+
+ static:
+- make clean
+- make LDFLAGS="$(LDFLAGS) -static" all
++ $(MAKE) clean
++ $(MAKE) LDFLAGS="$(LDFLAGS) -static" all
+
+ debug:
+- make clean
+- make CFLAGS="$(CFLAGS) $(CFLAGS_DEBUG)" LDFLAGS="$(LDFLAGS)" all
++ $(MAKE) clean
++ $(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_DEBUG)" LDFLAGS="$(LDFLAGS)" all
+
+ # for testing the classify code by itself
+ os_classify: os_classify.c misc.c
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -10,16 +10,16 @@
+ DATADEST = ${prefix}/share/lanmap/
+
+ all:
+- cd ./src && make LANMAP_DATADIR="$(DATADEST)"
++ cd ./src && $(MAKE) LANMAP_DATADIR="$(DATADEST)"
+
+ install:
+- install -m 0755 ./src/$(BINARY) $(BINDEST)
++ install -m 0755 -D ./src/$(BINARY) $(BINDEST)/$(BINARY)
+ install -m 0755 -d $(DATADEST)
+ install -m 0755 -d $(DATADEST)data/
+ install -m 0755 -d $(DATADEST)data/graph/
+ install -m 0755 -d $(DATADEST)graph/img/
+ install -m 0644 ./data/mac_vendor $(DATADEST)data/
+- install -m 0644 -d $(DATADEST)graph
++ install -m 0755 -d $(DATADEST)graph
+ install -m 0644 ./graph/lanmap.header $(DATADEST)graph/
+ for f in ./graph/img/*.{png,gif,svg}; do install -m 0644 $$f $(DATADEST)graph/img/; done
+
+@@ -29,11 +29,11 @@
+
+ clean:
+ rm -f ./src/$(BINARY)
+- cd ./src && make clean
++ cd ./src && $(MAKE) clean
+
+ distclean: clean
+ rm -f Makefile config.cache config.log config.status config.h
+
+ debug:
+- cd ./src && make debug
++ cd ./src && $(MAKE) debug
+
diff --git a/net-misc/lanmap/files/makefile.patch b/net-misc/lanmap/files/makefile.patch
deleted file mode 100644
index 2977370d121b..000000000000
--- a/net-misc/lanmap/files/makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- lanmap/src/Makefile.in 2006-03-07 15:44:32.000000000 +0100
-+++ lanmap/src/Makefile.in.new 2008-12-02 16:08:13.000000000 +0100
-@@ -2,8 +2,8 @@
- # $Id: makefile.patch,v 1.1 2009/12/25 05:56:25 darkside Exp $
-
- # complation
--CFLAGS = -W -Wall -Wno-unused -DLINUX -DLANMAP_DATADIR=$(LANMAP_DATADIR)
--LDFLAGS = -lpcap -lm
-+CFLAGS += -DLINUX -DLANMAP_DATADIR=$(LANMAP_DATADIR)
-+LDFLAGS += -lpcap -lm
- CFLAGS_DEBUG = -D_DEBUG -ggdb
- LDFLAGS_DEBUG = -pg
- BINARY = lanmap
---- lanmap/Makefile.in 2008-12-03 14:40:22.000000000 +0100
-+++ lanmap/Makefile.in.new 2008-12-03 14:40:33.000000000 +0100
-@@ -13,7 +13,7 @@
- cd ./src && make LANMAP_DATADIR="$(DATADEST)"
-
- install:
-- install -m 0755 ./src/$(BINARY) $(BINDEST)
-+ install -m 0755 -D ./src/$(BINARY) $(BINDEST)/$(BINARY)
- install -m 0755 -d $(DATADEST)
- install -m 0755 -d $(DATADEST)data/
- install -m 0755 -d $(DATADEST)data/graph/
diff --git a/net-misc/lanmap/lanmap-81-r1.ebuild b/net-misc/lanmap/lanmap-81-r1.ebuild
index 6ba929b24ada..ed4231a7ee33 100644
--- a/net-misc/lanmap/lanmap-81-r1.ebuild
+++ b/net-misc/lanmap/lanmap-81-r1.ebuild
@@ -1,10 +1,9 @@
-# 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/net-misc/lanmap/lanmap-81-r1.ebuild,v 1.5 2013/09/26 01:29:27 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lanmap/lanmap-81-r1.ebuild,v 1.6 2014/07/18 17:01:09 jer Exp $
EAPI=5
-
-inherit toolchain-funcs eutils
+inherit autotools eutils toolchain-funcs
DESCRIPTION="lanmap sits quietly on a network and builds a picture of what it sees"
HOMEPAGE="http://www.parseerror.com/lanmap"
@@ -13,26 +12,30 @@ SRC_URI="http://www.parseerror.com/${PN}/rev/${PN}-2006-03-07-rev${PV}.zip"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE=""
-RDEPEND="net-libs/libpcap
- media-gfx/graphviz"
-DEPEND="${RDEPEND}
- app-arch/unzip"
+CDEPEND="net-libs/libpcap"
+RDEPEND="
+ ${CDEPEND}
+ media-gfx/graphviz
+"
+DEPEND="
+ ${CDEPEND}
+ app-arch/unzip
+"
-S="${WORKDIR}"/${PN}
+S=${WORKDIR}/${PN}
src_prepare() {
- epatch "${FILESDIR}"/makefile.patch
- sed -e 's:install -m 0644 -d:install -m 0755 -d:' -i Makefile.in || die
- chmod +x configure || die
+ epatch "${FILESDIR}"/${P}-make.patch
+ rm configure || die
+ eautoreconf
}
src_compile() {
- emake -j1 CC="$(tc-getCC)"
+ emake CC="$(tc-getCC)"
}
src_install() {
emake prefix="${ED}"/usr install
- dodoc {README,TODO}.txt
+ dodoc README.txt TODO.txt
}
diff --git a/net-misc/netkit-rwho/Manifest b/net-misc/netkit-rwho/Manifest
index c64b4a612483..1802cc70b712 100644
--- a/net-misc/netkit-rwho/Manifest
+++ b/net-misc/netkit-rwho/Manifest
@@ -1,2 +1,2 @@
-DIST netkit-rwho-0.17-patches.tar.gz 8077 RMD160 c394cc6e0d6a3641d497841175159418f20d2056 SHA1 6c98fcffac887d571022f36960d4fcb4c4656fb6 SHA256 e10fadd2d32981723ac0d0c22c93f7ba0398b463dfab6f39871cdcf0e13911f5
-DIST netkit-rwho-0.17.tar.gz 20610 RMD160 537786b51927c8235e5cfa92683ced6870d54747 SHA1 19dcd517bec846c788aee6307dfd4bf451793ec6 SHA256 0409e2ce4bfdb2dacb2c193d0fedfc49bb975cb057c5c6b0ffcca603a1188da7
+DIST netkit-rwho-0.17-patches.tar.bz2 7725 SHA256 c666d60fa21538f909374cdc1a3e661875559c3859f759fe060f35047dc3e54e SHA512 947f62316220791af7f36eee3d44481224ebda3410fb3e527fb1f066a663f56d6aec44483955edbbff1936972e86aeff9d6905d123ed78cb10d72ee6cb0f7454 WHIRLPOOL 5b8c47050a44ee3a80b6b622da9b947e30176d535cce2682a160df3c46153a321d279a30386df4aa21c69bdb12ecbaf20e0fa5867648e96917697f3ede394842
+DIST netkit-rwho-0.17.tar.gz 20610 SHA256 0409e2ce4bfdb2dacb2c193d0fedfc49bb975cb057c5c6b0ffcca603a1188da7 SHA512 ea1444b613d95f53100cf8f8d374dd132611432380b9142182c4fb5595014605896656b9a272945534371265e226fe591c22c12a9bdde9c763794249660e7b58 WHIRLPOOL 65a7d4851cba7c94d240e56e254df4978741eb780dd269063773620289894cc7269e5491e5955c22746345f4e4191379d10a022a1317a091a1e3a13210de1418
diff --git a/net-misc/netkit-rwho/netkit-rwho-0.17-r3.ebuild b/net-misc/netkit-rwho/netkit-rwho-0.17-r3.ebuild
deleted file mode 100644
index f68447333dec..000000000000
--- a/net-misc/netkit-rwho/netkit-rwho-0.17-r3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rwho/netkit-rwho-0.17-r3.ebuild,v 1.3 2010/10/18 13:39:05 leio Exp $
-
-inherit eutils
-
-DESCRIPTION="Netkit - ruptime/rwho/rwhod"
-HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html"
-SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz
- mirror://gentoo/${PN}-0.17-patches.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~mips ppc s390 sh sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- >=sys-apps/sed-4"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${WORKDIR}"/${P}-tiny-packet-dos.patch
- epatch "${WORKDIR}"/${P}-gentoo.diff
- epatch "${WORKDIR}"/${P}-debian.patch
-}
-
-src_compile() {
- ./configure || die "configure failed"
- sed -i \
- -e "s:-O2::" \
- -e "s:-Wpointer-arith::" \
- MCONFIG
- emake || die "emake failed"
-}
-
-src_install() {
- keepdir /var/spool/rwho
-
- into /usr
- dobin ruptime/ruptime rwho/rwho || die "dobin failed"
- dosbin rwhod/rwhod || die "dosbin failed"
- doman ruptime/ruptime.1 rwho/rwho.1 rwhod/rwhod.8
- dodoc README ChangeLog
-
- newinitd "${FILESDIR}"/${P}-rc rwhod
- newconfd "${FILESDIR}"/${P}-confd rwhod
-
- exeinto /etc/cron.monthly
- doexe "${FILESDIR}"/${P}-cron
-}
diff --git a/net-misc/netkit-rwho/netkit-rwho-0.17-r4.ebuild b/net-misc/netkit-rwho/netkit-rwho-0.17-r4.ebuild
index d2c6fbb8b086..6e4421b8f84e 100644
--- a/net-misc/netkit-rwho/netkit-rwho-0.17-r4.ebuild
+++ b/net-misc/netkit-rwho/netkit-rwho-0.17-r4.ebuild
@@ -1,45 +1,41 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rwho/netkit-rwho-0.17-r4.ebuild,v 1.6 2012/02/06 18:28:19 ranger Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rwho/netkit-rwho-0.17-r4.ebuild,v 1.7 2014/07/18 19:45:52 jer Exp $
+EAPI=5
inherit eutils toolchain-funcs
DESCRIPTION="Netkit - ruptime/rwho/rwhod"
HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html"
-SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz
- mirror://gentoo/${PN}-0.17-patches.tar.gz"
+SRC_URI="
+ ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz
+ https://dev.gentoo.org/~jer/${P}-patches.tar.bz2
+"
LICENSE="BSD"
SLOT="0"
KEYWORDS="alpha amd64 arm ~mips ppc s390 sh sparc x86"
-IUSE=""
src_prepare() {
- epatch "${WORKDIR}"/${P}-tiny-packet-dos.patch
- epatch "${WORKDIR}"/${P}-gentoo.diff
- epatch "${WORKDIR}"/${P}-debian.patch
- sed -i configure \
- -e '/^LDFLAGS=/d' \
- || die "sed configure"
+ epatch "${WORKDIR}"/000{1,2,3,4}-*.patch
}
src_configure() {
# Not an autotools build system
- ./configure --with-c-compiler=$(tc-getCC) || die "configure failed"
- sed -i MCONFIG \
+ ./configure --with-c-compiler=$(tc-getCC) || die
+ sed -i \
-e "s:-O2::" \
-e "s:-Wpointer-arith::" \
- || die "sed MCONFIG"
+ MCONFIG || die
}
src_install() {
keepdir /var/spool/rwho
into /usr
- dobin ruptime/ruptime rwho/rwho || die "dobin failed"
- dosbin rwhod/rwhod || die "dosbin failed"
+ dobin ruptime/ruptime rwho/rwho
+ dosbin rwhod/rwhod
+
doman ruptime/ruptime.1 rwho/rwho.1 rwhod/rwhod.8
dodoc README ChangeLog
diff --git a/net-misc/netpipes/metadata.xml b/net-misc/netpipes/metadata.xml
index 0ebac93c7981..03aa50bab7e3 100644
--- a/net-misc/netpipes/metadata.xml
+++ b/net-misc/netpipes/metadata.xml
@@ -2,6 +2,4 @@
netmon
-the network swiss army knife
-ネットワークにおけるスイス・アーミ・ナイフです。
diff --git a/net-misc/netpipes/netpipes-4.2-r1.ebuild b/net-misc/netpipes/netpipes-4.2-r1.ebuild
deleted file mode 100644
index 537205b888d9..000000000000
--- a/net-misc/netpipes/netpipes-4.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netpipes/netpipes-4.2-r1.ebuild,v 1.4 2013/11/29 16:34:26 jer Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="netpipes - a package to manipulate BSD TCP/IP stream sockets"
-HOMEPAGE="http://web.purplefrog.com/~thoth/netpipes/"
-SRC_URI="http://web.purplefrog.com/~thoth/netpipes/ftp/${P}-export.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S="${WORKDIR}/${P}-export"
-
-src_prepare() {
- sed -i \
- -e 's/CFLAGS =/CFLAGS +=/' \
- -e '/ -o /s:${CFLAGS}:& $(LDFLAGS):g' \
- Makefile || die "sed failed"
-
- epatch "${FILESDIR}/${P}-string.patch"
-}
-
-src_compile () {
- emake CC=$(tc-getCC) || die
-}
-
-src_install() {
- mkdir -p "${D}"/usr/share/man || die
- emake INSTROOT="${D}"/usr INSTMAN="${D}"/usr/share/man install || die
-}
diff --git a/net-misc/netpipes/netpipes-4.2-r2.ebuild b/net-misc/netpipes/netpipes-4.2-r2.ebuild
index 356a208c2860..f01fedce03b5 100644
--- a/net-misc/netpipes/netpipes-4.2-r2.ebuild
+++ b/net-misc/netpipes/netpipes-4.2-r2.ebuild
@@ -1,21 +1,19 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netpipes/netpipes-4.2-r2.ebuild,v 1.3 2014/05/04 08:27:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netpipes/netpipes-4.2-r2.ebuild,v 1.4 2014/07/18 19:53:46 jer Exp $
EAPI=5
-
inherit eutils toolchain-funcs
-DESCRIPTION="netpipes - a package to manipulate BSD TCP/IP stream sockets"
+DESCRIPTION="a package to manipulate BSD TCP/IP stream sockets"
HOMEPAGE="http://web.purplefrog.com/~thoth/netpipes/"
SRC_URI="http://web.purplefrog.com/~thoth/netpipes/ftp/${P}-export.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE=""
-S="${WORKDIR}/${P}-export"
+S=${WORKDIR}/${P}-export
src_prepare() {
sed -i \
@@ -23,7 +21,7 @@ src_prepare() {
-e '/ -o /s:${CFLAGS}:$(CFLAGS) $(LDFLAGS):g' \
Makefile || die
- epatch "${FILESDIR}/${P}-string.patch"
+ epatch "${FILESDIR}/${P}"-string.patch
}
src_compile () {
@@ -31,6 +29,6 @@ src_compile () {
}
src_install() {
- mkdir -p "${D}"/usr/share/man || die
+ dodir /usr/share/man
emake INSTROOT="${D}"/usr INSTMAN="${D}"/usr/share/man install
}
diff --git a/net-misc/netstat-nat/Manifest b/net-misc/netstat-nat/Manifest
index 1eebbeb9541a..0741ac0c2b3c 100644
--- a/net-misc/netstat-nat/Manifest
+++ b/net-misc/netstat-nat/Manifest
@@ -1,2 +1 @@
-DIST netstat-nat-1.4.10.tar.gz 83865 RMD160 9de334758d6996de215487c40591a590cdcd577f SHA1 665b4aff9939d124b055e34a89838e309b745c50 SHA256 e945faa283a49f33af15de915a949c9273a230fc17154925364c547adab676ca
-DIST netstat-nat-1.4.9.tar.gz 84292 RMD160 06852bc50d1009eaf785477dbebb6fc03af6cefd SHA1 3eb770517f9f978b41888f0fd55c7b341f84c1ef SHA256 95da25629e68b65dda4b1f960bbcd3586d7eca38cd9864be1efaa083ecf200de
+DIST netstat-nat-1.4.10.tar.gz 83865 SHA256 e945faa283a49f33af15de915a949c9273a230fc17154925364c547adab676ca SHA512 2089119b26039e656fbe76701e556f7d766159c96b18968195f255e15072af37972c83a8f05edb0b767a12f0521598975673d10d8ba5e6ed6b754a927d4f069d WHIRLPOOL 531c2989a69e26d2b66657727e0a30aebb57f689be458d6df8339adfb9f47b1cadf438c917ef49e1859c8b239379c9cd991528be887f734b833741e15aadc838
diff --git a/net-misc/netstat-nat/files/netstat-nat-1.4.10-install.patch b/net-misc/netstat-nat/files/netstat-nat-1.4.10-install.patch
index 79cf31fd64af..f56300fb432c 100644
--- a/net-misc/netstat-nat/files/netstat-nat-1.4.10-install.patch
+++ b/net-misc/netstat-nat/files/netstat-nat-1.4.10-install.patch
@@ -1,5 +1,5 @@
---- Makefile.am.org 2005-01-01 18:02:24.000000000 +0100
-+++ Makefile.am 2010-05-11 02:21:49.000000000 +0200
+--- a/Makefile.am
++++ b/Makefile.am
@@ -1,7 +1,7 @@
bin_PROGRAMS = netstat-nat
netstat_nat_SOURCES = netstat-nat.c netstat-nat.h
diff --git a/net-misc/netstat-nat/metadata.xml b/net-misc/netstat-nat/metadata.xml
index 91571c76c0ae..03aa50bab7e3 100644
--- a/net-misc/netstat-nat/metadata.xml
+++ b/net-misc/netstat-nat/metadata.xml
@@ -2,5 +2,4 @@
netmon
-Networks status program for NAT (network address translation) connections
diff --git a/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild b/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild
index cef3670ea82c..13ee6d3f4b1f 100644
--- a/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild
+++ b/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild,v 1.7 2012/04/15 04:04:58 heroxbd Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild,v 1.8 2014/07/18 19:58:26 jer Exp $
+EAPI=5
inherit autotools eutils
DESCRIPTION="Display NAT connections"
@@ -13,15 +12,8 @@ SRC_URI="http://tweegy.nl/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~arm ppc sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
src_prepare() {
epatch "${FILESDIR}"/${P}-install.patch
eautoreconf
}
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
-}
diff --git a/net-misc/netstat-nat/netstat-nat-1.4.9.ebuild b/net-misc/netstat-nat/netstat-nat-1.4.9.ebuild
deleted file mode 100644
index d418f3a196b9..000000000000
--- a/net-misc/netstat-nat/netstat-nat-1.4.9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netstat-nat/netstat-nat-1.4.9.ebuild,v 1.6 2012/05/21 19:14:33 xarthisius Exp $
-
-inherit autotools eutils
-
-DESCRIPTION="Display NAT connections"
-HOMEPAGE="http://tweegy.demon.nl/projects/netstat-nat/index.html"
-SRC_URI="http://tweegy.demon.nl/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
- unpack ${A}
-
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-1.4.10-install.patch
- eautoreconf
-}
-src_install() {
- make DESTDIR="${D}" install || die "make install failed"
-}
diff --git a/net-misc/packETH/Manifest b/net-misc/packETH/Manifest
index 70b523e68a8e..8f0837a46cf8 100644
--- a/net-misc/packETH/Manifest
+++ b/net-misc/packETH/Manifest
@@ -1,2 +1,2 @@
-DIST packETH-1.7.1.tar.bz2 397224 SHA256 0458e223def847d3450837db77885f3a94cd14d776b08419c91e2fbfcef58067 SHA512 c6522b9af42a28d7e50effcd59eeb489e8c7dc9618b66f6ed599f5d4689fbf45ad36eb9adf5cc858163608859ac9847948d38ac139720ae482987daa14e7aa12 WHIRLPOOL ff7181e5eb798957662c52ac0078033361c96710bf992f21f829f050367abd983ab762b355fe06ac47ef869c2be3a0106ebac9a2252a7d7cfd8992e71ac226a9
DIST packETH-1.7.2.tar.bz2 403655 SHA256 3bccfcc2fad3c68ae1489f73944421f438635c152c43b968dd0c20899351207e SHA512 110f66ea130a20491648df603bf83f54bd216c55f71bfa19e8e5d7c77fdc616a731cc5d540dd9b5c5ac6e762956bf4cff08d75d3b848a3714011162079a3ca78 WHIRLPOOL da05c1a2de0cd551c2268124b6a41eb06e4b8c83a10d5a1a38c21cab082a53638338955211e680e7920dca3f4f1c5643701f10e1db7c0661dfec7f8e284d0842
+DIST packETH-1.7.3.tar.gz 395666 SHA256 47c37918abc6d507aa4599e92ccd913d07cf8d73c44f247b661a1891188c29e6 SHA512 349fd579bbbbbbbe2ca96374c8083ecf047a1c5f51626341bd7f98b4c8a29b74342311e45950a3f2628ba53dba250135c3802556b6aa5c49181e72313a7256d5 WHIRLPOOL 8342cfd373217b400c9f1f59020dfcb4ad9ad3fc34a71d7080847242baeeefa1a77562ad25878c0634956d6a5e7fc76299042d7d18b98f6ab1d1b724ab216a55
diff --git a/net-misc/packETH/files/packETH-1.6.5-forced-as-needed.patch b/net-misc/packETH/files/packETH-1.6.5-forced-as-needed.patch
deleted file mode 100644
index df0f5c8b0f10..000000000000
--- a/net-misc/packETH/files/packETH-1.6.5-forced-as-needed.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'Makefile.am'
---- Makefile.am 2010-05-25 08:09:22 +0000
-+++ Makefile.am 2010-05-25 08:19:14 +0000
-@@ -29,7 +29,7 @@
- DEFS= \
- -DPKGDATADIR=\"$(pkgdatadir)/\"
-
--AM_LDFLAGS=$(DEPS_LIBS)
-+packETH_LDADD=$(DEPS_LIBS)
-
- AM_CPPFLAGS = \
- -g \
-
diff --git a/net-misc/packETH/files/packETH-1.7.1-gdk-pixbuf.patch b/net-misc/packETH/files/packETH-1.7.1-gdk-pixbuf.patch
deleted file mode 100644
index 3dac1b825e92..000000000000
--- a/net-misc/packETH/files/packETH-1.7.1-gdk-pixbuf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig 2010-10-05 18:28:18.000000000 +0200
-+++ configure.ac 2011-03-24 18:35:57.000000000 +0100
-@@ -20,7 +20,7 @@
- AC_CHECK_HEADERS([libintl.h netdb.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h sys/timeb.h unistd.h])
-
- # We need GTK
--pkg_modules="gtk+-2.0 >= 2.4 glib-2.0 >= 2.4 gthread-2.0 >= 2.4"
-+pkg_modules="gtk+-2.0 >= 2.4 glib-2.0 >= 2.4 gthread-2.0 >= 2.4 gdk-pixbuf-2.0"
- PKG_CHECK_MODULES(DEPS, [$pkg_modules])
-
- # Checks for library functions.
diff --git a/net-misc/packETH/files/packETH-1.7.3-libs-and-flags.patch b/net-misc/packETH/files/packETH-1.7.3-libs-and-flags.patch
new file mode 100644
index 000000000000..fc0efb7e309a
--- /dev/null
+++ b/net-misc/packETH/files/packETH-1.7.3-libs-and-flags.patch
@@ -0,0 +1,15 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -30,11 +30,9 @@
+ DEFS= \
+ -DPKGDATADIR=\"$(pkgdatadir)/\"
+
+-LIBS=$(DEPS_LIBS)
++LIBS+=$(DEPS_LIBS)
+
+ AM_CPPFLAGS = \
+- -g \
+- -O2 \
+ -Wall \
+ -Wmissing-prototypes \
+ -Wmissing-declarations \
diff --git a/net-misc/packETH/packETH-1.7.1.ebuild b/net-misc/packETH/packETH-1.7.1.ebuild
deleted file mode 100644
index 7c6baaf14a35..000000000000
--- a/net-misc/packETH/packETH-1.7.1.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/net-misc/packETH/packETH-1.7.1.ebuild,v 1.5 2012/05/05 03:20:45 jdhore Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs autotools
-
-DESCRIPTION="Packet generator tool for ethernet"
-HOMEPAGE="http://packeth.sourceforge.net/"
-SRC_URI="mirror://sourceforge/packeth/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
- x11-libs/gtk+:2
- x11-libs/gdk-pixbuf
-"
-DEPEND="
- virtual/pkgconfig
- ${RDEPEND}
-"
-
-S="${WORKDIR}/${P/.1}"
-
-src_prepare() {
- epatch \
- "${FILESDIR}/${PN}-1.6.5-forced-as-needed.patch" \
- "${FILESDIR}/${P}-gdk-pixbuf.patch"
- eautomake
-}
-
-src_compile() {
- tc-export CC
- default
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS README || die
-}
diff --git a/net-misc/packETH/packETH-1.7.3.ebuild b/net-misc/packETH/packETH-1.7.3.ebuild
new file mode 100644
index 000000000000..ff38092e2d03
--- /dev/null
+++ b/net-misc/packETH/packETH-1.7.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/packETH/packETH-1.7.3.ebuild,v 1.1 2014/07/18 20:17:37 jer Exp $
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Packet generator tool for ethernet"
+HOMEPAGE="http://packeth.sourceforge.net/"
+SRC_URI="mirror://sourceforge/packeth/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-libs/glib:2
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2
+"
+DEPEND="
+ virtual/pkgconfig
+ ${RDEPEND}
+"
+DOCS=( AUTHORS CHANGELOG README TODO )
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-libs-and-flags.patch
+ eautoreconf
+}
diff --git a/net-misc/pipes/Manifest b/net-misc/pipes/Manifest
index 928af34a54ab..15c3f96fc40c 100644
--- a/net-misc/pipes/Manifest
+++ b/net-misc/pipes/Manifest
@@ -1,2 +1,2 @@
-DIST pipes-1.16.1.tar.bz2 21642 RMD160 bd50b218ed799a54dc0731d609d94c6233a7eb30 SHA1 bdf459603b330d79b3cf4eb627bc6d6ae91f5ce3 SHA256 d7bb02f7e10ee91174a4d0d74ce61e1328d08be68d1ab3c235e63d2f34ada62c
-DIST pipes-1.16.tar.bz2 21441 RMD160 ebad7bad10855d1c6be1a5cca3fce4d42fe58cd7 SHA1 a41edb8b7ab6a597a3b3ca0bcef8b1fc73ff3aa5 SHA256 cd5366d8e1ee9a9135e61b976eafc4b2e36938cda81aaed6c281b0b438335150
+DIST pipes-1.16.1.tar.bz2 21642 SHA256 d7bb02f7e10ee91174a4d0d74ce61e1328d08be68d1ab3c235e63d2f34ada62c SHA512 ff8f6cf7934149c3d8a6e0443a06840863313acccd31791913fa25b086173e834d8f357212811e5e1ddb62148d3e687858e8956065734f11d7fc729f2a64b0a3 WHIRLPOOL 6ab87a0228451ad98746e5f9346922fcf6246c87b57e09a709781af478a546e49c521bd4b2bc0a7824776cf1dfd230bc7e61b3f1f12c41e19c87f09e2059a831
+DIST pipes-1.16.tar.bz2 21441 SHA256 cd5366d8e1ee9a9135e61b976eafc4b2e36938cda81aaed6c281b0b438335150
diff --git a/net-misc/pipes/pipes-1.16.1.ebuild b/net-misc/pipes/pipes-1.16.1.ebuild
index fd0ee4776e00..35b32645558d 100644
--- a/net-misc/pipes/pipes-1.16.1.ebuild
+++ b/net-misc/pipes/pipes-1.16.1.ebuild
@@ -1,10 +1,9 @@
-# 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/net-misc/pipes/pipes-1.16.1.ebuild,v 1.3 2011/12/15 16:23:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pipes/pipes-1.16.1.ebuild,v 1.4 2014/07/18 20:58:24 jer Exp $
-EAPI="3"
-
-inherit toolchain-funcs
+EAPI=5
+inherit eutils toolchain-funcs
DESCRIPTION="Very versatile TCP pipes"
HOMEPAGE="http://bisqwit.iki.fi/source/pipes.html"
@@ -13,25 +12,19 @@ SRC_URI="http://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~s390 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- >=sys-apps/sed-4"
src_prepare() {
- #sed -i Makefile -e 's:-O2:$(CFLAGS):' || die
# Prevent the build system from looking for dependencies
touch .depend || die
}
src_compile() {
- emake CC=$(tc-getCC) OPTIM="${CFLAGS}" LDFLAGS="${CFLAGS} ${LDFLAGS}" || die
+ emake CC=$(tc-getCC) OPTIM="${CFLAGS}" LDFLAGS="${CFLAGS} ${LDFLAGS}"
}
src_install() {
- dobin plis || die "dobin failed"
- dohard /usr/bin/plis /usr/bin/pcon || die "dohard failed"
+ dobin plis
+ dosym /usr/bin/plis /usr/bin/pcon
dodoc Examples ChangeLog
dohtml README.html
}
diff --git a/net-misc/switzerland/Manifest b/net-misc/switzerland/Manifest
index b6b2b93f302f..0108f71c1e82 100644
--- a/net-misc/switzerland/Manifest
+++ b/net-misc/switzerland/Manifest
@@ -1,2 +1 @@
-DIST switzerland-0.0.5.tgz 387352 SHA256 f4daa4d2cc2a4681be4e7ed692fabcc2196caf2e6096c6f49c7bd82266f01fe1
-DIST switzerland-0.1.0.tgz 592922 SHA256 759d7a3dfda9e71ee309410c741342393585e9a0328d8f0d7ebf2049f319bd60
+DIST switzerland-0.1.0.tgz 592922 SHA256 759d7a3dfda9e71ee309410c741342393585e9a0328d8f0d7ebf2049f319bd60 SHA512 3a5474c005bf45cddf8eede7c1e2faa5855bf9017f5c732555cfe2c8b7b82381ea25c2ada000a9945a330ff3af19f1e861a11508ff057c81a78eab53de1d0cdb WHIRLPOOL 8ac597d03a7ab39af9aad817ea850a5376e5fdacc4879df97a46fccfd97e7cc418dfc70f964873e618d8e9eee967b37fa1de80b5c75def0eb768219103455e0c
diff --git a/net-misc/switzerland/files/Makefile b/net-misc/switzerland/files/Makefile
index 39bcc0e426ff..c1e582d56dc4 100644
--- a/net-misc/switzerland/files/Makefile
+++ b/net-misc/switzerland/files/Makefile
@@ -1,18 +1,12 @@
SRC = FastCollector.c
OBJ = ${SRC:.c=.o}
-LIBS = -L/usr/lib -lpcap
-
-CFLAGS ?=
-LDFLAGS ?=
-
-CC = gcc
-LD = ${CC}
+LIBS = -lpcap
all: FastCollector
.c.o:
- ${CC} -c ${CFLAGS} $<
+ $(CC) -c $(CFLAGS) $<
-FastCollector: ${OBJ}
- ${LD} -o $@ ${CFLAGS} ${LDFLAGS} ${OBJ} ${LIBS}
+FastCollector: $(OBJ)
+ $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJ) $(LIBS)
diff --git a/net-misc/switzerland/switzerland-0.0.5.ebuild b/net-misc/switzerland/switzerland-0.0.5.ebuild
deleted file mode 100644
index ef2a431ee34f..000000000000
--- a/net-misc/switzerland/switzerland-0.0.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/switzerland/switzerland-0.0.5.ebuild,v 1.2 2011/04/05 20:20:11 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-
-inherit distutils toolchain-funcs
-
-DESCRIPTION="Switzerland Network Testing Tool"
-HOMEPAGE="http://www.eff.org/testyourisp/switzerland/"
-SRC_URI="mirror://sourceforge/switzerland/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="net-libs/libpcap"
-RDEPEND=${DEPEND}
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- cp "${FILESDIR}"/Makefile switzerland/client
-
- sed -i \
- -e "s/= find_binary()/= dest/" \
- setup.py
-}
-
-src_compile() {
- cd switzerland/client
- emake CC=$(tc-getCC) || die "emake failed"
-
- cd "${S}"
- distutils_src_compile
-}
-
-src_install() {
- distutils_src_install
-
- dodoc BUGS.txt CREDITS
-
- keepdir /var/log/switzerland-pcaps
- keepdir /var/log/switzerland
-}
diff --git a/net-misc/switzerland/switzerland-0.1.0.ebuild b/net-misc/switzerland/switzerland-0.1.0.ebuild
index c09eec2bc8ee..1c20e5c35ad4 100644
--- a/net-misc/switzerland/switzerland-0.1.0.ebuild
+++ b/net-misc/switzerland/switzerland-0.1.0.ebuild
@@ -1,47 +1,42 @@
-# 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/net-misc/switzerland/switzerland-0.1.0.ebuild,v 1.1 2011/05/08 20:31:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/switzerland/switzerland-0.1.0.ebuild,v 1.2 2014/07/18 21:14:42 jer Exp $
-EAPI="3"
-PYTHON_DEPEND="2"
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
-inherit distutils toolchain-funcs
+inherit distutils-r1 toolchain-funcs
-DESCRIPTION="Switzerland Network Testing Tool"
+DESCRIPTION="Network Testing Tool"
HOMEPAGE="http://www.eff.org/testyourisp/switzerland/"
SRC_URI="mirror://sourceforge/switzerland/${P}.tgz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~x86 ~amd64"
-IUSE=""
DEPEND="net-libs/libpcap"
RDEPEND=${DEPEND}
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
src_prepare() {
cp "${FILESDIR}"/Makefile switzerland/client
sed -i \
-e "s/= find_binary()/= dest/" \
setup.py
+ distutils-r1_src_prepare
}
src_compile() {
cd switzerland/client
- emake CC=$(tc-getCC) || die "emake failed"
+ emake CC=$(tc-getCC)
cd "${S}"
- distutils_src_compile
+ distutils-r1_src_compile
}
src_install() {
- distutils_src_install
+ distutils-r1_src_install
dodoc BUGS.txt CREDITS
diff --git a/net-misc/tcpsound/files/tcpsound-0.3.1-makefile.patch b/net-misc/tcpsound/files/tcpsound-0.3.1-makefile.patch
index 41eb3ee1401b..7192dcecb89f 100644
--- a/net-misc/tcpsound/files/tcpsound-0.3.1-makefile.patch
+++ b/net-misc/tcpsound/files/tcpsound-0.3.1-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.org 2005-09-05 09:26:34.000000000 +0200
-+++ Makefile 2010-04-09 06:42:41.000000000 +0200
+--- a/Makefile
++++ b/Makefile
@@ -1,32 +1,35 @@
# Makefile for tcpsound
diff --git a/net-misc/tcpsound/files/tcpsound-0.3.1-misc.patch b/net-misc/tcpsound/files/tcpsound-0.3.1-misc.patch
new file mode 100644
index 000000000000..7c7136fb954e
--- /dev/null
+++ b/net-misc/tcpsound/files/tcpsound-0.3.1-misc.patch
@@ -0,0 +1,22 @@
+--- a/src/tcpsound.c
++++ b/src/tcpsound.c
+@@ -16,7 +16,7 @@
+ #include "parse.h"
+ #include "sound.h"
+
+-static const char *DEFAULT_CONF = "searchpath = /usr/share/sounds:/usr/local/share/sounds\n\nsnd.default = 1,0,0,generic.wav\nsnd.icmp = 3,0,0,sonar.wav\nsnd.dns = 2,53,53,warning.wav\nsnd.http.in = 2,0,80,pop.wav\nsnd.http.out = 2,80,0,info.wav\nsnd.win.nam = 2,137,137,cuckoo.wav\n";
++static const char *DEFAULT_CONF = "searchpath = /usr/share/tcpsound\n\nsnd.default = 1,0,0,generic.wav\nsnd.icmp = 3,0,0,sonar.wav\nsnd.dns = 2,53,53,warning.wav\nsnd.http.in = 2,0,80,pop.wav\nsnd.http.out = 2,80,0,info.wav\nsnd.win.nam = 2,137,137,cuckoo.wav\n";
+
+ /* struct packet {
+ * unsigned long time;
+--- a/elaborate.conf
++++ b/elaborate.conf
+@@ -7,7 +7,7 @@
+ # to searchpath).
+ #
+
+-searchpath = /usr/share/sounds:/usr/local/share/sounds
++searchpath = /usr/share/tcpsound
+
+ snd.default = 1,0,0,generic.wav
+ snd.icmp = 3,0,0,sonar.wav
diff --git a/net-misc/tcpsound/tcpsound-0.3.1-r1.ebuild b/net-misc/tcpsound/tcpsound-0.3.1-r1.ebuild
index bf0353fbaadd..0478a7c9ae85 100644
--- a/net-misc/tcpsound/tcpsound-0.3.1-r1.ebuild
+++ b/net-misc/tcpsound/tcpsound-0.3.1-r1.ebuild
@@ -1,34 +1,30 @@
-# 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/net-misc/tcpsound/tcpsound-0.3.1-r1.ebuild,v 1.4 2013/02/12 14:20:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tcpsound/tcpsound-0.3.1-r1.ebuild,v 1.5 2014/07/18 21:27:18 jer Exp $
-EAPI="4"
-
-inherit base toolchain-funcs
+EAPI=5
+inherit eutils toolchain-funcs
DESCRIPTION="Play sounds in response to network traffic"
-HOMEPAGE="http://www.ioplex.com/~miallen/tcpsound/"
-SRC_URI="http://www.ioplex.com/~miallen/tcpsound/dl/${P}.tar.gz"
-
LICENSE="BSD"
+HOMEPAGE="http://www.ioplex.com/~miallen/tcpsound/"
+SRC_URI="${HOMEPAGE}dl/${P}.tar.gz"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE=""
-DEPEND="net-analyzer/tcpdump
+DEPEND="
+ dev-libs/libmba
media-libs/libsdl
- dev-libs/libmba"
+ net-analyzer/tcpdump
+"
RDEPEND="${DEPEND}"
DOCS=( README.txt elaborate.conf )
-PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
src_prepare() {
- # Fix paths
- sed -i -e "s;/usr/share/sounds:/usr/local/share/sounds;/usr/share/tcpsound;g"\
- "${S}"/src/tcpsound.c "${S}"/elaborate.conf || die 'sed failed'
-
- base_src_prepare
+ epatch \
+ "${FILESDIR}"/${P}-makefile.patch \
+ "${FILESDIR}"/${P}-misc.patch
}
src_compile() {
diff --git a/net-misc/tcpsound/tcpsound-0.3.1.ebuild b/net-misc/tcpsound/tcpsound-0.3.1.ebuild
deleted file mode 100644
index 20223f2db9c1..000000000000
--- a/net-misc/tcpsound/tcpsound-0.3.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tcpsound/tcpsound-0.3.1.ebuild,v 1.6 2012/11/18 06:48:19 pinkbyte Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Play sounds in response to network traffic"
-HOMEPAGE="http://www.ioplex.com/~miallen/tcpsound/"
-SRC_URI="http://www.ioplex.com/~miallen/tcpsound/dl/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND="net-analyzer/tcpdump
- media-libs/libsdl
- dev-libs/libmba"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
- tc-export CC
- sed -i -e "s;/usr/share/sounds:/usr/local/share/sounds;/usr/share/tcpsound;g"\
- "${S}"/src/tcpsound.c "${S}"/elaborate.conf
-
- sed -i -e "s;/share/sounds;/share/tcpsound;g"\
- "${S}"/Makefile
- emake || die "emake failed"
-}
-
-src_install() {
- # Makefile expects /usr/bin to be there...
- emake DESTDIR="${D}" install || die
-
- dodoc README.txt elaborate.conf
-}
diff --git a/net-misc/tightvnc/tightvnc-1.3.10-r2.ebuild b/net-misc/tightvnc/tightvnc-1.3.10-r2.ebuild
index 40f6eee9c5a5..dc190e1dc960 100644
--- a/net-misc/tightvnc/tightvnc-1.3.10-r2.ebuild
+++ b/net-misc/tightvnc/tightvnc-1.3.10-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/net-misc/tightvnc/tightvnc-1.3.10-r2.ebuild,v 1.2 2014/07/11 18:56:29 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3.10-r2.ebuild,v 1.3 2014/07/19 18:47:37 klausman Exp $
EAPI="5"
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/vnc-tight/${P}_unixsrc.tar.bz2
java? ( mirror://sourceforge/vnc-tight/${P}_javasrc.tar.gz )"
HOMEPAGE="http://www.tightvnc.com/"
-KEYWORDS="~alpha ~amd64 arm ~mips ~ppc ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 arm ~mips ~ppc ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
LICENSE="GPL-2"
SLOT="0"
diff --git a/net-misc/udpcast/Manifest b/net-misc/udpcast/Manifest
index 678eb990e956..17080889397f 100644
--- a/net-misc/udpcast/Manifest
+++ b/net-misc/udpcast/Manifest
@@ -1,2 +1 @@
-DIST udpcast-20110710.tar.bz2 138992 SHA256 84a0e577cdd01a555cd6dca80bc66cd0dfe7090848af560428dc71c1e6495329 SHA512 64197117e15a87592ebd41d70fb500bb6b08b119436fdd1149d45948a0e0995414b4e6a8efd5ce292a9e6faf128e8f57971d5888f081eab644ad275d27a4fbaf WHIRLPOOL 8138111d1b2486af494691c80f6820537f2fd940d0f7e2a07d14fd613cd826f55a0bf8b9a7e0aa1da0b5374723956a2c46b05bc2a6f41edb378966bff3e2d732
DIST udpcast-20120424.tar.bz2 138955 SHA256 d6c30352571a3215f00f8451d0fe932ba24ed5f98653d3aeb554e3c43c079677 SHA512 b28ada43f9f3cba498ffff3032cff6a673584836439275604c1201a18fe2e37f2c847a48b72783065b1656a7a2f9e9739d8a376e90df8b05749bc2e2f64278de WHIRLPOOL 9d8d48fabe30f462e49d2b1dc0b2d190fd5b0e6d1e68f801209a61782185464a952dd46ffbed9a6d39a3da8fce6de99f68916b3ef447db6d0fcc1523a83cc4de
diff --git a/net-misc/udpcast/udpcast-20110710.ebuild b/net-misc/udpcast/udpcast-20110710.ebuild
deleted file mode 100644
index 2c6b3db31825..000000000000
--- a/net-misc/udpcast/udpcast-20110710.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/udpcast/udpcast-20110710.ebuild,v 1.3 2012/01/28 15:20:30 phajdan.jr Exp $
-
-EAPI=4
-
-DESCRIPTION="Multicast file transfer tool"
-HOMEPAGE="http://udpcast.linux.lu/"
-SRC_URI="http://udpcast.linux.lu/download/${P}.tar.bz2"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND=""
-
-src_prepare() {
- sed -i Makefile.in \
- -e '/^LDFLAGS +=-s/d' \
- -e '/^CFLAGS/s: -O6::g' \
- || die
-}
-
-src_install() {
- default
- dodoc *.txt
-}
diff --git a/net-misc/udpcast/udpcast-20120424.ebuild b/net-misc/udpcast/udpcast-20120424.ebuild
index 4b72e37b56af..ae216e15a5d7 100644
--- a/net-misc/udpcast/udpcast-20120424.ebuild
+++ b/net-misc/udpcast/udpcast-20120424.ebuild
@@ -1,8 +1,8 @@
-# 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/net-misc/udpcast/udpcast-20120424.ebuild,v 1.4 2013/07/20 11:11:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/udpcast/udpcast-20120424.ebuild,v 1.5 2014/07/18 21:39:32 jer Exp $
-EAPI=4
+EAPI=5
inherit eutils
DESCRIPTION="Multicast file transfer tool"
@@ -12,7 +12,6 @@ SRC_URI="http://www.udpcast.linux.lu/download/${P}.tar.bz2"
LICENSE="GPL-2 BSD"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE=""
DEPEND="dev-lang/perl"
diff --git a/net-misc/vinagre/vinagre-3.12.1.ebuild b/net-misc/vinagre/vinagre-3.12.1.ebuild
index 1c6590f8fc28..364e26e1a143 100644
--- a/net-misc/vinagre/vinagre-3.12.1.ebuild
+++ b/net-misc/vinagre/vinagre-3.12.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/net-misc/vinagre/vinagre-3.12.1.ebuild,v 1.1 2014/04/27 18:01:53 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-3.12.1.ebuild,v 1.2 2014/07/18 13:15:02 klausman Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Vinagre"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="avahi rdp +ssh spice +telepathy"
# cairo used in vinagre-tab
diff --git a/net-misc/vinagre/vinagre-3.12.2.ebuild b/net-misc/vinagre/vinagre-3.12.2.ebuild
index 93fed3eb5dfc..d756a8c5f1d1 100644
--- a/net-misc/vinagre/vinagre-3.12.2.ebuild
+++ b/net-misc/vinagre/vinagre-3.12.2.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/net-misc/vinagre/vinagre-3.12.2.ebuild,v 1.1 2014/05/31 09:19:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-3.12.2.ebuild,v 1.2 2014/07/18 13:15:02 klausman Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Vinagre"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="avahi rdp +ssh spice +telepathy"
# cairo used in vinagre-tab
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index a997a174bca1..d5121f54f967 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,4 +1 @@
-DIST youtube-dl-2014.02.10.tar.gz 642951 SHA256 fa037ae7d3a3b47f57b91e57f89689c4277465152267809811ad5bf9f76a3d3f SHA512 2770b4721063ad3b06a06dc80c9ec81eb012b18b8d5e8aaace5b1e89d875e6e762e611f7c3ec9978e6dded3d27f8b12b1a7615be6dfa6cb283272e22e50f0545 WHIRLPOOL a8b7a4690fdee9c3053eb3d7ccc42862a05e1b75dabe81648e7ea28582b89981936559315b7bd9d0408a203efde09ff0bc23841a089cb4fb273c8d6d91581ad5
-DIST youtube-dl-2014.04.13.tar.gz 785764 SHA256 582ddfb0c4f008c7e9a9d2f9f8752851bdb47c119c51f3b77500ad3dadf560e1 SHA512 8f2acc2402254d720d6020d364f400aee66e77d8eb99ad3c5b8dbab4b118366bc1f2d4c32e1ccf5ca5a3eada3592e1a3b83b66fe3ded5ee956c5945d64df828f WHIRLPOOL 09280635d5c766acb60ce8102198bd66acae1cd2d120edaceb9c27dbd423f458436dd211be72a92794c619032715adc0bae2d5087da6b2f91ce9b5a5099d4b16
-DIST youtube-dl-2014.06.19.tar.gz 849158 SHA256 877f5a1652693e80d905831bbc10055bd101d6620176b6cb08dd983e465eba94 SHA512 bdf5d1c688852dbe3d433566d143d5430bac72c4494612e6516c7182eabca9da149cff1b76303d39fa6d48701080e33f7b782cb3fd4281922143183cdc67a42b WHIRLPOOL b2dbd39e5c5655397931866a2229377083e6243769b9865c774b8394996c29e225796ee90d90bf6794591e15e75f04cc15e8a05872c88bb41aa89310c133ff65
DIST youtube-dl-2014.07.15.tar.gz 881673 SHA256 2274535bb4822af0c6a384d352b85d7c724fe9bd371d9bdd428bba4b1493bd02 SHA512 f1ec3b368559ed79c8b03621f6a27344069af9d4bb62023de5a30dfa571f863d0fc50cd874db63d9867e1c1b04a79a7e127cc13081c73705dcdc17b624fd986b WHIRLPOOL e1954e4a3217ad3a248eb7996169fec5e545fa56d60db7359a159df7a2c4da521a2e27f0eedf08ba90db1379f1248cb5be09f4daffaf58fb82ef143980cfaa3e
diff --git a/net-misc/youtube-dl/youtube-dl-2014.02.10.ebuild b/net-misc/youtube-dl/youtube-dl-2014.02.10.ebuild
deleted file mode 100644
index 14f5bd1e37f4..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2014.02.10.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2014.02.10.ebuild,v 1.7 2014/03/14 10:05:45 ago Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7,3_3})
-DISTUTILS_SINGLE_IMPL=true
-inherit bash-completion-r1 distutils-r1 eutils
-
-DESCRIPTION="Download videos from YouTube.com (and mores sites...)"
-HOMEPAGE="http://rg3.github.com/youtube-dl/"
-SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="offensive test"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
- if ! use offensive; then
- sed -i -e "/__version__/s|'$|-gentoo_no_offensive_sites'|g" \
- youtube_dl/version.py || die
- local xxx=(
- extremetube mofosex pornhd pornhub pornotube redtube spankwire
- thisav tube8 xhamster xnxx xtube xvideos youjizz youporn
- )
- sed -i -e $( printf '/%s/d;' ${xxx[@]} ) youtube_dl/extractor/__init__.py || die
- rm $( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
- test/test_age_restriction.py || die
- fi
-}
-
-src_compile() {
- distutils-r1_src_compile
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- python_domodule youtube_dl
- dobin bin/${PN}
- dodoc CHANGELOG README.txt
- doman ${PN}.1
- newbashcomp ${PN}.bash-completion ${PN}
- python_fix_shebang "${ED}"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2014.04.13.ebuild b/net-misc/youtube-dl/youtube-dl-2014.04.13.ebuild
deleted file mode 100644
index 868fe99f732e..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2014.04.13.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2014.04.13.ebuild,v 1.3 2014/06/14 09:56:29 phajdan.jr Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7,3_3})
-DISTUTILS_SINGLE_IMPL=true
-inherit bash-completion-r1 distutils-r1 eutils
-
-DESCRIPTION="Download videos from YouTube.com (and mores sites...)"
-HOMEPAGE="http://rg3.github.com/youtube-dl/"
-SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm hppa ~ppc ~ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="offensive test"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
- if ! use offensive; then
- sed -i -e "/__version__/s|'$|-gentoo_no_offensive_sites'|g" \
- youtube_dl/version.py || die
- local xxx=(
- extremetube fourtube mofosex pornhd pornhub pornotube redtube
- spankwire thisav trutube tube8 xbef xhamster xnxx xtube xvideos youjizz youporn
- )
- sed -i -e $( printf '/%s/d;' ${xxx[@]} ) youtube_dl/extractor/__init__.py || die
- rm $( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
- test/test_age_restriction.py || die
- fi
-}
-
-src_compile() {
- distutils-r1_src_compile
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- python_domodule youtube_dl
- dobin bin/${PN}
- dodoc CHANGELOG README.txt
- doman ${PN}.1
- newbashcomp ${PN}.bash-completion ${PN}
- python_fix_shebang "${ED}"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2014.06.19.ebuild b/net-misc/youtube-dl/youtube-dl-2014.06.19.ebuild
deleted file mode 100644
index b0aed5c4f0cb..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2014.06.19.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2014.06.19.ebuild,v 1.3 2014/07/15 21:17:06 nimiux Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7,3_3,3_4})
-DISTUTILS_SINGLE_IMPL=true
-inherit bash-completion-r1 distutils-r1 eutils
-
-DESCRIPTION="Download videos from YouTube.com (and mores sites...)"
-HOMEPAGE="http://rg3.github.com/youtube-dl/"
-SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="offensive test"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
- if ! use offensive; then
- sed -i -e "/__version__/s|'$|-gentoo_no_offensive_sites'|g" \
- youtube_dl/version.py || die
- local xxx=(
- extremetube fourtube hentaistigma mofosex pornhd pornhub pornotube
- redtube slutload spankwire thisav trutube tube8 xbef xhamster xnxx
- xtube xvideos youjizz youporn
- )
- sed -i -e $( printf '/%s/d;' ${xxx[@]} ) youtube_dl/extractor/__init__.py || die
- rm $( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
- test/test_age_restriction.py || die
- fi
-}
-
-src_compile() {
- distutils-r1_src_compile
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- python_domodule youtube_dl
- dobin bin/${PN}
- dodoc README.txt
- doman ${PN}.1
- newbashcomp ${PN}.bash-completion ${PN}
- python_fix_shebang "${ED}"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2014.07.15.ebuild b/net-misc/youtube-dl/youtube-dl-2014.07.15.ebuild
index 4f3e6ae9b07a..6d8d65af31b2 100644
--- a/net-misc/youtube-dl/youtube-dl-2014.07.15.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2014.07.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/net-misc/youtube-dl/youtube-dl-2014.07.15.ebuild,v 1.1 2014/07/15 23:11:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2014.07.15.ebuild,v 1.3 2014/07/19 15:11:02 zlogene Exp $
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="offensive test"
DEPEND="
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index c2c6eb84e37f..1406585ab3d9 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,2 +1,3 @@
DIST cups-1.7.1-source.tar.bz2 8738002 SHA256 f52bec893d9daf92b6029be79c07e6c516b4c85ffae3e6e01885cc85e9081681 SHA512 e52f98f00e8b2c0eb7a8b29a8ed5e33b14b1a68a18f3f4558e473d8146c2dfd659c9a96ae07257c456d7a34dcc7bcabf858dcf719e8557173c8849d734711e57 WHIRLPOOL b715560357b22d0cc5887059137b79132e1f46a9adc76410d3ad2e8a1a16047fd2179372632f544b1d798a03a3d41410071f09d2ed82aeda66afe789c080cb04
DIST cups-1.7.3-source.tar.bz2 8792641 SHA256 fa989f856d1499169dc442fb2311053ea42fe455ca2721693ba5a9fe4b333e31 SHA512 78e5275682322a52c5e10d87c106059900595c4fd167924bece30d32b646c304ecc0f5051c53cb983b75d5a5ab76fd5b81931fb6f191b9e936f2528ca869798e WHIRLPOOL e988fe293c709f43313f37477eb35990b47d2eb0eb1d141b52ec0fa2e39b0b90021d4fb4916a286f0da811b3e092afff2978a812d470d083f19c6bd2acd716dc
+DIST cups-1.7.4-source.tar.bz2 8792324 SHA256 358fc7f22395a9ba07efcfc0d34a057ab5e9182b6e3297f71263a6b68fb41378 SHA512 af86076cbaa008e2c4b9a144d2999a0f1a77d801a256fd4021d4d830bb59322542181e58b54b8b36d929215e1c0db1e3f79cf58a448df64361baf46c05f84d65 WHIRLPOOL a2d6024c9bf13f66093c3f3cd99f03913ebc5400f53baec2666eb4fc5b1f834959025409c3a3786fafd527afc97de38ea1fe1c08ceffbb006018f63caca4a1a4
diff --git a/net-print/cups/cups-1.7.1-r2.ebuild b/net-print/cups/cups-1.7.4.ebuild
similarity index 97%
rename from net-print/cups/cups-1.7.1-r2.ebuild
rename to net-print/cups/cups-1.7.4.ebuild
index 4553a6b2c875..2f6d60327331 100644
--- a/net-print/cups/cups-1.7.1-r2.ebuild
+++ b/net-print/cups/cups-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/net-print/cups/cups-1.7.1-r2.ebuild,v 1.5 2014/06/18 20:44:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.4.ebuild,v 1.1 2014/07/18 16:04:42 dilfridge Exp $
EAPI=5
@@ -21,7 +21,7 @@ if [[ ${PV} == *9999 ]]; then
if [[ ${PV} != 9999 ]]; then
EGIT_BRANCH=branch-${PV/.9999}
fi
- KEYWORDS="~alpha ~arm ~hppa ~ia64 ~ppc ~ppc64"
+ KEYWORDS=""
else
SRC_URI="http://www.cups.org/software/${MY_PV}/${MY_P}-source.tar.bz2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
@@ -35,7 +35,7 @@ SLOT="0"
IUSE="acl dbus debug gnutls java kerberos lprng-compat pam
python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
-LANGS="ca es fr it ja ru"
+LANGS="ca es fr it ja pt_BR ru"
for X in ${LANGS} ; do
IUSE="${IUSE} +linguas_${X}"
done
@@ -97,7 +97,6 @@ PATCHES=(
"${FILESDIR}/${PN}-1.6.0-dont-compress-manpages.patch"
"${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
- "${FILESDIR}/${PN}-1.7.1-str4356.patch"
)
MULTILIB_CHOST_TOOLS=(
@@ -150,7 +149,7 @@ pkg_setup() {
src_prepare() {
base_src_prepare
- use systemd && epatch "${FILESDIR}/${PN}-1.5.0-systemd-socket-2.patch"
+ use systemd && epatch "${FILESDIR}/${PN}-1.7.2-systemd-socket-2.patch"
# Fix install-sh, posix sh does not have 'function'.
sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
diff --git a/net-wireless/airtraf/Manifest b/net-wireless/airtraf/Manifest
index 089337223c2f..71b78bc9bf97 100644
--- a/net-wireless/airtraf/Manifest
+++ b/net-wireless/airtraf/Manifest
@@ -1 +1 @@
-DIST airtraf-1.1.tar.gz 136241 RMD160 30df721b30220968446d31ce66cddfe8df97d1ad SHA1 7139046bed1b15d83466709b4a6af42a2f26a77c SHA256 10ad27d6cac5ac7fcfec04cd737a0d8a640d5bfeb6fa48a13268f9efbe6bfe53
+DIST airtraf-1.1.tar.gz 136241 SHA256 10ad27d6cac5ac7fcfec04cd737a0d8a640d5bfeb6fa48a13268f9efbe6bfe53 SHA512 7f341abb25e15dbdf510805230ee2f186a7a66d5c1e486bfdb978d3d8534d8b8c2cc1b5e0e323357c65af1eedbcb1da3e3e5f3ac8299db5f203f54b4a868f90b WHIRLPOOL de40aca3c5cacd5e5047b175e2538dba3ef90af1afb14dcb9a9e1ffab66fa3ddc0aee75aa916183a25f82906c108f3a7e9a177a2228858b2909c44a15a5227c7
diff --git a/net-wireless/airtraf/airtraf-1.1-r1.ebuild b/net-wireless/airtraf/airtraf-1.1-r1.ebuild
deleted file mode 100644
index f5223fc6583d..000000000000
--- a/net-wireless/airtraf/airtraf-1.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/airtraf/airtraf-1.1-r1.ebuild,v 1.2 2010/09/17 03:28:08 jer Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="AirTraf 802.11b Wireless traffic sniffer"
-HOMEPAGE="http://www.elixar.com/"
-SRC_URI="http://www.elixar.com/${P}.tar.gz"
-
-IUSE=""
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}.patch
-}
-
-src_compile() {
- # parallel make (bug #297331)
- emake -C src -j1 \
- CC=$(tc-getCC) \
- CXX=$(tc-getCXX) \
- CFLAGS="${CFLAGS}" \
- CXXFLAGS="${CXXFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- || die
-}
-
-src_install () {
- dobin src/airtraf || die
- newdoc docs/airtraf_doc.html airtraf_documentation.html
-}
diff --git a/net-wireless/airtraf/airtraf-1.1-r2.ebuild b/net-wireless/airtraf/airtraf-1.1-r2.ebuild
new file mode 100644
index 000000000000..dfaf0ae85994
--- /dev/null
+++ b/net-wireless/airtraf/airtraf-1.1-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/airtraf/airtraf-1.1-r2.ebuild,v 1.1 2014/07/19 12:26:37 jer Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="AirTraf 802.11b Wireless traffic sniffer"
+LICENSE="GPL-2"
+HOMEPAGE="http://www.elixar.com/"
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+ net-libs/libpcap
+ sys-libs/ncurses
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}.patch \
+ "${FILESDIR}"/${P}-off-by-one.patch
+ sed -i \
+ -e '/^LIBS/s|=.*|= $(shell $(PKG_CONFIG) --libs panel)|' \
+ src/libncurses/Makefile || die
+ sed -i \
+ -e 's|-lpanel -lncurses|$(shell $(PKG_CONFIG) --libs panel)|' \
+ src/sniffd/Makefile || die
+ tc-export PKG_CONFIG
+}
+
+src_compile() {
+ # parallel make (bug #297331)
+ emake -C src -j1 \
+ CC=$(tc-getCC) \
+ CXX=$(tc-getCXX) \
+ CFLAGS="${CFLAGS}" \
+ CXXFLAGS="${CXXFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ || die
+}
+
+src_install () {
+ dobin src/airtraf
+ dodoc Authors COMPATIBILITY docs/airtraf_doc.html
+}
diff --git a/net-wireless/airtraf/files/airtraf-1.1-off-by-one.patch b/net-wireless/airtraf/files/airtraf-1.1-off-by-one.patch
new file mode 100644
index 000000000000..571532b603ec
--- /dev/null
+++ b/net-wireless/airtraf/files/airtraf-1.1-off-by-one.patch
@@ -0,0 +1,29 @@
+--- a/src/sniffd/autoconfig.c
++++ b/src/sniffd/autoconfig.c
+@@ -68,7 +68,7 @@
+ struct ifreq ifr;
+
+ strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
+- ifr.ifr_name[IFNAMSIZ] = '\0';
++ ifr.ifr_name[IFNAMSIZ -1] = '\0';
+ if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0){
+ return (-1);
+ }
+@@ -89,7 +89,7 @@
+ struct ifreq ifr;
+
+ strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
+- ifr.ifr_name[IFNAMSIZ] = '\0';
++ ifr.ifr_name[IFNAMSIZ -1] = '\0';
+ if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0){
+ return (-1);
+ }
+@@ -129,7 +129,7 @@
+ {
+ /* Set device name */
+ strncpy(pwrq->ifr_name, ifname, IFNAMSIZ);
+- pwrq->ifr_name[IFNAMSIZ] = '\0';
++ pwrq->ifr_name[IFNAMSIZ -1] = '\0';
+
+ /* Do the request */
+ return(ioctl(skfd, request, pwrq));
diff --git a/net-wireless/airtraf/files/airtraf-1.1.patch b/net-wireless/airtraf/files/airtraf-1.1.patch
index f1309184ae9d..e88ef52267c1 100644
--- a/net-wireless/airtraf/files/airtraf-1.1.patch
+++ b/net-wireless/airtraf/files/airtraf-1.1.patch
@@ -1,5 +1,5 @@
---- a/airtraf-1.1/src/sniffd/autoconfig.c 2003-01-24 10:11:36.000000000 +0930
-+++ b/airtraf-1.1/src/sniffd/autoconfig.c 2005-01-12 19:23:16.481439336 +0930
+--- a/src/sniffd/autoconfig.c
++++ b/src/sniffd/autoconfig.c
@@ -360,7 +360,7 @@
int check_drv_compat(char * drvname, int * id)
{
@@ -26,8 +26,8 @@
}
/* update flag take off PROMISC */
---- a/airtraf-1.1/src/sniffd/gui_channel_scan.c 2003-01-22 13:05:01.000000000 +0930
-+++ b/airtraf-1.1/src/sniffd/gui_channel_scan.c 2005-01-12 19:21:33.135876552 +0930
+--- a/src/sniffd/gui_channel_scan.c
++++ b/src/sniffd/gui_channel_scan.c
@@ -384,7 +384,7 @@
if (!beep()) flash();
wattrset(statuswin, STDATTR);
@@ -37,8 +37,8 @@
hexdump((__u8*)&ap->bssid,6), ap->channel);
print_status_msg(statuswin, location, message);
ap->status = AP_STATUS_ACTIVE;
---- a/airtraf-1.1/src/sniffd/server.c 2003-01-22 13:05:01.000000000 +0930
-+++ b/airtraf-1.1/src/sniffd/server.c 2005-01-12 19:21:33.135876552 +0930
+--- a/src/sniffd/server.c
++++ b/src/sniffd/server.c
@@ -57,7 +57,7 @@
int process_command(int, char *);
diff --git a/net-wireless/airtraf/metadata.xml b/net-wireless/airtraf/metadata.xml
index b7dcddf18f9d..8c9992e713f9 100644
--- a/net-wireless/airtraf/metadata.xml
+++ b/net-wireless/airtraf/metadata.xml
@@ -2,9 +2,11 @@
netmon
-AirTraf 1.0 is a wireless sniffer that can detect and determine exactly
-what is being transmitted over 802.11 wireless networks. This open-source program tracks
-and identifies legitimate and rogue access points, keeps performance statistics on a
-by-user and by-protocol basis, measures the signal strength of network components, and
-more. Do you want to capture the sky?
+
+AirTraf 1.0 is a wireless sniffer that can detect and determine exactly what is
+being transmitted over 802.11 wireless networks. This open-source program
+tracks and identifies legitimate and rogue access points, keeps performance
+statistics on a by-user and by-protocol basis, measures the signal strength of
+network components, and more. Do you want to capture the sky?
+
diff --git a/net-wireless/wavemon/files/wavemon-0.6.7-dont-override-CFLAGS.patch b/net-wireless/wavemon/files/wavemon-0.6.7-dont-override-CFLAGS.patch
index 609c759c4aef..df98db7cd590 100644
--- a/net-wireless/wavemon/files/wavemon-0.6.7-dont-override-CFLAGS.patch
+++ b/net-wireless/wavemon/files/wavemon-0.6.7-dont-override-CFLAGS.patch
@@ -1,5 +1,5 @@
---- configure.ac.orig 2011-01-26 15:59:05.000000000 +0100
-+++ configure.ac 2011-01-26 15:59:17.000000000 +0100
+--- a/configure.ac
++++ b/configure.ac
@@ -9,8 +9,6 @@
AC_DEFINE_UNQUOTED([BUILD_DATE], ["`/bin/date`"],
[date wavemon was last configured and built])
diff --git a/net-wireless/wavemon/files/wavemon-0.7.5-ncurses-tinfo.patch b/net-wireless/wavemon/files/wavemon-0.7.5-ncurses-tinfo.patch
index 75c0043bbe41..8c18c0f83c2a 100644
--- a/net-wireless/wavemon/files/wavemon-0.7.5-ncurses-tinfo.patch
+++ b/net-wireless/wavemon/files/wavemon-0.7.5-ncurses-tinfo.patch
@@ -1,5 +1,5 @@
---- a/configure.ac 2014-03-05 11:05:12.319043741 +0100
-+++ b/configure.ac 2014-03-05 11:15:00.866849013 +0100
+--- a/configure.ac
++++ b/configure.ac
@@ -21,6 +21,7 @@ esac
AC_PROG_CC
AC_PROG_CPP
diff --git a/net-wireless/wavemon/files/wavemon-0.7.6-ncurses-tinfo.patch b/net-wireless/wavemon/files/wavemon-0.7.6-ncurses-tinfo.patch
index 6430a9761d79..e8d0af99587b 100644
--- a/net-wireless/wavemon/files/wavemon-0.7.6-ncurses-tinfo.patch
+++ b/net-wireless/wavemon/files/wavemon-0.7.6-ncurses-tinfo.patch
@@ -1,5 +1,5 @@
---- configure.ac.orig 2014-05-15 13:09:49.433810160 +0400
-+++ configure.ac 2014-05-15 13:10:33.441813996 +0400
+--- a/configure.ac
++++ b/configure.ac
@@ -21,6 +21,7 @@
AC_PROG_CC
AC_PROG_CPP
diff --git a/net-wireless/wavemon/wavemon-0.7.6.ebuild b/net-wireless/wavemon/wavemon-0.7.6.ebuild
index e920ed77a10b..2261917d9e41 100644
--- a/net-wireless/wavemon/wavemon-0.7.6.ebuild
+++ b/net-wireless/wavemon/wavemon-0.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/net-wireless/wavemon/wavemon-0.7.6.ebuild,v 1.3 2014/07/15 10:38:19 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wavemon/wavemon-0.7.6.ebuild,v 1.4 2014/07/19 20:48:42 jer Exp $
EAPI="5"
@@ -15,7 +15,7 @@ SRC_URI="http://eden-feed.erg.abdn.ac.uk/wavemon/stable-releases/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ~sparc x86"
+KEYWORDS="amd64 arm hppa ppc ~sparc x86"
IUSE="caps"
RDEPEND="sys-libs/ncurses
diff --git a/net-wireless/wepattack/Manifest b/net-wireless/wepattack/Manifest
index bc5b3123cca6..42a0a5551098 100644
--- a/net-wireless/wepattack/Manifest
+++ b/net-wireless/wepattack/Manifest
@@ -1 +1 @@
-DIST WepAttack-0.1.3.tar.gz 25063 RMD160 a9d2f7ad1df9b0c708a5551bf064e17e8bbd1b15 SHA1 90e28fb838096281e621a13c32f2708aed0312b9 SHA256 4a251df5b68eb2724491470cddda699e8fabdfce3c4778a722fb9299e4dc21a2
+DIST WepAttack-0.1.3.tar.gz 25063 SHA256 4a251df5b68eb2724491470cddda699e8fabdfce3c4778a722fb9299e4dc21a2 SHA512 fe8d9843613fc29b7802f699311cb67fe3546a17a279ebc2e150cce155e726270dc937b1c941d9e9287b813febf171fe56053f6b010c4f2021e45e572f91fdf4 WHIRLPOOL fcbbf595fc35e3f6fcdbd8e5a5bc334d40e1603fd6c40bd008440617c092b80cf1d24189c5459145fc87b2e8b88c8b352ff6688546375e7b67118796dea5d920
diff --git a/net-wireless/wepattack/files/0.1.3-filter-mac-address.patch b/net-wireless/wepattack/files/wepattack-0.1.3-filter-mac-address.patch
similarity index 87%
rename from net-wireless/wepattack/files/0.1.3-filter-mac-address.patch
rename to net-wireless/wepattack/files/wepattack-0.1.3-filter-mac-address.patch
index 65347e558ecd..63ba5f3473bb 100644
--- a/net-wireless/wepattack/files/0.1.3-filter-mac-address.patch
+++ b/net-wireless/wepattack/files/wepattack-0.1.3-filter-mac-address.patch
@@ -1,6 +1,5 @@
-diff -U 3 -r /src/config.h src/config.h
---- src/config.h 2002-10-24 15:16:34.000000000 +0200
-+++ src/config.h 2004-04-07 00:39:51.000000000 +0200
+--- a/src/config.h
++++ b/src/config.h
@@ -37,7 +37,7 @@
#define WEPKEYSTORE (WEPKEYSIZE * WEPKEYS)
@@ -10,9 +9,8 @@ diff -U 3 -r /src/config.h src/config.h
#endif
-diff -U 3 -r /src/log.c src/log.c
---- src/log.c 2002-10-24 15:15:55.000000000 +0200
-+++ src/log.c 2004-04-07 00:39:51.000000000 +0200
+--- a/src/log.c
++++ b/src/log.c
@@ -73,7 +73,7 @@
fprintf(fp, "Cracking started: %s", ctime(&start_time));
fprintf(fp, "%s\t%s\n", word, in);
@@ -31,9 +29,8 @@ diff -U 3 -r /src/log.c src/log.c
(int)difftime(now, start_time));
}
list = list->next;
-diff -U 3 -r /src/misc.c src/misc.c
---- src/misc.c 2002-10-24 15:15:42.000000000 +0200
-+++ src/misc.c 2004-04-07 00:39:51.000000000 +0200
+--- a/src/misc.c
++++ b/src/misc.c
@@ -40,10 +40,11 @@
fprintf(stdout,"WEPATTACK by Dominik Blunk and Alain ");
fprintf(stdout,"Girardet - Version %s\n", VERSION);
@@ -47,9 +44,8 @@ diff -U 3 -r /src/misc.c src/misc.c
fprintf(stdout,"-m mode \trun wepattack in diffente modes (default: all)\n");
fprintf(stdout,"\t\tvalues: 64, 128, n64, n128\n");
fprintf(stdout,"-n network \tnetwork number to attack\n");
-diff -U 3 -r /src/wepattack.c src/wepattack.c
---- src/wepattack.c 2002-10-24 15:14:29.000000000 +0200
-+++ src/wepattack.c 2004-04-07 00:43:56.000000000 +0200
+--- a/src/wepattack.c
++++ b/src/wepattack.c
@@ -4,6 +4,8 @@
* Author: Alain Girardet/Dominik Blunk
* Last Modified: 2002-10-24
@@ -168,9 +164,8 @@ diff -U 3 -r /src/wepattack.c src/wepattack.c
// arg for packet file to read from
case 'f':
packet_file = optarg;
-diff -U 3 -r /src/wepattack.h src/wepattack.h
---- src/wepattack.h 2002-10-24 15:14:22.000000000 +0200
-+++ src/wepattack.h 2004-04-07 00:39:51.000000000 +0200
+--- a/src/wepattack.h
++++ b/src/wepattack.h
@@ -38,6 +38,7 @@
unsigned char iv[3];
unsigned char key;
@@ -179,9 +174,8 @@ diff -U 3 -r /src/wepattack.h src/wepattack.h
};
/*
-diff -U 3 -r /src/wepfilter.c src/wepfilter.c
---- src/wepfilter.c 2002-10-24 15:14:13.000000000 +0200
-+++ src/wepfilter.c 2004-04-07 00:39:51.000000000 +0200
+--- a/src/wepfilter.c
++++ b/src/wepfilter.c
@@ -104,6 +103,7 @@
memcpy(&newframe->frame.key, data+limits.key, 1);
newframe->frame.key = newframe->frame.key >> 6;
diff --git a/net-wireless/wepattack/files/wepattack-0.1.3-missed-string.h-warnings-fix.diff b/net-wireless/wepattack/files/wepattack-0.1.3-missed-string.h-warnings-fix.diff
deleted file mode 100644
index a5e1cf754151..000000000000
--- a/net-wireless/wepattack/files/wepattack-0.1.3-missed-string.h-warnings-fix.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur WepAttack-0.1.3.orig/src/modes.c WepAttack-0.1.3/src/modes.c
---- WepAttack-0.1.3.orig/src/modes.c 2002-10-24 17:15:19.000000000 +0400
-+++ WepAttack-0.1.3/src/modes.c 2006-11-06 09:59:46.000000000 +0300
-@@ -20,6 +20,7 @@
-
- #include
- #include
-+#include
- #include "modes.h"
- #include "rc4.h"
- #include "wlan/wlan_compat.h"
-diff -Naur WepAttack-0.1.3.orig/src/wepattack.c WepAttack-0.1.3/src/wepattack.c
---- WepAttack-0.1.3.orig/src/wepattack.c 2006-11-06 09:58:33.000000000 +0300
-+++ WepAttack-0.1.3/src/wepattack.c 2006-11-06 09:59:36.000000000 +0300
-@@ -32,6 +32,7 @@
- #include
- #include
- #include
-+#include
- #include "wepattack.h"
- #include "wepfilter.h"
- #include "log.h"
diff --git a/net-wireless/wepattack/files/wepattack-0.1.3-missed-string.h-warnings-fix.patch b/net-wireless/wepattack/files/wepattack-0.1.3-missed-string.h-warnings-fix.patch
new file mode 100644
index 000000000000..b46220d0eff5
--- /dev/null
+++ b/net-wireless/wepattack/files/wepattack-0.1.3-missed-string.h-warnings-fix.patch
@@ -0,0 +1,30 @@
+--- a/src/modes.c
++++ b/src/modes.c
+@@ -20,6 +20,7 @@
+
+ #include
+ #include
++#include
+ #include "modes.h"
+ #include "rc4.h"
+ #include "wlan/wlan_compat.h"
+--- a/src/wepattack.c
++++ b/src/wepattack.c
+@@ -32,6 +32,7 @@
+ #include
+ #include
+ #include
++#include
+ #include "wepattack.h"
+ #include "wepfilter.h"
+ #include "log.h"
+--- a/src/verify.c
++++ b/src/verify.c
+@@ -19,6 +19,7 @@
+
+ #include
+ #include
++#include /* memcmp() */
+
+ int verify_crc32(unsigned char *data, int length, unsigned long* crc) {
+
diff --git a/net-wireless/wepattack/wepattack-0.1.3-r3.ebuild b/net-wireless/wepattack/wepattack-0.1.3-r3.ebuild
index a3e29b93bb76..0407a901dd73 100644
--- a/net-wireless/wepattack/wepattack-0.1.3-r3.ebuild
+++ b/net-wireless/wepattack/wepattack-0.1.3-r3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wepattack/wepattack-0.1.3-r3.ebuild,v 1.3 2006/11/25 08:30:06 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wepattack/wepattack-0.1.3-r3.ebuild,v 1.4 2014/07/19 00:59:00 jer Exp $
+EAPI=5
inherit eutils toolchain-funcs
MY_P="WepAttack-${PV}"
@@ -14,20 +15,20 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE="john"
-DEPEND="sys-libs/zlib
+DEPEND="
+ dev-libs/openssl
net-libs/libpcap
- dev-libs/openssl"
+ sys-libs/zlib
+"
RDEPEND="${DEPEND}
john? ( app-crypt/johntheripper )"
S="${WORKDIR}/${MY_P}"
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${PV}-filter-mac-address.patch
- epatch "${FILESDIR}"/${P}-missed-string.h-warnings-fix.diff
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-filter-mac-address.patch
+ epatch "${FILESDIR}"/${P}-missed-string.h-warnings-fix.patch
chmod +x src/wlan
sed -i \
-e "/^CFLAGS=/s:=:=${CFLAGS} :" \
@@ -35,21 +36,20 @@ src_unpack() {
-e "/^CC=/s:gcc:$(tc-getCC):" \
-e "/^LD=/s:gcc:$(tc-getCC):" \
-e 's:log.o\\:log.o \\:' \
- src/Makefile || die "sed Makefile failed"
+ src/Makefile || die
sed -i \
-e "s/wordfile:/-wordlist=/" \
- run/wepattack_word || die "sed wepattack_world faild"
+ run/wepattack_word || die
}
src_compile() {
- cd src
- emake || die "emake failed"
+ emake -C src
}
src_install() {
- dobin src/wepattack || die "dobin failed"
+ dobin src/wepattack
if use john; then
- dosbin run/wepattack_{inc,word} || die "dosbin failed"
+ dosbin run/wepattack_{inc,word}
insinto /etc
doins "${FILESDIR}"/wepattack.conf
fi
diff --git a/perl-core/AutoLoader/AutoLoader-5.720.0.ebuild b/perl-core/AutoLoader/AutoLoader-5.720.0.ebuild
deleted file mode 100644
index c0f6eb581b09..000000000000
--- a/perl-core/AutoLoader/AutoLoader-5.720.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/AutoLoader/AutoLoader-5.720.0.ebuild,v 1.1 2012/05/02 14:18:48 tove Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=SMUELLER
-MODULE_VERSION=5.72
-inherit perl-module
-
-DESCRIPTION="load subroutines only on demand"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-solaris"
-IUSE=""
-
-SRC_TEST=do
diff --git a/perl-core/AutoLoader/Manifest b/perl-core/AutoLoader/Manifest
index cfbec2e61bda..0de564795459 100644
--- a/perl-core/AutoLoader/Manifest
+++ b/perl-core/AutoLoader/Manifest
@@ -1,2 +1 @@
-DIST AutoLoader-5.72.tar.gz 27383 SHA256 990f3936c444cfb234328dda7379318e06d33ccf29ddb6016a36152920f20da8 SHA512 1c979092d316858519402f558276e2997ae7bd33a9264f2ec97a4779b6b34f79e240b40b8eb66a8f10eec83c8eff46f932f89297f7748501cbf8ed633c60543c WHIRLPOOL a0849e041515df570d1ac2edef7239e3de1195fe9a4a7cf69c9557d343e9dbae4a24f140a2471d2a36b209110ad1e9a005e9d5296744489e5c3aa2c4faf76675
DIST AutoLoader-5.73.tar.gz 30446 SHA256 184ef496ed3f1996e6cdc1c7ea0530758b2fd396b748ff81822c8c884f3bbc6f SHA512 6109e8bbba506a525fcffebe344ff9ec6ca98084e37210f8c855063ebcfb65b31ea6af471ad5a457f55dc23b9a5bc0e15744fe8dabbad24bde93f09b2b64f193 WHIRLPOOL 1829747b37478a8651239413b3e111137ff9653a9514ad142fc80a8442f238bbc8376689625720975e67bd7f277f5fdadc08ff3481c1f441053879666c7f135e
diff --git a/perl-core/B-Debug/B-Debug-1.190.0.ebuild b/perl-core/B-Debug/B-Debug-1.190.0.ebuild
deleted file mode 100644
index 1b7b8335f0a3..000000000000
--- a/perl-core/B-Debug/B-Debug-1.190.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/B-Debug/B-Debug-1.190.0.ebuild,v 1.1 2014/07/04 23:30:08 dilfridge Exp $
-
-EAPI=5
-
-MODULE_AUTHOR=RURBAN
-MODULE_VERSION=1.19
-inherit perl-module
-
-DESCRIPTION='print debug info about ops'
-LICENSE=" || ( Artistic GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- virtual/perl-ExtUtils-MakeMaker
- virtual/perl-Test-Simple
- "
-RDEPEND="
- virtual/perl-Test-Simple
- "
-SRC_TEST="do"
diff --git a/perl-core/B-Debug/Manifest b/perl-core/B-Debug/Manifest
index 9aadd3bfb53d..ca20a6c11db5 100644
--- a/perl-core/B-Debug/Manifest
+++ b/perl-core/B-Debug/Manifest
@@ -1,2 +1 @@
DIST B-Debug-1.18.tar.gz 16600 SHA256 3cf8f21dc9538198e4ef06c594749417876127c29969a5de885ed43ea1d62d57 SHA512 fd19011301f6853abd05ccc6509594e924620ba9b2be03be82a4452b6ff33980030a9ad11056cb34e51e7d8f94b25acf39567c7e6f6efa98d9810c8a533bade9 WHIRLPOOL a6e21cefc8d0080ec56b5c55ab4bd02108593fb193dd6f2645cb5818725b8eae641433ec58e157ef9ccc9acdea8f229093dea5ecfc91721672a308056529dd84
-DIST B-Debug-1.19.tar.gz 16775 SHA256 f4801979dbce713053b0a31b9593cdd70aed678bc4c3dee0e25921c64fb94559 SHA512 502a0109debdcd01f9f487038b20cbc9eec8f74a0df6290f1fa2d8a5f6d5c619c4fe107fd76517d55cda84d5075de69945bd7a6c2f13043218d44c08ec8d9900 WHIRLPOOL afc0e4acfad1e5c469e8b4c551bf1121a2ec165e9c65539c8afb57d01cc46a4f5d634bcb5b04d995d0739b0e781189475897a6cca5156400ab1439d9632a54f6
diff --git a/perl-core/CPAN-Meta-YAML/CPAN-Meta-YAML-0.7.0.ebuild b/perl-core/CPAN-Meta-YAML/CPAN-Meta-YAML-0.7.0.ebuild
deleted file mode 100644
index 58103ac30d87..000000000000
--- a/perl-core/CPAN-Meta-YAML/CPAN-Meta-YAML-0.7.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/CPAN-Meta-YAML/CPAN-Meta-YAML-0.7.0.ebuild,v 1.1 2012/02/08 14:42:25 tove Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=DAGOLDEN
-MODULE_VERSION=0.007
-inherit perl-module
-
-DESCRIPTION="Read and write a subset of YAML for CPAN Meta files"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/perl-core/CPAN-Meta-YAML/Manifest b/perl-core/CPAN-Meta-YAML/Manifest
index ec69b5be5c73..6a9af713897e 100644
--- a/perl-core/CPAN-Meta-YAML/Manifest
+++ b/perl-core/CPAN-Meta-YAML/Manifest
@@ -1,2 +1 @@
-DIST CPAN-Meta-YAML-0.007.tar.gz 31126 SHA256 dd8af5bdf528b830348cfb84724eda050a2a5276945dcea39091156bffc0a6da SHA512 6b93f92e35b221ec48fe4f85efce3b6a5248be7dcb41693f626d8fa31c347a5077d8451ced92845bb61136ed4897890ddd29753e78a2124ae6ba9970cdc670b5 WHIRLPOOL 96466e6ed4c8aa90f0581dfbbf7bd134da63d5b8611ec85927861f0de011d2f5370a89300dd6d64cefebaaf4858d42b0d3a2c99873f86464791aecde53c09362
DIST CPAN-Meta-YAML-0.008.tar.gz 31204 SHA256 e05bb0c4fb4579fbb3e06d55ca5c56cadd0ae3cbc9d8807dffaf55639747acbb SHA512 e021e1218f76a5c9db8d516c65d3e7ec33db7b63f490f0d938a6d41eeb3afdb83dc3c9fc35da347927ecea9616d423145c0ed1643f04b2fc5ea052904231091d WHIRLPOOL 85c6a5e52dfbb05044163e8f1b8bbfb94fd59f013dcad14b56d718a1af1cb2c92c4150b6ae7681b6190d6c60ce5c1c95d50b5337ae6bee4629415a8a85b1786d
diff --git a/perl-core/CPAN-Meta/CPAN-Meta-2.120.630.ebuild b/perl-core/CPAN-Meta/CPAN-Meta-2.120.630.ebuild
deleted file mode 100644
index 0ff0f8555435..000000000000
--- a/perl-core/CPAN-Meta/CPAN-Meta-2.120.630.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/CPAN-Meta/CPAN-Meta-2.120.630.ebuild,v 1.2 2013/01/07 17:24:33 vapier Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=DAGOLDEN
-MODULE_VERSION=2.120630
-inherit perl-module
-
-DESCRIPTION="The distribution metadata for a CPAN dist"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
- >=virtual/perl-CPAN-Meta-YAML-0.2.0
- >=virtual/perl-Parse-CPAN-Meta-1.440
- >=virtual/perl-JSON-PP-2.271.30
- virtual/perl-Scalar-List-Utils
- >=virtual/perl-version-0.82"
-DEPEND="${RDEPEND}
- virtual/perl-File-Spec
- >=virtual/perl-File-Temp-0.20
- virtual/perl-IO
- >=virtual/perl-Test-Simple-0.88
- >=virtual/perl-ExtUtils-MakeMaker-6.56"
-
-SRC_TEST="do"
diff --git a/perl-core/CPAN-Meta/Manifest b/perl-core/CPAN-Meta/Manifest
index 896b743aa2a3..fa2d19add78a 100644
--- a/perl-core/CPAN-Meta/Manifest
+++ b/perl-core/CPAN-Meta/Manifest
@@ -1,3 +1,2 @@
-DIST CPAN-Meta-2.120630.tar.gz 82174 SHA256 b83aecad3550d0f74ca4c8ae951f964b08b447f254eb608fa909cedf03a2e44a SHA512 b72730c5f04d0d1a58e3aa381085f9c0265a0b45c5e023cd43b1925cf3e444a673e5459f949f225b158212ec5206e5235dfb3084a4f2c6de0bd44d6f2744f670 WHIRLPOOL 0f0c88ab2f7be2dda70edb87e30f5b535afa6e8c57aa4ef1edfd2a59231d0ed3446271403e2ff9e4403049ab1fcb008867abec1dc80208eb0a1f72a940feb331
DIST CPAN-Meta-2.120921.tar.gz 75958 SHA256 e9a829a3149920655f1bdb36cd061c21b3bfa52f05b67d12a3534933cccc9789 SHA512 0a20ce69515c7f52656bd6d9354ea16419cd2b7cd604ebbd5b07518ff08766d0173b23f6ea6b7a4532d0dbde8f51312d869636a41f12bd743ec96362f5725a55 WHIRLPOOL 601b21a132abc728f29201cc9434714e6bf45bca737924fa4aa6d91cdcecf741485429ebbef532f7b1b649fd7f795d55fa07e336197beb6722ecb2f3ea97b380
DIST CPAN-Meta-2.132510.tar.gz 79484 SHA256 97c77bd84dbe707c79452de42b47fe9f4daa98d08d160d3ae43e2e7207351ee9 SHA512 264bbded26f031b7abd92ea4410fd236523a86aa1cfb2cd8686ee084ea86786a2b91c32a59eb47dec14ecb428d5c0c03c6578aed253c9dfecdbf61015641c4c5 WHIRLPOOL bae640020730b5ab6a17814d6385c714599e802415deab252123a5fe530a4a649c5a28e1ca53847065c6487a2e6f63f2190717e9628e8d071bb265dd06999e4b
diff --git a/perl-core/DB_File/DB_File-1.826.0.ebuild b/perl-core/DB_File/DB_File-1.826.0.ebuild
deleted file mode 100644
index f1144073a319..000000000000
--- a/perl-core/DB_File/DB_File-1.826.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/DB_File/DB_File-1.826.0.ebuild,v 1.1 2012/01/29 08:43:08 tove Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=PMQS
-MODULE_VERSION=1.826
-inherit perl-module multilib eutils
-
-DESCRIPTION="A Berkeley DB Support Perl Module"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND="sys-libs/db"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
-
-src_prepare() {
- if [[ $(get_libdir) != "lib" ]] ; then
- sed -i "s:^LIB.*:LIB = /usr/$(get_libdir):" "${S}"/config.in || die
- fi
- epatch "${FILESDIR}"/DB_File-MakeMaker.patch
-}
diff --git a/perl-core/DB_File/Manifest b/perl-core/DB_File/Manifest
index 568d13b3da12..c9155ec36f39 100644
--- a/perl-core/DB_File/Manifest
+++ b/perl-core/DB_File/Manifest
@@ -1,2 +1 @@
-DIST DB_File-1.826.tar.gz 88977 SHA256 c39828ef3cfecff8197ff057cb1c6127b87107c051d182b87c6b9ac79d23f09c SHA512 046a826d2ec1ed071693f9fc7841bde144fd4fe165f7b939beca347d3f149bd34d455143e04bdac1755db3cd9be2a2906b78d81cbe974d02bc6d7fee76464eed WHIRLPOOL bf4a403df6bbe65fe4432dc6c7cd93578694887642570dc099cb11f053e44dda67757f42871c305a200a3d32206fc5c8bf3e43841d8513e48f3a6eac5efbb369
DIST DB_File-1.827.tar.gz 89246 SHA256 91e658238506efa0cb8abb22cfe71cfde420eac8489b272d24fe67c147be3cb4 SHA512 d6d761088f12ade56f5873d633efcb7e8aa29c026708b75b8d7f559edc71cca78f224788ec7655eed569bb18a4f57353bc26e8350bb26bc8a96b44daf43ac37e WHIRLPOOL 94a0e860aa94940c882fe8bd5e712651c5eb48322a203d0e000fcd4a88776da038558c6969b6f2e3562a6c7b5f11b488130591aefd9e34be91dacbda8ad50b09
diff --git a/profiles/package.mask b/profiles/package.mask
index 76745b0573a0..11f4539ca88e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15912 2014/07/18 07:49:01 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15916 2014/07/19 16:18:59 dilfridge Exp $
#
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -22,7 +22,7 @@
#
## Example:
##
-## # Dev E. Loper (25 Jan 2013)
+## # Dev E. Loper (25 Jul 2014)
## # Masked for removal in 30 days. Doesn't work
## # with new libfoo. Upstream dead, gtk-1, smells
## # funny. (bug #987654)
@@ -30,6 +30,16 @@
#--- END OF EXAMPLES ---
+# Pawel Hajdan jr (19 Jul 2014)
+# Dev channel releases are only for people who are developers or want more
+# experimental features and accept a more unstable release.
+>=www-client/chromium-38
+
+# Michael Weber (18 Jul 2014)
+# Masked for removal of affected versions in 30 days.
+# Security issue bug 513560
+ (18 Jul 2014)
# Mask for removal in 30 days for bug 380711.
# This virtual always was a no-op and can be removed from
@@ -251,7 +261,6 @@ dev-java/ibm-jdk-bin:1.5
=virtual/perl-ExtUtils-CBuilder-0.280.216
=virtual/perl-ExtUtils-Install-1.670.0
=virtual/perl-ExtUtils-MakeMaker-6.980.0
-=virtual/perl-ExtUtils-Manifest-1.630.0-r1
=virtual/perl-ExtUtils-ParseXS-3.240.0
=virtual/perl-File-Spec-3.470.0
=virtual/perl-Filter-Simple-0.910.0
@@ -288,12 +297,6 @@ dev-java/ibm-jdk-bin:1.5
=virtual/perl-net-ping-2.430.0
=virtual/perl-threads-1.930.0
=virtual/perl-threads-shared-1.460.0
-=perl-core/B-Debug-1.190.0
-
-# Pawel Hajdan jr (24 May 2014)
-# Dev channel releases are only for people who are developers or want more
-# experimental features and accept a more unstable release.
->=www-client/chromium-37
# Ryan Hill (22 May 2014)
# Big API break. Masked until something needs it.
diff --git a/profiles/updates/3Q-2014 b/profiles/updates/3Q-2014
index f774c427d0c0..a1b1de0446a1 100644
--- a/profiles/updates/3Q-2014
+++ b/profiles/updates/3Q-2014
@@ -1,2 +1,4 @@
move perl-core/Class-ISA dev-perl/Class-ISA
move perl-core/Filter dev-perl/Filter
+slotmove =net-misc/iperf-2* 0 2
+slotmove =net-misc/iperf-3* 0 3
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 2ee39780c971..a5750884e6e2 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -250,7 +250,7 @@ app-arch/cfv:bittorrent - Enable support for checking .torrent files
app-arch/dpkg:dselect - Build the dselect package-management frontend
app-arch/dpkg:update-alternatives - Install update-alternatives
app-arch/dump:ermt - encrypted rmt support
-app-arch/engrampa:caja - Enable engrampa to integrate with mate-base/mate-file-manager by providing entries in its context menu
+app-arch/engrampa:caja - Enable engrampa to integrate with mate-base/caja by providing entries in its context menu
app-arch/file-roller:nautilus - Enable file-roller to integrate with gnome-base/nautilus by providing entries in its context menu
app-arch/file-roller:packagekit - Enable support for the distro-neutral package manager GUI app-admin/packagekit
app-arch/gzip:pic - disable optimized assembly code that is not PIC friendly
@@ -5128,7 +5128,7 @@ net-libs/libbtbb:pcap - Add support for network packet capture via net-libs/libp
net-libs/libbtbb:wireshark-plugins - Build the wireshark plugins for bluetooth baseband sniffing
net-libs/libcrafter:pcap - Use net-libs/libpcap for packet capturing
net-libs/libeXosip:srv - enable support for SRV records DNS queries
-net-libs/libesmtp:ssl - Enable support for advanced SMTP authentication methods, like NTML and STARTTLS. Also use OpenSSL's MD5 implementation over internal version.
+net-libs/libesmtp:ntlm - Enable support for NTLM authentication
net-libs/libetpan:liblockfile - Enable support for liblockfile library
net-libs/libgsasl:gcrypt - Use dev-libs/libgcrypt for low-level crypto
net-libs/libgsasl:ntlm - Add support for Microsoft's NTLM mechanism using net-libs/libntlm
diff --git a/sci-calculators/units/units-2.11.ebuild b/sci-calculators/units/units-2.11.ebuild
index 0628e2533b2e..0520c8932f3c 100644
--- a/sci-calculators/units/units-2.11.ebuild
+++ b/sci-calculators/units/units-2.11.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/sci-calculators/units/units-2.11.ebuild,v 1.3 2014/05/15 20:01:41 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/units/units-2.11.ebuild,v 1.4 2014/07/19 17:24:08 klausman Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="FDL-1.3 GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm hppa ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~x86 ~amd64-linux ~x86-linux"
IUSE="+units_cur"
DEPEND="
diff --git a/sci-electronics/cirkuit/cirkuit-0.4.3-r1.ebuild b/sci-electronics/cirkuit/cirkuit-0.4.3-r1.ebuild
index 3c0f7cac68f4..de4cd664a31b 100644
--- a/sci-electronics/cirkuit/cirkuit-0.4.3-r1.ebuild
+++ b/sci-electronics/cirkuit/cirkuit-0.4.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/sci-electronics/cirkuit/cirkuit-0.4.3-r1.ebuild,v 1.2 2014/06/14 10:54:10 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/cirkuit/cirkuit-0.4.3-r1.ebuild,v 1.3 2014/07/18 14:34:06 nimiux Exp $
EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://wwwu.uni-klu.ac.at/magostin/src/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="4"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="
diff --git a/sci-electronics/cirkuit/cirkuit-0.4.3.ebuild b/sci-electronics/cirkuit/cirkuit-0.4.3.ebuild
deleted file mode 100644
index 93a9b14af1a6..000000000000
--- a/sci-electronics/cirkuit/cirkuit-0.4.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/cirkuit/cirkuit-0.4.3.ebuild,v 1.3 2013/09/05 19:24:17 ago Exp $
-
-EAPI=5
-inherit kde4-base
-
-DESCRIPTION="An application to generate publication-ready figures"
-HOMEPAGE="http://wwwu.uni-klu.ac.at/magostin/cirkuit.html"
-SRC_URI="http://wwwu.uni-klu.ac.at/magostin/src/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="
- >=app-text/poppler-0.12.3-r3[qt4]
-"
-RDEPEND="${DEPEND}
- virtual/latex-base
- media-libs/netpbm
- dev-texlive/texlive-pstricks
- app-text/ghostscript-gpl
- app-text/ps2eps
- media-gfx/pdf2svg
-"
-
-DOCS=( Changelog README )
diff --git a/sci-visualization/gnuplot/gnuplot-4.6.4-r2.ebuild b/sci-visualization/gnuplot/gnuplot-4.6.4-r2.ebuild
index 1bd108c71d35..418071eefd5d 100644
--- a/sci-visualization/gnuplot/gnuplot-4.6.4-r2.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.6.4-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/sci-visualization/gnuplot/gnuplot-4.6.4-r2.ebuild,v 1.7 2014/05/19 13:41:23 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6.4-r2.ebuild,v 1.8 2014/07/19 06:19:28 ulm Exp $
EAPI=5
@@ -26,7 +26,7 @@ fi
LICENSE="gnuplot bitmap? ( free-noncomm )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="aqua bitmap cairo doc examples +gd ggi latex lua plotutils qt4 readline svga thin-splines wxwidgets X"
RDEPEND="
diff --git a/sys-apps/acl/acl-2.2.52-r1.ebuild b/sys-apps/acl/acl-2.2.52-r1.ebuild
index 630d7774a7bc..f9af06b130c5 100644
--- a/sys-apps/acl/acl-2.2.52-r1.ebuild
+++ b/sys-apps/acl/acl-2.2.52-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/sys-apps/acl/acl-2.2.52-r1.ebuild,v 1.10 2014/07/16 10:40:02 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-2.2.52-r1.ebuild,v 1.12 2014/07/19 13:44:21 zlogene Exp $
EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.src.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
IUSE="nls static-libs"
RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]
diff --git a/sys-apps/net-tools/net-tools-1.60_p20130513023548.ebuild b/sys-apps/net-tools/net-tools-1.60_p20130513023548.ebuild
index 85011d11dece..d3a5605b09f2 100644
--- a/sys-apps/net-tools/net-tools-1.60_p20130513023548.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60_p20130513023548.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/sys-apps/net-tools/net-tools-1.60_p20130513023548.ebuild,v 1.10 2014/07/11 17:37:32 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60_p20130513023548.ebuild,v 1.13 2014/07/19 16:24:44 zlogene Exp $
EAPI="3"
@@ -13,7 +13,7 @@ else
PATCH_VER="1"
SRC_URI="mirror://gentoo/${P}.tar.xz
mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz"
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
fi
DESCRIPTION="Standard Linux networking tools"
diff --git a/sys-apps/qingy/files/qingy_at.service b/sys-apps/qingy/files/qingy_at.service
new file mode 100644
index 000000000000..b321d224a152
--- /dev/null
+++ b/sys-apps/qingy/files/qingy_at.service
@@ -0,0 +1,21 @@
+[Unit]
+Description=Qingy on %I
+Documentation=info:qingy
+After=systemd-user-sessions.service plymouth-quit-wait.service
+
+[Service]
+Environment=TERM=linux
+ExecStart=/sbin/qingy %I -n
+Type=idle
+Restart=always
+RestartSec=0
+UtmpIdentifier=%I
+TTYPath=/dev/%I
+TTYReset=yes
+TTYVHangup=yes
+TTYVTDisallocate=yes
+KillMode=process
+IgnoreSIGPIPE=no
+
+[Install]
+Alias=getty.target.wants/qingy@tty1.service
diff --git a/sys-apps/qingy/qingy-1.0.0-r2.ebuild b/sys-apps/qingy/qingy-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..4336ed716442
--- /dev/null
+++ b/sys-apps/qingy/qingy-1.0.0-r2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/qingy/qingy-1.0.0-r2.ebuild,v 1.1 2014/07/19 14:09:13 pacho Exp $
+
+EAPI=5
+inherit autotools elisp-common eutils pam systemd
+
+GENTOO_THEME_VERSION=2.1
+
+DESCRIPTION="a DirectFB getty replacement"
+HOMEPAGE="http://qingy.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+ mirror://gentoo/${PN}-gentoo-theme-${GENTOO_THEME_VERSION}.tar.bz2
+ http://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/${P}-screensavers.patch.gz
+ http://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/${P}-consolekit-pam.patch.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="consolekit crypt directfb emacs gpm opensslcrypt pam static X"
+
+RDEPEND=">=sys-libs/ncurses-5.7-r7:=
+ opensslcrypt? ( dev-libs/openssl:0= )
+ crypt? ( >=dev-libs/libgcrypt-1.2.1:0= )
+ directfb? ( >=dev-libs/DirectFB-1.4.2[fbcon,jpeg,png,truetype] )
+ emacs? ( virtual/emacs )
+ pam? ( >=sys-libs/pam-0.75-r11 )
+ X? (
+ x11-libs/libX11:=
+ x11-libs/libXScrnSaver:=
+ x11-proto/scrnsaverproto
+ )"
+DEPEND="${RDEPEND}
+ >=sys-apps/sed-4.1.4-r1
+ virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+ consolekit? (
+ sys-auth/consolekit
+ sys-apps/dbus )
+ pam? ( sys-auth/pambase )"
+
+SITEFILE=50${PN}-gentoo.el
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-tinfo.patch
+ # bug #359637 and bug #462634 - fixes from upstream
+ epatch "${DISTDIR}"/${P}-screensavers.patch.gz
+ # bug #372675 - fix from upstream
+ epatch "${DISTDIR}"/${P}-consolekit-pam.patch.gz
+ eautoreconf
+}
+
+src_configure() {
+ local crypto_support="--disable-crypto"
+ local emacs_support="--disable-emacs --without-lispdir"
+
+ if use crypt && use opensslcrypt; then
+ echo
+ ewarn "You can have openssl or libgcrypt as a crypto library, not both."
+ ewarn "Using libgcrypt now..."
+ echo
+ fi
+
+ use emacs && emacs_support="--enable-emacs --with-lispdir=${SITELISP}/${PN}"
+ use opensslcrypt && crypto_support="--enable-crypto=openssl"
+ use crypt && crypto_support="--enable-crypto=libgcrypt"
+ econf \
+ --sbindir=/sbin \
+ --disable-optimizations \
+ $(use_enable consolekit) \
+ $(use_enable pam) \
+ $(use_enable static static-build) \
+ $(use_enable gpm gpm-lock) \
+ $(use_enable X x-support) \
+ $(use_enable directfb DirectFB-support ) \
+ ${crypto_support} \
+ ${emacs_support}
+}
+
+src_install() {
+ # Copy documentation manually as make install only installs info files
+ # INSTALL is left because it contains also configuration informations
+ dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS TODO
+
+ # Install the program
+ emake DESTDIR="${D}" install
+
+ # Set the settings file umask to 600, in case somebody
+ # wants to make use of the autologin feature
+ /bin/chmod 600 "${D}"/etc/qingy/settings
+
+ # Install Gentoo theme
+ dodir /usr/share/${PN}/themes/gentoo
+ cp "${WORKDIR}"/gentoo/* "${D}"/usr/share/${PN}/themes/gentoo || die
+
+ # Alter config file so that it uses our theme
+ sed -i 's/theme = "default"/theme = "gentoo"/' "${D}"/etc/${PN}/settings
+
+ # Install log rotation policy
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/${PN}-logrotate ${PN}
+
+ use emacs && elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+
+ rm "${D}"/etc/pam.d/qingy
+ pamd_mimic system-local-login qingy auth account password session
+
+ systemd_newunit "${FILESDIR}/${PN}_at.service" "${PN}@.service"
+}
+
+pkg_postinst() {
+ einfo "In order to use qingy you must first edit your /etc/inittab"
+ einfo "Check the documentation at ${HOMEPAGE}"
+ einfo "for instructions on how to do that."
+ echo
+ einfo "Also, make sure to adjust qingy settings file (/etc/qingy/settings)"
+ einfo "to your preferences/machine configuration..."
+
+ if use crypt; then
+ echo
+ einfo "You will have to create a key pair using 'qingy-keygen'"
+ echo
+ ewarn "Note that sometimes a generated key-pair may pass the internal tests"
+ ewarn "but fail to work properly. You will get a 'regenerate your keys'"
+ ewarn "message. If this is your case, please remove /etc/qingy/public_key"
+ ewarn "and /etc/qingy/private_key and run qingy-keygen again..."
+ fi
+
+ use emacs && echo && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index a04b4aa44e27..5f8bd7ca007c 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -19,6 +19,7 @@ DIST fio-2.0.3.tar.bz2 373972 SHA256 5cba2bfe5f9ad23d2a1e2be5c63898ac5566e309f6f
DIST fio-2.0.8.tar.bz2 216417 SHA256 584724a98cbed7364a550c9106c88d1ae3833b3edffda46ed5fcbb90fffb672a SHA512 ae254e4a2ea1a17052c9c2de6e6707c6254a80dd96c29a74c88d85808f1aa471e1ef2dd0a558114814b7813daedfabf4d38eb1bf875791d186b08eaeaecfe9e4 WHIRLPOOL 0350893fb7b097ae6ef902134f77fed078ae54be29e5c8c3108467c1d4dffb87e96d75fb365473c80f5f9b36b63a5fdc135bf0dd3f5f45f358081adc191a5df8
DIST fio-2.0.9.tar.bz2 217972 SHA256 46c44757f489ffa89fa4566baba93c9f2efdc584029f1106d0c04ee900a8993a SHA512 c8be33477e3735170de9b91da3af8de32680e5e6e96728f0664aab21156e59f24a2508f6d2966b316c01e89f4932e0cdcbd9ef3c22067b76f81dd48e56dd6fc3 WHIRLPOOL 4e9313a75b56c925b58fd9dd19d4148e9643661ee63bfd7dfca89c669f42c9fc58d91bdcfaf62b5761a44a189c9c11555456557d76069ffdc80f935ea4584d84
DIST fio-2.1.10.tar.bz2 432787 SHA256 4dd98cfe7da343b82ce351dd2a12f9ea456f9a54efc80a380786956a68c4edfc SHA512 207e4dc2c3f2d39dda6d901e38baa7a4e40ab0c2b7af074d4d7c24e72ca6859a43d6a10a1de8ab0953a82234d114762bcb53c4adf12cd12f748b3c4aa3e02914 WHIRLPOOL faecbe02ccad8b8cb982a25bfd0aec0f410c90761c3add1f0f99b0fc0973ab8ebdf6da4914ce5683fe4127c3ee9475b57216844f53194dcc955176a98054079c
+DIST fio-2.1.11.tar.bz2 438440 SHA256 aba2d8bac1997277cb9bb5a0abab345248298d4c0c712d484c3d2fab0674dbb1 SHA512 af6bb8038abbb704e21d183189f625ac321d651ff7a7027cc7f05095fb41671482c74903e08e4a5fb6ab5658b98371822580c62220a59333405ec26294a6104b WHIRLPOOL f06ee4ef948af1b74a8b365937838af13f4069c8d09a899edcc6b69d085fe9e197bf9824b9fd983bd1be4e0d1c7f5167b5cd8c96dbfce728980c78857aa31a14
DIST fio-2.1.2.tar.bz2 403177 SHA256 ebebbdfb6035369a6e5c960527a3ec77e96cd6c35cd3cfda058d76b7f15d2729 SHA512 39e67fce877f971ca86ce95f318bd582b481b52a679435279aa0fb44c9b099660010d8f8855c82df522f2a7a9519002feb395d4693139b4785a1b40dba898df7 WHIRLPOOL 398a9581c6efaf750b33a9043f602ef2421834d24782572cacb6ff63597ced5016b7bbc1d4e18ab04728a8716763fca53b97245a6c2e0d50147c3742f94da72d
DIST fio-2.1.4.tar.bz2 407430 SHA256 62e075862340513fcdb1f75ccee3765a47d1f380f7a6bdb2175f24acf4b77467 SHA512 5dd12c298a715012761554a2239548571052d0655e51a142d6cc87f62e0daf0a007dafd61c7d0c1a7c45cb2ca1670493caa70bb056254e1bb9ebb86b75f7f556 WHIRLPOOL 82014ef1b9e6e9c87e532a66a19f98c229cdb165e38802679da5a869bfa5be9e7872d30cfda464bd3cf66cdfc459cb7a1dbdb9c9f909c6f9c10e6e8569abb038
DIST fio-2.1.5.tar.bz2 413595 SHA256 8cb8a6599c223ba7a3f9b7fe817a9ca2b3c8512be89c64cc223f1951f3b19d26 SHA512 3e37ab487d8c97a31c752b9f5b70ca32632d7ba871db9d3501ef1528bb5e2f40d0d698ed13fbafa2ca59166a332d5984c4f14118a91f2fe1a32d2d682d9495c0 WHIRLPOOL b86a1d689cb49c0ecd1640fb1313f5662f00fa36a0bdafe301e745c7ccfa6fd89d8967049080d4e365bf45f39574019775aac199cf26dabfd20dcee6b7974e0c
diff --git a/sys-block/fio/fio-2.1.11.ebuild b/sys-block/fio/fio-2.1.11.ebuild
new file mode 100644
index 000000000000..0a7c3d04884e
--- /dev/null
+++ b/sys-block/fio/fio-2.1.11.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.1.11.ebuild,v 1.1 2014/07/19 04:30:39 radhermit Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-r1 toolchain-funcs
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Jens Axboe's Flexible IO tester"
+HOMEPAGE="http://brick.kernel.dk/snaps/"
+SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="aio gnuplot gtk numa zlib"
+
+DEPEND="aio? ( dev-libs/libaio )
+ gtk? (
+ dev-libs/glib:2
+ x11-libs/gtk+:2
+ )
+ numa? ( sys-process/numactl )
+ zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+ gnuplot? (
+ sci-visualization/gnuplot
+ ${PYTHON_DEPS}
+ )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ sed -i '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' Makefile || die
+ epatch_user
+
+ # Many checks don't have configure flags.
+ sed -i \
+ -e "s:\:$(tc-getPKG_CONFIG):" \
+ -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \
+ -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
+ configure || die
+}
+
+src_configure() {
+ # not a real configure script
+ ./configure \
+ --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
+ --cc="$(tc-getCC)" \
+ $(usex gtk '--enable-gfio' '') \
+ $(usex numa '' '--disable-numa') \
+ || die 'configure failed'
+}
+
+src_compile() {
+ emake V=1 OPTFLAGS=
+}
+
+src_install() {
+ emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
+
+ if use gnuplot ; then
+ python_replicate_script "${ED}/usr/bin/fio2gnuplot"
+ else
+ rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
+ rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
+ rm "${ED}"/usr/share/fio/*.gpm || die
+ rmdir "${ED}"/usr/share/fio/ 2>/dev/null
+ fi
+
+ # This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
+ rm "${ED}"/usr/bin/genfio || die
+
+ dodoc README REPORTING-BUGS HOWTO
+ docinto examples
+ dodoc examples/*
+}
diff --git a/sys-fs/eudev/eudev-1.9-r1.ebuild b/sys-fs/eudev/eudev-1.9-r1.ebuild
index 560a7dfcc216..b7edfd29677c 100644
--- a/sys-fs/eudev/eudev-1.9-r1.ebuild
+++ b/sys-fs/eudev/eudev-1.9-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/sys-fs/eudev/eudev-1.9-r1.ebuild,v 1.5 2014/07/15 14:46:04 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.9-r1.ebuild,v 1.6 2014/07/19 17:34:03 jer Exp $
EAPI="5"
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
inherit git-2
else
SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
- KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 x86"
+ KEYWORDS="amd64 arm hppa ~mips ppc ppc64 x86"
fi
DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/genext2fs/genext2fs-1.4.1.ebuild b/sys-fs/genext2fs/genext2fs-1.4.1.ebuild
index bca077339d8c..6173683dc123 100644
--- a/sys-fs/genext2fs/genext2fs-1.4.1.ebuild
+++ b/sys-fs/genext2fs/genext2fs-1.4.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/sys-fs/genext2fs/genext2fs-1.4.1.ebuild,v 1.5 2014/07/06 17:44:27 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/genext2fs/genext2fs-1.4.1.ebuild,v 1.6 2014/07/19 18:50:07 klausman Exp $
DESCRIPTION="generate ext2 file systems"
HOMEPAGE="http://sourceforge.net/projects/genext2fs"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~mips ~ppc ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ~mips ~ppc ~sparc x86"
IUSE=""
DEPEND=""
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index 5088e35beb3f..4a6d587c80f3 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -1,4 +1,3 @@
DIST mdadm-3.2.6.tar.bz2 371525 SHA256 c44ed3b31238b41cffe67caffaf45067d01e095de94988889ea8a94e22dc6c38 SHA512 1ebcd4c797cd9f7388f9a27372a19205dc81a4b19adc83e1d6d7cfd4ef18f40a211fddf59ed027a1bf35bd36d4b6795e88e8086c3b022c188ec6e9f68bf1a4ee WHIRLPOOL 61d07512758491326c21bb745ca457a9f3d9215292358d7b4755eb84bb72877058fb239cbffe25c8121caff066aded84e8353b9716e9d4a45d724777f01a6714
DIST mdadm-3.3.1.tar.xz 407964 SHA256 d8c74112cfd77bdc1dbc1291fe8d9243c76d91bfa276fcb95f2a75ca7717ab02 SHA512 46fc1889e97d2d14b72ac26ee07eb4301467dc4a0e838ba89920253484fcd443749f3afccb3d792f7e468b20021d50dbc29dda7033d9b5a8fbaee664200f1981 WHIRLPOOL ca690bd35ab8ff475694d8f0420cd762704cc1777116edfdc9394973efa0d6decce1721dc1f7c8c84728d7434073cb6ab5161e5518c46aa8b4a7a5547ebb011d
-DIST mdadm-3.3.tar.xz 399152 SHA256 565d2d0f3114679d7ac96c31282fdc61b0e2eddbed13d3ea723a64b079899151 SHA512 09eca8a8e26f4159be3d1988925d9ade5e580eac94ea4044ee92e0c5e08fbfbc8d7ec83d34621df4eab1217b97df372b868144db20e33ad2c6ed01210911bd9a WHIRLPOOL 32f83199b9327fa1124c80c63a815a16f7423f76ef9b9d77a568e2c25e2cef8ef84ffdff25f3314f77e976c0d9ed758a3e62837a15a46c6e60932d83b7bb805b
DIST mdadm_3.3-2.debian.tar.gz 127889 SHA256 c38b155e7395b35380d506458d979b82c5b853de996f21ccab50b1202d726301 SHA512 92e4c403542caba4b9afb870ba803e6bc7ade143b27efdc27e03b3407f322722a635457cce9e8c195a3ecd7cbce66fdebdd6046fc4f36836e56e27d5d838c037 WHIRLPOOL 8f8ef1142a79044093a5f55b181dc35a142b83041a59a9b71945aa6fe84cd089a7e1b183ec6b5db210a0d07e94efad0ab3a0d0341fc6cbbbf4da9d0254b5c737
diff --git a/sys-fs/mdadm/files/mdadm-3.3.1-DDF-validate-metadata_update-size-before-using-it.patch b/sys-fs/mdadm/files/mdadm-3.3.1-DDF-validate-metadata_update-size-before-using-it.patch
new file mode 100644
index 000000000000..befb7da91735
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-3.3.1-DDF-validate-metadata_update-size-before-using-it.patch
@@ -0,0 +1,44 @@
+From 1f17f96b538793a0e665e471f602c6fa490ec167 Mon Sep 17 00:00:00 2001
+From: NeilBrown
+Date: Thu, 10 Jul 2014 15:59:06 +1000
+Subject: [PATCH 12/14] DDF: validate metadata_update size before using it.
+
+process_update already checks update->len, for all but
+the 'magic', prepare_update doesn't at all.
+
+So add tests to prepare_update that we don't exceed the buffer.
+This will consequently protect process_update from looking
+for a 'magic' which isn't there.
+
+Reported-by: Vincent Berg
+Signed-off-by: NeilBrown
+---
+ super-ddf.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/super-ddf.c b/super-ddf.c
+index 1e43ca2..8957c2e 100644
+--- a/super-ddf.c
++++ b/super-ddf.c
+@@ -4914,10 +4914,16 @@ static int ddf_prepare_update(struct supertype *st,
+ * If a malloc is needed, do it here.
+ */
+ struct ddf_super *ddf = st->sb;
+- be32 *magic = (be32 *)update->buf;
++ be32 *magic;
++ if (update->len < 4)
++ return 0;
++ magic = (be32 *)update->buf;
+ if (be32_eq(*magic, DDF_VD_CONF_MAGIC)) {
+ struct vcl *vcl;
+- struct vd_config *conf = (struct vd_config *) update->buf;
++ struct vd_config *conf;
++ if (update->len < (int)sizeof(*conf))
++ return 0;
++ conf = (struct vd_config *) update->buf;
+ if (posix_memalign(&update->space, 512,
+ offsetof(struct vcl, conf)
+ + ddf->conf_rec_len * 512) != 0) {
+--
+2.0.0
+
diff --git a/sys-fs/mdadm/files/mdadm-3.3.1-Grow-Do-not-try-to-restart-if-reshape-is-running.patch b/sys-fs/mdadm/files/mdadm-3.3.1-Grow-Do-not-try-to-restart-if-reshape-is-running.patch
new file mode 100644
index 000000000000..717317b8a2d0
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-3.3.1-Grow-Do-not-try-to-restart-if-reshape-is-running.patch
@@ -0,0 +1,45 @@
+From 13ffbe89b6103c146c08eb1c9a70833306c8322b Mon Sep 17 00:00:00 2001
+From: Pawel Baldysiak
+Date: Wed, 16 Jul 2014 12:20:34 +0200
+Subject: [PATCH 14/14] Grow: Do not try to restart if reshape is running
+
+Grow process did not check if reshape is already started
+when deciding about restarting.
+Sync_action should be checked in this case, and if
+reshape is running - restart flag should not be set.
+Otherwise, Grow process will fail to write data to
+sysfs, and reshape will not be continued.
+
+Signed-off-by: Pawel Baldysiak
+Signed-off-by: Artur Paszkiewicz
+Signed-off-by: NeilBrown
+---
+ Grow.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Grow.c b/Grow.c
+index a2f4f14..ea9cc60 100644
+--- a/Grow.c
++++ b/Grow.c
+@@ -2822,6 +2822,7 @@ static int reshape_array(char *container, int fd, char *devname,
+ unsigned long long array_size;
+ int done;
+ struct mdinfo *sra = NULL;
++ char buf[20];
+
+ /* when reshaping a RAID0, the component_size might be zero.
+ * So try to fix that up.
+@@ -2869,7 +2870,9 @@ static int reshape_array(char *container, int fd, char *devname,
+ goto release;
+ }
+
+- if (st->ss->external && restart && (info->reshape_progress == 0)) {
++ if (st->ss->external && restart && (info->reshape_progress == 0) &&
++ !((sysfs_get_str(info, NULL, "sync_action", buf, sizeof(buf)) > 0) &&
++ (strncmp(buf, "reshape", 7) == 0))) {
+ /* When reshape is restarted from '0', very begin of array
+ * it is possible that for external metadata reshape and array
+ * configuration doesn't happen.
+--
+2.0.0
+
diff --git a/sys-fs/mdadm/files/mdadm-3.3.1-Grow-fix-removal-of-line-in-wrong-case.patch b/sys-fs/mdadm/files/mdadm-3.3.1-Grow-fix-removal-of-line-in-wrong-case.patch
new file mode 100644
index 000000000000..acc38267d160
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-3.3.1-Grow-fix-removal-of-line-in-wrong-case.patch
@@ -0,0 +1,39 @@
+From e339dba2a1744dc6860a58e286ded39fc993c2db Mon Sep 17 00:00:00 2001
+From: Pawel Baldysiak
+Date: Wed, 11 Jun 2014 15:18:44 +0000
+Subject: [PATCH 02/14] Grow: fix removal of line in wrong case
+
+Commit 18d9bcfa33939cee345d4d7735bc6081bcc409c8
+removed wrong line (in case RAID0->RAID4).
+This patch corrects this mistake
+(line should be removed in case RAID4->RAID4).
+
+Signed-off-by: Pawel Baldysiak
+Signed-off-by: NeilBrown
+---
+ Grow.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Grow.c b/Grow.c
+index 12730e2..a2f4f14 100644
+--- a/Grow.c
++++ b/Grow.c
+@@ -1324,6 +1324,7 @@ char *analyse_change(char *devname, struct mdinfo *info, struct reshape *re)
+
+ switch (re->level) {
+ case 4:
++ re->before.layout = 0;
+ re->after.layout = 0;
+ break;
+ case 5:
+@@ -1339,7 +1340,6 @@ char *analyse_change(char *devname, struct mdinfo *info, struct reshape *re)
+
+ switch (re->level) {
+ case 4:
+- re->before.layout = 0;
+ re->after.layout = 0;
+ break;
+ case 5:
+--
+2.0.0
+
diff --git a/sys-fs/mdadm/files/mdadm-3.3.1-IMSM-use-strcpy-rather-than-pointless-strncpy.patch b/sys-fs/mdadm/files/mdadm-3.3.1-IMSM-use-strcpy-rather-than-pointless-strncpy.patch
new file mode 100644
index 000000000000..b63b1e732d36
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-3.3.1-IMSM-use-strcpy-rather-than-pointless-strncpy.patch
@@ -0,0 +1,32 @@
+From 6d8d290a2f09a3bfd9e44f382ae5daea128772f7 Mon Sep 17 00:00:00 2001
+From: NeilBrown
+Date: Thu, 3 Jul 2014 15:04:01 +1000
+Subject: [PATCH 03/14] IMSM: use strcpy rather than pointless strncpy.
+
+As strncpy doesn't guarantee to nul-terminate, some static
+analysers get upset that it is followed by a 'strncat'.
+So just use a 'strcpy' - strlen(disk_by_path) is constant
+and definitely less than PATH_MAX.
+
+Link: https://github.com/neilbrown/mdadm/issues/4
+Signed-off-by: NeilBrown
+---
+ super-intel.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/super-intel.c b/super-intel.c
+index 9dd807a..0106b4f 100644
+--- a/super-intel.c
++++ b/super-intel.c
+@@ -9357,7 +9357,7 @@ static const char *imsm_get_disk_controller_domain(const char *path)
+ char *drv=NULL;
+ struct stat st;
+
+- strncpy(disk_path, disk_by_path, PATH_MAX - 1);
++ strcpy(disk_path, disk_by_path);
+ strncat(disk_path, path, PATH_MAX - strlen(disk_path) - 1);
+ if (stat(disk_path, &st) == 0) {
+ struct sys_dev* hba;
+--
+2.0.0
+
diff --git a/sys-fs/mdadm/files/mdadm-3.3.1-IMSM-validate-metadata_update-size-before-using-it.patch b/sys-fs/mdadm/files/mdadm-3.3.1-IMSM-validate-metadata_update-size-before-using-it.patch
new file mode 100644
index 000000000000..b1610835753a
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-3.3.1-IMSM-validate-metadata_update-size-before-using-it.patch
@@ -0,0 +1,128 @@
+From 095b8088fa99ad1195d1aba03af2aa561b4a6379 Mon Sep 17 00:00:00 2001
+From: NeilBrown
+Date: Thu, 10 Jul 2014 16:09:28 +1000
+Subject: [PATCH 13/14] IMSM: validate metadata_update size before using it.
+
+Every case in prepare_update check that the size message
+size is sufficient, so process_update doesn't need to check anything.
+
+Reported-by: Vincent Berg
+Signed-off-by: NeilBrown
+---
+ super-intel.c | 44 +++++++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 41 insertions(+), 3 deletions(-)
+
+diff --git a/super-intel.c b/super-intel.c
+index 2547b4a..b4efa72 100644
+--- a/super-intel.c
++++ b/super-intel.c
+@@ -8587,7 +8587,7 @@ static void imsm_process_update(struct supertype *st,
+ }
+ case update_add_remove_disk: {
+ /* we may be able to repair some arrays if disks are
+- * being added, check teh status of add_remove_disk
++ * being added, check the status of add_remove_disk
+ * if discs has been added.
+ */
+ if (add_remove_disk_update(super)) {
+@@ -8617,19 +8617,28 @@ static int imsm_prepare_update(struct supertype *st,
+ * integrated by the monitor thread without worrying about live pointers
+ * in the manager thread.
+ */
+- enum imsm_update_type type = *(enum imsm_update_type *) update->buf;
++ enum imsm_update_type type;
+ struct intel_super *super = st->sb;
+ struct imsm_super *mpb = super->anchor;
+ size_t buf_len;
+ size_t len = 0;
+
++ if (update->len < (int)sizeof(type))
++ return 0;
++
++ type = *(enum imsm_update_type *) update->buf;
++
+ switch (type) {
+ case update_general_migration_checkpoint:
++ if (update->len < (int)sizeof(struct imsm_update_general_migration_checkpoint))
++ return 0;
+ dprintf("imsm: prepare_update() "
+ "for update_general_migration_checkpoint called\n");
+ break;
+ case update_takeover: {
+ struct imsm_update_takeover *u = (void *)update->buf;
++ if (update->len < (int)sizeof(*u))
++ return 0;
+ if (u->direction == R0_TO_R10) {
+ void **tail = (void **)&update->space_list;
+ struct imsm_dev *dev = get_imsm_dev(super, u->subarray);
+@@ -8670,6 +8679,9 @@ static int imsm_prepare_update(struct supertype *st,
+ struct intel_dev *dl;
+ void **space_tail = (void**)&update->space_list;
+
++ if (update->len < (int)sizeof(*u))
++ return 0;
++
+ dprintf("imsm: imsm_prepare_update() for update_reshape\n");
+
+ for (dl = super->devlist; dl; dl = dl->next) {
+@@ -8702,6 +8714,9 @@ static int imsm_prepare_update(struct supertype *st,
+ void *s;
+ int current_level = -1;
+
++ if (update->len < (int)sizeof(*u))
++ return 0;
++
+ dprintf("imsm: imsm_prepare_update() for update_reshape\n");
+
+ /* add space for bigger array in update
+@@ -8769,6 +8784,13 @@ static int imsm_prepare_update(struct supertype *st,
+ break;
+ }
+ case update_size_change: {
++ if (update->len < (int)sizeof(struct imsm_update_size_change))
++ return 0;
++ break;
++ }
++ case update_activate_spare: {
++ if (update->len < (int)sizeof(struct imsm_update_activate_spare))
++ return 0;
+ break;
+ }
+ case update_create_array: {
+@@ -8781,6 +8803,9 @@ static int imsm_prepare_update(struct supertype *st,
+ int i;
+ int activate = 0;
+
++ if (update->len < (int)sizeof(*u))
++ return 0;
++
+ inf = get_disk_info(u);
+ len = sizeof_imsm_dev(dev, 1);
+ /* allocate a new super->devlist entry */
+@@ -8802,9 +8827,22 @@ static int imsm_prepare_update(struct supertype *st,
+ }
+ len += activate * sizeof(struct imsm_disk);
+ break;
+- default:
++ }
++ case update_kill_array: {
++ if (update->len < (int)sizeof(struct imsm_update_kill_array))
++ return 0;
+ break;
+ }
++ case update_rename_array: {
++ if (update->len < (int)sizeof(struct imsm_update_rename_array))
++ return 0;
++ break;
++ }
++ case update_add_remove_disk:
++ /* no update->len needed */
++ break;
++ default:
++ return 0;
+ }
+
+ /* check if we need a larger metadata buffer */
+--
+2.0.0
+
diff --git a/sys-fs/mdadm/files/mdadm-3.3.1-Makefile-install-mdadm-grow-continue-.service.patch b/sys-fs/mdadm/files/mdadm-3.3.1-Makefile-install-mdadm-grow-continue-.service.patch
new file mode 100644
index 000000000000..431bfd1abe3b
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-3.3.1-Makefile-install-mdadm-grow-continue-.service.patch
@@ -0,0 +1,28 @@
+From 616f197f9d6d044afb9e27ddc9cd087d21d610f0 Mon Sep 17 00:00:00 2001
+From: NeilBrown
+Date: Tue, 10 Jun 2014 20:34:40 +1000
+Subject: [PATCH 01/14] Makefile: install mdadm-grow-continue@.service
+
+Forgot to add this to install-systemd target
+
+Signed-off-by: NeilBrown
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index c7e7a42..1a4a5dc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -290,7 +290,7 @@ install-udev: udev-md-raid-arrays.rules udev-md-raid-assembly.rules
+
+ install-systemd: systemd/mdmon@.service
+ @for file in mdmon@.service mdmonitor.service mdadm-last-resort@.timer \
+- mdadm-last-resort@.service ; \
++ mdadm-last-resort@.service mdadm-grow-continue@.service; \
+ do sed -e 's,BINDIR,$(BINDIR),g' systemd/$$file > .install.tmp && \
+ echo $(INSTALL) -D -m 644 systemd/$$file $(DESTDIR)$(SYSTEMD_DIR)/$$file ; \
+ $(INSTALL) -D -m 644 .install.tmp $(DESTDIR)$(SYSTEMD_DIR)/$$file ; \
+--
+2.0.0
+
diff --git a/sys-fs/mdadm/files/mdadm-3.3.1-mdmon-allow-prepare_update-to-report-failure.patch b/sys-fs/mdadm/files/mdadm-3.3.1-mdmon-allow-prepare_update-to-report-failure.patch
new file mode 100644
index 000000000000..772248b19c3d
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-3.3.1-mdmon-allow-prepare_update-to-report-failure.patch
@@ -0,0 +1,119 @@
+From 5fe6f031d9a21a935f0ef1b1fbdb314b53f2199f Mon Sep 17 00:00:00 2001
+From: NeilBrown
+Date: Thu, 10 Jul 2014 15:54:02 +1000
+Subject: [PATCH 11/14] mdmon: allow prepare_update to report failure.
+
+If 'prepare_update' fails for some reason there is little
+point continuing on to 'process_update'.
+For now only malloc failures are caught, but other failures
+will be considered in future.
+
+Signed-off-by: NeilBrown
+---
+ managemon.c | 3 ++-
+ mdadm.h | 5 ++++-
+ super-ddf.c | 8 +++++---
+ super-intel.c | 9 +++++----
+ 4 files changed, 16 insertions(+), 9 deletions(-)
+
+diff --git a/managemon.c b/managemon.c
+index 5f7e2ce..1c9eccc 100644
+--- a/managemon.c
++++ b/managemon.c
+@@ -819,7 +819,8 @@ static void handle_message(struct supertype *container, struct metadata_update *
+ mu->space_list = NULL;
+ mu->next = NULL;
+ if (container->ss->prepare_update)
+- container->ss->prepare_update(container, mu);
++ if (!container->ss->prepare_update(container, mu))
++ free_updates(&mu);
+ queue_metadata_update(mu);
+ }
+ }
+diff --git a/mdadm.h b/mdadm.h
+index 914d67c..02a9288 100644
+--- a/mdadm.h
++++ b/mdadm.h
+@@ -929,7 +929,10 @@ extern struct superswitch {
+ void (*sync_metadata)(struct supertype *st);
+ void (*process_update)(struct supertype *st,
+ struct metadata_update *update);
+- void (*prepare_update)(struct supertype *st,
++ /* Prepare updates allocates extra memory that might be
++ * needed. If the update cannot be understood, return 0.
++ */
++ int (*prepare_update)(struct supertype *st,
+ struct metadata_update *update);
+
+ /* activate_spare will check if the array is degraded and, if it
+diff --git a/super-ddf.c b/super-ddf.c
+index ab9fc46..1e43ca2 100644
+--- a/super-ddf.c
++++ b/super-ddf.c
+@@ -4906,8 +4906,8 @@ static void ddf_process_update(struct supertype *st,
+ /* case DDF_SPARE_ASSIGN_MAGIC */
+ }
+
+-static void ddf_prepare_update(struct supertype *st,
+- struct metadata_update *update)
++static int ddf_prepare_update(struct supertype *st,
++ struct metadata_update *update)
+ {
+ /* This update arrived at managemon.
+ * We are about to pass it to monitor.
+@@ -4922,15 +4922,17 @@ static void ddf_prepare_update(struct supertype *st,
+ offsetof(struct vcl, conf)
+ + ddf->conf_rec_len * 512) != 0) {
+ update->space = NULL;
+- return;
++ return 0;
+ }
+ vcl = update->space;
+ vcl->conf.sec_elmnt_count = conf->sec_elmnt_count;
+ if (alloc_other_bvds(ddf, vcl) != 0) {
+ free(update->space);
+ update->space = NULL;
++ return 0;
+ }
+ }
++ return 1;
+ }
+
+ /*
+diff --git a/super-intel.c b/super-intel.c
+index 7734bde..2547b4a 100644
+--- a/super-intel.c
++++ b/super-intel.c
+@@ -8607,8 +8607,8 @@ static void imsm_process_update(struct supertype *st,
+
+ static struct mdinfo *get_spares_for_grow(struct supertype *st);
+
+-static void imsm_prepare_update(struct supertype *st,
+- struct metadata_update *update)
++static int imsm_prepare_update(struct supertype *st,
++ struct metadata_update *update)
+ {
+ /**
+ * Allocate space to hold new disk entries, raid-device entries or a new
+@@ -8828,6 +8828,7 @@ static void imsm_prepare_update(struct supertype *st,
+ else
+ super->next_buf = NULL;
+ }
++ return 1;
+ }
+
+ /* must be called while manager is quiesced */
+@@ -9716,8 +9717,8 @@ static void imsm_update_metadata_locally(struct supertype *st,
+ mu.space = NULL;
+ mu.space_list = NULL;
+ mu.next = NULL;
+- imsm_prepare_update(st, &mu);
+- imsm_process_update(st, &mu);
++ if (imsm_prepare_update(st, &mu))
++ imsm_process_update(st, &mu);
+
+ while (mu.space_list) {
+ void **space = mu.space_list;
+--
+2.0.0
+
diff --git a/sys-fs/mdadm/files/mdadm-3.3.1-mdmon-ensure-Unix-domain-socket-is-created-with-safe.patch b/sys-fs/mdadm/files/mdadm-3.3.1-mdmon-ensure-Unix-domain-socket-is-created-with-safe.patch
new file mode 100644
index 000000000000..9780196e28cd
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-3.3.1-mdmon-ensure-Unix-domain-socket-is-created-with-safe.patch
@@ -0,0 +1,34 @@
+From 120ec6f7b96455e42bdfa9131c0c9026c57eaf19 Mon Sep 17 00:00:00 2001
+From: NeilBrown
+Date: Thu, 3 Jul 2014 17:06:45 +1000
+Subject: [PATCH 09/14] mdmon: ensure Unix domain socket is created with safe
+ permissions.
+
+In the unlikely case that mdmon is started with an overly
+permissive umask, we don't want to risk giving away world acccess.
+
+All other "mkdir" and "O_CREAT" calls in mdmon and mdadm set
+a suitably restrictive permission mask. 'bind' don't take an
+explicit mask so it needs an implicit one.
+
+Reported-by: Vincent Berg
+Signed-off-by: NeilBrown
+---
+ mdmon.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/mdmon.c b/mdmon.c
+index b84d4d9..21221cd 100644
+--- a/mdmon.c
++++ b/mdmon.c
+@@ -232,6 +232,7 @@ static int make_control_sock(char *devname)
+
+ addr.sun_family = PF_LOCAL;
+ strcpy(addr.sun_path, path);
++ umask(077); /* ensure no world write access */
+ if (bind(sfd, &addr, sizeof(addr)) < 0) {
+ close(sfd);
+ return -1;
+--
+2.0.0
+
diff --git a/sys-fs/mdadm/files/mdadm.service-r1 b/sys-fs/mdadm/files/mdadm.service-r1
deleted file mode 100644
index f8877cb83563..000000000000
--- a/sys-fs/mdadm/files/mdadm.service-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Software RAID monitoring and management
-ConditionPathExists=/etc/mdadm.conf
-
-[Service]
-ExecStart=/sbin/mdadm --monitor --scan
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/sys-fs/mdadm/mdadm-3.3-r4.ebuild b/sys-fs/mdadm/mdadm-3.3-r4.ebuild
deleted file mode 100644
index 6da084cf654f..000000000000
--- a/sys-fs/mdadm/mdadm-3.3-r4.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.3-r4.ebuild,v 1.2 2014/07/17 07:55:29 ssuominen Exp $
-
-EAPI="4"
-inherit multilib flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="A useful tool for running RAID systems - it can be used as a replacement for the raidtools"
-HOMEPAGE="http://neil.brown.name/blog/mdadm"
-DEB_PR=2
-SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P}.tar.xz
- mirror://debian/pool/main/m/mdadm/${PN}_${PV}-${DEB_PR}.debian.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static"
-
-DEPEND="virtual/pkgconfig
- app-arch/xz-utils"
-RDEPEND=">=sys-apps/util-linux-2.16"
-
-# The tests edit values in /proc and run tests on software raid devices.
-# Thus, they shouldn't be run on systems with active software RAID devices.
-RESTRICT="test"
-
-mdadm_emake() {
- emake \
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \
- CC="$(tc-getCC)" \
- CWFLAGS="-Wall" \
- CXFLAGS="${CFLAGS}" \
- MAP_DIR=/run/mdadm \
- "$@"
-}
-
-src_compile() {
- use static && append-ldflags -static
- mdadm_emake all mdassemble
-}
-
-src_test() {
- mdadm_emake test
-
- sh ./test || die
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- SYSTEMD_DIR=$(systemd_get_unitdir) \
- install
- emake \
- DESTDIR="${D}" \
- SYSTEMD_DIR=$(systemd_get_unitdir) \
- install-systemd
- into /
- dosbin mdassemble
- dodoc ChangeLog INSTALL TODO README* ANNOUNCE-${PV}
-
- insinto /etc
- newins mdadm.conf-example mdadm.conf
- newinitd "${FILESDIR}"/mdadm.rc mdadm
- newconfd "${FILESDIR}"/mdadm.confd mdadm
- newinitd "${FILESDIR}"/mdraid.rc mdraid
- newconfd "${FILESDIR}"/mdraid.confd mdraid
- systemd_newunit "${FILESDIR}"/mdadm.service-r1 mdadm.service
-
- # From the Debian patchset
- into /usr
- dodoc "${WORKDIR}/debian/README.checkarray"
- dosbin "${WORKDIR}/debian/checkarray"
-
- insinto /etc/cron.weekly
- newins "${FILESDIR}"/mdadm.weekly mdadm
-}
-
-pkg_postinst() {
- if ! systemd_is_booted; then
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- # Only inform people the first time they install.
- elog "If you're not relying on kernel auto-detect of your RAID"
- elog "devices, you need to add 'mdraid' to your 'boot' runlevel:"
- elog " rc-update add mdraid boot"
- fi
- fi
-}
diff --git a/sys-fs/mdadm/mdadm-3.3.1-r1.ebuild b/sys-fs/mdadm/mdadm-3.3.1-r2.ebuild
similarity index 68%
rename from sys-fs/mdadm/mdadm-3.3.1-r1.ebuild
rename to sys-fs/mdadm/mdadm-3.3.1-r2.ebuild
index 59a4d83df4c4..7177222d4de3 100644
--- a/sys-fs/mdadm/mdadm-3.3.1-r1.ebuild
+++ b/sys-fs/mdadm/mdadm-3.3.1-r2.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.3.1-r1.ebuild,v 1.1 2014/07/17 07:03:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.3.1-r2.ebuild,v 1.4 2014/07/18 15:32:43 ssuominen Exp $
-EAPI="4"
-inherit multilib flag-o-matic systemd toolchain-funcs udev
+EAPI=4
+inherit eutils flag-o-matic multilib systemd toolchain-funcs udev
DESCRIPTION="A useful tool for running RAID systems - it can be used as a replacement for the raidtools"
HOMEPAGE="http://neil.brown.name/blog/mdadm"
@@ -30,12 +30,25 @@ mdadm_emake() {
CC="$(tc-getCC)" \
CWFLAGS="-Wall" \
CXFLAGS="${CFLAGS}" \
- MAP_DIR=/run/mdadm \
UDEVDIR="$(get_udevdir)" \
SYSTEMD_DIR="$(systemd_get_unitdir)" \
"$@"
}
+src_prepare() {
+ # These are important bugfixes from upstream git after 3.3.1 release,
+ # and before and including 17 Jul 2014:
+ epatch \
+ "${FILESDIR}"/${P}-Makefile-install-mdadm-grow-continue-.service.patch \
+ "${FILESDIR}"/${P}-Grow-fix-removal-of-line-in-wrong-case.patch \
+ "${FILESDIR}"/${P}-IMSM-use-strcpy-rather-than-pointless-strncpy.patch \
+ "${FILESDIR}"/${P}-mdmon-ensure-Unix-domain-socket-is-created-with-safe.patch \
+ "${FILESDIR}"/${P}-mdmon-allow-prepare_update-to-report-failure.patch \
+ "${FILESDIR}"/${P}-DDF-validate-metadata_update-size-before-using-it.patch \
+ "${FILESDIR}"/${P}-IMSM-validate-metadata_update-size-before-using-it.patch \
+ "${FILESDIR}"/${P}-Grow-Do-not-try-to-restart-if-reshape-is-running.patch
+}
+
src_compile() {
use static && append-ldflags -static
mdadm_emake all mdassemble
diff --git a/sys-kernel/genkernel/genkernel-3.4.49.ebuild b/sys-kernel/genkernel/genkernel-3.4.49.ebuild
index ac835f6c4209..614e97513123 100644
--- a/sys-kernel/genkernel/genkernel-3.4.49.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.49.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/sys-kernel/genkernel/genkernel-3.4.49.ebuild,v 1.10 2014/06/21 15:32:58 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.49.ebuild,v 1.11 2014/07/19 19:23:25 klausman Exp $
# genkernel-9999 -> latest Git branch "master"
# genkernel-VERSION -> normal genkernel release
@@ -43,7 +43,7 @@ else
inherit bash-completion-r1 eutils
SRC_URI="mirror://gentoo/${P}.tar.bz2
${COMMON_URI}"
- KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+ KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
fi
DESCRIPTION="Gentoo automatic kernel building scripts"
diff --git a/sys-kernel/tuxonice-sources/Manifest b/sys-kernel/tuxonice-sources/Manifest
index 41580750f0ae..9910b556bade 100644
--- a/sys-kernel/tuxonice-sources/Manifest
+++ b/sys-kernel/tuxonice-sources/Manifest
@@ -10,6 +10,9 @@ DIST genpatches-3.10-54.extras.tar.xz 17824 SHA256 836d0d3f15f0e068d9c499a56ce34
DIST genpatches-3.10-56.base.tar.xz 849584 SHA256 d1526425b6133bd832d2de8e536d0ef8fdeeb1b05f12220ea7350707187409fc SHA512 8017151888a29d45280fa0163c1ef1c7e28ac8952d9caf2d81834fcabdd1edfd4030d699df42fd523b6d62fa164f11bcd9022a4e2fa7f12bbd914429fa652754 WHIRLPOOL 09ce3821aac0febbd91831306749219fce70857783f53ab08cb082b24c9702dab6e55f51689be84140f2e153524062ca4ff0bd7c57472f0208442acfff55facb
DIST genpatches-3.10-56.experimental.tar.xz 48588 SHA256 4c6cdf6f64cc01e1812b82bff5b829b7252635073477870b1aaab4c43c516309 SHA512 3c2ec7a4b5e15a6ca1ac1861fd64f8e53afddfdc95c6dc5b202e888beffa5bf6a60936f3091ef472e3375d2cda477f909b8dfba2419327fe795214fb0a07748e WHIRLPOOL e05dc23df4f7b34b9dc8af75bff0cb522d2b89fdf917e18ba584cd4241baf2ffdc2aa3186b068b9e8bda0bb25d9fcda85d5768d72c5d38f67eaafa85888ec458
DIST genpatches-3.10-56.extras.tar.xz 17824 SHA256 4d922fa4e29604a62b241dd705e2d1eda059a5e18caa37c3365e55a1ad0665e9 SHA512 6e3ca43a0942ea1a9bea2339739ef42d18a32610a0e7cd5a77e5607910d76a1b7e43d5d80d41e8d408fb0fc417ca4ef49b693beb0b1fad45c5fd132fe48fa9de WHIRLPOOL 39304ef15429ad5c6d5f3dde8e845d82a67acae7e409391bcf8205a0786de1f7e6994079c8a8073a89596034e20ebe147a28db6f6aa62cfc3626118b7acf7174
+DIST genpatches-3.10-57.base.tar.xz 860268 SHA256 3253c5ff96d258ad5b2a4937d307a4c3964864b8c552cc2bce941b62150b9dea SHA512 7f9136c9698739492ff3f00b19313999d149105bba9dccddbddaf2ba34f49405fdbe8ccc0931e23f3a74bb1d93d6a32834b93d7079bf5d6037dee42e1e090e87 WHIRLPOOL 3d516fbad421871da15f1b1151473d688ac893d0859c87b24df20a4aff429d7070ac594c134bc49bbb9bdccd8fb679d60166ba18e541196b72720702af02d020
+DIST genpatches-3.10-57.experimental.tar.xz 48596 SHA256 af7834e7db5e6d6066375db9c6fcb296e9d60d521f7e81d36499abd692902c27 SHA512 992e69918e6e477ffaf5e76609cd43a65d0804c4df4bce82f2aafa207e31f0aae7ef22049be7d16dd586939994fa3cb6b7872df8c9a463c621d77cd60ef3374b WHIRLPOOL 579536d595f2d90d898360a4069c13dd7b3e28646231cb6f2482d99b01f8d347aef62f82afaf400d59842437aaf7d840efc7669d706f2c14cf70f20e3652ef8b
+DIST genpatches-3.10-57.extras.tar.xz 17828 SHA256 89715ac466d578c46393c2fb421674a3bf67c7671301a7cda1fdd53ebe3ee4e8 SHA512 6e3f98345843f53aeff075855d9ff4844ee989b34069b23a9b256adfb5dc606fc9cae96a569bc0936bb5ef7c6cc173208b2688aeba5a01394a0dc2cd75517856 WHIRLPOOL 8e23c95654353d84e7906a8c1c67e4596b96dbcfdb905a01113f685b0cb5b8b1cd22be703dfd5dfcd50c5c9bf3ff5eb76072455e3096be18995f465dc557e047
DIST genpatches-3.12-25.base.tar.xz 628560 SHA256 66f9313c1314dfac6565892f49dccb3dab064b1fa8d8f00893d600cf6c408821 SHA512 4e2da929765efbcf6471176f055c12228b7d4f4d833559375ee472a36328ff17d6b8ec98f2804b9bbb34215e2951de86640bf4124da3c844ea187217dbf822c1 WHIRLPOOL 5e9f20d8f9b8b9d6686e8f56aaf5e727e79bb4b93d09f4505b6d795cfad92327e3d8d7e73560a37a9fec1427811d20f5f700c96100515bd011f35ec6212584de
DIST genpatches-3.12-25.experimental.tar.xz 46532 SHA256 59f42751f67e25819d24975d3c58e17753ac25ca870e819cb330f84231ebd08e SHA512 f3c6a46af2784f416c5eac692ea2d5d161a7fa3d3946844d1dcad912f59e8f9a9a5f327c57cc17c86419d264ceac9aef244133b29135789131ffafa9a30f464e WHIRLPOOL 650d8b5ee57d3df67aed10a7e8207c88b5c0914dcce21752dfcd4c0e20147ad45281940bc1010957f89d33fa7447518a175e6c815b25c16393dc9534144b2d3e
DIST genpatches-3.12-25.extras.tar.xz 19756 SHA256 f800e2611164e8c732b8752cea5e94ac75000d7cab31b112022f8cd8f72f6d9d SHA512 30e985c5ba7eda5c52e7e53204b2f211af3e89339d5dab26627412bae04dbac55ccefe319569578a66d902c752f766f56eed1809e55ec52d20b32e784d309875 WHIRLPOOL 5909c60c470737c359dee4b70ff8b29b47dd80103d0cf95384854f43f9c692332294c1267c4427d56c3db2192b4dc81485d7d01f2d785673ad25873be11ca6a6
@@ -34,6 +37,9 @@ DIST genpatches-3.14-14.extras.tar.xz 18236 SHA256 c0f21ba7dbfe10ea01e86aa146c85
DIST genpatches-3.14-16.base.tar.xz 339044 SHA256 42fd8392ccc0473eb733b88e19cfb854db6aa4a8630a83ae442e296e52d5ad92 SHA512 25ae8369c415381b7aaefa57a5e365e08aafa8585ffac06d1a59525ba4605c7090c738959868928822dbcf379f47ca6e03231a59226b45beeed8adf1a03205b1 WHIRLPOOL e53be63616e542c2dd2a4765fa27403ef14cde3226173a7fe2d70edd2f2c864186c53d7879e13da6f9fe8ba30b2c95c1db97fe39ece5dd9f5d555f04ee60684d
DIST genpatches-3.14-16.experimental.tar.xz 51204 SHA256 75f657b9a4a8dba29cf47d3ad6acfde205b595dd8dd3afec8908f6c296154c5e SHA512 4f40764dd9fa4024d4de5a1e29354fa267b2edc075f2e04d27ce2f50139865262ca503725ba35d5d9a92fab7efa840ce315b52088ac19d3d8647507d4c17fda3 WHIRLPOOL 399e14e666443d21f9cf765e29a3eb497e0c80016ccd4b259f32f34f00282695f492fc5c54f90b0d39d8bde8b0ce0cf9cf8f051d62d486a95b2e881d776bca93
DIST genpatches-3.14-16.extras.tar.xz 18236 SHA256 8e68175ea4d9d3cfebcd31aa783ba3ad48653697f7051c527d6ce1a688e9fa47 SHA512 ec9e87141548d589bb2defdafca4c49c258bcfa59068f2587966f13d7256e639c5d26e5a935cb61771a8253a123f71962e5b6ea7fbfe3ec111d5d7604bc9f159 WHIRLPOOL 87fa2fac7e28e4773a6eaed3ad889feb03c57ddd41318c1599bc209f5184ccf0c6e6e465fd849de9c87df0ba7383008905de1f4d3f67b4b4c4efddde807c9f0d
+DIST genpatches-3.14-17.base.tar.xz 354008 SHA256 857ad9a4ba1512f18b1404255acb643a2e2e43fa78a06e07cf702dee868c1920 SHA512 3587e516c239dfac0e98942059eec04b3ca3ab12c5375b3e1144cff8462df1fbae74cfbb05c469b50d2a9bdfcf5cf0b960ce144c86092fda1d31f2e75ad7b687 WHIRLPOOL e29d6f9e58e59d0acc2dd389e8481bf13835d1509b85434c3e8758e211555387396de6809d8ae1a92b00b729a29726a03ca65785a440693f9001651396d3e737
+DIST genpatches-3.14-17.experimental.tar.xz 51208 SHA256 c5bae576406e88720f6bf45d168068ce526265862c2017ce580e3c2043ea4c25 SHA512 b599377f6d18c330929e5681e5cc22b192d51f93f57d47b7f43b2544f7166de90a4fd3fc0636b2204bc56b46f0140c49b61cfd3930420049907a3b39ec7ea9c7 WHIRLPOOL 18f44a883b5a8b0b6aaaff152036aa090b1fce41dcfc9756433a2b6ff58a9fd3d8ab994dd27538f3758e3e84385895edb6d858043b0f09bced5d9a552317e9c2
+DIST genpatches-3.14-17.extras.tar.xz 18240 SHA256 d027a7f42bcc8c88b0568caf726d0addd01b69e827db5d8aa2665678500bacbf SHA512 92ad31b04e12257808ee9cd5ebfa516ced3a87b7000e76e3ebbd45350004241a72fdc8cc31aeac6ec997bd5cefa5bff2576f247368a7a9c468c4da1b2b613691 WHIRLPOOL b8c3b885c94c6f1b8f6b3bc4be3bc07fc7438a172f415843e3089b3d082946e949752cdb4a5f13df3a5396703d82a4a35264c97f1b4923fa11a4e6851f751de6
DIST genpatches-3.15-3.base.tar.xz 10916 SHA256 ea3e83f7b429137c8f131d11b541d7d48e651a6c05ffe489ebe08f2d225c7f6d SHA512 f44b531275cd91211ab99537aeb32bcf6ee17768be2b7c44b8d9c97452a50b4c40a58b8124467f67814d5d20050c5a644cad6a8a1d30835b879d662054b870ee WHIRLPOOL 61a0b17f4ddcb7c573552425b7135c45b7e4de2b2df351fd0767b4cb84f3b0dd0fb6217327b0b056502bb324153baf3cefd7d0503085ec1dc54e5951e50febe6
DIST genpatches-3.15-3.experimental.tar.xz 52800 SHA256 7b74f9fcd75012736edec6929dddf732941ff1dfce92d898edc7cb37a3a972c8 SHA512 a3124d53168c179f590e90070487d71540d827b10bc7c3ab9336dda4804a52b118fa89d21ec82349eb1f27a1abd3126e41c0a251c50c3ac6bb77a7303a608a9c WHIRLPOOL b462f2c92b1a22969af73563b8a2f11785170c2c6789e1f00dfba38262f6a99e5fbb9ac694c90cc79bcbf328f0eb15db79461a5fd5bb530bd54aa61268b8b483
DIST genpatches-3.15-3.extras.tar.xz 3156 SHA256 769c345961c04096c9c10a506d329a053be9073b90fc047922f9f7722f3783a7 SHA512 991184b3f97b542164d996aab18ae4c64fff41b5a6b60f1f700f7e315affc75acd03e6009b3810526f512c4de6c3b134c5a4a80b001bfa75189bf9c88932e5d5 WHIRLPOOL 5493acdc62e4e9f87f379ff11dcdd152acc51e29e408998504dcb3cb5b04843ce3e8c8998013b8e6064e2c696a0b7c8bb14feb36eaabc9aba40ffd1a5fec4aca
@@ -46,6 +52,9 @@ DIST genpatches-3.15-5.extras.tar.xz 17668 SHA256 94dadd0f23f81742d7b56d98cd5870
DIST genpatches-3.15-7.base.tar.xz 129444 SHA256 ac36954acce2fe6065ede5f82bf9d554469b26eff80a03ef7261cc3f2c30fa59 SHA512 eb1b8bf726ae7c019968d42e411aba203c6d17c04866a0ae4744b5df648de69b35f1d462606c6a474ad2153da9e8c6616da59e696a10c1c9b2aa5a418bc86dd0 WHIRLPOOL 83121ddfa40fc1aa59090f7b4d00b55cea06dd003e5839b821bcf9257569f6daa765e4e9b088448b5406dcc4c87e28b788bce3f23864eaef6b7620d8c222512d
DIST genpatches-3.15-7.experimental.tar.xz 55804 SHA256 2a08194d95dfc9b1c4dd220c5e27e8c67fa85e69c36ccc3a5bbd994247bfc6e9 SHA512 e831e52c17adb6a4e4008c7b31f84791380bbf41df33c6a18b1844ff77cb17e7560b0cc91f0e6aee2a45bd4bb38405b06b7acd801dd340ba612f68e9ec45bfb0 WHIRLPOOL 4735bff9feb4b710125cd1dcefc39dbbf0d62b5ec2a355ab9522d8c5be44d7b0745310830eeca0adb6a76708bc3b6488ba09016d11a2c8f7b878ebe3417f1c1c
DIST genpatches-3.15-7.extras.tar.xz 17668 SHA256 3c505f00c51b593b26d613d9d02ac99664b206dc87670e1ec01d666c714ace6c SHA512 e1ec4f7a37d619ea087773d44bbab9cbfbebe4dde5dca0a718b51c7d9c00a584172fbbd05d2f1dadcf637474be034d66e96c41d28e80537dc36fac9f01f2cdbd WHIRLPOOL c978ac63c0993be52b9d48b47123b297628722be95c8b18e60931cf42e0de944fd5524eb945c3577acbc0f0eb37b98b56a3d1ba6759e4536a9a948d58ac70f49
+DIST genpatches-3.15-8.base.tar.xz 152608 SHA256 22a03917ed9bf8ae9eaa59e2f3bd8d0d892ff0a4dfebaf53d6be2c923889e946 SHA512 9495805021c2f269466f88c0c78d55878302eb8b2c477eb8d811b1ecb46f9f268b55edbd74d7bac15224eb7aec08d1fb7021e927bbf1e0b8ed06ce729e5ce3dc WHIRLPOOL e6e37b77879017424fa424125815144cd0407d04df756923bba5a3e75a79e482b917e17e73c1675d547f30fb6d5492599216216e5eff0e329fb8368e932e484d
+DIST genpatches-3.15-8.experimental.tar.xz 55816 SHA256 9b3fa8f4c1435a4f1c417e9bbfb2ec4382e2840f22354217084a6dd80a665533 SHA512 a969dd0883d9f387a85862158494651971f25858f80a70d67829bc67ee5f671e6bf69555a92bd33772573484cef4efcab17ec024725ac69f184b20f4bac0cef3 WHIRLPOOL 1b40aad9d4e57e36268f8e1e30ae74f18b5419176c37eb015a703161b8ee93fbec74f25ec61e7dcd1097f9667e37323e19d4c4ba17340f9357bf27f0d44c301c
+DIST genpatches-3.15-8.extras.tar.xz 17664 SHA256 b863dc86435c2d51a09451fdf433fbb9e3c2923b260cfe6abbfb399e48103bdc SHA512 4ce0312a21febc39eab52d1e755f99a5667eb0c16f276b14971d74a8a9c017d71960ff348b0be5c4e0e3d6074876db61b5bf756f413b1b369d7d1589160f3546 WHIRLPOOL fce77388c22e465f7a80c3ad0d788321c10c62117369a220fed0cb2de4a33985050a7f9d556f3355dfdf4910f54ab90e7ab70cafb462dbde564271590b36438b
DIST genpatches-3.4-77.base.tar.xz 1135740 SHA256 bb9785cc689dee181b2fea7e34c0d73610177d0fa294e5621b07cb3bd36880d4 SHA512 aca9707c9de5e63cec08ee853923a5f835a2405226ee768a07f0d0d0e8dfd8d8b674fcaf6d1137cae05ed07db27e15a9427b95d6d02d06620cb7fca66dc9be69 WHIRLPOOL f6f1d0226a2e5bb2f7c9211e361b7820e0e5d427838dd6f966704a638cf856c9a4c9d9378a424244dbd2cfb76e3099c0d0fd93d81afac753e2fff4346bcced0f
DIST genpatches-3.4-77.extras.tar.xz 18228 SHA256 5b52fffbdf4b96c28f6769a73b56bb4fb9661a907b76b7fd15ddd3c1229994bd SHA512 c74c1834243cef59f0032f14908d09a42af5f038eff95ccb0338f547a17d04bba2f90dd86708dbcbd3b6541848d6ebcc2b51b2e4cab68832cd38a9087a135573 WHIRLPOOL 9785048d52b78deeed38a86ba2f49c339302f1ea8faf724a89ceb136efa4a34344563b340d2c97695495742cbd8ad2b76da068e12257b85592a64ccae6536d9f
DIST genpatches-3.4-78.base.tar.xz 1146300 SHA256 f722fb6b6869cffc599e8042ffd68f287306f1fa32317dd7249dda32722e9deb SHA512 608ddf4dd32b552d4da95d4fa55c1d84e652149c1a8c727ceb4bf12d530720534a282e86215b0b5b9cc71a6cfa9f2f96986403c4ea9ee5608dd1467b0316b2f8 WHIRLPOOL 5064d5a54c10e71e2dbe7f2ddf89f9d8408a5a28c6a24913372cb6f1bf0285bd80fca1f052dce5d2f15c6e2601c7048714fb32da7895e07f3d00195e0eda6561
@@ -54,6 +63,8 @@ DIST genpatches-3.4-79.base.tar.xz 1154776 SHA256 7547a800ff70e33e625899a8fc86e7
DIST genpatches-3.4-79.extras.tar.xz 18212 SHA256 36dd71d4d759771c15cabe18b2a24e5c8e322656afdaea923227eddd253da8de SHA512 6cb853a56e47f4a4e31c3ef797701da5aaf37c919c235624cdea867b9e3a62539ce0c0fb349808683b8772494dc89c30bc81cc63dfb4ec8bb687955ab071991a WHIRLPOOL 5aefc68838ac93f188b5ec29bb51e5375d61711097103a7a3575fdfaf5d3e5ac031d2601e867a3233f72027e14824f89ae2b826443c6e8eb68e2f27f5fa6fc6e
DIST genpatches-3.4-81.base.tar.xz 1168532 SHA256 8bd54ce3ea6ac8dd5e84173914d0cff5546e5bf88c9fbe91cebecda247a41a2b SHA512 86bab6397ba2556f50ac48db66318234dec537f018003ca77868f38436cae207cab1e8e80117d9a89d5f6ef027b300a24643877fb8e87417bdd0ae4105b3765d WHIRLPOOL 46c3fc186f31e16d738259641cbd1ef9429eb039e080413e5ffbdf94c1887ec93c1d90b0fe4f493b411df70e7133d333696e33f7cb4ce7068857a961222b6d89
DIST genpatches-3.4-81.extras.tar.xz 18228 SHA256 2c821035b3186dc08d7b4b5677a43bfb9d41d13b276a91ff02d10f5fc47e4dfd SHA512 5b6ba21868730d3389b0641f2c65c89669aa35c324c33cadf67f97b097b46ab005c47ebc22c4149000abe048341f8324f28e5e559c5afb6422644b4d0e03d7bd WHIRLPOOL 6faf71e1f4579936616c9211e9ebd133f5577a8eb0199c945ba59faae904517de1440b2eb085f808b11b918af9c7281f176a2aa8bb4c6fc0ac6220ce03bc4481
+DIST genpatches-3.4-82.base.tar.xz 1173592 SHA256 efe1c429828afddc6e98e6f18422657479e08f34f2c04ba5a0c5e833b127d7f8 SHA512 44236e2ba4573193aa885cf6800b6cac429564310cff14928325fd7f9b8edc6a4f30688ea05e49973e13a7e723fdf508b183b5ec7c0d6df0e8fc5033dfa37107 WHIRLPOOL bec2164159cc5046e655a0c31987e3d4672db65ed2e07707bef5e4d95bc554b822b31be5351e4a7d26bee26397d32abc8191763dff89417791307714caa1aeff
+DIST genpatches-3.4-82.extras.tar.xz 18216 SHA256 fe361d6103f95adc6a0d2141e46603fc92fa9c86b9c5f379846663bf20df2f70 SHA512 c31e3cf352691c9be0ddf3c621c3d9a810db1969ef0c208f7f0b0afb3f6c702e1fea765a8f92d1c324d77299fc88d88ad156f632e4059164ef611a0719a1dc22 WHIRLPOOL 91c64dd57729a9d1a5985e39aff0750ea7bbb6526008f61a3dfab9b67d86bee61faf0a8dc05908bc124f4861312bdf877bec8357c7956dca8fdb8a01f0bfdcbc
DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
DIST linux-3.12.tar.xz 76384600 SHA256 2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02 SHA512 4ba5797e0772726d05c9f2eee66dc6dc2a5033c749ef44764c805a83da739ed5d0c6443b76785e38fe1ef74cc7ade787e48144faed0cfcb6f124f05248c700ff WHIRLPOOL a40195f6b53ba3440cf90a44495f6a59670f750851d1518e2bdfe3b949f0e898d1df5d37e271c31c555087026ddb6cc2c9109b22b9639e3222735e6f650a1417
DIST linux-3.13.tar.xz 77187032 SHA256 4d5e5eee5f276424c32e9591f1b6c971baedc7b49f28ce03d1f48b1e5d6226a2 SHA512 1ba223bb4b885d691a67196d86a8aaf7b4a1c351bf2a762f50f1b0c32da00dd0c28895872a66b49e8d244498d996876609268e64861d28ac4048886ef9f79b87 WHIRLPOOL 2992257a17e85b3eb16fcaf21678fa6dbf31f80c2099fd1ad0ff9852ac1d16122ac8e2c0b46421d8895d4368253a724e439cd625307ee7af7bd1e50cb2c9b62a
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.49.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.49.ebuild
new file mode 100644
index 000000000000..7a10bf424ccd
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.49.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.49.ebuild,v 1.1 2014/07/19 15:28:35 floppym Exp $
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="57"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="3.10.45"
+TUXONICE_DATE="2014-06-27"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+RDEPEND="${RDEPEND}
+ >=sys-apps/tuxonice-userui-1.0
+ || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.13.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.13.ebuild
new file mode 100644
index 000000000000..5b9eb9b507ff
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.13.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.13.ebuild,v 1.1 2014/07/19 15:28:35 floppym Exp $
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="17"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="3.14.9"
+TUXONICE_DATE="2014-06-27"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+RDEPEND="${RDEPEND}
+ >=sys-apps/tuxonice-userui-1.0
+ || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.15.6.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.15.6.ebuild
new file mode 100644
index 000000000000..be6f98b27d18
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.15.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.15.6.ebuild,v 1.1 2014/07/19 15:28:35 floppym Exp $
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="8"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="3.15.2"
+TUXONICE_DATE="2014-06-27"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+RDEPEND="${RDEPEND}
+ >=sys-apps/tuxonice-userui-1.0
+ || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.99.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.99.ebuild
new file mode 100644
index 000000000000..b0215ef170c4
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.99.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.99.ebuild,v 1.1 2014/07/19 15:28:35 floppym Exp $
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="82"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="3.4.95"
+TUXONICE_DATE="2014-06-27"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="${RDEPEND}
+ >=sys-apps/tuxonice-userui-1.0
+ || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-libs/libfaketime/Manifest b/sys-libs/libfaketime/Manifest
index 8711bfd5dca2..bfa5c9a82388 100644
--- a/sys-libs/libfaketime/Manifest
+++ b/sys-libs/libfaketime/Manifest
@@ -1,3 +1,2 @@
DIST libfaketime-0.9.1.tar.gz 30398 SHA256 ec3d5b5dcc1de408a9e86afa5dadcca35371c395b7435bf3c2ba5dc89627b43a SHA512 c1c5a60226dcbf56b7c854efae31712c6085bfcef3d55e11731c4ed84da4e08e7667a085f9ab2d507acc6140d76a5e807a741646a9a81d9f138c2be344b3faba WHIRLPOOL acf23a47de2df0322322c490787caa5508b9d856e946061a77d00971b71c385c5321ede863df105bc6875f5fffd04aa46afbc534e46403e9af448d4630664ab4
-DIST libfaketime-0.9.5.tar.gz 46103 SHA256 5e07678d440d632bef012068ca58825402da5ad25954513e785717cc539c213d SHA512 905a72e5798967f8a44bea5d275880d5a5169ee4ad91a54db99fe8fb75b37ec238512e7701f22c1aeda2112e4d3bee7e235e79bd5affca42cd2343270f4706d3 WHIRLPOOL f62e60799cc4b37fe6844a0c7f7f651686e1a47b49a4e2bba4ae3f72bb5a003961d831a1d266255fb077bbe23eef3813ee5b200d68e2b8108091460eb6065ea8
DIST libfaketime-0.9.6.tar.gz 51333 SHA256 3a89972708e262ae3a548655a04f197b48e9c82ac2b61acaeb1c47b135a682b7 SHA512 ab2e9c53f4ca2b9dcd2bbcd8de3ab9e27be57547ed9b52a17f07a6fe880fd3a283a6f10018736be2a6ba4e150f54e92161959ccb887be1f78ddfc96058729860 WHIRLPOOL 1a2dcc549286bb9d4e8a576ee8ea44b8508e6b40c581560099cf3351464470ef3b01e0ea8667e9d4973f5f8d35d3eeea68bd258f9ffc2fb0f424e128ba446a6d
diff --git a/sys-libs/libfaketime/files/0001-Fake-__clock_gettime-and-similar-calls-using-__.-cal.patch b/sys-libs/libfaketime/files/0001-Fake-__clock_gettime-and-similar-calls-using-__.-cal.patch
deleted file mode 100644
index 608582b5a745..000000000000
--- a/sys-libs/libfaketime/files/0001-Fake-__clock_gettime-and-similar-calls-using-__.-cal.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From c1cc101f910867191cafa91f52dddf4b8d9bbe9d Mon Sep 17 00:00:00 2001
-From: Balint Reczey
-Date: Wed, 16 Oct 2013 09:16:05 +0200
-Subject: [PATCH 1/2] Fake __clock_gettime() and similar calls using __...
- calls
-
-This breaks potential infinite loops.
----
- src/libfaketime.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++---
- 1 file changed, 105 insertions(+), 6 deletions(-)
-
-diff --git a/src/libfaketime.c b/src/libfaketime.c
-index 3ec372b..babda94 100644
---- a/src/libfaketime.c
-+++ b/src/libfaketime.c
-@@ -115,6 +115,9 @@ static int (*real_ftime) (struct timeb *);
- static int (*real_gettimeofday) (struct timeval *, void *);
- static int (*real_clock_gettime) (clockid_t clk_id, struct timespec *tp);
- #ifndef __APPLE__
-+static int (*real___ftime) (struct timeb *);
-+static int (*real___gettimeofday) (struct timeval *, void *);
-+static int (*real___clock_gettime) (clockid_t clk_id, struct timespec *tp);
- #ifdef FAKE_TIMERS
- static int (*real_timer_settime_22) (int timerid, int flags, const struct itimerspec *new_value,
- struct itimerspec * old_value);
-@@ -1865,23 +1868,119 @@ int clock_get_time(clock_serv_t clock_serv, mach_timespec_t *cur_timeclockid_t)
- #ifdef FAKE_INTERNAL_CALLS
- int __gettimeofday(struct timeval *tv, void *tz)
- {
-- return gettimeofday(tv, tz);
-+ int result;
-+
-+ /* sanity check */
-+ if (tv == NULL)
-+ {
-+ return -1;
-+ }
-+
-+ /* Check whether we've got a pointer to the real ftime() function yet */
-+ if (NULL == real___gettimeofday)
-+ { /* dlsym() failed */
-+#ifdef DEBUG
-+ (void) fprintf(stderr, "faketime problem: original __gettimeofday() not found.\n");
-+#endif
-+ return -1; /* propagate error to caller */
-+ }
-+
-+ /* initialize our result with the real current time */
-+ DONT_FAKE_TIME(result = (*real___gettimeofday)(tv, tz));
-+ if (result == -1) return result; /* original function failed */
-+
-+ /* pass the real current time to our faking version, overwriting it */
-+ result = fake_gettimeofday(tv);
-+
-+ /* return the result to the caller */
-+ return result;
- }
-
- int __clock_gettime(clockid_t clk_id, struct timespec *tp)
- {
-- return clock_gettime(clk_id, tp);
-+ int result;
-+
-+ /* sanity check */
-+ if (tp == NULL)
-+ {
-+ return -1;
-+ }
-+
-+ if (NULL == real___clock_gettime)
-+ { /* dlsym() failed */
-+#ifdef DEBUG
-+ (void) fprintf(stderr, "faketime problem: original __clock_gettime() not found.\n");
-+#endif
-+ return -1; /* propagate error to caller */
-+ }
-+
-+ /* initialize our result with the real current time */
-+ DONT_FAKE_TIME(result = (*real___clock_gettime)(clk_id, tp));
-+ if (result == -1) return result; /* original function failed */
-+
-+ /* pass the real current time to our faking version, overwriting it */
-+ result = fake_clock_gettime(clk_id, tp);
-+
-+ /* return the result to the caller */
-+ return result;
- }
-
--int __ftime(struct timeb *tp)
-+time_t __time(time_t *time_tptr)
- {
-- return ftime(tp);
-+ struct timespec tp;
-+ time_t result;
-+
-+ DONT_FAKE_TIME(result = (*real___clock_gettime)(CLOCK_REALTIME, &tp));
-+ if (result == -1) return -1;
-+
-+ /* pass the real current time to our faking version, overwriting it */
-+ (void)fake_clock_gettime(CLOCK_REALTIME, &tp);
-+
-+ if (time_tptr != NULL)
-+ {
-+ *time_tptr = tp.tv_sec;
-+ }
-+ return tp.tv_sec;
- }
-
--time_t __time(time_t *time_tptr)
-+int __ftime(struct timeb *tb)
- {
-- return time(time_tptr);
-+ struct timespec tp;
-+ int result;
-+
-+ /* sanity check */
-+ if (tb == NULL)
-+ return 0; /* ftime() always returns 0, see manpage */
-+
-+ /* Check whether we've got a pointer to the real ftime() function yet */
-+ if (NULL == real___ftime)
-+ { /* dlsym() failed */
-+#ifdef DEBUG
-+ (void) fprintf(stderr, "faketime problem: original ftime() not found.\n");
-+#endif
-+ return 0; /* propagate error to caller */
-+ }
-+
-+ /* initialize our TZ result with the real current time */
-+ DONT_FAKE_TIME(result = (*real___ftime)(tb));
-+ if (result == -1)
-+ {
-+ return result;
-+ }
-+
-+ DONT_FAKE_TIME(result = (*real_clock_gettime)(CLOCK_REALTIME, &tp));
-+ if (result == -1) return -1;
-+
-+ /* pass the real current time to our faking version, overwriting it */
-+ (void)fake_clock_gettime(CLOCK_REALTIME, &tp);
-+
-+ tb->time = tp.tv_sec;
-+ tb->millitm = tp.tv_nsec / 1000000;
-+
-+ /* return the result to the caller */
-+ return result; /* will always be 0 (see manpage) */
- }
-+
- #endif
- #endif
-
---
-1.9.0
-
diff --git a/sys-libs/libfaketime/files/0002-Finish-safe-faking-of-internal-calls.patch b/sys-libs/libfaketime/files/0002-Finish-safe-faking-of-internal-calls.patch
deleted file mode 100644
index 57ed04c20574..000000000000
--- a/sys-libs/libfaketime/files/0002-Finish-safe-faking-of-internal-calls.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From c719a977a724c4d83a8f850784b95377f61abe78 Mon Sep 17 00:00:00 2001
-From: Balint Reczey
-Date: Wed, 16 Oct 2013 09:33:50 +0200
-Subject: [PATCH 2/2] Finish safe faking of internal calls
-
----
- src/libfaketime.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/libfaketime.c b/src/libfaketime.c
-index babda94..1f8a6c4 100644
---- a/src/libfaketime.c
-+++ b/src/libfaketime.c
-@@ -115,9 +115,11 @@ static int (*real_ftime) (struct timeb *);
- static int (*real_gettimeofday) (struct timeval *, void *);
- static int (*real_clock_gettime) (clockid_t clk_id, struct timespec *tp);
- #ifndef __APPLE__
-+#ifdef FAKE_INTERNAL_CALLS
- static int (*real___ftime) (struct timeb *);
- static int (*real___gettimeofday) (struct timeval *, void *);
- static int (*real___clock_gettime) (clockid_t clk_id, struct timespec *tp);
-+#endif
- #ifdef FAKE_TIMERS
- static int (*real_timer_settime_22) (int timerid, int flags, const struct itimerspec *new_value,
- struct itimerspec * old_value);
-@@ -1390,6 +1392,11 @@ void __attribute__ ((constructor)) ftpl_init(void)
- real_timer_gettime_22 = dlvsym(RTLD_NEXT, "timer_gettime","GLIBC_2.2");
- real_timer_gettime_233 = dlvsym(RTLD_NEXT, "timer_gettime","GLIBC_2.3.3");
- #endif
-+#ifdef FAKE_INTERNAL_CALLS
-+ real___ftime = dlsym(RTLD_NEXT, "__ftime");
-+ real___gettimeofday = dlsym(RTLD_NEXT, "__gettimeofday");
-+ real___clock_gettime = dlsym(RTLD_NEXT, "__clock_gettime");
-+#endif
- #endif
-
- ft_shm_init();
---
-1.9.0
-
diff --git a/sys-libs/libfaketime/libfaketime-0.9.5.ebuild b/sys-libs/libfaketime/libfaketime-0.9.5.ebuild
deleted file mode 100644
index 1cac95856211..000000000000
--- a/sys-libs/libfaketime/libfaketime-0.9.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libfaketime/libfaketime-0.9.5.ebuild,v 1.1 2014/03/06 04:16:56 radhermit Exp $
-
-EAPI=5
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="Report faked system time to programs"
-HOMEPAGE="http://www.code-wizards.com/projects/libfaketime/ https://github.com/wolfcw/libfaketime/"
-SRC_URI="http://www.code-wizards.com/projects/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_prepare() {
- epatch "${FILESDIR}"/0001-Fake-__clock_gettime-and-similar-calls-using-__.-cal.patch
- epatch "${FILESDIR}"/0002-Finish-safe-faking-of-internal-calls.patch
- tc-export CC
-}
-
-src_install() {
- dobin src/faketime
- doman man/faketime.1
- exeinto /usr/$(get_libdir)/faketime
- doexe src/${PN}*.so.*
- dosym ${PN}.so.1 /usr/$(get_libdir)/faketime/${PN}.so
- dosym ${PN}MT.so.1 /usr/$(get_libdir)/faketime/${PN}MT.so
- dodoc NEWS README TODO
-}
diff --git a/sys-libs/libfaketime/libfaketime-0.9.6.ebuild b/sys-libs/libfaketime/libfaketime-0.9.6-r1.ebuild
similarity index 69%
rename from sys-libs/libfaketime/libfaketime-0.9.6.ebuild
rename to sys-libs/libfaketime/libfaketime-0.9.6-r1.ebuild
index 11005fa8878e..75b551cb77e2 100644
--- a/sys-libs/libfaketime/libfaketime-0.9.6.ebuild
+++ b/sys-libs/libfaketime/libfaketime-0.9.6-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/sys-libs/libfaketime/libfaketime-0.9.6.ebuild,v 1.1 2014/06/18 23:31:54 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libfaketime/libfaketime-0.9.6-r1.ebuild,v 1.1 2014/07/18 16:35:46 radhermit Exp $
EAPI=5
@@ -18,12 +18,16 @@ src_prepare() {
tc-export CC
}
+src_compile() {
+ emake CC="$(tc-getCC)" LIBDIRNAME="/$(get_libdir)" PREFIX=/usr
+}
+
src_install() {
dobin src/faketime
doman man/faketime.1
- exeinto /usr/$(get_libdir)/faketime
+ exeinto /usr/$(get_libdir)
doexe src/${PN}*.so.*
- dosym ${PN}.so.1 /usr/$(get_libdir)/faketime/${PN}.so
- dosym ${PN}MT.so.1 /usr/$(get_libdir)/faketime/${PN}MT.so
+ dosym ${PN}.so.1 /usr/$(get_libdir)/${PN}.so
+ dosym ${PN}MT.so.1 /usr/$(get_libdir)/${PN}MT.so
dodoc NEWS README TODO
}
diff --git a/virtual/perl-AutoLoader/perl-AutoLoader-5.720.0-r1.ebuild b/virtual/perl-AutoLoader/perl-AutoLoader-5.720.0-r1.ebuild
deleted file mode 100644
index fd712542b2b0..000000000000
--- a/virtual/perl-AutoLoader/perl-AutoLoader-5.720.0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-AutoLoader/perl-AutoLoader-5.720.0-r1.ebuild,v 1.1 2012/05/21 11:50:36 tove Exp $
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-solaris"
-IUSE=""
-
-RDEPEND="|| ( =dev-lang/perl-5.16* ~perl-core/${PN#perl-}-${PV} )"
diff --git a/virtual/perl-AutoLoader/perl-AutoLoader-5.730.0-r1.ebuild b/virtual/perl-AutoLoader/perl-AutoLoader-5.730.0-r2.ebuild
similarity index 61%
rename from virtual/perl-AutoLoader/perl-AutoLoader-5.730.0-r1.ebuild
rename to virtual/perl-AutoLoader/perl-AutoLoader-5.730.0-r2.ebuild
index 4e40dd0d747a..84f8d4b0d202 100644
--- a/virtual/perl-AutoLoader/perl-AutoLoader-5.730.0-r1.ebuild
+++ b/virtual/perl-AutoLoader/perl-AutoLoader-5.730.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/virtual/perl-AutoLoader/perl-AutoLoader-5.730.0-r1.ebuild,v 1.1 2014/07/06 09:36:20 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-AutoLoader/perl-AutoLoader-5.730.0-r2.ebuild,v 1.1 2014/07/18 16:16:02 dilfridge Exp $
EAPI=5
@@ -13,4 +13,8 @@ SLOT="0"
KEYWORDS="amd64 ~ppc x86 ~x86-solaris"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-AutoLoader/perl-AutoLoader-5.740.0.ebuild b/virtual/perl-AutoLoader/perl-AutoLoader-5.740.0.ebuild
index f2b049d5b083..e904f478a581 100644
--- a/virtual/perl-AutoLoader/perl-AutoLoader-5.740.0.ebuild
+++ b/virtual/perl-AutoLoader/perl-AutoLoader-5.740.0.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/virtual/perl-AutoLoader/perl-AutoLoader-5.740.0.ebuild,v 1.1 2014/07/05 11:27:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-AutoLoader/perl-AutoLoader-5.740.0.ebuild,v 1.2 2014/07/18 16:16:02 dilfridge Exp $
EAPI=5
@@ -13,4 +13,8 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~x86-solaris"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-B-Debug/perl-B-Debug-1.180.0-r1.ebuild b/virtual/perl-B-Debug/perl-B-Debug-1.180.0-r2.ebuild
similarity index 70%
rename from virtual/perl-B-Debug/perl-B-Debug-1.180.0-r1.ebuild
rename to virtual/perl-B-Debug/perl-B-Debug-1.180.0-r2.ebuild
index 1ad415bb2e41..6db0ff0c2379 100644
--- a/virtual/perl-B-Debug/perl-B-Debug-1.180.0-r1.ebuild
+++ b/virtual/perl-B-Debug/perl-B-Debug-1.180.0-r2.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-B-Debug/perl-B-Debug-1.180.0-r1.ebuild,v 1.1 2014/07/06 09:37:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-B-Debug/perl-B-Debug-1.180.0-r2.ebuild,v 1.1 2014/07/18 17:50:09 dilfridge Exp $
EAPI=5
-DESCRIPTION="Virtual for B::Debug"
+DESCRIPTION="Virtual for ${PN#perl-}"
HOMEPAGE=""
SRC_URI=""
@@ -14,4 +14,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
IUSE=""
DEPEND=""
-RDEPEND="|| ( =dev-lang/perl-5.18* ~perl-core/B-Debug-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-B-Debug/perl-B-Debug-1.190.0.ebuild b/virtual/perl-B-Debug/perl-B-Debug-1.190.0.ebuild
index f88dea919c44..963159bde774 100644
--- a/virtual/perl-B-Debug/perl-B-Debug-1.190.0.ebuild
+++ b/virtual/perl-B-Debug/perl-B-Debug-1.190.0.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-B-Debug/perl-B-Debug-1.190.0.ebuild,v 1.1 2014/07/04 23:29:17 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-B-Debug/perl-B-Debug-1.190.0.ebuild,v 1.2 2014/07/18 17:50:09 dilfridge Exp $
EAPI=5
-DESCRIPTION="Virtual for B::Debug"
+DESCRIPTION="Virtual for ${PN#perl-}"
HOMEPAGE=""
SRC_URI=""
@@ -14,4 +14,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
IUSE=""
DEPEND=""
-RDEPEND="|| ( =dev-lang/perl-5.20* ~perl-core/B-Debug-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-CGI/perl-CGI-3.630.0-r1.ebuild b/virtual/perl-CGI/perl-CGI-3.630.0-r2.ebuild
similarity index 69%
rename from virtual/perl-CGI/perl-CGI-3.630.0-r1.ebuild
rename to virtual/perl-CGI/perl-CGI-3.630.0-r2.ebuild
index 8dbd7b4d2f55..e7cc9327b141 100644
--- a/virtual/perl-CGI/perl-CGI-3.630.0-r1.ebuild
+++ b/virtual/perl-CGI/perl-CGI-3.630.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/virtual/perl-CGI/perl-CGI-3.630.0-r1.ebuild,v 1.1 2014/07/06 09:39:38 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CGI/perl-CGI-3.630.0-r2.ebuild,v 1.1 2014/07/18 17:53:26 dilfridge Exp $
EAPI=5
@@ -13,4 +13,8 @@ SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-CGI/perl-CGI-3.650.0.ebuild b/virtual/perl-CGI/perl-CGI-3.650.0.ebuild
index 8b459b7abc0c..9fd860790297 100644
--- a/virtual/perl-CGI/perl-CGI-3.650.0.ebuild
+++ b/virtual/perl-CGI/perl-CGI-3.650.0.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/virtual/perl-CGI/perl-CGI-3.650.0.ebuild,v 1.1 2014/07/05 11:33:07 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CGI/perl-CGI-3.650.0.ebuild,v 1.2 2014/07/18 17:53:26 dilfridge Exp $
EAPI=5
@@ -13,4 +13,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.122.0-r1.ebuild b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.122.0-r2.ebuild
similarity index 70%
rename from virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.122.0-r1.ebuild
rename to virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.122.0-r2.ebuild
index 39d9a8684524..65f5a1004df9 100644
--- a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.122.0-r1.ebuild
+++ b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.122.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/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.122.0-r1.ebuild,v 1.1 2014/07/06 09:45:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.122.0-r2.ebuild,v 1.1 2014/07/18 18:03:58 dilfridge Exp $
EAPI=5
@@ -13,4 +13,8 @@ SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0.ebuild b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0-r1.ebuild
similarity index 70%
rename from virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0.ebuild
rename to virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0-r1.ebuild
index 29416336e128..f4bf6f4eae90 100644
--- a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0.ebuild
+++ b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0-r1.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0.ebuild,v 1.3 2014/07/05 11:56:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0-r1.ebuild,v 1.1 2014/07/18 18:03:58 dilfridge Exp $
+
+EAPI=5
DESCRIPTION="Virtual for ${PN#perl-}"
HOMEPAGE=""
@@ -11,4 +13,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.12.0.ebuild b/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.12.0.ebuild
index 27733a7ac981..75bdb8eec2f8 100644
--- a/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.12.0.ebuild
+++ b/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.12.0.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/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.12.0.ebuild,v 1.1 2014/07/05 12:17:30 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.12.0.ebuild,v 1.2 2014/07/18 18:07:57 dilfridge Exp $
EAPI=5
@@ -13,4 +13,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.7.0-r1.ebuild b/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.7.0-r1.ebuild
deleted file mode 100644
index 93b888544e0c..000000000000
--- a/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.7.0-r1.ebuild,v 1.1 2012/05/21 11:50:34 tove Exp $
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="|| ( =dev-lang/perl-5.16* ~perl-core/${PN#perl-}-${PV} )"
diff --git a/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.8.0-r1.ebuild b/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.8.0-r2.ebuild
similarity index 74%
rename from virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.8.0-r1.ebuild
rename to virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.8.0-r2.ebuild
index 04505c8bd403..f330e366694b 100644
--- a/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.8.0-r1.ebuild
+++ b/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.8.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/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.8.0-r1.ebuild,v 1.1 2014/07/06 09:46:37 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.8.0-r2.ebuild,v 1.1 2014/07/18 18:07:57 dilfridge Exp $
EAPI=5
@@ -13,4 +13,8 @@ SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.630-r1.ebuild b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.630-r1.ebuild
deleted file mode 100644
index 8f06e6db3efc..000000000000
--- a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.630-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.630-r1.ebuild,v 1.1 2012/05/21 11:50:38 tove Exp $
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="|| ( =dev-lang/perl-5.16* ~perl-core/${PN#perl-}-${PV} )"
diff --git a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.921-r1.ebuild b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.921-r2.ebuild
similarity index 74%
rename from virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.921-r1.ebuild
rename to virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.921-r2.ebuild
index 3b6b0a3c3660..4cf1c5a25756 100644
--- a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.921-r1.ebuild
+++ b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.921-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/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.921-r1.ebuild,v 1.1 2014/07/06 09:41:28 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.921-r2.ebuild,v 1.1 2014/07/18 18:00:51 dilfridge Exp $
EAPI=5
@@ -13,4 +13,8 @@ SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.140.640.ebuild b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.140.640.ebuild
index 5e7ef6207570..693b86c228f5 100644
--- a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.140.640.ebuild
+++ b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.140.640.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/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.140.640.ebuild,v 1.1 2014/07/05 11:49:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.140.640.ebuild,v 1.2 2014/07/18 18:00:51 dilfridge Exp $
EAPI=5
@@ -13,4 +13,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-CPAN/perl-CPAN-2.0.0.ebuild b/virtual/perl-CPAN/perl-CPAN-2.0.0-r1.ebuild
similarity index 56%
rename from virtual/perl-CPAN/perl-CPAN-2.0.0.ebuild
rename to virtual/perl-CPAN/perl-CPAN-2.0.0-r1.ebuild
index b82f18e5e26f..d0c8e4aff1d8 100644
--- a/virtual/perl-CPAN/perl-CPAN-2.0.0.ebuild
+++ b/virtual/perl-CPAN/perl-CPAN-2.0.0-r1.ebuild
@@ -1,8 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN/perl-CPAN-2.0.0.ebuild,v 1.9 2014/04/24 17:47:10 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN/perl-CPAN-2.0.0-r1.ebuild,v 1.1 2014/07/18 17:57:14 dilfridge Exp $
-DESCRIPTION="Virtual for CPAN"
+EAPI=5
+
+DESCRIPTION="Virtual for ${PN#perl-}"
HOMEPAGE=""
SRC_URI=""
@@ -12,4 +14,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
DEPEND=""
-RDEPEND="|| ( =dev-lang/perl-5.18* ~perl-core/CPAN-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-CPAN/perl-CPAN-2.0.5.ebuild b/virtual/perl-CPAN/perl-CPAN-2.0.5.ebuild
index 72aff14bef03..5ec65af202fc 100644
--- a/virtual/perl-CPAN/perl-CPAN-2.0.5.ebuild
+++ b/virtual/perl-CPAN/perl-CPAN-2.0.5.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN/perl-CPAN-2.0.5.ebuild,v 1.1 2014/07/05 11:36:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN/perl-CPAN-2.0.5.ebuild,v 1.2 2014/07/18 17:57:13 dilfridge Exp $
EAPI=5
-DESCRIPTION="Virtual for CPAN"
+DESCRIPTION="Virtual for ${PN#perl-}"
HOMEPAGE=""
SRC_URI=""
@@ -14,4 +14,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
DEPEND=""
-RDEPEND="|| ( =dev-lang/perl-5.20* ~perl-core/CPAN-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Carp/perl-Carp-1.290.0.ebuild b/virtual/perl-Carp/perl-Carp-1.290.0-r1.ebuild
similarity index 79%
rename from virtual/perl-Carp/perl-Carp-1.290.0.ebuild
rename to virtual/perl-Carp/perl-Carp-1.290.0-r1.ebuild
index aecc1742d045..f5577dc516c2 100644
--- a/virtual/perl-Carp/perl-Carp-1.290.0.ebuild
+++ b/virtual/perl-Carp/perl-Carp-1.290.0-r1.ebuild
@@ -1,8 +1,10 @@
-# 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/virtual/perl-Carp/perl-Carp-1.290.0.ebuild,v 1.2 2013/09/05 07:08:02 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Carp/perl-Carp-1.290.0-r1.ebuild,v 1.1 2014/07/18 18:11:14 dilfridge Exp $
-DESCRIPTION="Virtual for Carp"
+EAPI=5
+
+DESCRIPTION="Virtual for ${PN#perl-}"
HOMEPAGE=""
SRC_URI=""
diff --git a/virtual/perl-Carp/perl-Carp-1.330.100.ebuild b/virtual/perl-Carp/perl-Carp-1.330.100.ebuild
index 7b032bf6018d..487f186865cf 100644
--- a/virtual/perl-Carp/perl-Carp-1.330.100.ebuild
+++ b/virtual/perl-Carp/perl-Carp-1.330.100.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Carp/perl-Carp-1.330.100.ebuild,v 1.1 2014/07/05 12:23:29 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Carp/perl-Carp-1.330.100.ebuild,v 1.2 2014/07/18 18:11:14 dilfridge Exp $
EAPI=5
-DESCRIPTION="Virtual for Carp"
+DESCRIPTION="Virtual for ${PN#perl-}"
HOMEPAGE=""
SRC_URI=""
diff --git a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.60.0-r1.ebuild b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.60.0-r2.ebuild
similarity index 71%
rename from virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.60.0-r1.ebuild
rename to virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.60.0-r2.ebuild
index 3ef2493f4a38..55ca3c947c85 100644
--- a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.60.0-r1.ebuild
+++ b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.60.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/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.60.0-r1.ebuild,v 1.1 2014/07/06 09:52:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.60.0-r2.ebuild,v 1.1 2014/07/18 21:53:27 dilfridge Exp $
EAPI=5
@@ -13,4 +13,8 @@ SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.64.0.ebuild b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.64.0.ebuild
index 2be3952a8338..2de52767ebc0 100644
--- a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.64.0.ebuild
+++ b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.64.0.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/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.64.0.ebuild,v 1.1 2014/07/05 15:50:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.64.0.ebuild,v 1.2 2014/07/18 21:53:27 dilfridge Exp $
EAPI=5
@@ -13,4 +13,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.60.0-r1.ebuild b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.60.0-r2.ebuild
similarity index 72%
rename from virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.60.0-r1.ebuild
rename to virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.60.0-r2.ebuild
index ef7cd3c8ea2f..9b87e56c18a9 100644
--- a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.60.0-r1.ebuild
+++ b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.60.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/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.60.0-r1.ebuild,v 1.1 2014/07/06 09:53:43 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.60.0-r2.ebuild,v 1.1 2014/07/18 21:55:28 dilfridge Exp $
EAPI=5
@@ -13,4 +13,8 @@ SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.65.0.ebuild b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.65.0.ebuild
index 93e659e3edb9..062e0e4cdeb4 100644
--- a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.65.0.ebuild
+++ b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.65.0.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/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.65.0.ebuild,v 1.1 2014/07/05 16:01:03 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.65.0.ebuild,v 1.2 2014/07/18 21:55:28 dilfridge Exp $
EAPI=5
@@ -13,4 +13,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-DB_File/perl-DB_File-1.826.0-r2.ebuild b/virtual/perl-DB_File/perl-DB_File-1.826.0-r2.ebuild
deleted file mode 100644
index df52b79617c8..000000000000
--- a/virtual/perl-DB_File/perl-DB_File-1.826.0-r2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-DB_File/perl-DB_File-1.826.0-r2.ebuild,v 1.1 2012/06/19 19:11:58 tove Exp $
-
-EAPI=2
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-RDEPEND="|| ( =dev-lang/perl-5.16*[berkdb] ~perl-core/${PN#perl-}-${PV} )"
diff --git a/virtual/perl-DB_File/perl-DB_File-1.827.0-r1.ebuild b/virtual/perl-DB_File/perl-DB_File-1.827.0-r2.ebuild
similarity index 65%
rename from virtual/perl-DB_File/perl-DB_File-1.827.0-r1.ebuild
rename to virtual/perl-DB_File/perl-DB_File-1.827.0-r2.ebuild
index 8ffcd9db862a..9432c38d8c9f 100644
--- a/virtual/perl-DB_File/perl-DB_File-1.827.0-r1.ebuild
+++ b/virtual/perl-DB_File/perl-DB_File-1.827.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/virtual/perl-DB_File/perl-DB_File-1.827.0-r1.ebuild,v 1.1 2014/07/06 09:54:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-DB_File/perl-DB_File-1.827.0-r2.ebuild,v 1.1 2014/07/18 21:59:02 dilfridge Exp $
EAPI=5
@@ -13,4 +13,8 @@ SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.18*[berkdb] ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.18*[berkdb] ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-DB_File/perl-DB_File-1.831.0.ebuild b/virtual/perl-DB_File/perl-DB_File-1.831.0.ebuild
index 7ba15d64100c..d1576f48717b 100644
--- a/virtual/perl-DB_File/perl-DB_File-1.831.0.ebuild
+++ b/virtual/perl-DB_File/perl-DB_File-1.831.0.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/virtual/perl-DB_File/perl-DB_File-1.831.0.ebuild,v 1.1 2014/07/05 16:10:25 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-DB_File/perl-DB_File-1.831.0.ebuild,v 1.2 2014/07/18 21:59:02 dilfridge Exp $
EAPI=5
@@ -13,4 +13,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.20*[berkdb] ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.20*[berkdb] ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.145.0-r1.ebuild b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.145.0-r2.ebuild
similarity index 63%
rename from virtual/perl-Data-Dumper/perl-Data-Dumper-2.145.0-r1.ebuild
rename to virtual/perl-Data-Dumper/perl-Data-Dumper-2.145.0-r2.ebuild
index 27ef6acdd8cc..d0e3e2e2fcdc 100644
--- a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.145.0-r1.ebuild
+++ b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.145.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/virtual/perl-Data-Dumper/perl-Data-Dumper-2.145.0-r1.ebuild,v 1.1 2014/07/06 09:55:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Data-Dumper/perl-Data-Dumper-2.145.0-r2.ebuild,v 1.1 2014/07/19 12:08:04 dilfridge Exp $
EAPI=5
@@ -13,4 +13,8 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.151.0.ebuild b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.151.0.ebuild
index cf8f76e2ed4a..488f64ac5f30 100644
--- a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.151.0.ebuild
+++ b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.151.0.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/virtual/perl-Data-Dumper/perl-Data-Dumper-2.151.0.ebuild,v 1.1 2014/07/05 21:54:46 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Data-Dumper/perl-Data-Dumper-2.151.0.ebuild,v 1.2 2014/07/19 12:08:04 dilfridge Exp $
EAPI=5
@@ -13,4 +13,8 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.200.0-r2.ebuild b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.200.0-r2.ebuild
deleted file mode 100644
index a9337ad1f524..000000000000
--- a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.200.0-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.200.0-r2.ebuild,v 1.9 2014/04/24 17:47:40 zlogene Exp $
-
-DESCRIPTION="Virtual for Devel-PPPort"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="|| ( =dev-lang/perl-5.18* =dev-lang/perl-5.16* ~perl-core/Devel-PPPort-${PV} )"
diff --git a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.200.0-r3.ebuild b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.200.0-r3.ebuild
new file mode 100644
index 000000000000..4ba0048eac8b
--- /dev/null
+++ b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.200.0-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.200.0-r3.ebuild,v 1.1 2014/07/19 12:12:29 dilfridge Exp $
+
+EAPI=5
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+ || ( =dev-lang/perl-5.18* =dev-lang/perl-5.16* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.210.0.ebuild b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.210.0.ebuild
index 1cff74889e8e..eec99a8bb91e 100644
--- a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.210.0.ebuild
+++ b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.210.0.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.210.0.ebuild,v 1.1 2014/07/05 21:59:25 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.210.0.ebuild,v 1.2 2014/07/19 12:12:29 dilfridge Exp $
EAPI=5
-DESCRIPTION="Virtual for Devel-PPPort"
+DESCRIPTION="Virtual for ${PN#perl-}"
HOMEPAGE=""
SRC_URI=""
@@ -14,4 +14,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
DEPEND=""
-RDEPEND="|| ( =dev-lang/perl-5.20* ~perl-core/Devel-PPPort-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Digest-MD5/perl-Digest-MD5-2.520.0-r1.ebuild b/virtual/perl-Digest-MD5/perl-Digest-MD5-2.520.0-r2.ebuild
similarity index 74%
rename from virtual/perl-Digest-MD5/perl-Digest-MD5-2.520.0-r1.ebuild
rename to virtual/perl-Digest-MD5/perl-Digest-MD5-2.520.0-r2.ebuild
index 7b8550469d62..8a91d71ca532 100644
--- a/virtual/perl-Digest-MD5/perl-Digest-MD5-2.520.0-r1.ebuild
+++ b/virtual/perl-Digest-MD5/perl-Digest-MD5-2.520.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/virtual/perl-Digest-MD5/perl-Digest-MD5-2.520.0-r1.ebuild,v 1.1 2014/07/06 09:57:44 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Digest-MD5/perl-Digest-MD5-2.520.0-r2.ebuild,v 1.1 2014/07/19 12:15:03 dilfridge Exp $
EAPI=5
@@ -13,4 +13,8 @@ SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Digest-MD5/perl-Digest-MD5-2.530.0-r1.ebuild b/virtual/perl-Digest-MD5/perl-Digest-MD5-2.530.0-r2.ebuild
similarity index 74%
rename from virtual/perl-Digest-MD5/perl-Digest-MD5-2.530.0-r1.ebuild
rename to virtual/perl-Digest-MD5/perl-Digest-MD5-2.530.0-r2.ebuild
index 32c8a28925b2..1d24eb4b3b22 100644
--- a/virtual/perl-Digest-MD5/perl-Digest-MD5-2.530.0-r1.ebuild
+++ b/virtual/perl-Digest-MD5/perl-Digest-MD5-2.530.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/virtual/perl-Digest-MD5/perl-Digest-MD5-2.530.0-r1.ebuild,v 1.1 2014/07/06 09:57:44 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Digest-MD5/perl-Digest-MD5-2.530.0-r2.ebuild,v 1.1 2014/07/19 12:15:03 dilfridge Exp $
EAPI=5
@@ -13,4 +13,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Digest-SHA/perl-Digest-SHA-5.880.0.ebuild b/virtual/perl-Digest-SHA/perl-Digest-SHA-5.880.0.ebuild
index 4a139ed24936..4badf18e2014 100644
--- a/virtual/perl-Digest-SHA/perl-Digest-SHA-5.880.0.ebuild
+++ b/virtual/perl-Digest-SHA/perl-Digest-SHA-5.880.0.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/virtual/perl-Digest-SHA/perl-Digest-SHA-5.880.0.ebuild,v 1.1 2014/07/05 22:07:30 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Digest-SHA/perl-Digest-SHA-5.880.0.ebuild,v 1.2 2014/07/19 12:17:10 dilfridge Exp $
EAPI=5
@@ -13,4 +13,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Dumpvalue/perl-Dumpvalue-1.170.0-r2.ebuild b/virtual/perl-Dumpvalue/perl-Dumpvalue-1.170.0-r3.ebuild
similarity index 55%
rename from virtual/perl-Dumpvalue/perl-Dumpvalue-1.170.0-r2.ebuild
rename to virtual/perl-Dumpvalue/perl-Dumpvalue-1.170.0-r3.ebuild
index c29eb9c67d1c..642585f79a08 100644
--- a/virtual/perl-Dumpvalue/perl-Dumpvalue-1.170.0-r2.ebuild
+++ b/virtual/perl-Dumpvalue/perl-Dumpvalue-1.170.0-r3.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Dumpvalue/perl-Dumpvalue-1.170.0-r2.ebuild,v 1.1 2014/07/06 09:59:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Dumpvalue/perl-Dumpvalue-1.170.0-r3.ebuild,v 1.1 2014/07/19 12:20:00 dilfridge Exp $
EAPI=5
-DESCRIPTION="Virtual for perl-core/Dumpvalue"
+DESCRIPTION="Virtual for ${PN#perl-}"
HOMEPAGE=""
SRC_URI=""
@@ -15,10 +15,7 @@ IUSE=""
DEPEND=""
RDEPEND="
-|| (
- =dev-lang/perl-5.20*
- =dev-lang/perl-5.18*
- =dev-lang/perl-5.16*
- ~perl-core/Dumpvalue-${PV}
-)
+ || ( =dev-lang/perl-5.20* =dev-lang/perl-5.18* =dev-lang/perl-5.16* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
"
diff --git a/virtual/perl-Encode/perl-Encode-2.490.0-r1.ebuild b/virtual/perl-Encode/perl-Encode-2.490.0-r2.ebuild
similarity index 69%
rename from virtual/perl-Encode/perl-Encode-2.490.0-r1.ebuild
rename to virtual/perl-Encode/perl-Encode-2.490.0-r2.ebuild
index ab45bc6d20a6..0ceb70311331 100644
--- a/virtual/perl-Encode/perl-Encode-2.490.0-r1.ebuild
+++ b/virtual/perl-Encode/perl-Encode-2.490.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/virtual/perl-Encode/perl-Encode-2.490.0-r1.ebuild,v 1.1 2014/07/06 10:00:25 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Encode/perl-Encode-2.490.0-r2.ebuild,v 1.1 2014/07/19 12:22:34 dilfridge Exp $
EAPI=5
@@ -13,4 +13,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Encode/perl-Encode-2.600.0.ebuild b/virtual/perl-Encode/perl-Encode-2.600.0.ebuild
index 8bd1a688c042..8b394bd21f4f 100644
--- a/virtual/perl-Encode/perl-Encode-2.600.0.ebuild
+++ b/virtual/perl-Encode/perl-Encode-2.600.0.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/virtual/perl-Encode/perl-Encode-2.600.0.ebuild,v 1.1 2014/07/05 22:15:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Encode/perl-Encode-2.600.0.ebuild,v 1.2 2014/07/19 12:22:34 dilfridge Exp $
EAPI=5
@@ -13,4 +13,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Exporter/perl-Exporter-5.680.0-r1.ebuild b/virtual/perl-Exporter/perl-Exporter-5.680.0-r2.ebuild
similarity index 55%
rename from virtual/perl-Exporter/perl-Exporter-5.680.0-r1.ebuild
rename to virtual/perl-Exporter/perl-Exporter-5.680.0-r2.ebuild
index cfc2f115cc89..ca138de4a577 100644
--- a/virtual/perl-Exporter/perl-Exporter-5.680.0-r1.ebuild
+++ b/virtual/perl-Exporter/perl-Exporter-5.680.0-r2.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Exporter/perl-Exporter-5.680.0-r1.ebuild,v 1.1 2014/07/06 10:05:06 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Exporter/perl-Exporter-5.680.0-r2.ebuild,v 1.1 2014/07/19 12:32:39 dilfridge Exp $
EAPI=5
-DESCRIPTION="Virtual for perl-core/Exporter"
+DESCRIPTION="Virtual for ${PN#perl-}"
HOMEPAGE=""
SRC_URI=""
@@ -15,11 +15,7 @@ IUSE=""
DEPEND=""
RDEPEND="
- || (
- (
- =dev-lang/perl-5.18*
- !perl-core/Exporter
- )
- ~perl-core/Exporter-${PV}
- )
+ || ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
"
diff --git a/virtual/perl-Exporter/perl-Exporter-5.700.0.ebuild b/virtual/perl-Exporter/perl-Exporter-5.700.0.ebuild
index 57856101c3c7..24b3ae6ec11f 100644
--- a/virtual/perl-Exporter/perl-Exporter-5.700.0.ebuild
+++ b/virtual/perl-Exporter/perl-Exporter-5.700.0.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Exporter/perl-Exporter-5.700.0.ebuild,v 1.1 2014/07/05 22:18:18 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Exporter/perl-Exporter-5.700.0.ebuild,v 1.2 2014/07/19 12:32:39 dilfridge Exp $
EAPI=5
-DESCRIPTION="Virtual for perl-core/Exporter"
+DESCRIPTION="Virtual for ${PN#perl-}"
HOMEPAGE=""
SRC_URI=""
@@ -15,11 +15,7 @@ IUSE=""
DEPEND=""
RDEPEND="
- || (
- (
- =dev-lang/perl-5.20*
- !perl-core/Exporter
- )
- ~perl-core/Exporter-${PV}
- )
+ || ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
"
diff --git a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.210.ebuild b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.210-r1.ebuild
similarity index 71%
rename from virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.210.ebuild
rename to virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.210-r1.ebuild
index bf562e57e0a0..68f630896a5c 100644
--- a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.210.ebuild
+++ b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.210-r1.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.210.ebuild,v 1.3 2014/01/20 20:53:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.210-r1.ebuild,v 1.2 2014/07/19 16:05:18 dilfridge Exp $
+
+EAPI=5
DESCRIPTION="Virtual for ${PN#perl-}"
HOMEPAGE=""
@@ -11,4 +13,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.216.ebuild b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.216.ebuild
index de84279bfe11..e5de06066d11 100644
--- a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.216.ebuild
+++ b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.216.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/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.216.ebuild,v 1.1 2014/07/05 22:23:07 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.216.ebuild,v 1.2 2014/07/19 16:04:09 dilfridge Exp $
EAPI=5
@@ -13,4 +13,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.170.0-r4.ebuild b/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.170.0-r5.ebuild
similarity index 70%
rename from virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.170.0-r4.ebuild
rename to virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.170.0-r5.ebuild
index 5f683047dfc5..2d15fc464fe1 100644
--- a/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.170.0-r4.ebuild
+++ b/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.170.0-r5.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/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.170.0-r4.ebuild,v 1.4 2014/07/06 10:04:27 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.170.0-r5.ebuild,v 1.1 2014/07/19 16:07:54 dilfridge Exp $
EAPI=5
@@ -13,4 +13,8 @@ SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.16* =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.16* =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.180.0-r1.ebuild b/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.180.0-r2.ebuild
similarity index 72%
rename from virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.180.0-r1.ebuild
rename to virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.180.0-r2.ebuild
index da7d6b019721..764459890ecb 100644
--- a/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.180.0-r1.ebuild
+++ b/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.180.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/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.180.0-r1.ebuild,v 1.1 2014/07/06 10:04:27 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.180.0-r2.ebuild,v 1.1 2014/07/19 16:07:54 dilfridge Exp $
EAPI=5
@@ -13,4 +13,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.230.0-r4.ebuild b/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.230.0-r4.ebuild
deleted file mode 100644
index 95817f1e5777..000000000000
--- a/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.230.0-r4.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.230.0-r4.ebuild,v 1.1 2014/07/06 09:31:14 dilfridge Exp $
-
-EAPI=5
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="amd64 arm64 hppa ~ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND="|| ( =dev-lang/perl-5.20* =dev-lang/perl-5.18* =dev-lang/perl-5.16* =dev-lang/perl-5.14* ~perl-core/${PN#perl-}-${PV} )"
diff --git a/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.230.0-r5.ebuild b/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.230.0-r5.ebuild
new file mode 100644
index 000000000000..511f63cfd378
--- /dev/null
+++ b/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.230.0-r5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.230.0-r5.ebuild,v 1.1 2014/07/19 16:09:44 dilfridge Exp $
+
+EAPI=5
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="amd64 arm64 hppa ppc ppc64 x86"
+IUSE=""
+
+RDEPEND="
+ || ( =dev-lang/perl-5.20* =dev-lang/perl-5.18* =dev-lang/perl-5.16* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.660.0.ebuild b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.660.0-r1.ebuild
similarity index 72%
rename from virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.660.0.ebuild
rename to virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.660.0-r1.ebuild
index f635c6dde4b7..214d7e8f5001 100644
--- a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.660.0.ebuild
+++ b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.660.0-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/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.660.0.ebuild,v 1.1 2014/07/06 10:30:26 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.660.0-r1.ebuild,v 1.1 2014/07/19 16:13:54 dilfridge Exp $
EAPI=5
@@ -13,4 +13,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.980.0.ebuild b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.980.0.ebuild
index f5db2b24e620..c54be575dd71 100644
--- a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.980.0.ebuild
+++ b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.980.0.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/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.980.0.ebuild,v 1.1 2014/07/06 10:30:26 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.980.0.ebuild,v 1.2 2014/07/19 16:13:54 dilfridge Exp $
EAPI=5
@@ -13,4 +13,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.630.0-r1.ebuild b/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.630.0-r1.ebuild
index 8cd572f5fb39..969275219baf 100644
--- a/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.630.0-r1.ebuild
+++ b/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.630.0-r1.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.630.0-r1.ebuild,v 1.1 2014/07/06 11:31:38 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.630.0-r1.ebuild,v 1.2 2014/07/19 16:19:45 dilfridge Exp $
+
+EAPI=5
DESCRIPTION="Virtual for ${PN#perl-}"
HOMEPAGE=""
@@ -11,4 +13,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.18* =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.18* =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.630.0.ebuild b/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.630.0.ebuild
deleted file mode 100644
index 9c6d5adc9713..000000000000
--- a/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.630.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.630.0.ebuild,v 1.3 2014/01/19 21:09:18 vapier Exp $
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.180.0-r1.ebuild b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.180.0-r2.ebuild
similarity index 84%
rename from virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.180.0-r1.ebuild
rename to virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.180.0-r2.ebuild
index 0b4d1c09c697..a110615f0622 100644
--- a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.180.0-r1.ebuild
+++ b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.180.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/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.180.0-r1.ebuild,v 1.1 2014/07/06 15:30:34 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.180.0-r2.ebuild,v 1.1 2014/07/19 16:22:21 dilfridge Exp $
EAPI=5
@@ -16,4 +16,5 @@ IUSE=""
RDEPEND="
|| ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )
!perl-core/${PN#perl-}-${PV}-r999
"
diff --git a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.240.0.ebuild b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.240.0.ebuild
index 5cbef0c3cf46..d1373f85cd48 100644
--- a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.240.0.ebuild
+++ b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.240.0.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/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.240.0.ebuild,v 1.1 2014/07/06 15:30:34 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.240.0.ebuild,v 1.2 2014/07/19 16:22:21 dilfridge Exp $
EAPI=5
@@ -16,4 +16,5 @@ IUSE=""
RDEPEND="
|| ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
!perl-core/${PN#perl-}-${PV}-r999
"
diff --git a/virtual/perl-File-Path/perl-File-Path-2.90.0-r1.ebuild b/virtual/perl-File-Path/perl-File-Path-2.90.0-r2.ebuild
similarity index 74%
rename from virtual/perl-File-Path/perl-File-Path-2.90.0-r1.ebuild
rename to virtual/perl-File-Path/perl-File-Path-2.90.0-r2.ebuild
index 251a3a31c967..2958dbd2ce35 100644
--- a/virtual/perl-File-Path/perl-File-Path-2.90.0-r1.ebuild
+++ b/virtual/perl-File-Path/perl-File-Path-2.90.0-r2.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-File-Path/perl-File-Path-2.90.0-r1.ebuild,v 1.1 2014/07/06 15:35:50 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-File-Path/perl-File-Path-2.90.0-r2.ebuild,v 1.1 2014/07/19 16:24:24 dilfridge Exp $
EAPI=5
-DESCRIPTION="Virtual for File-Path"
+DESCRIPTION="Virtual for ${PN#perl-}"
HOMEPAGE=""
SRC_URI=""
@@ -16,4 +16,5 @@ IUSE=""
RDEPEND="
|| ( =dev-lang/perl-5.20* =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )
!perl-core/${PN#perl-}-${PV}-r999
"
diff --git a/virtual/pkgconfig/pkgconfig-0-r1.ebuild b/virtual/pkgconfig/pkgconfig-0-r1.ebuild
index 5b6e3fa05e0a..0dc2f0ce4653 100644
--- a/virtual/pkgconfig/pkgconfig-0-r1.ebuild
+++ b/virtual/pkgconfig/pkgconfig-0-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/virtual/pkgconfig/pkgconfig-0-r1.ebuild,v 1.9 2014/07/18 02:06:36 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/pkgconfig/pkgconfig-0-r1.ebuild,v 1.10 2014/07/19 13:41:01 zlogene Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI=""
LICENSE=""
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 2522334f550e..3f6fcb6576fe 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,6 +1,4 @@
DIST chromium-36.0.1985.125-testdata.tar.xz 111516748 SHA256 566530e718daee0ce0e6d28710b54ff4dcdf42cc6bab62421203790c0d31459d SHA512 659ef9503ce3570cbee30a4b74934c94109352a5055a4c14f7151d74ccfc346b8328547aa1710849a5c4b09250130237363c6e6404b3f1b20b7b5470007ad398 WHIRLPOOL 54aca91ab8d78a9cc2bfa7b4167299fe732b8316af0198a7295debd6b4089992b1d4023d7da2f48deee9567acbeeae9f3d6530758ed9b1d476af5a1395afa70f
DIST chromium-36.0.1985.125.tar.xz 205462088 SHA256 1782d0a5397e94313dee9e456de38bdfccf575c4e565f064a6ed7f9c509d5023 SHA512 a2c0f9b9fc91526ee053f0eca1aa2c6267b316717b8cb30bd5c50cad8891c28e1bf804838b2af035df46771d29d6815610066437d32afc504fbe39d2c48f303c WHIRLPOOL 3ee0ba43b0a3f93b4b7bededbe8443f1f9673a1c0712b7db09411ac96fe05327c835475ccb7298800b40c32dcac56573c0cf035f092ae52cf353b075c81fb16b
-DIST chromium-36.0.1985.67-testdata.tar.xz 111512620 SHA256 978504437ddb72b551442b8e85fda08040a6428dde1ba4e57a3e0f2e24dbb3e6 SHA512 41ec569b38a1836497f326f46559ce663d29ffa8fa816afb26af1abaa8551eda87bd8741fd4a4211e1d91f66a160d5169d706bb508bb752d5c8fc2f2acf92127 WHIRLPOOL 7c79b57d8fcc451c927764d405e2207c0aeb2fa3d341feede4550034e4ca82e747e6a6481f5a11de9035b88284a868b56cbeba63e82205bad17b176d633ca4a5
-DIST chromium-36.0.1985.67.tar.xz 205488864 SHA256 178eea1a764fd761591a84902f4dcf03c95fc6c09ab3b8c41b297f936410f785 SHA512 2e5d717c9670bc076234911826b9c06ac6fdc20cf8f4a53821c5a368b9fdf458007193a331e49cfa6156e0e420a6ad2530cdbb95b1f93875aa3846367dd8b196 WHIRLPOOL ee1f84b47d58cc5f2eab14c3e268e4965db80b9987884b17772180d368a772b4958e6e6037002b2d4d8083634c1651a9bf4f1af4d5d0b9f064d188c0353822e8
-DIST chromium-37.0.2054.3-lite.tar.xz 213917164 SHA256 1bc3c40daedcc714aa06d9b16d44d5e198fb881a82019ce6587cd9b98390909a SHA512 bfd9cdfc24852af7449719326f6e1e6757660aaeb6595027fa034de0bf6f2fede206d677abb089f9fab6ad190b7e2d9c02a8a76b56801f36d16883326f102b2d WHIRLPOOL 3596130b151790e9a185de3e1e329cabcc5dba6d7dd3f80524b9fecfa15430034dfa973e56b155aa4f48e85bcbf71d0e747661022a953d6b6837da3082f7ce30
DIST chromium-37.0.2062.0-lite.tar.xz 214080700 SHA256 5bfde430fd108a03afaf8bb2a013c998822d84fcbc8d2f5c259286a42fcbddb7 SHA512 712694291d2e80f4a8afd119b53ca990cb383e4a697396e1ab56b2d44bc271bef895ff5db7bf8ec88913ffa827bbe965c34445149f94ede0e798ba06a9e64637 WHIRLPOOL 69dc7826da84f554510b14a973feab06d7457e7ba40fee68c5ee25fa14552c1856da4bc0f4fac552a8ec537db407454b8aed5d0316ca38a782856fce158ccd15
+DIST chromium-37.0.2062.20-lite.tar.xz 214292380 SHA256 34abcf79964da0aa82d02edc0002743d6c7f2d4d8f2443c422864c1c27d8df9b SHA512 06fbdd0800e054c38973033b66a2bd51012ded2c3ca1f5608765717770dad76228fcf02e5e0d7534f6d119f0b75906eb20e3a31afb9729d2299c5b044870c8bc WHIRLPOOL 9b9e789ff6d8764a4e316d56d353855fd0f1fde7a97a9492b415be59e5f287227228c0f3fdfb53ba9106087b0e08cac43d2236b339c8616caad72ad0ce3ad758
diff --git a/www-client/chromium/chromium-36.0.1985.67.ebuild b/www-client/chromium/chromium-36.0.1985.67.ebuild
deleted file mode 100644
index 4e0e824850d3..000000000000
--- a/www-client/chromium/chromium-36.0.1985.67.ebuild
+++ /dev/null
@@ -1,664 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-36.0.1985.67.ebuild,v 1.2 2014/07/09 02:35:21 floppym Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
- hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
- sv sw ta te th tr uk vi zh_CN zh_TW"
-
-inherit chromium eutils flag-o-matic multilib multiprocessing pax-utils \
- portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
- test? ( https://commondatastorage.googleapis.com/chromium-browser-official/${P}-testdata.tar.xz )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bindist cups gnome gnome-keyring kerberos neon pulseaudio selinux +tcmalloc"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
- app-arch/bzip2:=
- app-arch/snappy:=
- cups? (
- dev-libs/libgcrypt:0=
- >=net-print/cups-1.3.11:=
- )
- >=dev-libs/elfutils-0.149
- dev-libs/expat:=
- dev-libs/icu:=
- >=dev-libs/jsoncpp-0.5.0-r1:=
- >=dev-libs/libevent-1.4.13:=
- dev-libs/libxml2:=[icu]
- dev-libs/libxslt:=
- dev-libs/nspr:=
- >=dev-libs/nss-3.14.3:=
- dev-libs/re2:=
- gnome? ( >=gnome-base/gconf-2.24.0:= )
- gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2:= )
- >=media-libs/alsa-lib-1.0.19:=
- media-libs/flac:=
- media-libs/harfbuzz:=[icu(+)]
- media-libs/libexif:=
- >=media-libs/libjpeg-turbo-1.2.0-r1:=
- media-libs/libpng:0=
- >=media-libs/libwebp-0.4.0:=
- media-libs/speex:=
- pulseaudio? ( media-sound/pulseaudio:= )
- sys-apps/dbus:=
- sys-apps/pciutils:=
- >=sys-libs/libcap-2.22:=
- sys-libs/zlib:=[minizip]
- virtual/udev
- x11-libs/libdrm
- x11-libs/gtk+:2=
- >=x11-libs/libXi-1.6.0:=
- x11-libs/libXinerama:=
- x11-libs/libXScrnSaver:=
- x11-libs/libXtst:=
- kerberos? ( virtual/krb5 )
- selinux? ( sec-policy/selinux-chromium )"
-DEPEND="${RDEPEND}
- !arm? (
- dev-lang/yasm
- )
- dev-lang/perl
- dev-perl/JSON
- >=dev-util/gperf-3.0.3
- dev-util/ninja
- sys-apps/hwids[usb(+)]
- >=sys-devel/bison-2.4.3
- sys-devel/flex
- virtual/pkgconfig
- test? (
- dev-libs/openssl:0
- )"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND+="
- !=www-client/chromium-9999
- x11-misc/xdg-utils
- virtual/ttf-fonts
- tcmalloc? ( ! "${T}/flapper_version.h" || die
- myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
-
- # Use system-provided libraries.
- # TODO: use_system_hunspell (upstream changes needed).
- # TODO: use_system_libsrtp (bug #459932).
- # TODO: use_system_libvpx (http://crbug.com/347823).
- # TODO: use_system_libusb (http://crbug.com/266149).
- # TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
- # TODO: use_system_protobuf (bug #503084).
- # TODO: use_system_ssl (http://crbug.com/58087).
- # TODO: use_system_sqlite (http://crbug.com/22208).
- myconf+="
- -Duse_system_bzip2=1
- -Duse_system_flac=1
- -Duse_system_harfbuzz=1
- -Duse_system_icu=1
- -Duse_system_jsoncpp=1
- -Duse_system_libevent=1
- -Duse_system_libjpeg=1
- -Duse_system_libpng=1
- -Duse_system_libwebp=1
- -Duse_system_libxml=1
- -Duse_system_libxslt=1
- -Duse_system_minizip=1
- -Duse_system_nspr=1
- -Duse_system_openssl=1
- -Duse_system_re2=1
- -Duse_system_snappy=1
- -Duse_system_speex=1
- -Duse_system_xdg_utils=1
- -Duse_system_zlib=1"
-
- # Needed for system icu - we don't need additional data files.
- myconf+=" -Dicu_use_data_file_flag=0"
-
- # TODO: patch gyp so that this arm conditional is not needed.
- if ! use arm; then
- myconf+="
- -Duse_system_yasm=1"
- fi
-
- # Optional dependencies.
- # TODO: linux_link_kerberos, bug #381289.
- myconf+="
- $(gyp_use cups)
- $(gyp_use gnome use_gconf)
- $(gyp_use gnome-keyring use_gnome_keyring)
- $(gyp_use gnome-keyring linux_link_gnome_keyring)
- $(gyp_use kerberos)
- $(gyp_use pulseaudio)
- $(gyp_use tcmalloc use_allocator tcmalloc none)"
-
- # Use explicit library dependencies instead of dlopen.
- # This makes breakages easier to detect by revdep-rebuild.
- myconf+="
- -Dlinux_link_gsettings=1
- -Dlinux_link_libpci=1
- -Dlinux_link_libspeechd=1
- -Dlibspeechd_h_prefix=speech-dispatcher/"
-
- # TODO: use the file at run time instead of effectively compiling it in.
- myconf+="
- -Dusb_ids_path=/usr/share/misc/usb.ids"
-
- # Save space by removing DLOG and DCHECK messages (about 6% reduction).
- myconf+="
- -Dlogging_like_official_build=1"
-
- # Never use bundled gold binary. Disable gold linker flags for now.
- myconf+="
- -Dlinux_use_bundled_binutils=0
- -Dlinux_use_bundled_gold=0
- -Dlinux_use_gold_flags=0"
-
- # TODO: enable mojo after fixing compile failures.
- myconf+=" -Duse_mojo=0"
-
- # Always support proprietary codecs.
- myconf+=" -Dproprietary_codecs=1"
-
- # Set python version and libdir so that python_arch.sh can find libpython.
- # Bug 492864.
- myconf+="
- -Dpython_ver=${EPYTHON#python}
- -Dsystem_libdir=$(get_libdir)"
-
- if ! use bindist; then
- # Enable H.264 support in bundled ffmpeg.
- myconf+=" -Dffmpeg_branding=Chrome"
- fi
-
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
- # Note: these are for Gentoo use ONLY. For your own distribution,
- # please get your own set of keys. Feel free to contact chromium@gentoo.org
- # for more info.
- myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
- -Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
- -Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
-
- local myarch="$(tc-arch)"
- if [[ $myarch = amd64 ]] ; then
- target_arch=x64
- ffmpeg_target_arch=x64
- elif [[ $myarch = x86 ]] ; then
- target_arch=ia32
- ffmpeg_target_arch=ia32
- elif [[ $myarch = arm ]] ; then
- target_arch=arm
- ffmpeg_target_arch=$(usex neon arm-neon arm)
- # TODO: re-enable NaCl (NativeClient).
- local CTARGET=${CTARGET:-${CHOST}}
- if [[ $(tc-is-softfloat) == "no" ]]; then
-
- myconf+=" -Darm_float_abi=hard"
- fi
- filter-flags "-mfpu=*"
- use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
-
- if [[ ${CTARGET} == armv[78]* ]]; then
- myconf+=" -Darmv7=1"
- else
- myconf+=" -Darmv7=0"
- fi
- myconf+=" -Dsysroot=
- $(gyp_use neon arm_neon)
- -Ddisable_nacl=1"
- else
- die "Failed to determine target arch, got '$myarch'."
- fi
-
- myconf+=" -Dtarget_arch=${target_arch}"
-
- # Make sure that -Werror doesn't get added to CFLAGS by the build system.
- # Depending on GCC version the warnings are different and we don't want
- # the build to fail because of that.
- myconf+=" -Dwerror="
-
- # Disable fatal linker warnings, bug 506268.
- myconf+=" -Ddisable_fatal_linker_warnings=1"
-
- # Avoid CFLAGS problems, bug #352457, bug #390147.
- if ! use custom-cflags; then
- replace-flags "-Os" "-O2"
- strip-flags
-
- # Prevent linker from running out of address space, bug #471810 .
- if use x86; then
- filter-flags "-g*"
- fi
- fi
-
- # Make sure the build system will use the right tools, bug #340795.
- tc-export AR CC CXX RANLIB
-
- # Tools for building programs to be executed on the build system, bug #410883.
- export AR_host=$(tc-getBUILD_AR)
- export CC_host=$(tc-getBUILD_CC)
- export CXX_host=$(tc-getBUILD_CXX)
- export LD_host=${CXX_host}
-
- # Bug 491582.
- export TMPDIR="${WORKDIR}/temp"
- mkdir -m 755 "${TMPDIR}" || die
-
- # Re-configure bundled ffmpeg. See bug #491378 for example reasons.
- einfo "Configuring bundled ffmpeg..."
- pushd third_party/ffmpeg > /dev/null || die
- chromium/scripts/build_ffmpeg.sh linux ${ffmpeg_target_arch} "${PWD}" config-only || die
- chromium/scripts/copy_config.sh || die
- popd > /dev/null || die
-
- einfo "Configuring Chromium..."
- build/linux/unbundle/replace_gyp_files.py ${myconf} || die
- egyp_chromium ${myconf} || die
-}
-
-eninja() {
- if [[ -z ${NINJAOPTS+set} ]]; then
- local jobs=$(makeopts_jobs)
- local loadavg=$(makeopts_loadavg)
-
- if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
- NINJAOPTS+=" -j ${jobs}"
- fi
- if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
- NINJAOPTS+=" -l ${loadavg}"
- fi
- fi
- set -- ninja -v ${NINJAOPTS} "$@"
- echo "$@"
- "$@"
-}
-
-src_compile() {
- # TODO: add media_unittests after fixing compile (bug #462546).
- local test_targets=""
- for x in base cacheinvalidation content crypto \
- gpu net printing sql; do
- test_targets+=" ${x}_unittests"
- done
-
- local ninja_targets="chrome chrome_sandbox chromedriver"
- if use test; then
- ninja_targets+=" $test_targets"
- fi
-
- # Build mksnapshot and pax-mark it.
- eninja -C out/Release mksnapshot.${target_arch} || die
- pax-mark m out/Release/mksnapshot.${target_arch}
-
- # Even though ninja autodetects number of CPUs, we respect
- # user's options, for debugging with -j 1 or any other reason.
- eninja -C out/Release ${ninja_targets} || die
-
- pax-mark m out/Release/chrome
- if use test; then
- for x in $test_targets; do
- pax-mark m out/Release/${x}
- done
- fi
-}
-
-src_test() {
- # For more info see bug #350349.
- local LC_ALL="en_US.utf8"
-
- if ! locale -a | grep -q "${LC_ALL}"; then
- eerror "${PN} requires ${LC_ALL} locale for tests"
- eerror "Please read the following guides for more information:"
- eerror " http://www.gentoo.org/doc/en/guide-localization.xml"
- eerror " http://www.gentoo.org/doc/en/utf-8.xml"
- die "locale ${LC_ALL} is not supported"
- fi
-
- # If we have the right locale, export it to the environment
- export LC_ALL
-
- # For more info see bug #370957.
- if [[ $UID -eq 0 ]]; then
- die "Tests must be run as non-root. Please use FEATURES=userpriv."
- fi
-
- # virtualmake dies on failure, so we run our tests in a function
- VIRTUALX_COMMAND="chromium_test" virtualmake
-}
-
-chromium_test() {
- # Keep track of the cumulative exit status for all tests
- local exitstatus=0
-
- runtest() {
- local cmd=$1
- shift
- local IFS=:
- set -- "${cmd}" --test-launcher-bot-mode "--gtest_filter=-$*"
- einfo "$@"
- "$@"
- local st=$?
- (( st )) && eerror "${cmd} failed"
- (( exitstatus |= st ))
- }
-
- local excluded_base_unittests=(
- "OutOfMemoryDeathTest.ViaSharedLibraries" # bug #497512
- )
- runtest out/Release/base_unittests "${excluded_base_unittests[@]}"
- runtest out/Release/cacheinvalidation_unittests
-
- local excluded_content_unittests=(
- "RendererDateTimePickerTest.*" # bug #465452
- )
- runtest out/Release/content_unittests "${excluded_content_unittests[@]}"
-
- runtest out/Release/crypto_unittests
- runtest out/Release/gpu_unittests
-
- # TODO: add media_unittests after fixing compile (bug #462546).
- # runtest out/Release/media_unittests
-
- local excluded_net_unittests=(
- "NetUtilTest.IDNToUnicode*" # bug 361885
- "NetUtilTest.FormatUrl*" # see above
- "SpdyFramerTests/SpdyFramerTest.CreatePushPromiseCompressed/2" # bug #478168
- "SpdyFramerTests/SpdyFramerTest.CreateContinuationCompressed/2" # see above
- "HostResolverImplTest.BypassCache" # bug #498304
- "HostResolverImplTest.FlushCacheOnIPAddressChange" # bug #481812
- "HostResolverImplTest.ResolveFromCache" # see above
- "ProxyResolverV8TracingTest.*" # see above
- "SSLClientSocketTest.ConnectMismatched" # see above
- "UDPSocketTest.*" # see above
- "*EndToEndTest*" # see above
- "Version/QuicHttpStreamTest.Priority/0" # bug #503010
- "Version/QuicHttpStreamTest.DestroyedEarly/0" # see above
- )
- runtest out/Release/net_unittests "${excluded_net_unittests[@]}"
-
- runtest out/Release/printing_unittests
- runtest out/Release/sql_unittests
-
- return ${exitstatus}
-}
-
-src_install() {
- exeinto "${CHROMIUM_HOME}"
- doexe out/Release/chrome || die
-
- newexe out/Release/chrome_sandbox chrome-sandbox || die
- fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-
- doexe out/Release/chromedriver || die
-
- # if ! use arm; then
- # doexe out/Release/nacl_helper{,_bootstrap} || die
- # insinto "${CHROMIUM_HOME}"
- # doins out/Release/nacl_irt_*.nexe || die
- # doins out/Release/libppGoogleNaClPluginChrome.so || die
- # fi
-
- local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
- if [[ -n ${CHROMIUM_SUFFIX} ]]; then
- sedargs+=(
- -e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
- -e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
- -e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
- )
- fi
- sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
- doexe chromium-launcher.sh
-
- # It is important that we name the target "chromium-browser",
- # xdg-utils expect it; bug #355517.
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
- # keep the old symlink around for consistency
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
-
- dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
-
- # Allow users to override command-line options, bug #357629.
- dodir /etc/chromium || die
- insinto /etc/chromium
- newins "${FILESDIR}/chromium.default" "default" || die
-
- pushd out/Release/locales > /dev/null || die
- chromium_remove_language_paks
- popd
-
- insinto "${CHROMIUM_HOME}"
- doins out/Release/*.pak || die
-
- doins -r out/Release/locales || die
- doins -r out/Release/resources || die
-
- newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
- newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
-
- doexe out/Release/libffmpegsumo.so || die
-
- # Install icons and desktop entry.
- local branding size
- for size in 16 22 24 32 48 64 128 256 ; do
- case ${size} in
- 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
- *) branding="chrome/app/theme/chromium" ;;
- esac
- newicon -s ${size} "${branding}/product_logo_${size}.png" \
- chromium-browser${CHROMIUM_SUFFIX}.png
- done
-
- local mime_types="text/html;text/xml;application/xhtml+xml;"
- mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
- mime_types+="x-scheme-handler/ftp;" # bug #412185
- mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
- make_desktop_entry \
- chromium-browser${CHROMIUM_SUFFIX} \
- "Chromium${CHROMIUM_SUFFIX}" \
- chromium-browser${CHROMIUM_SUFFIX} \
- "Network;WebBrowser" \
- "MimeType=${mime_types}\nStartupWMClass=chromium-browser"
- sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
- # Install GNOME default application entry (bug #303100).
- if use gnome; then
- dodir /usr/share/gnome-control-center/default-apps || die
- insinto /usr/share/gnome-control-center/default-apps
- newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
- if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
- sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
- "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
- fi
- fi
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
- readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-37.0.2054.3.ebuild b/www-client/chromium/chromium-37.0.2062.20.ebuild
similarity index 97%
rename from www-client/chromium/chromium-37.0.2054.3.ebuild
rename to www-client/chromium/chromium-37.0.2062.20.ebuild
index 58c5c743d96b..8fb19ffb217f 100644
--- a/www-client/chromium/chromium-37.0.2054.3.ebuild
+++ b/www-client/chromium/chromium-37.0.2062.20.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/www-client/chromium/chromium-37.0.2054.3.ebuild,v 1.1 2014/06/18 14:42:55 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-37.0.2062.20.ebuild,v 1.2 2014/07/19 08:56:48 phajdan.jr Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -37,6 +37,7 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
)
>=dev-libs/elfutils-0.149
dev-libs/expat:=
+ dev-libs/glib:=
dev-libs/icu:=
>=dev-libs/jsoncpp-0.5.0-r1:=
>=dev-libs/libevent-1.4.13:=
@@ -46,9 +47,11 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
>=dev-libs/nss-3.14.3:=
dev-libs/re2:=
gnome? ( >=gnome-base/gconf-2.24.0:= )
- gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2:= )
+ gnome-keyring? ( gnome-base/libgnome-keyring:= )
>=media-libs/alsa-lib-1.0.19:=
media-libs/flac:=
+ media-libs/fontconfig:=
+ media-libs/freetype:=
media-libs/harfbuzz:=[icu(+)]
media-libs/libexif:=
>=media-libs/libjpeg-turbo-1.2.0-r1:=
@@ -61,12 +64,23 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
>=sys-libs/libcap-2.22:=
sys-libs/zlib:=[minizip]
virtual/udev
- x11-libs/libdrm
+ x11-libs/cairo:=
+ x11-libs/gdk-pixbuf:=
x11-libs/gtk+:2=
+ x11-libs/libdrm
+ x11-libs/libX11:=
+ x11-libs/libXcomposite:=
+ x11-libs/libXcursor:=
+ x11-libs/libXdamage:=
+ x11-libs/libXext:=
+ x11-libs/libXfixes:=
>=x11-libs/libXi-1.6.0:=
x11-libs/libXinerama:=
+ x11-libs/libXrandr:=
+ x11-libs/libXrender:=
x11-libs/libXScrnSaver:=
x11-libs/libXtst:=
+ x11-libs/pango:=
kerberos? ( virtual/krb5 )
selinux? ( sec-policy/selinux-chromium )"
DEPEND="${RDEPEND}
@@ -77,7 +91,7 @@ DEPEND="${RDEPEND}
dev-perl/JSON
>=dev-util/gperf-3.0.3
dev-util/ninja
- sys-apps/hwids
+ sys-apps/hwids[usb(+)]
>=sys-devel/bison-2.4.3
sys-devel/flex
virtual/pkgconfig"
@@ -156,7 +170,7 @@ src_prepare() {
# fi
epatch "${FILESDIR}/${PN}-angle-r0.patch"
- epatch "${FILESDIR}/${PN}-ffmpeg-r1.patch"
+ epatch "${FILESDIR}/${PN}-ffmpeg-r2.patch"
epatch_user
diff --git a/www-client/vimprobable2/vimprobable2-1.4.2-r1.ebuild b/www-client/vimprobable2/vimprobable2-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..aaf054766518
--- /dev/null
+++ b/www-client/vimprobable2/vimprobable2-1.4.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/vimprobable2/vimprobable2-1.4.2-r1.ebuild,v 1.1 2014/07/19 04:53:56 radhermit Exp $
+
+EAPI=5
+inherit toolchain-funcs savedconfig
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://git.code.sf.net/p/vimprobable/code"
+ EGIT_PROJECT="vimprobable"
+else
+ SRC_URI="mirror://sourceforge/vimprobable/${PN}_${PV}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+ S=${WORKDIR}/${PN}
+fi
+
+DESCRIPTION="A minimal web browser that behaves like the Vimperator plugin for Firefox"
+HOMEPAGE="http://www.vimprobable.org/"
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="net-libs/libsoup:2.4
+ net-libs/webkit-gtk:2
+ x11-libs/gtk+:2
+ x11-libs/libX11"
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ virtual/pkgconfig"
+
+src_prepare() {
+ tc-export CC
+ restore_config config.h keymap.h
+}
+
+src_install() {
+ dobin ${PN}
+ doman ${PN}.1 vimprobablerc.5
+
+ save_config config.h keymap.h
+}
diff --git a/www-client/vimprobable2/vimprobable2-9999.ebuild b/www-client/vimprobable2/vimprobable2-9999.ebuild
index 7ce232db7586..a50e5f9da8df 100644
--- a/www-client/vimprobable2/vimprobable2-9999.ebuild
+++ b/www-client/vimprobable2/vimprobable2-9999.ebuild
@@ -1,13 +1,18 @@
-# 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/www-client/vimprobable2/vimprobable2-9999.ebuild,v 1.3 2013/05/26 09:53:29 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/vimprobable2/vimprobable2-9999.ebuild,v 1.4 2014/07/19 04:53:56 radhermit Exp $
EAPI=5
+inherit toolchain-funcs savedconfig
-inherit toolchain-funcs git-2
-
-EGIT_REPO_URI="git://git.code.sf.net/p/vimprobable/code"
-EGIT_PROJECT="vimprobable"
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://git.code.sf.net/p/vimprobable/code"
+else
+ SRC_URI="mirror://sourceforge/vimprobable/${PN}_${PV}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+ S=${WORKDIR}/${PN}
+fi
DESCRIPTION="A minimal web browser that behaves like the Vimperator plugin for Firefox"
HOMEPAGE="http://www.vimprobable.org/"
@@ -23,13 +28,14 @@ DEPEND="${RDEPEND}
dev-lang/perl
virtual/pkgconfig"
-S=${WORKDIR}/${PN}
-
src_prepare() {
tc-export CC
+ restore_config config.h keymap.h
}
src_install() {
dobin ${PN}
doman ${PN}.1 vimprobablerc.5
+
+ save_config config.h keymap.h
}
diff --git a/www-client/w3m/w3m-0.5.3-r5.ebuild b/www-client/w3m/w3m-0.5.3-r5.ebuild
index f7366b3ab958..f0fbf568e97f 100644
--- a/www-client/w3m/w3m-0.5.3-r5.ebuild
+++ b/www-client/w3m/w3m-0.5.3-r5.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/www-client/w3m/w3m-0.5.3-r5.ebuild,v 1.3 2014/06/10 08:54:20 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.3-r5.ebuild,v 1.5 2014/07/19 16:07:29 zlogene Exp $
EAPI=5
inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/w3m/${P}.tar.gz"
LICENSE="w3m"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="X fbcon gpm gtk imlib lynxkeymap migemo nls nntp ssl unicode vanilla xface linguas_ja"
# We cannot build w3m with gtk+2 w/o X because gtk+2 ebuild doesn't
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.20_beta1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.20_beta1.ebuild
index fafb236d1412..be60e919880f 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.20_beta1.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.20_beta1.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/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.20_beta1.ebuild,v 1.1 2014/07/18 04:12:00 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.20_beta1.ebuild,v 1.2 2014/07/19 21:56:14 floppym Exp $
EAPI=4
@@ -41,7 +41,7 @@ SRC_URI="
LICENSE="google-chrome"
KEYWORDS="~amd64 ~x86"
-IUSE="+flash +pdf"
+IUSE="+flash"
RESTRICT="bindist mirror strip"
for x in 0 beta stable unstable; do
@@ -62,8 +62,6 @@ src_install() {
insinto /usr/$(get_libdir)/chromium-browser/
- use pdf && doins libpdf.so
-
if use flash; then
doins -r PepperFlash
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 90ae01b49949..866b17368f4e 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,32 +1,24 @@
DIST NVIDIA-FreeBSD-x86-173.14.39.tar.gz 20038266 SHA256 63a922ce4c5b676b4cb1ace98094dace4cc5408f2553e183df7b2127777a238b SHA512 96982fe7e0751c52fbef534193de09d187b99c1984c05e791223eb804719d8b3ba72efd983f227661ded4b71569bdbb914f1f629ab73a8bc9b8172832ccf3ec6 WHIRLPOOL 21f5906f42adf0064c7a7f81ac8e323de488e6d36356ee42c31a15c31ebb64335d5e2cff0ff022d41de480f9e0a57b3b96387f17151c7b59eceba2c61a7a102b
-DIST NVIDIA-FreeBSD-x86-304.121.tar.gz 33977409 SHA256 980e613a5f969741f15ce8b87077c3b4343c72f2762613bf96237ba11d963ec0 SHA512 e031d7ce8f2db917a54792792901ce46d9a939bd818ed5167b5dabf58d102b54c687addfb083283db3091e54bdd71479dc4d87699be22abefe65662d93c4e49f WHIRLPOOL facc59cea0ff57819dafb9465b697d34b1f309ef7b4eae072b3af93ff64672845b747de57a77bb66fd62f224df4cad85b97efbd6ff79726ba51995abfe7f871a
DIST NVIDIA-FreeBSD-x86-304.123.tar.gz 34160879 SHA256 7e4433364c5f42de6611b8cf722e0073eae6763a6664d6b9fd652ef05ebee24b SHA512 7b65ab3e99bfb9f95655c3d9124849bb830d12e43ff2d5297496c114dcdd68f738229ea244f95c53e1fc9d62d64ad3b2efb17eccac0fc2f280e8f226a9a47e7d WHIRLPOOL a33ef07363f336b01248434e4aae80bad0ce5d20985dca53484c63c4f39eae9d5b2e8cab1e08e20a8857aac8acd15ac42605a8e3af1fc3f11b8dc9d75914db09
-DIST NVIDIA-FreeBSD-x86-331.79.tar.gz 55893626 SHA256 fe74b414eb5d5d6675cc28fe583a6cb42d13f74d7fac4e949023b658e980967b SHA512 1a94d948f7bebd21a688c503684529da148714259ca6b9bdb3c1e72b59283695339d06cc649723b9ae9613e17b3f973f9192c8d5bc8373d464e9f6def3c7e18f WHIRLPOOL 5f78ee136f5ee3aa94339950b04dd588abec790584664249fd35b7793c6e34ccc7d6c64a405c111cc4190d9f95dd0e43ce4c9536e5170621e39d8a302cd9f840
DIST NVIDIA-FreeBSD-x86-331.89.tar.gz 56039270 SHA256 c6c8dc05b7d47dc612494ecec12b24a0baf4b4323b2865426c98c63c5346a1ee SHA512 bc5f792b86a8faff5a7811d4931709b8cc93de0688bc849f4ebb0e970aff8430a0f7e8c8a7878e12c6f54c83298f2c690c8e5e203d537bc1f417fbe6f4af6c9e WHIRLPOOL efe8da8b1a45aa82d7bf636561484a04cf80dbd511796faf4891f0311c8f0a5a834aace0f4bf763378596e1e6e7fc387994d9d243b5cf68e545dd2b131be1726
DIST NVIDIA-FreeBSD-x86-334.21.tar.gz 56975582 SHA256 ddce7f8e23dd4070c53c7239ce1436c07e28a8bc9679fafba6748038767e8648 SHA512 9e421cac504f075bb80501e7815ada27182c66e6bc22324595da1824b49c00fc8b005028bd9f5d0428f0d9ee04af82e1c90bf1f6b77cf0d60b90dbac963c544b WHIRLPOOL 1ba6573f67be85efdc656063aab8d5cc9a51eb455946dcfdea1b368879d6279de214c7554359bfa2252925f338d597ac5178593f50cc073bb66bf952beffce5f
DIST NVIDIA-FreeBSD-x86-337.25.tar.gz 58137349 SHA256 9857b24b5d910fb8688a2b9e11039d88b70ec250e900149183454675a363e8db SHA512 0c85814061732bd09948b5fd203d5d3a1fd5df0e1c23f4af11e1cfae6f7d8c7d7f569f35398c2c5551abf7eb5ce357229fa9b16ce2c21799e96396cff3313777 WHIRLPOOL a7ca516e184334117e1cdd45b3f4c1b0a8c50281ffd1c3859865d877c2bfb20136c308b1ff09e4d64d0e7fef8eeddacab488d0bc30c98d82a9280572be5f0de0
DIST NVIDIA-FreeBSD-x86-340.24.tar.gz 59001888 SHA256 43717bc70d138ac841c85befcc0475c9403354134d8a91529198a9b93951497a SHA512 a69f488d4c751e0f3307532579b386fc01538dc20a561c84fd01a22326a2a7af8a72f54c7e883b25f32a66b4f459ff65b870f0e9e74eae956a15076074665e60 WHIRLPOOL 0c2436d99bb5fa1b5d728781417c897f2f65bb78b517642c103fa67739b33a9f65d582063bdb000fd068a522bea48253b55aa843c88dbe914cd3f8dc19551a3b
DIST NVIDIA-FreeBSD-x86-96.43.23.tar.gz 15463464 SHA256 18d855db8381eda1a6cf548c9e5095fc5bb8694bf1d6e24fc1072fba4e54cd78 SHA512 42d7b1b76cdb3b23680363e565614a22112162a5dd3639cb804fe670c0c3f3f23595bbefa3f78afdc6a8ca848446dee853c7a355f2c96a0d01b354753ba2785c WHIRLPOOL f8e59ce521990cd9edee441e73f973f074db492952807a0931e362102874cddbb47604ff5c5eb20a0cbde27f9b6d4e440dd12cc2e5a20c9cb65bf3c0b3e62511
-DIST NVIDIA-FreeBSD-x86_64-304.121.tar.gz 34946870 SHA256 91fd8f924b99682c59f96e1b4513f8d2c51985fff743c8a448861b536955e2e9 SHA512 890a20aa82d16197a5633c8128dac5a042e057aef3cb5d338daafd284960a9851201f9bec68a06c10a632704b7537d13079f0f539565962a1092dc7eec324b11 WHIRLPOOL 52128075de0d8e841c340dbe408aad6ee10fea41a0b203ffa82ad5a0bf836d7b348e3de6d516012507df64de561741a18d9205a1752b635ec6b049d0c29a3e48
DIST NVIDIA-FreeBSD-x86_64-304.123.tar.gz 35144064 SHA256 32ea8ce22b4fe50f59782c390b8ec1d90bb44e02787255476f0304c60f11e877 SHA512 e12f55e2a303e8df628b3d7e5f2c80517cae4f6a146f20a3c10ab2d1147b4bc9386b678bbab9e519e28ea921832e1c855b4b8f4643c839717c5c97a833679b2a WHIRLPOOL 5d751bf72e1e089edcaab34d2ba8d413793a92c5a0d3601ff71285b458ad6aef4632481ece9f520f2006440d35b2eab3941e30f54d79351bc8da3ba12eaf3388
-DIST NVIDIA-FreeBSD-x86_64-331.79.tar.gz 47007716 SHA256 2a6ce8fac79f6ce27edefd7f258f6aafdb27734716bc4a9a73d6b288267ecca9 SHA512 4c157b215ccd24ce5ed6ad855c6729446e480d86fa91ed7ed0d7958209e7d784842aca735304845113c2092a2a23b644a3964dc5d6e5ba68caa132017aa2c3d6 WHIRLPOOL a01b2dbecc42f0957a448a866b86808d1ac3a4987796fa0eb6788c1fe5b93d703127a85fc520d2fcfe548482d0fadc3487d0c184ff2ba2b05dd865e019a6cf5d
DIST NVIDIA-FreeBSD-x86_64-331.89.tar.gz 47156745 SHA256 78d78d02cbafb7538a981263748026c533fd052dac861e270f2a8b259c8c4f07 SHA512 e3e34abeda9a7c0a13558d6d32106dc59b2d6341c28352e002616883059c60bba943f6eacffb0fb4b77d413ebb8e17b52d39e7bf645f8858bc043b69f3a3dd01 WHIRLPOOL f7a0cf3f78002d2396ad8c7335497627d14e8ff624a39acde9f5425986d1b75d3d282d616343fd6cd743d80191059157bddc77bdbfda023d26f20dfce6fcc463
DIST NVIDIA-FreeBSD-x86_64-334.21.tar.gz 57725419 SHA256 5f6c34f6cce4190631b9ffa64006b611c92c8e6af8f016f8c541561d50c0f5d0 SHA512 0a2dc4150b0fd2798438cf68205497c12c5019daca1dc1b3d0f29483220c5db4a5837547ce909f2248770fed8061ef32ace710c9cc5866a0d300bee2c9c2681d WHIRLPOOL 54b0f15bc53dee73a3d6d11eee6f780aa1880c3bacfb45ea75187388411669349a2928ef28d2113b74f87fc9ad825b2e5f5413c2a0a110eaa3e6c9e9a6e67ae0
DIST NVIDIA-FreeBSD-x86_64-337.25.tar.gz 58941876 SHA256 189dc0f70528d0099d0396a52bf759af74d6a99203484be2d2d6514faf0d4161 SHA512 458c9200579a6caed02aabbc196ec998a0d19149cca665c5ef9bc709c018b991b27713c92d00bdd1ea6ddd86e04c641f387e1ec8a1235cc9581af9e7a3b19ebf WHIRLPOOL d819cf486edc443b1da39ea67582a12698b1dea1501f3b6738014a80f8a96260aa0ba30a9e2f1fac075f0f7d604dc94978f7f82092b40531dd4989a2954cc420
DIST NVIDIA-FreeBSD-x86_64-340.24.tar.gz 59816713 SHA256 b05f406a887d6b96bc58b46338db43fffa8f702cf460a45adfbe1b90d96909d4 SHA512 6c789964f4b873c5404aeaf7ad742460217dc39719b3a3776639ddf53646495e72c155f8c2976f629297a3ec5bb22ae62e3a64eae423f482bd9338394e6f67a9 WHIRLPOOL b081ca26c0a8ebc07e2bef362b844ca165944741178ee6263c93704ef7c45748f3d9902eca6947688f0b5807a94aad04a8ec1ed0e6ae6053d741bc534fe7553f
DIST NVIDIA-Linux-x86-173.14.39-pkg0.run 15134997 SHA256 a09935f37121ed3db8ae3da63a0d8e9d4348a19c859811c9fe44d6ce8e3eab23 SHA512 e24e15ccec725d3cbca502c2b77061776a81ef92917a950adec4ff6bdc34f10903aa654433177ea74be0dade4af81c5380d5710d375a5ea445940d06154bde93 WHIRLPOOL fce3d8e4f6cdf698f5a057514b6fe220bb1011025bdce5bd4cf0e424fb4d306d38251b6726bda03f290ea8137d5a95ed418cf8751722879f9042462abd9181b6
-DIST NVIDIA-Linux-x86-304.121.run 40081628 SHA256 25ee2e45bd1f728b9de30a88575dadea210549d812944fff2026cf192ea4c52d SHA512 a3848474f7996c260fb3f2692d2c35b17738d6f13fd20fcd49e52bd6b7fcefb91b436ebf0670579aa5cb7d250f5d2eb6ce28b4c087fa5c33373a2da91c42138f WHIRLPOOL 1fd3c0e8f397a9bc58011bbe8d830df9f46370bcb85c9df0e1155ced1d85f9106dd30fae9d708ff94ce92ebe04fa68e6d8ac32ae19840b92e0d3d29553e1ab85
DIST NVIDIA-Linux-x86-304.123.run 40250272 SHA256 d5034900173cb7195f52bd6add5bf574dfcd8868bd75c0e1793592c03b97f425 SHA512 7397a28c67a3cfc5ad58f079ced4c45639922c39008d606ca703c22dde34374c4942c894eec49d42187cf00cb0179e3dcf80edd28a81c4c89456a62e42f12b43 WHIRLPOOL 8b55196678cddba5e640f90525d69835c273befe01e4e1a87c00a21839e9a86bc68829a3c59c64609c47475466a158f43d8579897728cabe6b6bc0eadef62e2b
-DIST NVIDIA-Linux-x86-331.79.run 37031391 SHA256 344d3daaec8010ffe53fd132f706d87d25448847f139eafc5fe76733837c8636 SHA512 0dbe089d39916720797187367c857fc87f57a780f780b733975929f0f11038c18170560f4300f1160212115e6ec77fed19dccada4b1a751ded8d3e27fdbc6b95 WHIRLPOOL 60e0b6fe1c6e3967248c51f56453f4661a88355eae34e5b15203fa22823bf232875902d35a32a65816c47102db4b8853dbbc3017bb5a9975bc6ecc81a425ea89
DIST NVIDIA-Linux-x86-331.89.run 37023195 SHA256 608c5555933fd8738f9263e569ae31acff0a9ef93390aa61889ab0606182c942 SHA512 b6afc4212687fb8ffa6256c23088d3eb98bae39486b9d2886075483fbfa97bc4fbfd5da1de5072ae4f309b64201dc176e38351cbe18b8b7a7339d1d957e3ca67 WHIRLPOOL b10567f54eb6f63aca997f8df6cb9e1c303186e9e853a463318f43904edf719d3beba4f3e5d7b480cbc7576078302ec92f711cb1cfccaa511d376de00b7f83de
DIST NVIDIA-Linux-x86-334.21.run 37740148 SHA256 ece6ac1d66b0de53b6db0ae92f72112f734c9ec4b7f1ffb1ec508d32f700df39 SHA512 b52a9f08fb91ef915c3c7ce2aa34ecdd93a5fd8731d7f4b9cb887289f931a4dc5e82afa259bc985be55964a8c788550683ef61306bed9a32a5614dcb2d64373d WHIRLPOOL 547862c1ef1b1f3c0684af38ddef9ecd37776e820a7d5c2a7e2ae2e71a5c7956fb1b5c87b78f60e0ce52b7bb7f37efdc27ee4f62a1d42699f48a69521ee42056
DIST NVIDIA-Linux-x86-337.25.run 37649836 SHA256 f76ece6bd98bfe2ae641a1847094e98c6f7ad7a01af682b4f38108d6b6227f9b SHA512 f68105a43f9129f4112c8a091ed7c9641708b62d20c199544e5e7079d5c5bdc0b6c83427be868e62c7134400ca62cab6a65eaff96ddb940768750250cbd50112 WHIRLPOOL 1ff92ffe33dad59bf393a7b6fe7523362433704dc8329701e74814c2eef833d15e44334264601080b90f723f5390ce6502fa3ed530fe9fadaf3efff139e65047
DIST NVIDIA-Linux-x86-340.24.run 38451146 SHA256 55ed96acf22b6f67ce352576e73963730eb6a404df7ee8563d7dc1984d8fb130 SHA512 fc2bdd4346cb09607f20fa30c026fac302d0660a90f79192f41cf0c7f92877d8a1686fb3125996f2fc96884d6c1b886de9bf95cf2a5fe31068ba2a43d677c61e WHIRLPOOL 4a165fec8835fbd3aa36e3075140bbcd1b4e3ae76b4763bd9f17e4522c95bbbcc7686de6d1219a293d93804471b56c4b3f8a31f10f62227a8eec59457b747e10
DIST NVIDIA-Linux-x86-96.43.23-pkg0.run 11504817 SHA256 51e6adf4ba73071622045fc37169f80db3ae3e784dff53b29d35146a04042142 SHA512 bed5726e57637481fe4e3c03a65ec14fe949f00860e729ebde408f4fd861d7bfdc296a78bc2f5d42e8b282db09f4bbde1e0545df7228fa20227080dc4b868ba7 WHIRLPOOL 6d4fd1786c11f4e326cc3101d0bb1a2f8b63c25c3dd59f10188f8355759e2861ce44fd53d60258b513d5a1d6124d0f91ba8edf4d3668b6feabfb3e8d585f14fe
DIST NVIDIA-Linux-x86_64-173.14.39-pkg2.run 21100833 SHA256 15a953666d5681ba54c97498b578ffd286a1dc96d605f3b02110f3f99813100e SHA512 a65cd496e6ed57f771c3d99f37f616a1242d97844f6faef7a807825ad899c0e536a99fde397020839f0857883b934032f9491024f3047a6b06d3eea1f5d77713 WHIRLPOOL dc5f243b7d1de7e2d1b7f005e018a2940d63335b11a7c83c234b348b7a1839e9131169d2ea928bd8c2f549a4535149b03e16e6c94d59dfa745f7f904ff790a45
-DIST NVIDIA-Linux-x86_64-304.121.run 68553265 SHA256 6532eef8b6f65dc44ed912b4ffa86494a954ae98f53c3ffd394fa511cdf75928 SHA512 d5d241043dab325aee209bcd8732c557250847f41408e1aded2026c849dddbc7d5cf3c42fc63e3bb6b81c2563359c763f902bbfe344258f0964fdc9edcb98d54 WHIRLPOOL ec7ea87171a22dfb73e0e9db48d0ac721a7be9d12c06073a481868690741afe34ffa861967ba919a13aafc9c83f55627c361e7b261a8fa0acce2d880545d2fb4
DIST NVIDIA-Linux-x86_64-304.123.run 68755898 SHA256 68ee60d2a96ff80adad7e62f79f55f137dd10b8c38ce6c60fb481e73fdf6b155 SHA512 b16df726e8ba48153fcea337ab198c913eaa9f1dd004bed5c4262731e12c5a7c775c2a31996e207d051e4e479b7eb5173fcffe07d9988877385503f940e15dd8 WHIRLPOOL e9fe629dd262e68fe776c28fd93b4923d03681b2761265383becf914e84429f094b311b6e02051d2fb61436d48a59051d20fe9c8803fe7ed7daf98cd936f0dab
-DIST NVIDIA-Linux-x86_64-331.79.run 60383762 SHA256 c3314bd7f1f722929a2b401e12301a750ee7a73640518932a5a9af39c390a604 SHA512 31758b4d4a780c724e2db253ee7e781ac9dd74eac8d54d5b7444982bd848c3826f3a97d3515a5612b53b79bb28d16abf90372a2c1d2774deb63d103c31e0b7ba WHIRLPOOL 64c4010831a4e5271c73f7c2ff42b4242ac8225685f9b967b90edb3c0aa4ef5774fc7b9df36a7aea17d27cf3de9f1dbdd6a4fb2a36c958af4c66a8153139cf4a
DIST NVIDIA-Linux-x86_64-331.89.run 60300634 SHA256 e7f51a6c7abfe3ba8f03dbb284e2ade7430cc909b2241ff7703b17beff0dd237 SHA512 0216d291c810f1e304d06129eca3d28b67bc587f395626ed201e18e341dc7386b938fae2b75c694f4ed14bcf5a262b468d0919253bde4c9a6898656ae54125f0 WHIRLPOOL fd968f627471256be3bd842fd3d1f36d39d7da2296525e5aac518e5cd678e1c39851d4441851566912108c50baf611bc52d887e9fc828e3db415d13ae3c635f3
DIST NVIDIA-Linux-x86_64-334.21.run 67906887 SHA256 dd35011967b815e096c267f80b36664e34d779bc33017f396dabbd1a1b86d057 SHA512 254500cbb83420df26c860df13a448aece837096db8374c41cc0a979c0102b848b5a6ad463e2daf4dc34ae5fcedf7921767e7bd7d86a97ceff4c683b7ee1c886 WHIRLPOOL c525946dc40b03ee5b395535ee278e09ecc400b833bd501a14ee0672ddfb61e1f3dfda305e9c1bdf70344dc34b6aeadfa68a636afba0a80e33a1da808c8f17b4
DIST NVIDIA-Linux-x86_64-337.25.run 68053486 SHA256 83280f7738f65bb2e790e7530a38978cf0bd0aa741eda51629c9e9b068128af0 SHA512 27cb5030da00d6fa2a2dd6701cc149ce885e7ff7e7ca4f1629c27737357fdadedec41e830f5cacabef14646515d6d2729f753d78424260316e28111f2c3e53b9 WHIRLPOOL 72eba5239ae7272d3501403ef292f0e131896b3dd852a7e2423e79206d99aa5a4a3b98eb4193ad5cd1e0247ffd48189d3a3ba02ca307a759a4f15b9c9a386dbd
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.121.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.121.ebuild
deleted file mode 100644
index c6fd4825a39a..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.121.ebuild
+++ /dev/null
@@ -1,463 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.121.ebuild,v 1.4 2014/06/18 20:58:34 mgorny Exp $
-
-EAPI=5
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
- portability toolchain-funcs unpacker user versionator udev
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
- amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
- amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
- x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
- x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="GPL-2 NVIDIA-r1"
-SLOT="0"
-KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-COMMON="app-admin/eselect-opencl
- kernel_linux? ( >=sys-libs/glibc-2.6.1 )
- X? (
- >=app-admin/eselect-opengl-1.0.9
- )"
-DEPEND="${COMMON}
- kernel_linux? (
- virtual/linux-sources
- virtual/pkgconfig
- )"
-RDEPEND="${COMMON}
- acpi? ( sys-power/acpid )
- tools? (
- dev-libs/atk
- dev-libs/glib
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/pango[X]
- || ( x11-libs/pangox-compat =x11-libs/libX11-1.6.2[abi_x86_32]
- >=x11-libs/libXext-1.3.2[abi_x86_32]
- )
- app-emulation/emul-linux-x86-xlibs
- )
- )
- )
-"
-PDEPEND="X? ( >=x11-libs/libvdpau-0.3-r1 )"
-
-REQUIRED_USE="tools? ( X )"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-
- if use amd64 && has_multilib_profile && \
- [ "${DEFAULT_ABI}" != "amd64" ]; then
- eerror "This ebuild doesn't currently support changing your default ABI"
- die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
- fi
-
- # Kernel features/options to check for
- CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
- use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
- # Now do the above checks
- use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
- # try to turn off distcc and ccache for people that have a problem with it
- export DISTCC_DISABLE=1
- export CCACHE_DISABLE=1
-
- if use kernel_linux; then
- linux-mod_pkg_setup
- MODULE_NAMES="nvidia(video:${S}/kernel)"
- BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
- SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
- # linux-mod_src_compile calls set_arch_to_kernel, which
- # sets the ARCH to x86 but NVIDIA's wrapping Makefile
- # expects x86_64 or i386 and then converts it to x86
- # later on in the build process
- BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
- fi
-
- if use kernel_linux && kernel_is ge 3 14 ; then
- ewarn "Gentoo supports kernels which are supported by NVIDIA"
- ewarn "which are limited to the following kernels:"
- ewarn " "${S}"/nvidia.icd
- /usr/$(get_libdir)/libnvidia-opencl.so
- EOF
-
- # Allow user patches so they can support RC kernels and whatever else
- epatch_user
-}
-
-src_compile() {
- # This is already the default on Linux, as there's no toplevel Makefile, but
- # on FreeBSD there's one and triggers the kernel module build, as we install
- # it by itself, pass this.
-
- cd "${NV_SRC}"
- if use kernel_FreeBSD; then
- MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
- LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
- elif use kernel_linux; then
- linux-mod_src_compile
- fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if its not /usr/lib
-donvidia() {
- # Full path to library minus SOVER
- MY_LIB="$1"
-
- # SOVER to use
- MY_SOVER="$2"
-
- # Where to install
- MY_DEST="$3"
-
- if [[ -z "${MY_DEST}" ]]; then
- MY_DEST="/usr/$(get_libdir)"
- action="dolib.so"
- else
- exeinto ${MY_DEST}
- action="doexe"
- fi
-
- # Get just the library name
- libname=$(basename $1)
-
- # Install the library with the correct SOVER
- ${action} ${MY_LIB}.${MY_SOVER} || \
- die "failed to install ${libname}"
-
- # If SOVER wasn't 1, then we need to create a .1 symlink
- if [[ "${MY_SOVER}" != "1" ]]; then
- dosym ${libname}.${MY_SOVER} \
- ${MY_DEST}/${libname}.1 || \
- die "failed to create ${libname} symlink"
- fi
-
- # Always create the symlink from the raw lib to the .1
- dosym ${libname}.1 \
- ${MY_DEST}/${libname} || \
- die "failed to create ${libname} symlink"
-}
-
-src_install() {
- if use kernel_linux; then
- linux-mod_src_install
-
- # Add the aliases
- # This file is tweaked with the appropriate video group in
- # pkg_preinst, see bug #491414
- insinto /etc/modprobe.d
- newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-
- # Ensures that our device nodes are created when not using X
- exeinto "$(udev_get_udevdir)"
- doexe "${FILESDIR}"/nvidia-udev.sh
- udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
- elif use kernel_FreeBSD; then
- if use x86-fbsd; then
- insinto /boot/modules
- doins "${S}/src/nvidia.kld"
- fi
-
- exeinto /boot/modules
- doexe "${S}/src/nvidia.ko"
- fi
-
- # NVIDIA kernel <-> userspace driver config lib
- donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
-
- if use kernel_linux; then
- # NVIDIA video decode <-> CUDA
- donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
- fi
-
- if use X; then
- # Xorg DDX driver
- insinto /usr/$(get_libdir)/xorg/modules/drivers
- doins ${NV_X11}/nvidia_drv.so
-
- # Xorg GLX driver
- donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
- /usr/$(get_libdir)/opengl/nvidia/extensions
-
- # XvMC driver
- dolib.a ${NV_X11}/libXvMCNVIDIA.a || \
- die "failed to install libXvMCNVIDIA.so"
- donvidia ${NV_X11}/libXvMCNVIDIA.so ${NV_SOVER}
- dosym libXvMCNVIDIA.so.${NV_SOVER} \
- /usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 || \
- die "failed to create libXvMCNVIDIA_dynamic.so symlink"
- fi
-
- # OpenCL ICD for NVIDIA
- if use kernel_linux; then
- insinto /etc/OpenCL/vendors
- doins nvidia.icd
- donvidia ${NV_OBJ}/libnvidia-opencl.so ${NV_SOVER}
- fi
-
- # Documentation
- dohtml ${NV_DOC}/html/*
- if use kernel_FreeBSD; then
- dodoc "${NV_DOC}/README"
- use X && doman "${NV_MAN}/nvidia-xconfig.1"
- use tools && doman "${NV_MAN}/nvidia-settings.1"
- else
- # Docs
- newdoc "${NV_DOC}/README.txt" README
- dodoc "${NV_DOC}/NVIDIA_Changelog"
- doman "${NV_MAN}/nvidia-smi.1.gz"
- use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
- use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
- doman "${NV_MAN}/nvidia-cuda-proxy-control.1.gz"
- fi
-
- # Helper Apps
- exeinto /opt/bin/
-
- if use X; then
- doexe ${NV_OBJ}/nvidia-xconfig
- fi
-
- if use kernel_linux ; then
- doexe ${NV_OBJ}/nvidia-debugdump
- doexe ${NV_OBJ}/nvidia-cuda-proxy-control
- doexe ${NV_OBJ}/nvidia-cuda-proxy-server
- doexe ${NV_OBJ}/nvidia-smi
- newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
- fi
-
- if use tools; then
- doexe ${NV_OBJ}/nvidia-settings
- fi
-
- exeinto /usr/bin/
- doexe ${NV_OBJ}/nvidia-bug-report.sh
-
- # Desktop entries for nvidia-settings
- if use tools ; then
- # There is no icon in the FreeBSD tarball.
- use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png
- domenu "${FILESDIR}"/${PN}-settings.desktop
- exeinto /etc/X11/xinit/xinitrc.d
- doexe "${FILESDIR}"/95-nvidia-settings
- fi
-
- #doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
-
- if has_multilib_profile && use multilib ; then
- local OABI=${ABI}
- for ABI in $(get_install_abis) ; do
- src_install-libs
- done
- ABI=${OABI}
- unset OABI
- else
- src_install-libs
- fi
-
- is_final_abi || die "failed to iterate through all ABIs"
-
- readme.gentoo_create_doc
-}
-
-src_install-libs() {
- local inslibdir=$(get_libdir)
- local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
- local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
- local libdir=${NV_OBJ}
-
- if use kernel_linux && has_multilib_profile && \
- [[ ${ABI} == "x86" ]] ; then
- libdir=${NV_OBJ}/32
- fi
-
- if use X; then
- # The GLX libraries
- donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
- donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
- if use kernel_FreeBSD; then
- donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER} ${GL_ROOT}
- else
- donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER} ${GL_ROOT}
- fi
-
- # VDPAU
- donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
- fi
-
- # NVIDIA monitoring library
- if use kernel_linux ; then
- donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
- fi
-
- # CUDA & OpenCL
- if use kernel_linux; then
- donvidia ${libdir}/libcuda.so ${NV_SOVER}
- donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
- donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
- fi
-}
-
-pkg_preinst() {
- if use kernel_linux; then
- linux-mod_pkg_preinst
-
- local videogroup="$(egetent group video | cut -d ':' -f 3)"
- if [ -z "${videogroup}" ]; then
- eerror "Failed to determine the video group gid"
- die "Failed to determine the video group gid"
- else
- sed -i \
- -e "s:PACKAGE:${PF}:g" \
- -e "s:VIDEOGID:${videogroup}:" \
- "${D}"/etc/modprobe.d/nvidia.conf || die
- fi
- fi
-
- # Clean the dynamic libGL stuff's home to ensure
- # we dont have stale libs floating around
- if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
- rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
- fi
- # Make sure we nuke the old nvidia-glx's env.d file
- if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
- rm -f "${ROOT}"/etc/env.d/09nvidia
- fi
-}
-
-pkg_postinst() {
- use kernel_linux && linux-mod_pkg_postinst
-
- # Switch to the nvidia implementation
- use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
- "${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
- readme.gentoo_print_elog
-
- if ! use X; then
- elog "You have elected to not install the X.org driver. Along with"
- elog "this the OpenGL libraries, XvMC, and VDPAU libraries were not"
- elog "installed. Additionally, once the driver is loaded your card"
- elog "and fan will run at max speed which may not be desirable."
- elog "Use the 'nvidia-smi' init script to have your card and fan"
- elog "speed scale appropriately."
- elog
- fi
- if ! use tools; then
- elog "USE=tools controls whether the nvidia-settings application"
- elog "is installed. If you would like to use it, enable that"
- elog "flag and re-emerge this ebuild. Optionally you can install"
- elog "media-video/nvidia-settings"
- elog
- fi
-}
-
-pkg_prerm() {
- use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
- use kernel_linux && linux-mod_pkg_postrm
- use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.123.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.123.ebuild
index ad23f37c1123..2890abd3d1b2 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.123.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.123.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/x11-drivers/nvidia-drivers/nvidia-drivers-304.123.ebuild,v 1.1 2014/07/11 10:50:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.123.ebuild,v 1.2 2014/07/19 20:23:23 jer Exp $
EAPI=5
inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
@@ -23,7 +23,7 @@ SRC_URI="
LICENSE="GPL-2 NVIDIA-r1"
SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X"
RESTRICT="bindist mirror strip"
EMULTILIB_PKG="true"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-331.79.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-331.79.ebuild
deleted file mode 100644
index b658dd984853..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-331.79.ebuild
+++ /dev/null
@@ -1,477 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-331.79.ebuild,v 1.3 2014/06/18 20:58:34 mgorny Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
- portability toolchain-funcs unpacker user udev
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
- amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
- amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
- x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
- x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0"
-KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X uvm"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-COMMON="
- app-admin/eselect-opencl
- kernel_linux? ( >=sys-libs/glibc-2.6.1 )
- X? (
- >=app-admin/eselect-opengl-1.0.9
- )
-"
-DEPEND="
- ${COMMON}
- app-arch/xz-utils
- kernel_linux? ( virtual/linux-sources )
-"
-RDEPEND="
- ${COMMON}
- acpi? ( sys-power/acpid )
- tools? (
- dev-libs/atk
- dev-libs/glib
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/pango[X]
- )
- X? (
- =x11-libs/libvdpau-0.3-r1
- multilib? (
- || (
- (
- >=x11-libs/libX11-1.6.2[abi_x86_32]
- >=x11-libs/libXext-1.3.2[abi_x86_32]
- )
- app-emulation/emul-linux-x86-xlibs
- )
- )
- )
-"
-
-REQUIRED_USE="tools? ( X )"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-
- if use amd64 && has_multilib_profile && \
- [ "${DEFAULT_ABI}" != "amd64" ]; then
- eerror "This ebuild doesn't currently support changing your default ABI"
- die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
- fi
-
- if use kernel_linux && kernel_is ge 3 15 ; then
- ewarn "Gentoo supports kernels which are supported by NVIDIA"
- ewarn "which are limited to the following kernels:"
- ewarn " userspace driver config lib
- donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
-
- # NVIDIA framebuffer capture library
- donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
-
- # NVIDIA video encode/decode <-> CUDA
- if use kernel_linux; then
- donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
- donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
- fi
-
- if use X; then
- # Xorg DDX driver
- insinto /usr/$(get_libdir)/xorg/modules/drivers
- doins ${NV_X11}/nvidia_drv.so
-
- # Xorg GLX driver
- donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
- /usr/$(get_libdir)/opengl/nvidia/extensions
- fi
-
- # OpenCL ICD for NVIDIA
- if use kernel_linux; then
- insinto /etc/OpenCL/vendors
- doins ${NV_OBJ}/nvidia.icd
- fi
-
- # Documentation
- dohtml ${NV_DOC}/html/*
- if use kernel_FreeBSD; then
- dodoc "${NV_DOC}/README"
- use X && doman "${NV_MAN}/nvidia-xconfig.1"
- use tools && doman "${NV_MAN}/nvidia-settings.1"
- else
- # Docs
- newdoc "${NV_DOC}/README.txt" README
- dodoc "${NV_DOC}/NVIDIA_Changelog"
- doman "${NV_MAN}/nvidia-smi.1.gz"
- use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
- use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
- doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
- fi
-
- # Helper Apps
- exeinto /opt/bin/
-
- if use X; then
- doexe ${NV_OBJ}/nvidia-xconfig
- fi
-
- if use kernel_linux ; then
- doexe ${NV_OBJ}/nvidia-cuda-mps-control
- doexe ${NV_OBJ}/nvidia-cuda-mps-server
- doexe ${NV_OBJ}/nvidia-debugdump
- doexe ${NV_OBJ}/nvidia-persistenced
- doexe ${NV_OBJ}/nvidia-smi
-
- # install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
- doexe ${NV_OBJ}/nvidia-modprobe
- fowners root:video /opt/bin/nvidia-modprobe
- fperms 4710 /opt/bin/nvidia-modprobe
- dosym /{opt,usr}/bin/nvidia-modprobe
-
- doman nvidia-cuda-mps-control.1.gz
- doman nvidia-modprobe.1.gz
- doman nvidia-persistenced.1.gz
- newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
- fi
-
- if use tools; then
- doexe ${NV_OBJ}/nvidia-settings
- fi
-
- exeinto /usr/bin/
- doexe ${NV_OBJ}/nvidia-bug-report.sh
-
- # Desktop entries for nvidia-settings
- if use tools ; then
- # There is no icon in the FreeBSD tarball.
- use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png
- domenu "${FILESDIR}"/${PN}-settings.desktop
- exeinto /etc/X11/xinit/xinitrc.d
- doexe "${FILESDIR}"/95-nvidia-settings
- fi
-
- #doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
-
- if has_multilib_profile && use multilib ; then
- local OABI=${ABI}
- for ABI in $(get_install_abis) ; do
- src_install-libs
- done
- ABI=${OABI}
- unset OABI
- else
- src_install-libs
- fi
-
- is_final_abi || die "failed to iterate through all ABIs"
-
- readme.gentoo_create_doc
-}
-
-src_install-libs() {
- local inslibdir=$(get_libdir)
- local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
- local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
- local libdir=${NV_OBJ}
-
- if use kernel_linux && has_multilib_profile && \
- [[ ${ABI} == "x86" ]] ; then
- libdir=${NV_OBJ}/32
- fi
-
- if use X; then
- # The GLX libraries
- donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
- donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
- donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
- if use kernel_FreeBSD; then
- donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
- else
- donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
- fi
-
- # VDPAU
- donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
- fi
-
- # NVIDIA monitoring library
- if use kernel_linux ; then
- donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
- fi
-
- # CUDA & OpenCL
- if use kernel_linux; then
- donvidia ${libdir}/libcuda.so ${NV_SOVER}
- donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
- donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
- donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
- fi
-}
-
-pkg_preinst() {
- if use kernel_linux; then
- linux-mod_pkg_preinst
-
- local videogroup="$(egetent group video | cut -d ':' -f 3)"
- if [ -z "${videogroup}" ]; then
- eerror "Failed to determine the video group gid"
- die "Failed to determine the video group gid"
- else
- sed -i \
- -e "s:PACKAGE:${PF}:g" \
- -e "s:VIDEOGID:${videogroup}:" \
- "${D}"/etc/modprobe.d/nvidia.conf || die
- fi
- fi
-
- # Clean the dynamic libGL stuff's home to ensure
- # we dont have stale libs floating around
- if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
- rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
- fi
- # Make sure we nuke the old nvidia-glx's env.d file
- if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
- rm -f "${ROOT}"/etc/env.d/09nvidia
- fi
-}
-
-pkg_postinst() {
- use kernel_linux && linux-mod_pkg_postinst
-
- # Switch to the nvidia implementation
- use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
- "${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
- readme.gentoo_print_elog
-
- if ! use X; then
- elog "You have elected to not install the X.org driver. Along with"
- elog "this the OpenGL libraries and VDPAU libraries were not"
- elog "installed. Additionally, once the driver is loaded your card"
- elog "and fan will run at max speed which may not be desirable."
- elog "Use the 'nvidia-smi' init script to have your card and fan"
- elog "speed scale appropriately."
- elog
- fi
- if ! use tools; then
- elog "USE=tools controls whether the nvidia-settings application"
- elog "is installed. If you would like to use it, enable that"
- elog "flag and re-emerge this ebuild. Optionally you can install"
- elog "media-video/nvidia-settings"
- elog
- fi
-}
-
-pkg_prerm() {
- use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
- use kernel_linux && linux-mod_pkg_postrm
- use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-331.89.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-331.89.ebuild
index 3d7c288212bb..e1c9056592b8 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-331.89.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-331.89.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/x11-drivers/nvidia-drivers/nvidia-drivers-331.89.ebuild,v 1.1 2014/07/04 16:24:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-331.89.ebuild,v 1.2 2014/07/19 20:23:23 jer Exp $
EAPI=5
@@ -24,7 +24,7 @@ SRC_URI="
LICENSE="GPL-2 NVIDIA-r2"
SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X uvm"
RESTRICT="bindist mirror strip"
EMULTILIB_PKG="true"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.24.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.24.ebuild
index da66bd3b7b49..9ff24e25394c 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.24.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.24.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/x11-drivers/nvidia-drivers/nvidia-drivers-340.24.ebuild,v 1.1 2014/07/08 14:29:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-340.24.ebuild,v 1.2 2014/07/19 20:23:23 jer Exp $
EAPI=5
@@ -24,7 +24,7 @@ SRC_URI="
LICENSE="GPL-2 NVIDIA-r2"
SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X uvm"
RESTRICT="bindist mirror strip"
EMULTILIB_PKG="true"
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index 4aec8abf6d13..136e9fbc1a82 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -1,4 +1,4 @@
-DIST VirtualBox-4.2.22.tar.bz2 77039185 SHA256 4a017ec5fa0e0cfa830ae6c2b9d680c9b108e5fb96348e1397a7d0ea051f8bc1 SHA512 136b3f3ea9a79493aecd86883c619d10934d80c391ce88985501736fc95d7066e0e31d02e7867974f9077eae5a431519d0c1001fc781d240f0578a1c63c29ee6 WHIRLPOOL e6ea0768587ee152463c3388476199333cf39f56f7bda43094ad98ea2179b8f0e81819004c6433133a68d7ede9606d2aaa4ee2aa96ad05bda06a7706f4e079cc
DIST VirtualBox-4.2.24.tar.bz2 77067941 SHA256 6ae695a84f722e1a9fbf1fa5e89d2c05239f058a6a20f04a708d47d7f2081b9d SHA512 df75324e43c6781af41caccad7718ce71cae293f3deec907785678bf7769810df70a57f61a83f593c1766bcedde1209f8e1698bb5aaf0681fc3f51a2e80037c4 WHIRLPOOL 5f546b35a5bb0431ff3c3d585ab46f59630dce6e08a31a69663700ba05692ff89f7b6d019aff416fae4f4a546c3fb5b1ed29db7af4918afe48981c45c82be4de
-DIST VirtualBox-4.3.10.tar.bz2 90333712 SHA256 739835aee3274a663b23eeb748bd0430e8a5d8ba2f4d0eae5dc47ff2c485e23b SHA512 1744145508567f811216d884f9cad60d2698be7323333dd7784edff9ef76ba432712285f6c6e8936f026e1e032983a310ddac3dd0f1cdd6909b16699f856ebca WHIRLPOOL f0b202fac8f49a4a4ab0b8ff99c9ea58e4b7befc789dad00ec721ef4a322813f2be82ad4387a35079cb9c3c7e74c24c4192b53e5d4d2487b4a0dad57256d0c43
+DIST VirtualBox-4.2.26.tar.bz2 77724304 SHA256 7fa840edd5c0e691936c14fcf49d50f4654fd63e2b71510232c226dda863b270 SHA512 c2a0c201e677a23702865256b80af2118b067356313939b1d3af3bf8f42746c2eaf04ab3d7ece8a3d98b2be67c1d3d2b2b34d4debbe2fc667e375391f2510b51 WHIRLPOOL 495cd625e1641e630ef826ca6d287d462af681b699205af7095b04bc96e381af728beb0c265fac609830955208c1c17265469c3450e495e077146a0545c20694
DIST VirtualBox-4.3.12.tar.bz2 90346010 SHA256 db84ddf47d1ecd316ec46417595f0252e3ec2f67e35e1e17320aba87b7c2934f SHA512 3c7afe744b49908dae74d57e694976672ea1c638cefb17a8b569ce8663250a1b8157f88c8f1b29b11174a7c65d97a8eb28b77a6bd4526b9bceaa1e503412519d WHIRLPOOL 0ee4a6a3a1985b59425628b10cc4f146e2ac51a9cc1135f2997299b50eaf2c2c0ebf6320d468f3e24f887ab29327fdec60e89cc66681a0c69a237775f0b2d620
+DIST VirtualBox-4.3.14.tar.bz2 90833795 SHA256 bc893adde4449a2d35d8b4d0b8b247f0f2ac62a434fd8a8f7c54f613a100855a SHA512 afc08be0e95b28bed3d03db7d5e72f27cfbe323fabd7db4eef2a3e031bbbc39d74a46ebfe8e1c24b9b2fb3cd4e160e681186e0a9c3b23b099dcdec757f7fb434 WHIRLPOOL d2ad01fd017a3a0c6a503d0f78db045d997a630d62376d2b7dbcae86b2e6783ef346666b9d786cf7d912c1a4ea6a94a9f397d519ad642ac7d2336782aa1e76b4
diff --git a/x11-drivers/xf86-video-virtualbox/metadata.xml b/x11-drivers/xf86-video-virtualbox/metadata.xml
index 92ce5ad8344e..67c990ef325f 100644
--- a/x11-drivers/xf86-video-virtualbox/metadata.xml
+++ b/x11-drivers/xf86-video-virtualbox/metadata.xml
@@ -1,11 +1,6 @@
-proxy-maintainers
-
- swapon@gmail.com
- Alessio Cassibba
-
polynomial-c@gentoo.org
Lars Wendler
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.22.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.26.ebuild
similarity index 97%
rename from x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.22.ebuild
rename to x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.26.ebuild
index d2d12142e316..2f6a836944c6 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.22.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.26.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/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.22.ebuild,v 1.4 2014/01/23 18:54:33 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.26.ebuild,v 1.1 2014/07/18 13:52:43 polynomial-c Exp $
EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="dri"
RDEPEND=">=x11-base/xorg-server-1.7:=[-minimal]
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.10.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.14.ebuild
similarity index 96%
rename from x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.10.ebuild
rename to x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.14.ebuild
index e03383b54b7c..c0a50f6b1065 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.10.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.14.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/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.10.ebuild,v 1.1 2014/03/26 10:12:49 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.14.ebuild,v 1.2 2014/07/20 02:03:17 polynomial-c Exp $
EAPI=5
@@ -91,8 +91,6 @@ src_prepare() {
if gcc-specs-now ; then
epatch "${FILESDIR}/${PN}-4.3.6-link-lazy.patch"
fi
-
- epatch "${FILESDIR}"/${PN}-4.3.8-vboxvideo_compilefixes.patch
}
src_configure() {
diff --git a/x11-libs/libXfont/Manifest b/x11-libs/libXfont/Manifest
index 018b234e302c..f0a68578b69a 100644
--- a/x11-libs/libXfont/Manifest
+++ b/x11-libs/libXfont/Manifest
@@ -1 +1,2 @@
DIST libXfont-1.4.8.tar.bz2 490641 SHA256 5568d4febf790fb250fb8d4ecf1f389a428eb545a79fb2abe9c82f652d14d005 SHA512 1ddf6582e9b833a7bba5cdb086f2cae4c639307e39eeffcddcce86963ccecee72b281addad41afb046e14f8ac0b4d971aae33dfdf99e804ad7bfb47badd970f3 WHIRLPOOL a2e2e8d5a462e6577f98c33d1c0e9f21a0fd920d39c842674f1e0908b54b6eb3087e27da2632f6cd2728a3e4ef2919840f17cb9237f5c7a579c4a709518d6336
+DIST libXfont-1.5.0.tar.bz2 491483 SHA256 3a3c52c4adf9352b2160f07ff0596af17ab14f91d6509564e606678a1261c25f SHA512 466ecebe27ef4b8dbe2ff1cae0e111d4c449cb29a240477ac53ccb415ee74bb5d51cfd5f41d9f84e9e444b9eca91853306978a3094b279033bf7dedfafba9f3e WHIRLPOOL 635f828f09f9cba64df736975999c88166319cdad34af733ffc41db223e32546fb60249d7eb7ca6317a99c12e39bc1d7fda8cd52e523dc08e83e3072d56129db
diff --git a/x11-libs/libXfont/libXfont-1.5.0.ebuild b/x11-libs/libXfont/libXfont-1.5.0.ebuild
new file mode 100644
index 000000000000..62be136a8e13
--- /dev/null
+++ b/x11-libs/libXfont/libXfont-1.5.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.5.0.ebuild,v 1.1 2014/07/19 18:03:27 mattst88 Exp $
+
+EAPI=5
+
+XORG_DOC=doc
+inherit xorg-2
+
+DESCRIPTION="X.Org Xfont library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 ipv6 truetype"
+
+RDEPEND="x11-libs/xtrans
+ x11-libs/libfontenc
+ truetype? ( >=media-libs/freetype-2 )
+ bzip2? ( app-arch/bzip2 )
+ x11-proto/xproto
+ >=x11-proto/fontsproto-2.1.3
+ !=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+ >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc specs)
+ $(use_with doc xmlto)
+ $(use_with doc asciidoc)
+ --without-fop
+ )
+ xorg-2_src_configure
+}
+
+pkg_postinst() {
+ xorg-2_pkg_postinst
+
+ ewarn "Some special keys and keyboard layouts may stop working."
+ ewarn "To fix them, recompile xorg-server."
+}
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index ac6dd1a56039..0b842ff4bd21 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,2 +1,2 @@
DIST QScintilla-gpl-2.7.2.tar.gz 2842625 SHA256 14b47d686dc1586321f84fcf3c9a911ddaace37a1cb0b1e6a6195e252e5bb69c SHA512 d3ca9d75687687210ca6ae3599fd44bfbbad8c99d6d38aaf1c92c83250dc0c5af1c713bdd74d077d0fb9ba1eccbd5e2910eef855d3656392c33c4832d46ff7fb WHIRLPOOL 1ea4a189a5998755afaa0fad111a7f2153e5ecbe13290d62930cce992b0159040de9cb304e848705abc3d0f1909a82fde908d8179ddd9de05970323cee5ffebe
-DIST QScintilla-gpl-2.8.tar.gz 2917864 SHA256 41d32af71501bdfdfc0668f304ba7d7c15019462795e9441d3b23fc054fdfb71 SHA512 531cec5fb89037f79b71bfd07bc94f2744b8b43c7cf8376d102bd4c85d91af1213ac39cce0cb19e8b90d2fbcda47a8617d1b787dbbadaf6270b66660d7d72cd4 WHIRLPOOL 39eb0231fb6c557f49de1abf8c851dd22dd6416841acecf2350a0dcb23f500f571c1bab67a7e5c28d0c31c142781feb32c8475e5a9840dfbfe6decaa6909df80
+DIST QScintilla-gpl-2.8.3.tar.gz 3028154 SHA256 fb94e6d61c3ccd4bf167d5f092629e619f7069d42207469458998b761a7cf505 SHA512 088973c1ac3947594e46464b02bee5bae09a2c92054911b7ce73d7723f018d3e8e4f5ebe97480180d275bc7bf5684711f44604310d02c790e4ef2d94bc4df603 WHIRLPOOL eff01464a6d9f6d77bfcf52d6451120104bd88f71ef752a563a23a64d553f0dd0f1a2cc4a227b5893256f306ccc0eb2435382a651690b647ea024c85c20ea8f8
diff --git a/x11-libs/qscintilla/files/qscintilla-2.8.3-designer.patch b/x11-libs/qscintilla/files/qscintilla-2.8.3-designer.patch
new file mode 100644
index 000000000000..1dbae09a51b4
--- /dev/null
+++ b/x11-libs/qscintilla/files/qscintilla-2.8.3-designer.patch
@@ -0,0 +1,18 @@
+This patch causes the designer plugin to be built against the just-built
+qscintilla, rather than trying to build against the system qscintilla
+which may not be installed yet.
+
+--- QScintilla-gpl-2.8.3.orig/designer-Qt4Qt5/designer.pro 2014-07-18 21:42:30.822408448 +0200
++++ QScintilla-gpl-2.8.3/designer-Qt4Qt5/designer.pro 2014-07-18 21:42:56.153048772 +0200
+@@ -4,7 +4,10 @@
+ TEMPLATE = lib
+ TARGET = qscintillaplugin
+
+-CONFIG += release plugin qscintilla2
++CONFIG += release plugin
++
++INCLUDEPATH += ../Qt4Qt5
++LIBS += -L../Qt4Qt5 -lqscintilla2
+
+ greaterThan(QT_MAJOR_VERSION, 4) {
+ QT += designer
diff --git a/x11-libs/qscintilla/metadata.xml b/x11-libs/qscintilla/metadata.xml
index a789e7bbe9ee..2b23b45efd14 100644
--- a/x11-libs/qscintilla/metadata.xml
+++ b/x11-libs/qscintilla/metadata.xml
@@ -1,6 +1,6 @@
-python
qt
+python
diff --git a/x11-libs/qscintilla/qscintilla-2.8-r1.ebuild b/x11-libs/qscintilla/qscintilla-2.8.3.ebuild
similarity index 87%
rename from x11-libs/qscintilla/qscintilla-2.8-r1.ebuild
rename to x11-libs/qscintilla/qscintilla-2.8.3.ebuild
index 62572a17141b..3d853399c422 100644
--- a/x11-libs/qscintilla/qscintilla-2.8-r1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.8.3.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.8-r1.ebuild,v 1.3 2014/04/15 19:44:51 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.8.3.ebuild,v 1.1 2014/07/18 19:50:08 pesa Exp $
EAPI=5
-inherit qt4-r2
+inherit eutils qmake-utils
MY_P=QScintilla-gpl-${PV}
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0/11"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="doc"
DEPEND="
@@ -27,11 +27,11 @@ RDEPEND="${DEPEND}"
S=${WORKDIR}/${MY_P}
PATCHES=(
- "${FILESDIR}/${PN}-2.7.1-designer.patch"
+ "${FILESDIR}/${PN}-2.8.3-designer.patch"
)
src_unpack() {
- qt4-r2_src_unpack
+ default
# Sub-slot sanity check
local subslot=${SLOT#*/}
@@ -47,6 +47,10 @@ src_unpack() {
fi
}
+src_prepare() {
+ [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+}
+
src_configure() {
pushd Qt4Qt5 > /dev/null
einfo "Configuration of qscintilla"
diff --git a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild b/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild
index 7058f7bdad0f..468533b3c6d5 100644
--- a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild
+++ b/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild,v 1.6 2012/06/19 09:58:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild,v 1.7 2014/07/19 19:36:03 jer Exp $
-EAPI=4
+EAPI=5
inherit autotools eutils
DESCRIPTION="OpenGL virtual desktop switching"
@@ -12,22 +12,25 @@ SRC_URI="mirror://sourceforge/desk3d/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86"
-IUSE=""
-RDEPEND="media-libs/freeglut
+RDEPEND="
>=media-libs/freetype-2
+ media-libs/freeglut
media-libs/imlib2[X]
x11-libs/libX11
x11-libs/libXext
x11-libs/libXi
x11-libs/libXmu
x11-libs/libXt
- x11-libs/libXxf86vm"
-DEPEND="${RDEPEND}
+ x11-libs/libXxf86vm
+"
+DEPEND="
+ ${RDEPEND}
x11-proto/xf86vidmodeproto
- x11-proto/xproto"
+ x11-proto/xproto
+"
-DOCS="AUTHORS TODO ChangeLog README README.windowmanagers"
+DOCS=( AUTHORS TODO ChangeLog README README.windowmanagers )
src_prepare() {
epatch \
diff --git a/x11-misc/3ddesktop/Manifest b/x11-misc/3ddesktop/Manifest
index 0fb068922843..3c778c2be7e1 100644
--- a/x11-misc/3ddesktop/Manifest
+++ b/x11-misc/3ddesktop/Manifest
@@ -1 +1 @@
-DIST 3ddesktop-0.2.9.tar.gz 182278 RMD160 86ca9d9df57a83d2f4719ce45708e129bdc75fb4 SHA1 33ff86b559d0c0407ef4c6c989a9fcbf804f7e5f SHA256 8fde969c1aec60685e0a74d2ebcfa1ef570df454288d5774646e2b291515e8c5
+DIST 3ddesktop-0.2.9.tar.gz 182278 SHA256 8fde969c1aec60685e0a74d2ebcfa1ef570df454288d5774646e2b291515e8c5 SHA512 87de83561bc1614e4dde623197b04e482e04ad363ba88adf4e4e9950a942a5725d2a7199406949981c1a4aeba5d71fb9a1693f99aefa21ed7b83e083bb902686 WHIRLPOOL 5238f9c99b1df49cab181e0d872c6af0d54b8fc126801c9d7a0b145729e7921cb5db82d734498506af74a0dcc2a7fe51009bfbe6a06b018754ed5980aa32560f
diff --git a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-asneeded.patch b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-asneeded.patch
index 135472a323b6..2534535dee1f 100644
--- a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-asneeded.patch
+++ b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-asneeded.patch
@@ -1,7 +1,7 @@
http://bugs.gentoo.org/206817
---- Makefile.am
-+++ Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
@@ -37,7 +37,7 @@
camera.cpp \
config.cpp
diff --git a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gcc4.patch b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gcc4.patch
index 8cde1eb524f6..a67753fcee39 100644
--- a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gcc4.patch
+++ b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gcc4.patch
@@ -1,7 +1,7 @@
http://bugs.gentoo.org/118458
---- event.hpp
-+++ event.hpp
+--- a/event.hpp
++++ b/event.hpp
@@ -74,7 +74,7 @@
list::iterator k;
for (k = events.begin(); k != events.end(); ++k) {
diff --git a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gl_init.patch b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gl_init.patch
index 523e8c88f11f..d817cea54ece 100644
--- a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gl_init.patch
+++ b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gl_init.patch
@@ -1,7 +1,7 @@
http://bugs.gentoo.org/123762
---- 3ddeskd.cpp
-+++ 3ddeskd.cpp
+--- a/3ddeskd.cpp
++++ b/3ddeskd.cpp
@@ -2411,15 +2411,15 @@
// initialize opengl
diff --git a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-missing-include.patch b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-missing-include.patch
index 45970c19739e..328cbcad6d29 100644
--- a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-missing-include.patch
+++ b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-missing-include.patch
@@ -1,7 +1,7 @@
http://bugs.gentoo.org/228217
---- config.hpp
-+++ config.hpp
+--- a/config.hpp
++++ b/config.hpp
@@ -24,6 +24,7 @@
#include
diff --git a/x11-misc/3ddesktop/metadata.xml b/x11-misc/3ddesktop/metadata.xml
index 4a1d72db4184..d51ca019bc25 100644
--- a/x11-misc/3ddesktop/metadata.xml
+++ b/x11-misc/3ddesktop/metadata.xml
@@ -1,6 +1,10 @@
- desktop-misc
- 3d Destkop is an OpenGL program for switching virtual desktops in a seamless 3-dimensional manner. The current desktop is mapped into a 3D space where you may choose other screens. Several different visualization modes are available.
+desktop-misc
+
+3d Destkop is an OpenGL program for switching virtual desktops in a seamless
+3-dimensional manner. The current desktop is mapped into a 3D space where you
+may choose other screens. Several different visualization modes are available.
+
diff --git a/x11-misc/i3lock/Manifest b/x11-misc/i3lock/Manifest
index bd15d7a481cb..cd2a823227fb 100644
--- a/x11-misc/i3lock/Manifest
+++ b/x11-misc/i3lock/Manifest
@@ -1 +1,2 @@
DIST i3lock-2.5.tar.bz2 16135 SHA256 ac2772c9e4fc13adb882cacaae13ccc381d6d4f154ffd538634a58e6369d0d77 SHA512 8e49c25b0efe3836a8daa4dae61354ecb57374a8de8f10b8b5f262d7c1f6070d60e3ac25112be6079a56baa83f73c3c2a85d48ab27c8559df8aef358ffdab2a7 WHIRLPOOL 3adf11ecd931f1d266a56ac7d3135317d6c12c03478ae65221e985b1b8991ddac3066221d711b3f77b2ae812f1a1c74790876ced9c1f3910feae70815392c573
+DIST i3lock-2.6.tar.bz2 17972 SHA256 c02d899fefc66bc36e47b305251363861400541f3925a21a94c66cee9055402a SHA512 ccaf336b4abd65df24ba37613ba46e129d6e4c42cb8c0a05cc8d9cc0815f0f9f03613230b1cdbb5d16d6903a57a04f2c6b0fc168881ae03000aa170716fedf4a WHIRLPOOL 7ce2dfc29e3366075597097d53c09373677019d0c6f8e872a157a8e7f32b44daf0ccd19fe56c69ca8ae43f60a2d87eed4c8e2e5716cc8ec24c82f5a0cda8a2a5
diff --git a/x11-misc/i3lock/i3lock-2.6.ebuild b/x11-misc/i3lock/i3lock-2.6.ebuild
new file mode 100644
index 000000000000..b105fe92f325
--- /dev/null
+++ b/x11-misc/i3lock/i3lock-2.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/i3lock/i3lock-2.6.ebuild,v 1.1 2014/07/18 19:33:46 xarthisius Exp $
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Simple screen locker"
+HOMEPAGE="http://i3wm.org/i3lock/"
+SRC_URI="http://i3wm.org/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="virtual/pam
+ dev-libs/libev
+ >=x11-libs/libxkbcommon-0.3.1[X]
+ x11-libs/libxcb[xkb]
+ x11-libs/xcb-util
+ x11-libs/cairo[xcb]"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+DOCS=( CHANGELOG README )
+
+pkg_setup() {
+ tc-export CC
+}
+
+src_prepare() {
+ sed -i -e 's:login:system-auth:' ${PN}.pam || die
+}
+
+src_install() {
+ default
+ doman ${PN}.1
+}
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 99a1cb6f0de5..c80ae5b6c471 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -1,7 +1,7 @@
DIST introspection-20110205.m4.tar.bz2 1220 SHA256 4394a606d380ae5315872ede35387f104da5fad96794d29c45c444a9d481d8b2 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be WHIRLPOOL 0765c0a72919b26d0c8c38714450eec578a347bfc1c59d4950b633b64b17aa1cde38dfb87fdcd6e2f364c98d6c0bd3dadaa9c2a9711bd1b5ac09a583b988f500
DIST lightdm-1.10.0.tar.xz 460296 SHA256 0edfaf947984906b1f37be7a24377267cdd3e0ebee64d683c9401dd3988d1824 SHA512 b3bd85f3c00c1fa26fb2c635a53ec9e17223cd4401f4c122ecc789204a5952a474e8b6a55ba50f40ad0a5a7b6dda8e717343330adc128966986275559a23bc49 WHIRLPOOL a25b5b85e05101d9d26c6f14146519dcfa23d4c94d85e11df79249614d5923d3de9eb15eeb16b6f2b23a907d96221048b4fd61ba0d9d47c8a164a340d49ce967
DIST lightdm-1.10.1.tar.xz 462396 SHA256 737123001a7ae2ab126c75f61dcebb767d082ec043c012285eab6fa6b0d6a58f SHA512 e235eeb03999d31d693c89a0e06fc33371d40f7c3c216942440a8498990b1efa0b5f19c72bc0ed18611a3b401b8ee521e2c2caa5e441247bad625466a8346278 WHIRLPOOL 93b68fda601ccfa9a74c852b7449dcad36cd7f8b319a484004958c6866d38ca99624323325f50edf7af82e5424392a40912c9bd8ef6076070ba032bbd8426ef2
-DIST lightdm-1.11.2.tar.xz 469236 SHA256 7ed7fb8094485d6ba9cbd7b3dfe5c80f25dd9c606922369a0bfb233691272d9a SHA512 5e46a16dcd8fe3d916ef827f1b38074d163273e854ab451c930f4524d0bbffd17c79d6dddeaf4bc6841dcbfee62601ba3370e8e6e5922a8ac9cb9bbcbbfb18cd WHIRLPOOL 57bae95655ee93e37e212d6809462f79d40a7e5ff8b14dc7ba4d5f1088067f394631fea64fb51931420e6fca42001c39adbed2163e64909c4d99b28a26d30fb0
+DIST lightdm-1.11.4.tar.xz 470064 SHA256 65c1365185d3da7ae3f6a06a30b9ae103feb6706e1c43abe44edf945f8116a47 SHA512 afea7e67662efa135ff4e06cff63d00d8dd1c4a45489e7e9a3dae50e8a4ba06a8dbd103911f9239d20383c7d0c7dc4480d9279e8235e78b36401112aead529fe WHIRLPOOL 9b4073a0952d5cd5de3d4470e96da5ede02a0bc41ec9d677691816167bd51d1bc87f4f385b08b3b17827a141bfe1e0e2d868084b97630cd1db8944de741c6cd1
DIST lightdm-1.4.0.tar.gz 660979 SHA256 3486a9f828864a78d452696cf6fef6e1dec2f4ef92a72e90ab37edf9a0824c43 SHA512 dedea48dbf2dde1a84c63691474b6452340b7ba5abd9793afb02f3ffcdb4d664432e3e4bbd6151bfb5861424c1063b42ca99989642b970b4a804ed8bfea6fb1e WHIRLPOOL 0def63f88e3f6ab810411bd51f53984d5cdb832faa81f33d0dd2243b774c06362d20d1c91d32c79f2630c8e543834ed3f5cf411c76843702ed997f60bad30212
DIST lightdm-1.4.3.tar.gz 686161 SHA256 0c21ccd00c63da28f2b2e282df542d19427ab2f62aae994536fe444f31b0dd4c SHA512 8499ddda3fc07fdbecd5f7e958e5e19cb8a8397248f6dcf5d3640a28d57019a64d2440c8135a634ad1dc39a8a567ebc15b973a33b29ceb6d67c7ebd5c5870658 WHIRLPOOL 252ef8cb56f2314492c5c5e6da28ea08ac04b4d5ccec40d9329e7b25775e8a9c4ca90dedbf840cc2849f6f32534d3d682ac713d50c9e06726f95456578650870
DIST lightdm-1.8.5.tar.xz 449024 SHA256 c1a55800628c7a683a529e32646eae4be32295a09af049c9b15387acff0232a2 SHA512 a3941560abe402b07e5595a6fb6bcbd9df36f775b07ac23c526a14c25c1bc2e9ce4e2f912354446111f58499d9df92c650b44b05dbd1e49b5207722d5bf7985f WHIRLPOOL aabc3adf3412b92b235fc8c2674d6807d5bf5c0714a73ac62b558decf779f98a5fbf9151ec00498c4ef3032b153d7735ca216d9451fdd11924f72dab77e7f4ef
diff --git a/x11-misc/lightdm/lightdm-1.11.2.ebuild b/x11-misc/lightdm/lightdm-1.11.4.ebuild
similarity index 98%
rename from x11-misc/lightdm/lightdm-1.11.2.ebuild
rename to x11-misc/lightdm/lightdm-1.11.4.ebuild
index faa7ceb0967b..19ff19861fd6 100644
--- a/x11-misc/lightdm/lightdm-1.11.2.ebuild
+++ b/x11-misc/lightdm/lightdm-1.11.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/x11-misc/lightdm/lightdm-1.11.2.ebuild,v 1.1 2014/05/16 23:05:58 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.11.4.ebuild,v 1.1 2014/07/19 08:41:22 hwoarang Exp $
EAPI=5
inherit autotools eutils pam readme.gentoo systemd versionator
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index e495f668e1ad..fc4dda6798f9 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -1,2 +1,3 @@
DIST shutter-0.90.1.tar.gz 3354197 SHA256 10ba5cda49b2407ba2ea87bf8b06b60bd03c63e7ce391dda100c321054a02124 SHA512 306671fdf0f31758b256bf6986db3c9100c292d12dce7316a111a20ae0ae4bc1820b4875d2fe593941b175e7fcf6767b328f1c0c518f55ea081aed49071ce0c7 WHIRLPOOL f36bf5fa9c358c40b25fe856c7fc36c8d5b26c6f94502ae213caf33d025dff9910d2d0926f6c358d2d81c766df09b64b6a918757fb53b6a197f353fe08f6df30
DIST shutter-0.90.tar.gz 3281329 SHA256 7001b872f1723f58ec27289ceeb1fe9e3a75d82236250dc466076d30d7137a7d SHA512 f27912f2b1a2d9469e20870c79f8cd11671ce9559510149f3806e2d1d3fd00d25e1f1216f9aac226aef1d7f6d543078d1a03ade912a4797d1342aad739ef6999 WHIRLPOOL 5c57ee654aa01f6bdfe8d7d69903a7fcc5186a88d0e1172326425c945796b3fc1f28929af97c67d065ddb1029f9a42b0fe86b71cef31fcae5aae3d19a3e0a36d
+DIST shutter-0.91.tar.gz 3376735 SHA256 08764792ac6c2ed139a59283a8e5151fa40294c6822986d555977e6f60a49815 SHA512 bc777d034b7ac103db59e686080590dae656fafbc4684227b256fc197a3bd02a66f67f674836db66afe5524427c127042830fe9b760d5a32c6e6a1c2e2be764b WHIRLPOOL 98ca5193b6c342fcf48eede47cac0944c670092beaacf340c78607b659e5c59445fc0e55b22155886a79b318bce681935a15932d78de616425072819d5af6e21
diff --git a/x11-misc/shutter/shutter-0.91.ebuild b/x11-misc/shutter/shutter-0.91.ebuild
new file mode 100644
index 000000000000..9a5cf25ed398
--- /dev/null
+++ b/x11-misc/shutter/shutter-0.91.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shutter/shutter-0.91.ebuild,v 1.1 2014/07/19 08:44:56 hwoarang Exp $
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Feature-rich screenshot program"
+HOMEPAGE="http://shutter-project.org/"
+SRC_URI="http://shutter-project.org/wp-content/uploads/releases/tars/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="drawing webphoto"
+
+RDEPEND="dev-lang/perl
+ drawing? ( dev-perl/Goo-Canvas )
+ webphoto? ( gnome-extra/gnome-web-photo )
+ || ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] )
+ dev-perl/libxml-perl
+ dev-perl/gnome2-wnck
+ dev-perl/gnome2-canvas
+ dev-perl/gnome2-perl
+ dev-perl/Gtk2-Unique
+ dev-perl/Gtk2-ImageView
+ dev-perl/File-DesktopEntry
+ dev-perl/File-HomeDir
+ dev-perl/File-Which
+ dev-perl/JSON
+ dev-perl/File-Copy-Recursive
+ dev-perl/File-MimeInfo
+ dev-perl/Locale-gettext
+ dev-perl/Net-DBus
+ dev-perl/Proc-Simple
+ dev-perl/Proc-ProcessTable
+ dev-perl/Sort-Naturally
+ dev-perl/WWW-Mechanize
+ dev-perl/X11-Protocol
+ dev-perl/XML-Simple
+ dev-perl/libwww-perl"
+
+src_prepare() {
+ use webphoto || epatch "${FILESDIR}"/${PN}-0.90-webphoto.patch
+ use drawing || epatch "${FILESDIR}"/${PN}-0.90-goocanvas.patch
+ #Fix tray icon because it doesn't pick the right icon using various themes
+ sed -i -e "/\$tray->set_from_icon_name/s:set_from_icon_name:set_from_file:" \
+ -e "s:shutter-panel:/usr/share/icons/hicolor/scalable/apps/&.svg:" \
+ bin/shutter || die "failed to fix trayicon"
+}
+
+src_install() {
+ dobin bin/${PN} || die "dobin failed"
+ insinto /usr/share/${PN}
+ doins -r share/${PN}/* || die "doins failed"
+ dodoc README || die "dodoc failed"
+ domenu share/applications/${PN}.desktop
+ # Man page is broken. Reconstruct it.
+ gunzip share/man/man1/${PN}.1.gz || die "gunzip failed"
+ doman share/man/man1/${PN}.1 || die "doman failed"
+ doicon share/pixmaps/${PN}.png
+ doins -r share/locale || die "doins failed"
+ insinto /usr/share/icons/hicolor
+ doins -r share/icons/hicolor/* || die "doins failed"
+ find "${D}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \
+ || die "failed to make plugins executables"
+ find "${D}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \
+ -name "*.pm" -exec chmod 755 {} \; || die "failed to make upload plugins executables"
+}
diff --git a/x11-misc/urxvt-font-size/urxvt-font-size-20140501.ebuild b/x11-misc/urxvt-font-size/urxvt-font-size-20140501-r1.ebuild
similarity index 83%
rename from x11-misc/urxvt-font-size/urxvt-font-size-20140501.ebuild
rename to x11-misc/urxvt-font-size/urxvt-font-size-20140501-r1.ebuild
index f185cc3ef5ea..97586069f491 100644
--- a/x11-misc/urxvt-font-size/urxvt-font-size-20140501.ebuild
+++ b/x11-misc/urxvt-font-size/urxvt-font-size-20140501-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/x11-misc/urxvt-font-size/urxvt-font-size-20140501.ebuild,v 1.1 2014/05/02 04:57:56 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/urxvt-font-size/urxvt-font-size-20140501-r1.ebuild,v 1.1 2014/07/19 04:59:56 radhermit Exp $
EAPI=5
inherit multilib
@@ -19,7 +19,10 @@ HOMEPAGE="https://github.com/majutsushi/urxvt-font-size/"
LICENSE="MIT"
SLOT="0"
-RDEPEND="x11-terms/rxvt-unicode[perl]"
+RDEPEND="
+ x11-apps/xlsfonts
+ x11-terms/rxvt-unicode[perl]
+"
src_install() {
insinto /usr/$(get_libdir)/urxvt/perl
diff --git a/x11-misc/urxvt-font-size/urxvt-font-size-99999999.ebuild b/x11-misc/urxvt-font-size/urxvt-font-size-99999999.ebuild
index aabf8da47c5c..8c36d588c1ac 100644
--- a/x11-misc/urxvt-font-size/urxvt-font-size-99999999.ebuild
+++ b/x11-misc/urxvt-font-size/urxvt-font-size-99999999.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/x11-misc/urxvt-font-size/urxvt-font-size-99999999.ebuild,v 1.1 2014/05/02 05:00:30 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/urxvt-font-size/urxvt-font-size-99999999.ebuild,v 1.2 2014/07/19 04:59:56 radhermit Exp $
EAPI=5
inherit multilib
@@ -19,7 +19,10 @@ HOMEPAGE="https://github.com/majutsushi/urxvt-font-size/"
LICENSE="MIT"
SLOT="0"
-RDEPEND="x11-terms/rxvt-unicode[perl]"
+RDEPEND="
+ x11-apps/xlsfonts
+ x11-terms/rxvt-unicode[perl]
+"
src_install() {
insinto /usr/$(get_libdir)/urxvt/perl
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 96b6b3976ce3..6ec2ad302899 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -1,2 +1 @@
-DIST VirtualGL-2.3.2.tar.gz 2741077 SHA256 bee2abb3225bd1a607036a50e60e2652248d976afdbfcb096423648f1acc5418 SHA512 69cf5082a33d86a3778c147de6296366efd056a8be9d38c3dc41030e832c58025fc2ee535076ae2a66a3ed8ee817109068c9255f9c1e0b9c5ff983450223b53d WHIRLPOOL c0f1fe6629b0020322e7a165025d704091cd6dd88e5ca11037cddf14cdcccf5b50bc7a8b081d5f1d7508369a7d4f55d88aad3b783760ca32daeef1b244c3793e
DIST VirtualGL-2.3.3.tar.gz 2614988 SHA256 857fd5c51c64016a1687cbda62ca5dcdf7073181df86b57be010501b565e5d45 SHA512 7bab5145be338d9bb2f9b4952ee530e84ae195185d55039cf10c89ced049716756f23f4d9c41c82f032c6e6a57bbbaebf023b3e501011bfd5c6aa3d59b22dd8d WHIRLPOOL e903172545c825b8df1dc6678738ac5e7ac2a104ec979668e522f46e2d2f715a3a07cb3cbac57c9e848a6420873f671737b7bed9acf50556a4aea08c4c1355a3
diff --git a/x11-misc/virtualgl/virtualgl-2.3.2-r3.ebuild b/x11-misc/virtualgl/virtualgl-2.3.2-r3.ebuild
deleted file mode 100644
index 405313ceb4c4..000000000000
--- a/x11-misc/virtualgl/virtualgl-2.3.2-r3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/virtualgl-2.3.2-r3.ebuild,v 1.5 2014/06/18 21:16:07 mgorny Exp $
-
-EAPI=5
-inherit cmake-multilib multilib systemd
-
-DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
-HOMEPAGE="http://www.virtualgl.org/"
-
-MY_PN="VirtualGL"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-KEYWORDS="amd64 x86"
-IUSE="ssl"
-
-RDEPEND="
- ssl? ( dev-libs/openssl )
- media-libs/libjpeg-turbo
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXv
- amd64? ( abi_x86_32? (
- || (
- (
- >=x11-libs/libX11-1.6.2[abi_x86_32]
- >=x11-libs/libXext-1.3.2[abi_x86_32]
- >=x11-libs/libXv-1.0.10[abi_x86_32]
- )
- app-emulation/emul-linux-x86-xlibs
- )
- app-emulation/emul-linux-x86-baselibs
- app-emulation/emul-linux-x86-opengl
- ) )
- virtual/glu
- virtual/opengl
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- # Use /var/lib, bug #428122
- sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
- server/vglrun server/vglgenkey server/vglserver_config || die
-
- default
-}
-
-src_configure() {
- abi_configure() {
- local mycmakeargs=(
- $(cmake-utils_use ssl VGL_USESSL)
- -DVGL_DOCDIR=/usr/share/doc/"${P}"
- -DTJPEG_INCLUDE_DIR=/usr/include
- -DVGL_LIBDIR=/usr/$(get_libdir)
- -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
- -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
- -DVGL_FAKELIBDIR=/usr/fakelib/${ABI}
- )
- cmake-utils_src_configure
- }
- multilib_parallel_foreach_abi abi_configure
-}
-
-src_install() {
- cmake-multilib_src_install
-
- # Make config dir
- dodir /var/lib/VirtualGL
- fowners root:video /var/lib/VirtualGL
- fperms 0750 /var/lib/VirtualGL
- newinitd "${FILESDIR}/vgl.initd-r2" vgl
- newconfd "${FILESDIR}/vgl.confd-r1" vgl
-
- exeinto /usr/libexec
- doexe "${FILESDIR}/vgl-helper.sh"
- systemd_dounit "${FILESDIR}/vgl.service"
-
- # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
- mv "${D}"/usr/bin/{,v}glxinfo || die
-}
diff --git a/x11-misc/virtualgl/virtualgl-2.3.3.ebuild b/x11-misc/virtualgl/virtualgl-2.3.3.ebuild
index 0610121bf972..14a16700e45d 100644
--- a/x11-misc/virtualgl/virtualgl-2.3.3.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.3.3.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/x11-misc/virtualgl/virtualgl-2.3.3.ebuild,v 1.3 2014/06/18 21:16:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/virtualgl-2.3.3.ebuild,v 1.4 2014/07/18 17:35:49 pacho Exp $
EAPI=5
inherit cmake-multilib multilib systemd
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
SLOT="0"
LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="ssl"
RDEPEND="
diff --git a/x11-misc/xscreensaver/xscreensaver-5.29.ebuild b/x11-misc/xscreensaver/xscreensaver-5.29.ebuild
index 19d1af544791..9c7fccde8959 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.29.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.29.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/x11-misc/xscreensaver/xscreensaver-5.29.ebuild,v 1.1 2014/06/09 20:05:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.29.ebuild,v 1.2 2014/07/19 17:33:07 jer Exp $
EAPI=5
inherit autotools eutils flag-o-matic multilib pam
@@ -11,7 +11,7 @@ SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE="gdm jpeg new-login opengl pam +perl selinux suid xinerama"
COMMON_DEPEND="dev-libs/libxml2
diff --git a/xfce-base/exo/exo-0.10.2-r1.ebuild b/xfce-base/exo/exo-0.10.2-r1.ebuild
index b9b68a51a512..170bb9d54565 100644
--- a/xfce-base/exo/exo-0.10.2-r1.ebuild
+++ b/xfce-base/exo/exo-0.10.2-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/xfce-base/exo/exo-0.10.2-r1.ebuild,v 1.4 2014/06/29 18:57:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/exo-0.10.2-r1.ebuild,v 1.9 2014/07/18 19:56:07 ago Exp $
EAPI=5
inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE="debug"
RDEPEND=">=dev-lang/perl-5.6
diff --git a/xfce-base/exo/exo-0.10.2.ebuild b/xfce-base/exo/exo-0.10.2.ebuild
deleted file mode 100644
index 849f7024e248..000000000000
--- a/xfce-base/exo/exo-0.10.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/exo-0.10.2.ebuild,v 1.10 2013/04/13 07:19:08 ago Exp $
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Extensions, widgets and framework library with session support for the Xfce desktop environment"
-HOMEPAGE="http://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="debug"
-
-RDEPEND=">=dev-lang/perl-5.6
- >=dev-libs/glib-2.30
- dev-perl/URI
- >=x11-libs/gtk+-2.24:2
- >=xfce-base/libxfce4ui-4.10
- >=xfce-base/libxfce4util-4.10"
-DEPEND="${RDEPEND}
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig"
-
-pkg_setup() {
- XFCONF=(
- --docdir="${EPREFIX}"/usr/share/doc/${PF}
- $(xfconf_use_debug)
- --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
- )
-
- [[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857
-
- DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS TODO )
-}
diff --git a/xfce-base/xfce4-session/xfce4-session-4.10.1-r1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.10.1-r1.ebuild
deleted file mode 100644
index 041bc179948b..000000000000
--- a/xfce-base/xfce4-session/xfce4-session-4.10.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.10.1-r1.ebuild,v 1.15 2014/06/19 16:33:04 ssuominen Exp $
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A session manager for the Xfce desktop environment"
-HOMEPAGE="http://docs.xfce.org/xfce/xfce4-session/start"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug nls systemd udev +xscreensaver"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
- x11-apps/iceauth
- x11-libs/libSM
- >=x11-libs/libwnck-2.30:1
- x11-libs/libX11
- >=xfce-base/libxfce4util-4.10.1
- >=xfce-base/libxfce4ui-4.10
- >=xfce-base/xfconf-4.10
- !xfce-base/xfce-utils
- systemd? ( >=sys-auth/polkit-0.100 )"
-RDEPEND="${COMMON_DEPEND}
- x11-apps/xrdb
- nls? ( x11-misc/xdg-user-dirs )
- udev? (
- systemd? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
- !systemd? ( || ( =x11-misc/xscreensaver-5.26
- gnome-extra/gnome-screensaver
- >=x11-misc/xlockmore-5.43
- x11-misc/slock
- x11-misc/alock[pam]
- ) )"
-DEPEND="${COMMON_DEPEND}
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig"
-
-pkg_setup() {
- PATCHES=( "${FILESDIR}"/${P}-alock_support_to_xflock4.patch )
-
- XFCONF=(
- --docdir="${EPREFIX}"/usr/share/doc/${PF}
- $(use_enable systemd)
- --with-xsession-prefix="${EPREFIX}"/usr
- $(xfconf_use_debug)
- )
-
- DOCS=( AUTHORS BUGS ChangeLog NEWS README TODO )
-}
-
-src_install() {
- xfconf_src_install
-
- local sessiondir=/etc/X11/Sessions
- echo startxfce4 > "${T}"/Xfce4
- exeinto ${sessiondir}
- doexe "${T}"/Xfce4
- dosym Xfce4 ${sessiondir}/Xfce
-}
diff --git a/xfce-base/xfce4-session/xfce4-session-4.10.1-r2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.10.1-r2.ebuild
index 193ac3bb731b..660987f75038 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.10.1-r2.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.10.1-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/xfce-base/xfce4-session/xfce4-session-4.10.1-r2.ebuild,v 1.4 2014/06/29 18:58:12 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.10.1-r2.ebuild,v 1.10 2014/07/18 20:28:02 ssuominen Exp $
EAPI=5
EAUTORECONF=1
@@ -12,7 +12,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="debug nls systemd udev +xscreensaver"
COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
@@ -30,7 +30,7 @@ RDEPEND="${COMMON_DEPEND}
nls? ( x11-misc/xdg-user-dirs )
udev? (
systemd? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
- !systemd? ( || ( =x11-misc/xscreensaver-5.26
diff --git a/xfce-extra/xfce4-clipman-plugin/Manifest b/xfce-extra/xfce4-clipman-plugin/Manifest
index c3b83b73d9b0..e16aa742628a 100644
--- a/xfce-extra/xfce4-clipman-plugin/Manifest
+++ b/xfce-extra/xfce4-clipman-plugin/Manifest
@@ -1,2 +1 @@
-DIST xfce4-clipman-plugin-1.2.5.tar.bz2 410792 SHA256 1af5e18ae30344c0e1e8e08f842ce56ff06595c4fcf6dfa5604a535bf89f0af1 SHA512 5c344969ce4c0f15a70e768be217623e5c761c7dc73f14ca3506f1ea60ab6ae432e9ff4fd2fa94728235b25f834b5e3ce6138e17483c415c41330c2629b65696 WHIRLPOOL b78412ee2d2c6080b0c43d44ce04de70263e47daefaea7f00ec881f1a99338d6c8ff9f494a720efc86717934029058a0eb783a3e3705bd70ad56ea55e8d321f3
DIST xfce4-clipman-plugin-1.2.6.tar.bz2 438346 SHA256 23043f99c3e5257d1f3d68b5ee5125e3469c15620d098e22c6250386197f48a5 SHA512 fc6b4cee1990ff13f4c0050ebf3e4b69fc0f7124fa2dd9b41933ce11449d322fad666b1af82bd610ce2add28d012a7dddc345be4afa1432bb330ecd6344a168e WHIRLPOOL 6fa94e6e364c1a10e9de6cd80a1fad889a411ea3ca533647bf10f73967c60f1ad10caeefb0e838977b2b01f550a88561b196eba1f42949f00edb76103ec8ed2c
diff --git a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.2.5.ebuild b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.2.5.ebuild
deleted file mode 100644
index 45420a75d495..000000000000
--- a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.2.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.2.5.ebuild,v 1.8 2014/04/20 08:50:22 ago Exp $
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A clipboard manager plug-in for the Xfce panel"
-HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="debug qrcode"
-
-RDEPEND=">=dev-libs/glib-2.18
- dev-libs/libunique:1
- >=x11-libs/gtk+-2.14:2
- x11-libs/libXtst
- >=xfce-base/exo-0.10
- >=xfce-base/libxfce4ui-4.10
- >=xfce-base/libxfce4util-4.10
- >=xfce-base/xfce4-panel-4.10
- >=xfce-base/xfconf-4.10
- qrcode? ( >=media-gfx/qrencode-3.3.0 )"
-DEPEND="${RDEPEND}
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig
- x11-proto/xproto"
-
-pkg_setup() {
- XFCONF=(
- --docdir="${EPREFIX}"/usr/share/doc/${PF}
- $(use_enable qrcode libqrencode)
- $(xfconf_use_debug)
- )
-
- DOCS=( AUTHORS ChangeLog NEWS README )
-}
diff --git a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.2.6.ebuild b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.2.6.ebuild
index f8adadeff6a9..98fc766c0fab 100644
--- a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.2.6.ebuild
+++ b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.2.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/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.2.6.ebuild,v 1.4 2014/06/29 18:58:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.2.6.ebuild,v 1.6 2014/07/18 19:54:13 ago Exp $
EAPI=5
inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
IUSE="debug qrcode"
RDEPEND=">=dev-libs/glib-2.18
diff --git a/xfce-extra/xfce4-mount-plugin/Manifest b/xfce-extra/xfce4-mount-plugin/Manifest
index 81f5d49f5d24..98152ddbd6f1 100644
--- a/xfce-extra/xfce4-mount-plugin/Manifest
+++ b/xfce-extra/xfce4-mount-plugin/Manifest
@@ -1,2 +1 @@
-DIST xfce4-mount-plugin-0.6.4.tar.bz2 390365 SHA256 541d7af84d7d0b00ae547aa1f438e2fac51ee4195c4d0a17173c4f72accb227d SHA512 6cb94a43bc5dea0fca39af3069ece15a8436b641b2b2b71415e8f3892de7efd62d9c7f020542507610e703ad2f521200d2accd482afc8e8c81348223a4f86c36 WHIRLPOOL c90bd88f92fa5ee8b3a7a18ee04cfaf050f366e5636f09011d882d14cc3240cc3a4f12aa1726c226c437c45d0935919436c623461b4059ce3fa150b335538f29
DIST xfce4-mount-plugin-0.6.7.tar.bz2 390163 SHA256 541b94a892aa15d57707db9703bef85a5ce342769326f138cbf6cd7af1e2ac8d SHA512 18f4f4fc88c521f1fd6dcbcd3146fc8379e3aa0fb00e4787a34b6c52f68f765f18354e6b66e50c8b1a42e4f2366a5779cf057ba8b71fee45d0d3d023afe6fa7b WHIRLPOOL 87f60ccd0469e9ccc97d0a57ba3d968520edf5551cd017a8b90192eb4dec4b353e5fc08f8fc6fdef6cf22feab45122fa4ba66878babe08d9d302da094dcdd1e4
diff --git a/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-0.6.4.ebuild b/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-0.6.4.ebuild
deleted file mode 100644
index ed1be062221c..000000000000
--- a/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-0.6.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-0.6.4.ebuild,v 1.7 2012/11/28 12:20:13 ssuominen Exp $
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="An mount plug-in for the Xfce panel"
-HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND=">=xfce-base/libxfce4ui-4.8
- >=xfce-base/xfce4-panel-4.8"
-DEPEND="${RDEPEND}
- dev-util/intltool
- virtual/pkgconfig"
-
-pkg_setup() {
- XFCONF=(
- $(xfconf_use_debug)
- )
-
- DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}
diff --git a/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-0.6.7.ebuild b/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-0.6.7.ebuild
index f9a6eb5eb7be..fbeec0cdbeca 100644
--- a/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-0.6.7.ebuild
+++ b/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-0.6.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/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-0.6.7.ebuild,v 1.5 2014/06/29 18:58:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-0.6.7.ebuild,v 1.7 2014/07/18 19:54:16 ago Exp $
EAPI=5
inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
IUSE="debug"
RDEPEND=">=xfce-base/libxfce4ui-4.10
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.3.0.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.3.0.ebuild
index 183d3cf966cb..2a131b2e1a14 100644
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.3.0.ebuild
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.3.0.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/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.3.0.ebuild,v 1.6 2014/06/23 04:19:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.3.0.ebuild,v 1.8 2014/07/18 19:54:10 ago Exp $
EAPI=5
inherit linux-info multilib xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
IUSE="debug kernel_linux networkmanager policykit +udisks systemd +xfce_plugins_battery +xfce_plugins_brightness"
COMMON_DEPEND=">=dev-libs/dbus-glib-0.100.2