diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index 33702af29452..81c5b5c3e908 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -1,3 +1,2 @@
-DIST KeePass-2.24-Source.zip 3462540 SHA256 c0ea4da461d267ab95b92a9398328b1a85bc163316503d2354b2cc1ad46e7dce SHA512 ebd225634cda0f21704ccec620dd6c5309e5b14c32330f3221f107d51a1ee64f12d5d6da5da6a7a510c00f1a446f600fdfbc0369b1b44d08e5d140d84bbbf0b2 WHIRLPOOL ed70c69848a870d77f5a142a77016c3460ce6ca35a739658c2ed59507e0701973fe1299ad74e889460ea9174d514e97d20c2c87b8980d8e9b81f67f5a8a179b6
-DIST KeePass-2.25-Source.zip 3497356 SHA256 4be058632f23fc9dfb9ddb00209842e5a025f063980fb6f087ddda47d5661caa SHA512 1fd7e7c1a16d21c6f47694b92c9d541a7b30dd0355861cced349420f266ad2d29cf034690c9ebf0607982705b3f06b36e852c214f8358af7ccff6dce1b5061cd WHIRLPOOL 941112482501f6aeb34ffcf06cab9df6078b1e161049ce3a31351deb24afa0a55e3a10487ea8916239fb383e7d80a4b3e4e7d8a0067f2aaaaaf509fa557ef67e
DIST KeePass-2.26-Source.zip 3506320 SHA256 3a3e0e401acd2e1cc79a42f510c4654654439f0e2243e7f3d340c0b4918f2cd7 SHA512 2b10395bd067740a6600fdbc72384c603475c0eb57fd14842971f254470c520d98942ebbe2c8373bd36bac55c9ae057b870b4c4723f2398d82a0cb8c841401d0 WHIRLPOOL 8f18e2c389ae5a65dc75d40c572b33dcaac9da59c27b652b6c1688d8bb12d227fefebc62edc8b520743a548055b8908ecb710a489a920aa954b4ec5755f70c57
+DIST KeePass-2.27-Source.zip 3531254 SHA256 f812a7bc2921a491d7dcf4a247373fa53f32843b1df6a34ece488a25d599ca44 SHA512 9a2ec8b37cd9a4bf4d13585d3d594c766852b64cda8680d2a3ab934e320e1c110e93319d0c74652041198c03ea21209c95995b505e7924a054870d689da6dbe1 WHIRLPOOL aa2f543b83425bbef2ccd6f45f04c2f92b6a8498b45ab0db40d613c318e0b3202056654d3e40a9bad6c169c17b296a81462124732b1d84a535e7d70920d2d36a
diff --git a/app-admin/keepass/keepass-2.24.ebuild b/app-admin/keepass/keepass-2.24.ebuild
deleted file mode 100644
index 250adb0932c4..000000000000
--- a/app-admin/keepass/keepass-2.24.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/keepass/keepass-2.24.ebuild,v 1.1 2013/11/12 13:48:50 kensington Exp $
-
-EAPI=5
-
-inherit eutils fdo-mime gnome2-utils mono-env multilib
-
-MY_PN="KeePass"
-DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
-HOMEPAGE="http://keepass.info/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="aot"
-
-COMMON_DEPEND=">=dev-lang/mono-2.10.5"
-RDEPEND="${COMMON_DEPEND}
- dev-dotnet/libgdiplus[cairo]"
-DEPEND="${COMMON_DEPEND}
- app-arch/unzip"
-
-S=${WORKDIR}
-
-src_prepare() {
- # Remove Windows-specific things
- pushd Build > /dev/null || die
- . PrepMonoDev.sh || die
- popd > /dev/null || die
-
- # KeePass looks for some XSL files in the same folder as the executable,
- # we prefer to have it in /usr/share/KeePass
- epatch "${FILESDIR}/${PN}-2.20-xsl-path-detection.patch"
-}
-
-src_compile() {
- # Build with Release target
- xbuild /target:KeePass /property:Configuration=Release || die
-
- # Run Ahead Of Time compiler on the binary
- if use aot; then
- cp Ext/KeePass.exe.config Build/KeePass/Release/
- mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
- fi
-}
-
-src_install() {
- # Wrapper script to launch mono
- make_wrapper ${PN} "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
-
- # Some XSL files
- insinto /usr/share/${PN}/XSL
- doins Ext/XSL/*
-
- insinto /usr/$(get_libdir)/${PN}/
- exeinto /usr/$(get_libdir)/${PN}/
- doins Ext/KeePass.exe.config
- # Default configuration, simply says to use user-specific configuration
- doins Ext/KeePass.config.xml
-
- # The actual executable
- doexe Build/KeePass/Release/KeePass.exe
-
- # Copy the AOT compilation result
- if use aot; then
- doexe Build/KeePass/Release/KeePass.exe.so
- fi
-
- # Prepare the icons
- newicon -s 256 Ext/Icons/Finals/plockb.png "${PN}.png"
- newicon -s 256 -t gnome -c mimetypes Ext/Icons/Finals/plockb.png "application-x-${PN}2.png"
-
- # Create a desktop entry and associate it with the KeePass mime type
- make_desktop_entry ${PN} ${MY_PN} ${PN} "System;Security" "MimeType=application/x-keepass2;"
-
- # MIME descriptor for .kdbx files
- insinto /usr/share/mime/packages/
- doins "${FILESDIR}/${PN}.xml"
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- fdo-mime_mime_database_update
- fdo-mime_desktop_database_update
-
- if ! has_version x11-misc/xdotool ; then
- elog "Optional dependencies:"
- elog " x11-misc/xdotool (enables autotype)"
- fi
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- fdo-mime_mime_database_update
- fdo-mime_desktop_database_update
-}
diff --git a/app-admin/keepass/keepass-2.25.ebuild b/app-admin/keepass/keepass-2.27.ebuild
similarity index 98%
rename from app-admin/keepass/keepass-2.25.ebuild
rename to app-admin/keepass/keepass-2.27.ebuild
index 2c99a74ac08d..ea71bba3f94a 100644
--- a/app-admin/keepass/keepass-2.25.ebuild
+++ b/app-admin/keepass/keepass-2.27.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/keepass/keepass-2.25.ebuild,v 1.1 2014/02/14 17:35:17 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepass/keepass-2.27.ebuild,v 1.1 2014/07/15 17:34:17 kensington Exp $
EAPI=5
diff --git a/app-admin/lib_users/Manifest b/app-admin/lib_users/Manifest
index 471e238aaa0a..749dbbd23338 100644
--- a/app-admin/lib_users/Manifest
+++ b/app-admin/lib_users/Manifest
@@ -1,3 +1,3 @@
DIST lib_users-0.6.tar.gz 13314 SHA256 127cacaf8e108e4254401976e376b7ef9520cabc21b7b469b5cce39dd794a2dd SHA512 9f13878a309e0f879630dd45e5a27601cffc6816eec8497026815e85873e60f4991f2d412b9c82985cbc3c9088bcd6b8cb5b06bc15bbd327cfc5b002644f3db0 WHIRLPOOL 36430733778872bb18b83258c5bfe1e13c187d96d336d49fdc237ceccde662a14fb53faf9c6317194c49a943a0c32bd147797f82fcbbac2ec5a7c5f37d94c276
DIST lib_users-0.7.tar.gz 21857 SHA256 8bf206bf789f29df44f626472ac1371f3ae4eb6af848b22e856a955c09367c87 SHA512 80fb5546585edc66612f0f18067cbb34ebd7af9c7dfed8a4ea5596b9ab34fc604c2611f1af4737c421e5bece481ff88a942da7d1bdcaf6e35577577a7ec5a980 WHIRLPOOL b18bf777afad1fe488ee145e85a275a9f4d8004aea5a926d61421988b677a30d8ea56e1b13ccb7f3e104036bd514572aaa2b7c0d2d8a90a0240c75cdb3e8ae7b
-DIST lib_users-0.8.tar.gz 22988 SHA256 7e5661efa24caa219c01e134db7a54792493ad3ce11b76142a70c20c7dac6846 SHA512 f3c69bf8cd840338ec324d13a891f520d73ebe4ba68029efb358c94351b91471fe1975c78c1f6206236b049d15f574d8f853e81a894734aef826cf43a55904ca WHIRLPOOL 0566d97ae8a15e90dccdbcb0a1c0d8096ce8481783021ccc2f0a6784d1519c040f884e3a290813ae66bff08732175643baa12a3dfcd1f9f599add4ad54d62540
+DIST lib_users-0.9.tar.gz 22992 SHA256 361db39b14b9512b438cf96b2b9978c6b5c88abbc2c0b7227940e7e816fdcf1c SHA512 d4c10398d69410fc3d48a151c446105ed232fdca9ef68c3f0f1df903739b798762d6bf958dc08472e90151560d8a625b4ab8b5f5d89521918369ceadf2b85b19 WHIRLPOOL 312aaa05b10681a0eff7997ea8d1e359bd757b888fe6fadb29ef3370cc482371d65d14e06dc6887cefda0aee3bd65232ffcd06477e536e4d2c82996c27f60425
diff --git a/app-admin/lib_users/lib_users-0.8.ebuild b/app-admin/lib_users/lib_users-0.9.ebuild
similarity index 93%
rename from app-admin/lib_users/lib_users-0.8.ebuild
rename to app-admin/lib_users/lib_users-0.9.ebuild
index 824e3ef6d07a..7175ade9b397 100644
--- a/app-admin/lib_users/lib_users-0.8.ebuild
+++ b/app-admin/lib_users/lib_users-0.9.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/lib_users/lib_users-0.8.ebuild,v 1.1 2014/07/14 15:58:20 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lib_users/lib_users-0.9.ebuild,v 1.1 2014/07/15 17:32:33 klausman Exp $
EAPI=5
diff --git a/app-admin/recursos/recursos-2.0.ebuild b/app-admin/recursos/recursos-2.0.ebuild
index 073570f3396b..dc131b0fea2f 100644
--- a/app-admin/recursos/recursos-2.0.ebuild
+++ b/app-admin/recursos/recursos-2.0.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/app-admin/recursos/recursos-2.0.ebuild,v 1.8 2012/10/20 09:41:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/recursos/recursos-2.0.ebuild,v 1.9 2014/07/15 14:26:44 jer Exp $
EAPI=4
@@ -16,7 +16,7 @@ IUSE=""
DEPEND=""
RDEPEND="|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
app-shells/bash
- net-analyzer/rrdtool"
+ net-analyzer/rrdtool[graph]"
S=${WORKDIR}/r2
diff --git a/app-dicts/myspell-lv/metadata.xml b/app-dicts/myspell-lv/metadata.xml
index 4538a68724a6..74ca174bad99 100644
--- a/app-dicts/myspell-lv/metadata.xml
+++ b/app-dicts/myspell-lv/metadata.xml
@@ -1,5 +1,15 @@
-maintainer-needed@gentoo.org
+ proxy-maintainers
+
+ maris.gis@gmail.com
+ Maris Nartiss
+ Maintainer, assign bugs to him
+
+
+ mrueg@gentoo.org
+ Manuel Rüger
+ Proxy-Maintainer, CC him on bugs
+
diff --git a/app-editors/moe/Manifest b/app-editors/moe/Manifest
index 157ccc4adf7e..3093e0acd013 100644
--- a/app-editors/moe/Manifest
+++ b/app-editors/moe/Manifest
@@ -1 +1,2 @@
DIST moe-1.5.tar.gz 94386 SHA256 fa40d611fb36dd2145bbec5d35258be94247963cd6ec106395c87421007a0a43 SHA512 7f5abbfd3f5701d31f148d52bdbd06d01cdf08865c601bcf342b37210981b244519b4a12c40f4f6da887ac48e497287d43255771f259432ac1f30136ec4c1061 WHIRLPOOL fddd475386b260e3e2b0b7b712cf5b8210aaa46cad8b16ce9effb0fd5a7f146360876f387621c1f2b8c16b4f83d55a0cdbf2bbc5d8b06d2a5668d1070de16169
+DIST moe-1.6.tar.lz 75108 SHA256 8cafd9c97b40ff002b4cb66f63eb149f5fd9b9b964c5b6306458d0a68f89dcb1 SHA512 0aa717c865d41f73adccddbb158ae67b611a64f24258bcce5a68fea8175d28d6db55a0fb356fb294bfe3106c0973607b1fcc76ceee17d360e30eb80650ec043b WHIRLPOOL b7e55d187185f9eccea731619f4a6c4816125b2514eec68a202d00c33efb687945f025ef45ad5c49af67719486283b35a5f4639f476f86be7c5f9d58580f31ae
diff --git a/app-editors/moe/moe-1.6.ebuild b/app-editors/moe/moe-1.6.ebuild
new file mode 100644
index 000000000000..739bac1f4ee1
--- /dev/null
+++ b/app-editors/moe/moe-1.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/moe/moe-1.6.ebuild,v 1.1 2014/07/15 14:54:58 zlogene Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs unpacker
+
+DESCRIPTION="A powerful and user-friendly console text editor"
+HOMEPAGE="http://www.gnu.org/software/moe/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.lz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="$(unpacker_src_uri_depends)
+ sys-libs/ncurses"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ tc-export CXX
+ sed -i \
+ -e "/^CXXFLAGS=/d" \
+ -e "/^LDFLAGS=/d" \
+ -e "/^CXX=/d" \
+ configure || die "sed on configure failed"
+
+ epatch_user
+}
diff --git a/app-i18n/enca/enca-1.14-r1.ebuild b/app-i18n/enca/enca-1.14-r1.ebuild
index 9945fbea4001..60f64038b073 100644
--- a/app-i18n/enca/enca-1.14-r1.ebuild
+++ b/app-i18n/enca/enca-1.14-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-i18n/enca/enca-1.14-r1.ebuild,v 1.5 2014/07/11 11:37:41 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/enca/enca-1.14-r1.ebuild,v 1.6 2014/07/15 18:45:09 maekke Exp $
EAPI="4"
@@ -14,7 +14,7 @@ SRC_URI="http://dl.cihar.com/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc +recode"
DEPEND="recode? ( >=app-text/recode-3.6_p15 )
diff --git a/app-i18n/man-pages-de/Manifest b/app-i18n/man-pages-de/Manifest
index 848f0bc1203f..73f8ad3abca5 100644
--- a/app-i18n/man-pages-de/Manifest
+++ b/app-i18n/man-pages-de/Manifest
@@ -2,3 +2,4 @@ DIST manpages-de-0.12.tar.bz2 530398 SHA256 81ee3cb852ba3dfb9b16a926c1d24a0aafea
DIST manpages-de-0.8.tar.bz2 475407 SHA256 c40468b87ac1029af0df8e37d36dff6da38e5d823db932c4cd774f1a1bb9f15e SHA512 526b8498e7825f14cf35bd2d3517ee19df0fd9b698582e0e99c6778d58b022e8f2dc1136c04597bf216b424e2f77c70eaad42dcb933450f75a3d595737e79868 WHIRLPOOL ff62cd7aa9c50ae2a8ef980e58531f7ff4c580c06e24a21262ffa6b57a403e41352ef5a6b235cecfb44da7b7c53f0acd2090c88c7e97c5aa5b948c1f37fa85e3
DIST manpages-de-1.4.tar.bz2 1268124 SHA256 1c76f1e7e299c0ef813d30c36540affd6b886f1d810c69d0679b0005756d9ff7 SHA512 f6470732dfe29752daf9c254376a60ab595672f67bf7ebc7e6d53a61330191ecd7143b2fe08c7a0ad156f02227455c92f98c765925e1c847d8913c7ef400116c WHIRLPOOL b7d23c6e4bcfabfdef26dbd73f375c23f2bedce8b9eef7d0ae88144720428e5c71638d6ef939702d4305cd54153412bce3f5cc0c3dd5109c9f7bb7a1c412cf29
DIST manpages-de-1.5.tar.xz 1267308 SHA256 b3f04a113b9b8be11ffa366f35d535b3af4bacef2b071dab1ef5970b92144fd4 SHA512 d62d39420bb7cac0dc06e764a4e1d54eb9de60ef9cb565f982d96e3dada614731d1afc67e96c344d24bc01d848352050cde7ee931e28e6f4487cf2e4ae492cad WHIRLPOOL 66b801d3f2608d8afcd8b1042314b07c6cc0f4a9710ecd66741dc8fd1bce2fb5d8a7235e8664f927d34c686f648270d564a92fbf38695828ec2508214b17e6cb
+DIST manpages-de-1.7.tar.xz 1300384 SHA256 7bb014f4ffdc7a303791bb0ee672d901348babcb4c23002cecd3fc145831728a SHA512 d70f25daf10e233358b705c06a7c9e123fffc492429b4b9e1717c5db3a47d92fefb5e628fc75056306bc8bf0da7146aabd2c80a77cb50a430d2e11d6ce9712e0 WHIRLPOOL d8198220f4998e2550166a4b79434c4c1031c1e320b4b858dbf1468c1b1f19aa1d6a02816acd470191546dd5b08b4d1fff4fe612652866db932ee5b4e3dae33a
diff --git a/app-i18n/man-pages-de/man-pages-de-1.7.ebuild b/app-i18n/man-pages-de/man-pages-de-1.7.ebuild
new file mode 100644
index 000000000000..3e31c6c9b1e6
--- /dev/null
+++ b/app-i18n/man-pages-de/man-pages-de-1.7.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/app-i18n/man-pages-de/man-pages-de-1.7.ebuild,v 1.1 2014/07/15 23:22:22 mrueg Exp $
+
+EAPI=5
+
+inherit eutils autotools
+
+MY_P="${PN/-/}-${PV}"
+
+DESCRIPTION="A somewhat comprehensive collection of Linux german man page translations"
+HOMEPAGE="http://alioth.debian.org/projects/manpages-de/"
+SRC_URI="http://manpages-de.alioth.debian.org/downloads/${MY_P}.tar.xz"
+
+LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/man"
+DEPEND="${RDEPEND}
+ app-text/po4a"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.3-bzip2.patch
+
+ # Use the same compression as every other manpage
+ local PORTAGE_COMPRESS_LOCAL=${PORTAGE_COMPRESS-bzip2}
+ if [[ ${PORTAGE_COMPRESS+set} == "set" ]] ; then
+ PORTAGE_COMPRESS_LOCAL="#"
+ fi
+ if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then
+ case ${PORTAGE_COMPRESS_LOCAL} in
+ bzip2|gzip) local PORTAGE_COMPRESS_FLAGS_LOCAL="-9"
+ ;;
+ esac
+ fi
+ sed -i -e "s/gzip --best/${PORTAGE_COMPRESS_LOCAL} ${PORTAGE_COMPRESS_FLAGS_LOCAL}/"\
+ po/man{1,2,3,4,5,6,7,8}/Makefile.in po/common.mk || die
+ eautoreconf
+}
+
+src_compile() { :; }
+
+src_install() {
+ emake mandir="${ED}"/usr/share/man install
+ dodoc CHANGES README
+}
diff --git a/app-i18n/scim-tables/scim-tables-0.5.13.ebuild b/app-i18n/scim-tables/scim-tables-0.5.13.ebuild
index d7748ed2b36e..d74c687c9c00 100644
--- a/app-i18n/scim-tables/scim-tables-0.5.13.ebuild
+++ b/app-i18n/scim-tables/scim-tables-0.5.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/app-i18n/scim-tables/scim-tables-0.5.13.ebuild,v 1.2 2014/06/14 10:39:28 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tables/scim-tables-0.5.13.ebuild,v 1.3 2014/07/15 18:04:57 nimiux Exp $
inherit autotools base eutils
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="nls"
LANGS="am ar bn gu hi ja kn ko ml ne pa ru ta te th uk vi zh"
for i in ${LANGS} ; do
diff --git a/app-misc/vifm/vifm-0.7.6.ebuild b/app-misc/vifm/vifm-0.7.6.ebuild
index b700a7bcbb0d..1787e55c6c52 100644
--- a/app-misc/vifm/vifm-0.7.6.ebuild
+++ b/app-misc/vifm/vifm-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/app-misc/vifm/vifm-0.7.6.ebuild,v 1.4 2014/07/15 11:25:44 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/vifm/vifm-0.7.6.ebuild,v 1.5 2014/07/15 23:10:35 zlogene Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/vifm/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ~s390 ~x86"
+KEYWORDS="amd64 ppc ~s390 x86"
IUSE="X developer +extended-keys gtk +magic vim vim-syntax"
DEPEND="
diff --git a/app-text/sigil/metadata.xml b/app-text/sigil/metadata.xml
index 64b86e959872..368478b7c7f1 100644
--- a/app-text/sigil/metadata.xml
+++ b/app-text/sigil/metadata.xml
@@ -1,8 +1,15 @@
+ proxy-maintainers
- maintainer-needed@gentoo.org
+ tomboy64@sina.cn
+ Maintainer, assign bugs to him
+
+
+ mrueg@gentoo.org
+ Manuel Rüger
+ Proxy-Maintainer, CC him on bugs
Sigil is a multi-platform WYSIWYG ebook editor.
It is designed to edit books in ePub format.
diff --git a/dev-lang/nasm/Manifest b/dev-lang/nasm/Manifest
index 9143ef676e48..43d34ac4bc59 100644
--- a/dev-lang/nasm/Manifest
+++ b/dev-lang/nasm/Manifest
@@ -1,3 +1,2 @@
DIST nasm-2.10.07.tar.xz 680892 SHA256 d08ca2c0a9d141c0d279774e933e24bcc01dbb6dc20416ad8d9672a08019376f SHA512 400504dd0ed9131112d5d38ca8cad2f7070fed98f3fd2cb32600ebe784e645532f98a9ac80ed4a5656b5a975a6af5db350954eb407e2a97b475dc57cf8f20a4f WHIRLPOOL 1b19931fd482b703d746df2a8b630f99e3aea18916995eee9427110118bf10bf6892855eabdf1c2d9bbac32a289169b942d85a0b3492841409f1b09c65ef1659
-DIST nasm-2.10.09.tar.xz 686416 SHA256 9ffd9f910c783ee798cf2986cec01ebeeb01ba0ecacef64d2d4bea927c41fbf2 SHA512 089216f84f2d202c65d8223f5e66423995f96c2feebb0b8c6380761d36739a1a0f9cd2c4102bffd09646f12fd152da562c9be9e1ec2d62619dc78ed2012a0208 WHIRLPOOL fe9283153352069fbdd832481b675be7d5bd4cef9662b4cc863dd00993032c586cecdccae863a0105c5e1b851b0a4cf1a389f038012214c423ad019457987eb9
-DIST nasm-2.11.03.tar.xz 744612 SHA256 6e4965ca21b4cd45b9a86dae6b902a811cb04bf11d49bbec4fe0f315c478db06 SHA512 1a5c37aaf653d1815f9be5ee1f65ad551fb7ece750c77e8ccdccddb59c600d8d7d1337dae0ef24c9d9b1ffa015afb32ffb517f826be3570d721237f4b6b3792e WHIRLPOOL 5f4ffcf6e15ebe59f87f955adce5ab2abd88da9a8aa817ad70c377a2b4fde8e2d559007bd2c74f5cb69d920c932b41ef7d3dbd8a6cbe8d683b61d2010ab8419e
+DIST nasm-2.11.05.tar.xz 744740 SHA256 2f4769c2fc88dbd8df4383ce30bc86919b5d488854ab906ebcee5d5a38828a6b SHA512 2f7300d8699703c6f3c89a8d4abc224050e25949da8856809253d3c288203f8663ffc628998194dc08d9a638bdb7a67fe12e6dfebc5fabad9c75da15a62fe532 WHIRLPOOL 014ad39dfc3a62f1e387c87f09a5592a0089521e90c7338e16117577d863536aadf328777552f650b7db79ed97c82e4e40fe552f75b653482ddc5c71e65283e7
diff --git a/dev-lang/nasm/nasm-2.10.09.ebuild b/dev-lang/nasm/nasm-2.10.09.ebuild
deleted file mode 100644
index cc33699eb8e2..000000000000
--- a/dev-lang/nasm/nasm-2.10.09.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-lang/nasm/nasm-2.10.09.ebuild,v 1.1 2013/12/15 18:34:05 mr_bones_ Exp $
-
-EAPI=5
-inherit flag-o-matic
-
-DESCRIPTION="groovy little assembler"
-HOMEPAGE="http://nasm.sourceforge.net/"
-SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc"
-
-DEPEND="dev-lang/perl
- doc? ( app-text/ghostscript-gpl sys-apps/texinfo )"
-RDEPEND=""
-
-S=${WORKDIR}/${P/_}
-
-src_configure() {
- strip-flags
- econf
-}
-
-src_compile() {
- emake nasmlib.o
- emake all
- use doc && emake doc
-}
-
-src_install() {
- emake INSTALLROOT="${D}" install install_rdf
- dodoc AUTHORS CHANGES ChangeLog README TODO
- if use doc ; then
- doinfo doc/info/*
- dohtml doc/html/*
- dodoc doc/nasmdoc.*
- fi
-}
diff --git a/dev-lang/nasm/nasm-2.11.03.ebuild b/dev-lang/nasm/nasm-2.11.05.ebuild
similarity index 88%
rename from dev-lang/nasm/nasm-2.11.03.ebuild
rename to dev-lang/nasm/nasm-2.11.05.ebuild
index 2f49352b9728..fec1d009d518 100644
--- a/dev-lang/nasm/nasm-2.11.03.ebuild
+++ b/dev-lang/nasm/nasm-2.11.05.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/nasm/nasm-2.11.03.ebuild,v 1.1 2014/05/06 20:48:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-2.11.05.ebuild,v 1.1 2014/07/16 01:38:35 mr_bones_ Exp $
EAPI=5
inherit flag-o-matic
diff --git a/dev-lang/yasm/yasm-1.2.0-r1.ebuild b/dev-lang/yasm/yasm-1.2.0-r1.ebuild
index 936762f59b8d..afb68290a882 100644
--- a/dev-lang/yasm/yasm-1.2.0-r1.ebuild
+++ b/dev-lang/yasm/yasm-1.2.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/dev-lang/yasm/yasm-1.2.0-r1.ebuild,v 1.5 2014/06/14 10:55:26 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/yasm-1.2.0-r1.ebuild,v 1.6 2014/07/15 16:40:51 nimiux Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -13,7 +13,7 @@ SRC_URI="http://www.tortall.net/projects/yasm/releases/${P}.tar.gz
LICENSE="BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )"
SLOT="0"
-KEYWORDS="-* ~amd64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
IUSE="nls python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/lockdev/lockdev-1.0.3.1.2-r1.ebuild b/dev-libs/lockdev/lockdev-1.0.3.1.2-r1.ebuild
deleted file mode 100644
index 712b6a4019ec..000000000000
--- a/dev-libs/lockdev/lockdev-1.0.3.1.2-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/lockdev/lockdev-1.0.3.1.2-r1.ebuild,v 1.7 2014/07/04 12:41:39 klausman Exp $
-
-EAPI="2"
-
-GENTOO_DEPEND_ON_PERL="no"
-inherit toolchain-funcs base perl-module eutils versionator autotools
-
-MAJOR=$(get_major_version)
-MY_PV=$(get_version_component_range 1-3)
-MY_P=${PN}-${MY_PV}
-DEB_PV=$(replace_version_separator 3 '-')
-DEB_P=${PN}_${DEB_PV}
-
-DESCRIPTION="Library for locking devices"
-HOMEPAGE="http://packages.debian.org/source/sid/lockdev"
-SRC_URI="
- mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}.orig.tar.gz
- mirror://debian/pool/main/${PN:0:1}/${PN}/${DEB_P}.diff.gz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 x86"
-IUSE="perl"
-
-DEPEND="
- perl? ( || ( >=dev-lang/perl-5.16 =net-analyzer/rrdtool-1.4.5-r1"
+DEPEND=">=net-analyzer/rrdtool-1.4.5-r1[graph]"
RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-rrd/pecl-rrd-1.1.0.ebuild b/dev-php/pecl-rrd/pecl-rrd-1.1.0.ebuild
index ea86a6186c76..cafd3c6ccd6f 100644
--- a/dev-php/pecl-rrd/pecl-rrd-1.1.0.ebuild
+++ b/dev-php/pecl-rrd/pecl-rrd-1.1.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-php/pecl-rrd/pecl-rrd-1.1.0.ebuild,v 1.1 2013/07/19 14:13:06 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-rrd/pecl-rrd-1.1.0.ebuild,v 1.2 2014/07/15 14:49:41 jer Exp $
EAPI=5
@@ -14,7 +14,6 @@ DESCRIPTION="RRDtool bindings for PHP"
LICENSE="BSD"
SLOT="0"
-IUSE=""
-DEPEND=">=net-analyzer/rrdtool-1.4.5-r1"
+DEPEND=">=net-analyzer/rrdtool-1.4.5-r1[graph]"
RDEPEND="${DEPEND}"
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 6bd9bdfd5909..e23968a76fab 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -1,2 +1,3 @@
DIST PyQt-x11-gpl-4.10.3.tar.gz 11187362 SHA256 a713bebef394213b2c9e1fe0cad5699b869dc356bba50766e069013eba8bf630 SHA512 4edd3539e1855bc3358dcba866433e53d4b9444b867c14cc27115cf5a6c123b0af3bb0bae3085f6d71a31f0b6716da40809ac4ffcaaff415673ed7462f1a0420 WHIRLPOOL 675e324993e8f9a3b2a0a8975c9f1e2af9cd315073a68e6649a8de04e8e8a905d756be2c138a8c19b4ec16a75c7b118b32a3ffc27f8399953599a1b88ac76fad
+DIST PyQt-x11-gpl-4.11.1.tar.gz 11118850 SHA256 df9d7358d70748efa5b84fa3fe9e182a80c39ac590157daaabcc2618df176da3 SHA512 3851d4e61d9c6a0c62cbfd2a08153972fa3446c1982fc925796eb1d4c6524e7054cdb14ed2f4566386727e9e0cf67246765de19fab79152b0834477452681113 WHIRLPOOL 17e23997afcf06b99028d0d2115bc9328848acaaa1b6bcd8ec7397409ab2001d5fa29ca08bf42e0cef6dcd0441d0cff04e349fa8913a2b0fc86da878b79b5a5d
DIST PyQt-x11-gpl-4.11.tar.gz 11118078 SHA256 d91b942d2aa8115acb83f9aeae71a4afb4d042c1cd23a2a9ee75329a7c539366 SHA512 ba6e42afa5ea235d5b1e9be79ff57c458f1d0f11cd4bffff38c48c4c55692409c0750e7d6dd385fb811e874f308a2eaf3adce70e3d5aec70dfed0c540df65b58 WHIRLPOOL f71685defeddc3a182073b0ec9970b28416ed2bb61d4dafbd9dfdc887fa1e076426241e42a305cea744f17911ec0df9829c36fa5de30bb2881a0a40bdc1ead46
diff --git a/dev-python/PyQt4/PyQt4-4.11.1.ebuild b/dev-python/PyQt4/PyQt4-4.11.1.ebuild
new file mode 100644
index 000000000000..b671aab06914
--- /dev/null
+++ b/dev-python/PyQt4/PyQt4-4.11.1.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.11.1.ebuild,v 1.1 2014/07/15 17:34:33 pesa Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
+
+inherit eutils multibuild python-r1 qmake-utils toolchain-funcs
+
+DESCRIPTION="Python bindings for the Qt toolkit"
+HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ https://pypi.python.org/pypi/PyQt4"
+
+if [[ ${PV} == *_pre* ]]; then
+ MY_P="PyQt-x11-gpl-snapshot-${PV%_pre*}-${REVISION}"
+ SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.gz"
+else
+ MY_P="PyQt-x11-gpl-${PV}"
+ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+fi
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="X dbus debug declarative designer doc examples help kde multimedia opengl phonon script scripttools sql svg webkit xmlpatterns"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ declarative? ( X )
+ designer? ( X )
+ help? ( X )
+ multimedia? ( X )
+ opengl? ( X )
+ phonon? ( X )
+ scripttools? ( X script )
+ sql? ( X )
+ svg? ( X )
+ webkit? ( X )
+"
+
+# Minimal supported version of Qt.
+QT_PV="4.8.0:4"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ >=dev-python/sip-4.16:=[${PYTHON_USEDEP}]
+ >=dev-qt/qtcore-${QT_PV}
+ X? (
+ >=dev-qt/qtgui-${QT_PV}
+ >=dev-qt/qttest-${QT_PV}
+ )
+ dbus? (
+ >=dev-python/dbus-python-0.80[${PYTHON_USEDEP}]
+ >=dev-qt/qtdbus-${QT_PV}
+ )
+ declarative? ( >=dev-qt/qtdeclarative-${QT_PV} )
+ designer? ( || ( dev-qt/designer:4 =dev-qt/qthelp-${QT_PV} )
+ multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
+ opengl? ( >=dev-qt/qtopengl-${QT_PV} )
+ phonon? (
+ kde? ( media-libs/phonon )
+ !kde? ( || ( >=dev-qt/qtphonon-${QT_PV} media-libs/phonon ) )
+ )
+ script? ( >=dev-qt/qtscript-${QT_PV} )
+ sql? ( >=dev-qt/qtsql-${QT_PV} )
+ svg? ( >=dev-qt/qtsvg-${QT_PV} )
+ webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
+ xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+ dbus? ( virtual/pkgconfig )
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ # Support qreal on arm architecture (bug 322349).
+ use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
+
+ # Allow building against KDE's phonon (bug 433944 and others).
+ sed -i \
+ -e "s:VideoWidget()\":&, extra_include_dirs=[\"${EPREFIX}/usr/include/qt4/QtGui\"]:" \
+ -e "s:^\s\+generate_code(\"phonon\":&, extra_include_dirs=[\"${EPREFIX}/usr/include/phonon\"]:" \
+ configure.py || die
+
+ if ! use dbus; then
+ sed -i -e 's/^\(\s\+\)check_dbus()/\1pass/' configure.py || die
+ fi
+
+ python_copy_sources
+
+ preparation() {
+ if [[ ${EPYTHON} == python3.* ]]; then
+ rm -fr pyuic/uic/port_v2
+ else
+ rm -fr pyuic/uic/port_v3
+ fi
+ }
+ python_foreach_impl run_in_build_dir preparation
+}
+
+pyqt4_use_enable() {
+ use $1 && echo --enable=${2:-Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}}
+}
+
+src_configure() {
+ configuration() {
+ local myconf=(
+ "${PYTHON}" configure.py
+ --confirm-license
+ --bindir="${EPREFIX}/usr/bin"
+ --destdir="$(python_get_sitedir)"
+ --sipdir="${EPREFIX}/usr/share/sip"
+ --assume-shared
+ --no-timestamp
+ --qsci-api
+ $(use debug && echo --debug)
+ --enable=QtCore
+ --enable=QtNetwork
+ --enable=QtXml
+ $(pyqt4_use_enable X QtGui)
+ $(pyqt4_use_enable X QtTest)
+ $(pyqt4_use_enable dbus QtDBus)
+ $(pyqt4_use_enable declarative)
+ $(pyqt4_use_enable designer) $(use designer || echo --no-designer-plugin)
+ $(pyqt4_use_enable help)
+ $(pyqt4_use_enable multimedia)
+ $(pyqt4_use_enable opengl QtOpenGL)
+ $(pyqt4_use_enable phonon phonon)
+ $(pyqt4_use_enable script)
+ $(pyqt4_use_enable scripttools QtScriptTools)
+ $(pyqt4_use_enable sql)
+ $(pyqt4_use_enable svg)
+ $(pyqt4_use_enable webkit QtWebKit)
+ $(pyqt4_use_enable xmlpatterns QtXmlPatterns)
+ AR="$(tc-getAR) cqs"
+ CC="$(tc-getCC)"
+ CFLAGS="${CFLAGS}"
+ CFLAGS_RELEASE=
+ CXX="$(tc-getCXX)"
+ CXXFLAGS="${CXXFLAGS}"
+ CXXFLAGS_RELEASE=
+ LINK="$(tc-getCXX)"
+ LINK_SHLIB="$(tc-getCXX)"
+ LFLAGS="${LDFLAGS}"
+ LFLAGS_RELEASE=
+ RANLIB=
+ STRIP=
+ )
+ echo "${myconf[@]}"
+ "${myconf[@]}" || die
+
+ local mod
+ for mod in QtCore \
+ $(use X && echo QtGui) \
+ $(use dbus && echo QtDBus) \
+ $(use declarative && echo QtDeclarative) \
+ $(use designer && echo QtDesigner) \
+ $(use opengl && echo QtOpenGL); do
+ # Run eqmake4 inside the qpy subdirectories to respect
+ # CC, CXX, CFLAGS, CXXFLAGS, LDFLAGS and avoid stripping.
+ pushd qpy/${mod} > /dev/null || return
+ eqmake4 $(ls w_qpy*.pro)
+ popd > /dev/null || return
+
+ # Fix insecure runpaths.
+ sed -i -e "/^LFLAGS\s*=/ s:-Wl,-rpath,${BUILD_DIR}/qpy/${mod}::" \
+ ${mod}/Makefile || die "failed to fix rpath for ${mod}"
+ done
+
+ # Avoid stripping of libpythonplugin.so.
+ if use designer; then
+ pushd designer > /dev/null || return
+ eqmake4 python.pro
+ popd > /dev/null || return
+ fi
+ }
+ python_parallel_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+ python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+ installation() {
+ local tmp_root=${D%/}/tmp
+
+ # INSTALL_ROOT is used by designer/Makefile, other Makefiles use DESTDIR.
+ emake DESTDIR="${tmp_root}" INSTALL_ROOT="${tmp_root}" install
+
+ python_doexe "${tmp_root}${EPREFIX}"/usr/bin/pyuic4
+ rm "${tmp_root}${EPREFIX}"/usr/bin/pyuic4 || die
+
+ multibuild_merge_root "${tmp_root}" "${D}"
+ python_optimize
+ }
+ python_foreach_impl run_in_build_dir installation
+
+ dodoc NEWS THANKS
+
+ if use doc; then
+ dohtml -r doc/html/*
+ fi
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}
+ doins -r examples
+ fi
+}
diff --git a/dev-python/PyQt4/PyQt4-4.11.ebuild b/dev-python/PyQt4/PyQt4-4.11.ebuild
index 850981b69542..3d15c518b210 100644
--- a/dev-python/PyQt4/PyQt4-4.11.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.11.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/dev-python/PyQt4/PyQt4-4.11.ebuild,v 1.1 2014/05/30 18:30:07 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.11.ebuild,v 1.2 2014/07/15 17:34:33 pesa Exp $
EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
inherit eutils multibuild python-r1 qmake-utils toolchain-funcs
diff --git a/dev-python/pycurl/pycurl-7.19.3.1-r1.ebuild b/dev-python/pycurl/pycurl-7.19.3.1-r1.ebuild
index 30be9839356d..85906e9d0e58 100644
--- a/dev-python/pycurl/pycurl-7.19.3.1-r1.ebuild
+++ b/dev-python/pycurl/pycurl-7.19.3.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/pycurl/pycurl-7.19.3.1-r1.ebuild,v 1.2 2014/07/08 00:22:00 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.3.1-r1.ebuild,v 1.5 2014/07/16 03:59:55 floppym Exp $
EAPI=5
# The selftests fail with pypy, and urlgrabber segfaults for me.
@@ -27,9 +27,12 @@ RDEPEND=">=net-misc/curl-7.25.0-r1[ssl=]
ssl? (
net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)]
curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 ) )"
+
+# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
+# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802
DEPEND="${RDEPEND}
test? ( dev-python/nose[${PYTHON_USEDEP}]
- dev-python/bottle[${PYTHON_USEDEP}] )"
+ >=dev-python/bottle-0.12.7[${PYTHON_USEDEP}] )"
# Needed for individual runs of testsuite by python impls.
DISTUTILS_IN_SOURCE_BUILD=1
@@ -57,12 +60,6 @@ src_test() {
}
python_test() {
- # https://github.com/pycurl/pycurl/issues/180
- if [[ "${EPYTHON}" == python3.4 ]]; then
- sed -e 's:test_post_buffer:_&:' \
- -e 's:test_post_file:_&:' \
- -i tests/post_test.py || die
- fi
emake test
}
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index c7342e5ac8e9..c6a2ef63e467 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,4 +1,5 @@
DIST sip-4.14.7.tar.gz 754916 SHA256 05669120a53a2c98f98560424cda413ae95f5528494c80764004dbea78d361b7 SHA512 8a2ff12553c4c0b31f5884ef292b9c233d0a1148c66c9bdea2b7f74ce151465a16f8e511069e6e47a0527f960c1f13a9ec6c5766d7324670c236a92536bbb6b3 WHIRLPOOL 6729efbd0e6a42138d5590822a0a22f7c38938dc2af4af2245ae13b1461bf15510c0f4161ef3dd864f02c98a168817f755ccd60b41c94358ffcacfc3d14ad673
DIST sip-4.15.3.tar.gz 773818 SHA256 46f245252866dbdb7fb5aca194bda991cc84ba8090d5e864765ee7e511a053d4 SHA512 495522aa2a553099c02ab4f7ce7485d24267e5093398f5f20e7102542153084486b6e654564ee716634a257301dd094a08754cdc40282cd2e4496e52619bc138 WHIRLPOOL 3192e9f15420409905faaa155939829b24da8bd5e1467ca908857ba293416e114d31f4374bb54659f285ed693cd51074c249221e0063b4d916326e7724e8e9f0
DIST sip-4.15.4.tar.gz 776179 SHA256 594b742873cd135dc945e61f0fff4d9d35ea5da8d23e2fc8f3820c3771a52228 SHA512 887f740853d3ce09946faea2ccababfad505d454cfe2f9d525104d02a05fe6c146a549464901231a76039ea3855223206ef48c122bb51806cfd97a54c23ac143 WHIRLPOOL 545ea82634b87c0d782732bfbefe0d49fce2b09d1e405bd6b23691979c8f1b346fa95df962a1461b6654a651eb05b0c8eea7d94320d8d55d2dbcc54f2f36b1db
+DIST sip-4.16.2.tar.gz 793663 SHA256 a55a2324a46ab42e42ae57c52ef06583b17d25c987973fe2e7ff2e8a649294ce SHA512 07ced0188bd4dc897ddacbce226b33ac9d236455a95018e900fd5f652439c905ddd56688f8bb29f704fcf201a8e668d5cc89ba887065826653087cf0a9f6dbfb WHIRLPOOL 47c741f1b787ba147e7a299e3c93a7537f14f1b192726e39f3679d0b0e0a991df603509c5674f262311259d9ad2e1e845746d215d5ef70eb7b827c1557eb8b82
DIST sip-4.16.tar.gz 793162 SHA256 d769ce2486bab4cb0b3bea8868153c7e5c27b50ee74fec3329e35ed50a346398 SHA512 e0f5f08f0157d1f709b7eed71aa1cd4633beea856b074a92434243d734c8b7f2f3eae3db474b8fb35fc9bdc0c679510b635a4183accd80dcec8381a5fdd62b25 WHIRLPOOL 4fd3caf872699d9f356305294b9f53cce1b2a4294c54a1df239a33131ca785e144a88f5cecd090cefe36e9d712eefd6b7c3b17f00e253c156e4f996a68c8529c
diff --git a/dev-python/sip/sip-4.16.2.ebuild b/dev-python/sip/sip-4.16.2.ebuild
new file mode 100644
index 000000000000..329967f37e6d
--- /dev/null
+++ b/dev-python/sip/sip-4.16.2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.16.2.ebuild,v 1.1 2014/07/15 17:27:22 pesa Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
+
+inherit eutils python-r1 toolchain-funcs
+
+DESCRIPTION="Python extension module generator for C and C++ libraries"
+HOMEPAGE="http://www.riverbankcomputing.co.uk/software/sip/intro http://pypi.python.org/pypi/SIP"
+LICENSE="|| ( GPL-2 GPL-3 sip )"
+
+if [[ ${PV} == *9999* ]]; then
+ # live version from mercurial repo
+ EHG_REPO_URI="http://www.riverbankcomputing.com/hg/sip"
+ inherit mercurial
+elif [[ ${PV} == *_pre* ]]; then
+ # development snapshot
+ HG_REVISION=
+ MY_P=${PN}-${PV%_pre*}-snapshot-${HG_REVISION}
+ SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.gz"
+ S=${WORKDIR}/${MY_P}
+else
+ # official release
+ SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
+fi
+
+# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
+SLOT="0/11"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug doc"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+
+[[ ${PV} == *9999* ]] && DEPEND+="
+ =dev-lang/python-2*
+ sys-devel/bison
+ sys-devel/flex
+ doc? ( dev-python/sphinx[$(python_gen_usedep 'python2*')] )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-4.15.5-darwin.patch
+
+ if [[ ${PV} == *9999* ]]; then
+ python2 build.py prepare || die
+ if use doc; then
+ python2 build.py doc || die
+ fi
+ fi
+
+ # Sub-slot sanity check
+ local sub_slot=${SLOT#*/}
+ local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h.in)
+ if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
+ eerror
+ eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
+ eerror "Please update SLOT variable as follows:"
+ eerror " SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
+ eerror
+ die "sub-slot sanity check failed"
+ fi
+
+ python_copy_sources
+}
+
+src_configure() {
+ configuration() {
+ local myconf=(
+ "${PYTHON}" configure.py
+ --bindir="${EPREFIX}/usr/bin"
+ --destdir="$(python_get_sitedir)"
+ --incdir="$(python_get_includedir)"
+ --sipdir="${EPREFIX}/usr/share/sip"
+ $(use debug && echo --debug)
+ AR="$(tc-getAR) cqs"
+ CC="$(tc-getCC)"
+ CFLAGS="${CFLAGS}"
+ CFLAGS_RELEASE=
+ CXX="$(tc-getCXX)"
+ CXXFLAGS="${CXXFLAGS}"
+ CXXFLAGS_RELEASE=
+ LINK="$(tc-getCXX)"
+ LINK_SHLIB="$(tc-getCXX)"
+ LFLAGS="${LDFLAGS}"
+ LFLAGS_RELEASE=
+ RANLIB=
+ STRIP=
+ )
+ echo "${myconf[@]}"
+ "${myconf[@]}"
+ }
+ python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+ python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+ installation() {
+ emake DESTDIR="${D}" install
+ python_optimize
+ }
+ python_foreach_impl run_in_build_dir installation
+
+ dodoc NEWS
+ use doc && dohtml -r doc/html/*
+}
diff --git a/dev-python/wheel/Manifest b/dev-python/wheel/Manifest
new file mode 100644
index 000000000000..be4417b944e1
--- /dev/null
+++ b/dev-python/wheel/Manifest
@@ -0,0 +1 @@
+DIST wheel-0.24.0.tar.gz 50597 SHA256 ef832abfedea7ed86b6eae7400128f88053a1da81a37c00613b1279544d585aa SHA512 9990e6bb6e42eebdac26ce75cee13e3b3da293520b2b25fad6dd328b920ce484bcf238ab7f9092d4ac565e26833b164b1ad5b8b258c824ff07daede127b17283 WHIRLPOOL faf13ddf756910558fd13d3b9eae399e488cd1938998c58a1ac3117aa7843480da5aab7c8454d67596cac8f524e23c4465e0ee9d2499a6af4afd2017c6b5314d
diff --git a/dev-python/wheel/metadata.xml b/dev-python/wheel/metadata.xml
new file mode 100644
index 000000000000..5f34195aa2ab
--- /dev/null
+++ b/dev-python/wheel/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+ python
+
+ wheel
+
+
diff --git a/dev-python/wheel/wheel-0.24.0.ebuild b/dev-python/wheel/wheel-0.24.0.ebuild
new file mode 100644
index 000000000000..b4955025f857
--- /dev/null
+++ b/dev-python/wheel/wheel-0.24.0.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/dev-python/wheel/wheel-0.24.0.ebuild,v 1.1 2014/07/15 17:19:38 djc Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A built-package format for Python"
+HOMEPAGE="https://pypi.python.org/pypi/wheel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-ruby/celluloid-io/Manifest b/dev-ruby/celluloid-io/Manifest
new file mode 100644
index 000000000000..d1016511df1f
--- /dev/null
+++ b/dev-ruby/celluloid-io/Manifest
@@ -0,0 +1 @@
+DIST celluloid-io-0.15.0.gem 52224 SHA256 47d3c70d43580cd62d7c999cd3251b029ec2e4cdecb72ec40ab5614e82a3040a SHA512 de9d8d652f9a89c7c95e4dd19868180aa3ce6d4bb979526dd2379984695ca888f59f4a66aae1face3e0f5050bd97a5e5d67b32496db78bbf40fb9af5195572dd WHIRLPOOL 8e84bb308ba7f0601b2632007ba46ceb382df69b2a74c696109e23f8a67abb8e5e8bde21cdc85b7609fccdb12e906af5ac94d7692813bad4bcc94033596bc9c2
diff --git a/dev-ruby/celluloid-io/celluloid-io-0.15.0.ebuild b/dev-ruby/celluloid-io/celluloid-io-0.15.0.ebuild
new file mode 100644
index 000000000000..1dbe8592356f
--- /dev/null
+++ b/dev-ruby/celluloid-io/celluloid-io-0.15.0.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/dev-ruby/celluloid-io/celluloid-io-0.15.0.ebuild,v 1.1 2014/07/15 18:18:23 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Evented IO for Celluloid actors"
+HOMEPAGE="https://github.com/celluloid/celluloid-io"
+IUSE=""
+SLOT="0"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+
+# Test hangs
+RESTRICT="test"
+
+ruby_add_rdepend "dev-ruby/celluloid
+ dev-ruby/nio4r"
+
+all_ruby_prepare() {
+ sed -i -e '/[Bb]undler/d' -e '/[Cc]overalls/d' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/celluloid-io/metadata.xml b/dev-ruby/celluloid-io/metadata.xml
new file mode 100644
index 000000000000..852136183369
--- /dev/null
+++ b/dev-ruby/celluloid-io/metadata.xml
@@ -0,0 +1,5 @@
+
+
+
+ruby
+
diff --git a/dev-ruby/coderay/coderay-1.1.0-r1.ebuild b/dev-ruby/coderay/coderay-1.1.0-r1.ebuild
index e6164e9a5e16..a794d0660fca 100644
--- a/dev-ruby/coderay/coderay-1.1.0-r1.ebuild
+++ b/dev-ruby/coderay/coderay-1.1.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/dev-ruby/coderay/coderay-1.1.0-r1.ebuild,v 1.4 2014/06/29 18:50:27 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/coderay/coderay-1.1.0-r1.ebuild,v 1.5 2014/07/15 14:42:04 phajdan.jr Exp $
EAPI=5
@@ -25,7 +25,7 @@ RUBY_S="rubychan-coderay-*"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
# Redcloth is optional but automagically tested, so we add this
diff --git a/dev-ruby/mocha/mocha-0.10.5-r1.ebuild b/dev-ruby/mocha/mocha-0.10.5-r1.ebuild
index bcdbad480483..ed273fbbba2c 100644
--- a/dev-ruby/mocha/mocha-0.10.5-r1.ebuild
+++ b/dev-ruby/mocha/mocha-0.10.5-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/mocha/mocha-0.10.5-r1.ebuild,v 1.3 2014/06/22 14:18:17 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.10.5-r1.ebuild,v 1.4 2014/07/15 14:42:37 phajdan.jr Exp $
EAPI=5
USE_RUBY="ruby19 ruby20 jruby"
@@ -20,7 +20,7 @@ HOMEPAGE="http://mocha.rubyforge.org/"
LICENSE="MIT"
SLOT="0.10"
-KEYWORDS="~alpha ~amd64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "
diff --git a/dev-ruby/mocha/mocha-0.12.10.ebuild b/dev-ruby/mocha/mocha-0.12.10.ebuild
index f50a39af6597..2f05b95527ec 100644
--- a/dev-ruby/mocha/mocha-0.12.10.ebuild
+++ b/dev-ruby/mocha/mocha-0.12.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.12.10.ebuild,v 1.8 2014/06/24 19:17:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.12.10.ebuild,v 1.9 2014/07/15 14:42:37 phajdan.jr Exp $
EAPI=5
USE_RUBY="ruby19 jruby ruby20"
@@ -20,7 +20,7 @@ HOMEPAGE="http://gofreerange.com/mocha/docs/"
LICENSE="MIT"
SLOT="0.12"
-KEYWORDS="~alpha ~amd64 arm ~hppa ia64 ~ppc ~ppc64 ~x86 ~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 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "
diff --git a/dev-ruby/mocha/mocha-0.13.3-r1.ebuild b/dev-ruby/mocha/mocha-0.13.3-r1.ebuild
index 26eaba0e9e23..04343ab4e012 100644
--- a/dev-ruby/mocha/mocha-0.13.3-r1.ebuild
+++ b/dev-ruby/mocha/mocha-0.13.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.13.3-r1.ebuild,v 1.8 2014/06/24 19:18:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.13.3-r1.ebuild,v 1.9 2014/07/15 14:42:37 phajdan.jr Exp $
EAPI=5
USE_RUBY="ruby19 ruby20 jruby"
@@ -20,7 +20,7 @@ HOMEPAGE="http://gofreerange.com/mocha/docs/"
LICENSE="MIT"
SLOT="0.13"
-KEYWORDS="~alpha ~amd64 arm ~hppa ia64 ~ppc ~ppc64 ~x86 ~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 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "
diff --git a/dev-ruby/posix-spawn/Manifest b/dev-ruby/posix-spawn/Manifest
index 530ac4e0994d..aa08a3bb68ce 100644
--- a/dev-ruby/posix-spawn/Manifest
+++ b/dev-ruby/posix-spawn/Manifest
@@ -1 +1,2 @@
DIST posix-spawn-0.3.8.gem 26624 SHA256 2185d0834e8a097178caaffb4955245a0ae6195ad764804c8d9f0814e2771469 SHA512 0a03cd8dd11ea3c61db2bff2ecefdfac66978a3a75d3e42aaa59203422fc36e3f03fbede13a71629f80d260e3e95cf24f84ab9f7353cf5816d3c8b630cc2945e WHIRLPOOL 4c877aa18f5de8ceddfcbd2392325fd57bda8cb1a4126035bf788061ed687cb7526fa7fe0146a496cd63072cd4e7de8096a253615d7c16952bb28378c1fb560c
+DIST posix-spawn-0.3.8_p20140630.tar.gz 24383 SHA256 341e19d3074575a6b4a8b828f8ab691f0bfdd2b2a6cb654308120624b410a812 SHA512 99d7e6f1599a3d586a78050857db23dd443a0c482770397623dace995c707ec2144e4c9bbec7957071757588af3a47a1482c32a2de1a2f89a5ab9a0e8879c7ca WHIRLPOOL 26480a4f938c9c42ad07a2059532cf8f694d24a50921bb0a618d433d4144aca254469f6941d3fea6e6640a154eb8f253e5f9b9e5ef85cdf8d04982ba3772b6cd
diff --git a/dev-ruby/posix-spawn/posix-spawn-0.3.8_p20140630.ebuild b/dev-ruby/posix-spawn/posix-spawn-0.3.8_p20140630.ebuild
new file mode 100644
index 000000000000..33fdfdbf1066
--- /dev/null
+++ b/dev-ruby/posix-spawn/posix-spawn-0.3.8_p20140630.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/posix-spawn/posix-spawn-0.3.8_p20140630.ebuild,v 1.1 2014/07/16 02:11:54 mrueg Exp $
+
+EAPI=5
+
+# jruby → should be supported but does not work with "rake compile"
+USE_RUBY="ruby19 ruby20"
+KEYWORDS="~amd64"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md TODO HACKING"
+RUBY_FAKEGEM_VERSION="0.3.8.20140630"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The posix-spawn library aims to implement a subset of the Ruby 1.9 Process::spawn"
+HOMEPAGE="https://github.com/rtomayko/posix-spawn/"
+COMMIT_ID="25a0806ce0335faf958834d9dd6a41ff2288fa56"
+SRC_URI="https://github.com/rtomayko/posix-spawn/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT LGPL-2.1"
+SLOT="0"
+IUSE="test"
+
+RUBY_S="${PN}-${COMMIT_ID}"
+
+
+each_ruby_configure() {
+ ${RUBY} -Cext extconf.rb || die
+}
+
+each_ruby_compile() {
+ emake V=1 -Cext
+ cp ext/*$(get_modname) lib/ || die
+}
+
+each_ruby_test() {
+ ${RUBY} -Ilib -S testrb test || die
+}
diff --git a/dev-ruby/redcloth/redcloth-4.2.9-r1.ebuild b/dev-ruby/redcloth/redcloth-4.2.9-r1.ebuild
index 1c2ae8f7e5fe..f2ece8249b60 100644
--- a/dev-ruby/redcloth/redcloth-4.2.9-r1.ebuild
+++ b/dev-ruby/redcloth/redcloth-4.2.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/dev-ruby/redcloth/redcloth-4.2.9-r1.ebuild,v 1.6 2014/06/29 18:49:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/redcloth/redcloth-4.2.9-r1.ebuild,v 1.7 2014/07/15 14:41:36 phajdan.jr Exp $
EAPI=5
@@ -30,7 +30,7 @@ RUBY_S="${GITHUB_USER}-${PN}-*"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND+=" dev-util/ragel"
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8.ebuild
index 56afe45af44e..b4bbce257927 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8.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/rrdtool-bindings/rrdtool-bindings-1.4.8.ebuild,v 1.3 2014/05/20 09:05:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8.ebuild,v 1.4 2014/07/15 13:55:26 jer Exp $
EAPI="5"
@@ -20,11 +20,11 @@ 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"
-IUSE=""
# Block on older versions of rrdtool that install the bindings themselves.
-RDEPEND="${RDEPEND} net-analyzer/rrdtool !! circuit_macros-${PV}.tar.gz"
+
+LICENSE="LPPL-1.3c"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples +script"
+
+DEPEND=""
+RDEPEND="|| ( app-text/texlive[graphics] app-text/texlive[pstricks] )
+ media-gfx/dpic
+ sys-devel/m4
+ script? ( app-text/texlive[graphics]
+ dev-texlive/texlive-latexextra )"
+
+S="${WORKDIR}/Circuit_macros${PV}"
+
+src_compile() {
+ :
+}
+
+src_install() {
+ insinto /usr/share/${PN}
+ doins *.m4
+ insinto /usr/share/texmf-site/tex/latex/${PN}
+ doins boxdims.sty
+ dodoc README CHANGES Makefile doc/CMman.pdf
+ rm -f doc/CMman.pdf
+ use doc && dodoc -r doc
+ use examples && dodoc -r examples
+ use script && dobin "${FILESDIR}/cm2pdf"
+ docompress -x \
+ /usr/share/doc/${PF}/Makefile \
+ /usr/share/doc/${PF}/doc \
+ /usr/share/doc/${PF}/examples
+}
+
+pkg_postinst() {
+ etexmf-update
+ use script && einfo "cm2pdf was installed to automatically create PDFs. Run cm2pdf --help for usage help."
+}
+
+pkg_postrm() {
+ etexmf-update
+}
diff --git a/games-action/extreme-tuxracer/Manifest b/games-action/extreme-tuxracer/Manifest
index a13756511904..b10a054370cd 100644
--- a/games-action/extreme-tuxracer/Manifest
+++ b/games-action/extreme-tuxracer/Manifest
@@ -1,3 +1 @@
DIST etr-0.6.0.tar.xz 32889668 SHA256 44312719a1e9aa33e5aa0c8ad50bb52df702d64fd2d16bf2abda62ee27bf893a SHA512 c3127dd1f8d9b856cc42808713a53b48a64821f020ecf3bfaae8be96e36eaddfadfedcf394d445ea1f49df650763b50d35a5ad9cac03308bcb1a4a473e4906d8 WHIRLPOOL d003d5ef070ed15d4521cc2025ceb372b18b69f3172065159b5fd18bf5f2126da4cc8c179b95311c63afd5093ec2700483697544ade7ad02e1f255e1cdfc44e4
-DIST extremetuxracer-0.4.tar.gz 28749072 SHA256 5e4057f90e6854e774f251f189b0e676cfd7e2f15779c75544c9ac5b8e30273d SHA512 2de5342a0ae3aebd1e5999cab5672b260d797ef01be4f2771ea25eae13fdce6bee1734818b8b6c2c979bfae3ff14121120dd4ad68264c326b950f56de945e940 WHIRLPOOL 3c0bdbbfe92ab386473daebe612c27b910a4918ce9f0287e3c416d498308d9f8f11d874ef10954499d6fd992153eaae1190397aca3047e67a9d26fb8ff4a333d
-DIST extremetuxracer-0.5beta.tar.gz 43524138 SHA256 ba7fa156361cc6015ad2a1563ec7f05cdbf701f75177795562b528ebb44ba911 SHA512 495a8256938beaba7c02ed629a6ca8448c90da6eefab8cf24703320e575351d93468a8969f758bbce22d193d1da340eebbb102999bb187399d20c7daee7dec78 WHIRLPOOL 375cf26eb762a3be8807020aa211f48efc99f6ce8641d91dcb5c258dc40bb449590e47867c615cdd4ae4787d369e3948a034d19b8a52f0b2f2a303c1bb5063fe
diff --git a/games-action/extreme-tuxracer/extreme-tuxracer-0.4.ebuild b/games-action/extreme-tuxracer/extreme-tuxracer-0.4.ebuild
deleted file mode 100644
index 13014b90b243..000000000000
--- a/games-action/extreme-tuxracer/extreme-tuxracer-0.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/extreme-tuxracer/extreme-tuxracer-0.4.ebuild,v 1.9 2012/08/22 18:55:03 mr_bones_ Exp $
-
-EAPI=2
-inherit eutils games
-
-DESCRIPTION="High speed arctic racing game based on Tux Racer"
-HOMEPAGE="http://www.extremetuxracer.com/"
-SRC_URI="mirror://sourceforge/${PN/-}/${P/-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="virtual/opengl
- dev-lang/tcl
- virtual/glu
- media-libs/libsdl[X]
- media-libs/sdl-mixer[mod]
- >=media-libs/freetype-2
- media-libs/libpng
- x11-libs/libXmu
- x11-libs/libXi"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${P/-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc AUTHORS ChangeLog
- doicon "${FILESDIR}"/${PN}.svg
- make_desktop_entry etracer "Extreme Tux Racer" ${PN}
- prepgamesdirs
-}
diff --git a/games-action/extreme-tuxracer/extreme-tuxracer-0.5_beta.ebuild b/games-action/extreme-tuxracer/extreme-tuxracer-0.5_beta.ebuild
deleted file mode 100644
index 0a9bc1865ab4..000000000000
--- a/games-action/extreme-tuxracer/extreme-tuxracer-0.5_beta.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/extreme-tuxracer/extreme-tuxracer-0.5_beta.ebuild,v 1.7 2014/05/15 16:22:21 ulm Exp $
-
-EAPI=2
-inherit eutils games
-
-DESCRIPTION="High speed arctic racing game based on Tux Racer"
-HOMEPAGE="http://www.extremetuxracer.com/"
-SRC_URI="mirror://sourceforge/extremetuxracer/extremetuxracer-${PV/_/}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND="virtual/opengl
- virtual/glu
- dev-lang/tcl
- media-libs/libsdl[X,sound,video]
- media-libs/sdl-mixer[mod,vorbis]
- media-libs/freetype:2
- media-libs/libpng
- x11-libs/libXmu
- x11-libs/libXi
- virtual/libintl"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
- virtual/pkgconfig"
-
-S=${WORKDIR}/${P/_}
-
-src_prepare() {
- sed -i \
- -e '/^localedir/s:=.*:=@localedir@:' \
- src/Makefile.in \
- || die "sed failed"
-
- epatch "${FILESDIR}"/${P}-libpng14.patch
-}
-
-src_configure() {
- egamesconf \
- --disable-dependency-tracking \
- --localedir=/usr/share/locale \
- $(use_enable nls)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc AUTHORS ChangeLog
- doicon "${FILESDIR}"/${PN}.svg
- make_desktop_entry etracer "Extreme Tux Racer"
- prepgamesdirs
-}
diff --git a/games-action/extreme-tuxracer/files/extreme-tuxracer-0.5_beta-libpng14.patch b/games-action/extreme-tuxracer/files/extreme-tuxracer-0.5_beta-libpng14.patch
deleted file mode 100644
index 020fd9b872d1..000000000000
--- a/games-action/extreme-tuxracer/files/extreme-tuxracer-0.5_beta-libpng14.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=308651
-
---- src/ppgltk/images/png_reader.cpp
-+++ src/ppgltk/images/png_reader.cpp
-@@ -77,7 +77,7 @@ ReaderPNG::ReaderPNG(const char *fileNam
-
-
- png_get_IHDR(png_ptr, info_ptr, &width, &height,
-- &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
-+ &bit_depth, &color_type, &interlace_type,(int *) NULL, (int *) NULL);
-
- if(bit_depth == 16)
- png_set_strip_16(png_ptr);
-@@ -88,7 +88,7 @@ ReaderPNG::ReaderPNG(const char *fileNam
- png_set_expand(png_ptr);
- png_read_update_info(png_ptr, info_ptr);
- png_get_IHDR(png_ptr, info_ptr, &width, &height,
-- &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
-+ &bit_depth, &color_type, &interlace_type,(int *) NULL, (int *) NULL);
- }
-
- if( color_type == PNG_COLOR_TYPE_GRAY ||
-@@ -96,7 +96,7 @@ ReaderPNG::ReaderPNG(const char *fileNam
- png_set_gray_to_rgb(png_ptr);
- png_read_update_info(png_ptr, info_ptr);
- png_get_IHDR(png_ptr, info_ptr, &width, &height,
-- &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
-+ &bit_depth, &color_type, &interlace_type,(int *) NULL, (int *) NULL);
- }
-
- this->width=width;
-@@ -114,7 +114,7 @@ ReaderPNG::ReaderPNG(const char *fileNam
- }
-
- png_read_end(png_ptr, info_ptr);
-- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
-+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- fclose(fp);
- }
-
diff --git a/games-action/slune/slune-1.0.15.ebuild b/games-action/slune/slune-1.0.15.ebuild
deleted file mode 100644
index 3c6e2373befa..000000000000
--- a/games-action/slune/slune-1.0.15.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/slune/slune-1.0.15.ebuild,v 1.3 2011/04/06 19:56:01 arfrever Exp $
-
-EAPI=3
-PYTHON_DEPEND="2"
-inherit python distutils
-
-DESCRIPTION="A 3D action game with multiplayer mode and amazing graphics"
-HOMEPAGE="http://oomadness.tuxfamily.org/en/slune/"
-SRC_URI="http://download.gna.org/slune/Slune-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="virtual/opengl
- >=media-libs/libsdl-1.2.6
- >=dev-python/soya-0.9
- >=dev-python/py2play-0.1.9
- >=dev-python/pyopenal-0.1.3
- >=dev-python/pyogg-1.1
- >=dev-python/pyvorbis-1.1"
-
-S=${WORKDIR}/Slune-${PV}
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- python_convert_shebangs -r 2 .
- distutils_src_prepare
-}
diff --git a/games-arcade/vor/Manifest b/games-arcade/vor/Manifest
index 51d14ea39ddd..c17903091bbc 100644
--- a/games-arcade/vor/Manifest
+++ b/games-arcade/vor/Manifest
@@ -1,2 +1 @@
-DIST vor-0.5.4.tar.bz2 196413 SHA256 33b56e5c65b1926a0f093c6512fa5949ae9336d928b8d8a805f760c9025bc2aa SHA512 efb4bc155cceadad60a316f0f2d70fd6edf67821529373332576fdae7bc0d74a93c862856d79318fb488a3564fe3172d18d59406e618ce1d13a0f3676999cfdf WHIRLPOOL 11a50615bbc70b911d9962afb7500536b7992d1d984f11d438e2ed0995edef48483d0b289044d791900290e3451c3c04978e94436ac6682992b997c8aa16a94a
DIST vor-0.5.5.tar.bz2 239291 SHA256 ead1b9786741e26d37ff7c5185b7fe1e91f90f76ebed3785225312e323b7c7da SHA512 a4de43699b78adfe28bbd773cd9f9d1e3ee50b51b4e1848ff1baf836f6242d8391a304445994ca669eab13acbd2dd3ae49f0665bdb07d19c7a1674e0dde9bfbd WHIRLPOOL d0a63aa4b0c42e234593ed9ba09017ef3ab1a00de8ba8580dffefcd88ea0d09c8bc4e1d7edf6ef10cee319d1c17db9fef024aa6ffb495462cc97bf90ad8dbc46
diff --git a/games-arcade/vor/files/vor-0.5.4-underlink.patch b/games-arcade/vor/files/vor-0.5.4-underlink.patch
deleted file mode 100644
index 0d2745218e1c..000000000000
--- a/games-arcade/vor/files/vor-0.5.4-underlink.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.old 2011-05-19 09:48:26.698819456 +0200
-+++ Makefile 2011-05-19 16:40:54.526390959 +0200
-@@ -29,7 +29,7 @@
- sdl-cflags := $(shell sdl-config --cflags)
- sdl-ldflags := $(shell sdl-config --libs)
-
--ldflags := $(sdl-ldflags) -lSDL_image -lSDL_mixer $(LDFLAGS)
-+LDLIBS := $(sdl-ldflags) -lSDL_image -lSDL_mixer -lm
- cflags := $(sdl-cflags) $(paths) $(CFLAGS)
-
- my_objects := args.o dust.o file.o mt.o rocks.o score.o sprite.o sound.o autopilot.o
-@@ -89,7 +89,7 @@
- sprite.o: sprite.h common.h
-
- vor: $(objects)
-- $(CC) $^ $(ldflags) -o $@
-+ $(LINK.c) $^ $(LOADLIBES) $(LDLIBS) -o $@
-
- include gfx.mk
-
diff --git a/games-arcade/vor/vor-0.5.4.ebuild b/games-arcade/vor/vor-0.5.4.ebuild
deleted file mode 100644
index f1f1ee2a9e60..000000000000
--- a/games-arcade/vor/vor-0.5.4.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/games-arcade/vor/vor-0.5.4.ebuild,v 1.5 2012/08/24 07:49:43 mr_bones_ Exp $
-
-EAPI=2
-inherit eutils games
-
-DESCRIPTION="Variations on Rockdodger: Dodge the rocks until you die"
-HOMEPAGE="http://jasonwoof.org/vor"
-SRC_URI="http://qualdan.com/vor/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl
- media-libs/sdl-image[png]
- media-libs/sdl-mixer[mod]"
-
-PATCHES=( "${FILESDIR}"/${P}-underlink.patch )
-
-src_compile() {
- emake \
- CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- pkgdatadir="${GAMES_DATADIR}"/${PN} \
- || die "emake failed"
-}
-
-src_install() {
- dogamesbin ${PN} || die "dogamesbin failed"
- insinto "${GAMES_DATADIR}"/${PN}
- doins data/* || die "doins failed"
- newicon data/icon.png ${PN}.png
- make_desktop_entry ${PN} VoR
- dodoc README todo
- prepgamesdirs
-}
diff --git a/games-board/domination/Manifest b/games-board/domination/Manifest
index e8f2bc56ecfb..3d3e3fdff812 100644
--- a/games-board/domination/Manifest
+++ b/games-board/domination/Manifest
@@ -1,2 +1 @@
-DIST Domination_1.1.1.2.zip 5998523 SHA256 edd8eab16d4d66f1365ba7aa1696b536458762962a61423a34b0e3a47b4f94bf SHA512 7058c17cef649e5149dd1a10e3cd3283d927998f07761a7f8078058d6776e0234ac798f47f1aa15f9980defbda006b3dbe7bd07e8633c9139aa7ce6cc152615e WHIRLPOOL 107e853d8063881cecc89b4a5a2712443f9d933fec1b28cf419267f93e05d2e9d46352bd2aeaf0fb25fefb497f0adab3a819241ba56eb0a92c470fc8db3d8201
DIST Domination_1.1.1.5.zip 6390032 SHA256 6e0dd1c869679cc80c7904d6512cf9f6fc858a985b60c5a33f3f3291d716f740 SHA512 116d96aded29f60e71eacc8069c6b9ad3b2e8b7e44ed06c730cdaf8e1de4b95650e928e1876feb6bcb08697cd6eaedf1529cf323855e2da652855d07e8337360 WHIRLPOOL cd3de0950075f6330931f0847bd048d9919afc6009bfe99b7f3f6bed09a1b7ade30ad918af23139db2b15baacfe79845d3ce75c42463c5aa59603d141639b251
diff --git a/games-board/domination/domination-1.1.1.2.ebuild b/games-board/domination/domination-1.1.1.2.ebuild
deleted file mode 100644
index 1781476909fb..000000000000
--- a/games-board/domination/domination-1.1.1.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/domination/domination-1.1.1.2.ebuild,v 1.3 2013/01/13 11:31:14 ago Exp $
-
-inherit eutils java-pkg-2 java-ant-2 games
-
-DESCRIPTION="The well-known board game, written in java"
-HOMEPAGE="http://domination.sourceforge.net"
-SRC_URI="mirror://sourceforge/domination/Domination_${PV}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4
- app-arch/unzip"
-
-S=${WORKDIR}/Domination
-
-pkg_setup() {
- games_pkg_setup
- java-pkg-2_pkg_setup
-}
-
-EANT_BUILD_TARGET="game"
-
-src_compile() {
- java-pkg-2_src_compile
-}
-
-src_install() {
- mkdir -p "${D}${GAMES_PREFIX}"/bin
- cp "${S}"/FlashGUI.sh "${D}${GAMES_PREFIX}"/bin/${PN} || die
- sed -i \
- -e "s|cd.*|cd \"${GAMES_DATADIR}\"/${PN}|" \
- "${D}${GAMES_PREFIX}"/bin/${PN} \
- || die
- chmod +x "${D}${GAMES_PREFIX}"/bin/${PN} || die
-
- insinto "${GAMES_DATADIR}/${PN}"
- doins -r "${S}"/* || die
- rm -f "${D}${GAMES_DATADIR}"/${PN}/*.cmd || die
- java-pkg_regjar "${D}/${GAMES_DATADIR}/${PN}"/*.jar
-
- newicon resources/icon.png ${PN}.png
- make_desktop_entry ${PN} "Domination"
-
- prepgamesdirs
-}
diff --git a/games-board/pokerth/Manifest b/games-board/pokerth/Manifest
index b0d2ef94b988..4934c75da673 100644
--- a/games-board/pokerth/Manifest
+++ b/games-board/pokerth/Manifest
@@ -1,2 +1 @@
-DIST PokerTH-1.0.1-src.tar.bz2 19201790 SHA256 29c359028a27fad0d30e11a9295e610593d23e34bffdb71de488f63f459e3d5d SHA512 b91fe3780eab3a7bd9ffe6f3629f514f87d9962978f42822850a826278febe2e06fbf3397df9d66d4d3d3d3f9d5688715308f4aae4bda5084b9d0b10a4af75d8 WHIRLPOOL cc7dba615a00c5a305abde3cae620ceff8557eb22040c436703bcbf0d3f54b95073573267f5a9326f1fd6fd872db9177d9371832646ce09658db12636e767f5b
DIST PokerTH-1.1.1-src.tar.bz2 19326922 SHA256 afe6d3887d2fdf92fd6d89ee2951d3b14a0d43b70dba858d32d41214a5357388 SHA512 bd822d15747d94b67657ea2fd0b9c8c1bdad0031a6eae30380217387a702e5f648d6f612b1bff0355c3c301ecaf47ca9d635a526e575f1bc1c5f88e38a7f73c1 WHIRLPOOL 64fe03bbd2a4511c4d8c276cb0ee4a8f5913fe959a389578436098bd0546813d2bc47cb3ae1bcac4124a7bb843894bfce91c5e526cc66eb6912f60f98312f841
diff --git a/games-board/pokerth/files/pokerth-1.0.1-underlinking.patch b/games-board/pokerth/files/pokerth-1.0.1-underlinking.patch
deleted file mode 100644
index 397fb7d6c1bc..000000000000
--- a/games-board/pokerth/files/pokerth-1.0.1-underlinking.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Julian Ospald
-Date: Thu Aug 16 22:25:12 UTC 2012
-Subject: build system
-
-fix compilation for linkers that don't permit underlinking
-reorder linker line to fix issues with as-needed
-
---- pokerth_server.pro
-+++ pokerth_server.pro
-@@ -114,8 +114,8 @@
- LIBS += -lpokerth_lib \
- -lpokerth_db \
- -lpokerth_protocol \
-- -lcurl \
-- -lircclient
-+ -lircclient \
-+ $$system(pkg-config --libs --static libcurl)
-
- win32 {
- DEFINES += CURL_STATICLIB
diff --git a/games-board/pokerth/pokerth-1.0.1.ebuild b/games-board/pokerth/pokerth-1.0.1.ebuild
deleted file mode 100644
index 36b8abc30059..000000000000
--- a/games-board/pokerth/pokerth-1.0.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/pokerth/pokerth-1.0.1.ebuild,v 1.7 2014/03/01 22:25:50 mgorny Exp $
-
-EAPI=5
-inherit flag-o-matic eutils qt4-r2 games
-
-MY_P="PokerTH-${PV}-src"
-DESCRIPTION="Texas Hold'em poker game"
-HOMEPAGE="http://www.pokerth.net/"
-SRC_URI="mirror://sourceforge/pokerth/${MY_P}.tar.bz2"
-
-LICENSE="AGPL-3 GPL-1 GPL-2 GPL-3 BitstreamVera public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="dedicated"
-
-RDEPEND="dev-db/sqlite:3
- dev-libs/boost[threads(+)]
- dev-libs/protobuf
- dev-libs/libgcrypt:0
- dev-libs/tinyxml[stl]
- amd64? ( net-libs/libircclient )
- ppc? ( >=net-libs/libircclient-1.6-r2 )
- x86? ( net-libs/libircclient )
- >=net-misc/curl-7.16
- dev-qt/qtcore:4
- virtual/gsasl
- !dedicated? (
- media-libs/libsdl:0
- media-libs/sdl-mixer[mod,vorbis]
- dev-qt/qtgui:4
- )"
-DEPEND="${RDEPEND}
- !dedicated? ( dev-qt/qtsql:4 )
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- if use dedicated ; then
- sed -i \
- -e 's/pokerth_game.pro//' \
- pokerth.pro || die
- fi
-
- sed -i \
- -e '/no_dead_strip_inits_and_terms/d' \
- *pro || die
-
- epatch "${FILESDIR}"/${P}-underlinking.patch
-}
-
-src_configure() {
- eqmake4
-}
-
-src_install() {
- dogamesbin bin/pokerth_server
- if ! use dedicated ; then
- dogamesbin ${PN}
- insinto "${GAMES_DATADIR}/${PN}"
- doins -r data
- domenu ${PN}.desktop
- doicon ${PN}.png
- fi
- doman docs/pokerth.1
- dodoc ChangeLog TODO docs/{gui_styling,server_setup}_howto.txt
- prepgamesdirs
-}
diff --git a/games-emulation/emutos/Manifest b/games-emulation/emutos/Manifest
index 39d070efb0e0..ba51c9f92b74 100644
--- a/games-emulation/emutos/Manifest
+++ b/games-emulation/emutos/Manifest
@@ -1,7 +1,5 @@
DIST emutos-256k-0.8.5.zip 1060920 SHA256 fab55e8f0e45220e8263d89d3cdff9e465c6a52214f6a91e752ff257d1dfec75 SHA512 42ef1ad90dba755214da10d4ee4acc7bbe847c125944562ae141dadc4958933f08dc7654d8e34f97c5595ba3706531eb53ca52f31725876613a324100ba5635f WHIRLPOOL 6a4af2975eb6254dedc73d8253950d946792365cbb31d0946a67edd1d7836c53f91ce86adff23c37ea64f9ffad1296dcbc8b8ae433b18683a7bbe2f263065ffd
-DIST emutos-256k-0.8.7.zip 1519299 SHA256 43ac8dbdc03bf89ed683692ca3ab2d59d7997262e461a69f09c7918ccd38b1c0 SHA512 096a30ab59c58e04bfdbe5220235995d102e524f7dfb0c35d983d31058fa2af2fbc9ac862f46bdbf1fa918f17e66fe67646bab1450cd88ebeaf7503db007be55 WHIRLPOOL 06be71f044999fad8fa5ace3507c6b6713e8ecc1f8d2b085f34004583c986bce27bdfd7477c4ef1b8ad749d5dd75754b3f2681bc6fee0ce299b39b9f8943913a
DIST emutos-256k-0.9.3.zip 1573051 SHA256 1345274293ef8dc749e90652e085c34d87417c74aa1b94dc7b537d299a19600a SHA512 f5ad9223169b713d932ee3f5f986eef127f3f5d7d6a54ad272738034fda8436b69055937edbce335256edafef44466c4e34e932f2807c25fa099ce07f3410dde WHIRLPOOL 6a634a35f0850d0e76a696d3f3d70d30ae76a4b95fc3efdc1aa6c2a49756cc22863b6034a46efb1e0c4e079af75b375eb58d405f19b1029e407e6dedd4269790
DIST emutos-512k-0.8.5.zip 213435 SHA256 542042a9d816104e27fda0fbd35bbb20dd19337fa6e9d6fbbf15a52fb7890ca1 SHA512 d8ca973558d19cffc4900e2bf42b6f0c77c9ace1c5e515be136445e4d081f8e19d392475479fc97c3f4e26cb49e175b123ac62c540f2059f29a4c13e633ca477 WHIRLPOOL be538d5790bbf97794fad77541c0c1b71f3809a6b6cafbe579c0f6596d6c72eb74e2488faec95a5c196e231c99d899501ae93c0226781938339f477421a05cc7
-DIST emutos-512k-0.8.7.zip 254887 SHA256 e11cc584ea0a40975cd35d6e2635796fcddc16834831cd227982218dab18d71c SHA512 6cffa9708c884a85d1eb8c6b3c86e7a74e941a0141dff14a8a38865c1b211ecb0079f7151b4069dcffb9fd178d833e4ae280089a130c215f4c0e2a4704b7b68d WHIRLPOOL ee837a668671afb61f7689bd949bc2acd6f062181262a2cf5cad273b139120dc0d92ba2d085da606c76cce965016a68d60223ef95e42064c3cf909718cc3b9b2
DIST emutos-512k-0.9.3.zip 289576 SHA256 2220abe4b75e6f0709327446a5ac553d8365e2e22cc0c57d755085f272fbf5f0 SHA512 5f99f817813e90b65c19753b2cc68a1f1c8652e9a9dbe0d6241503bae2d196c04ef775a68c728e654860772cac8258ae839fa0204657d56d55a112d2a91386de WHIRLPOOL 2a32f2d968a166da64d57518e40cfb228b357a16e9d0ca44750c9e6043de828dd2721e4aec2338d3c1fa19928c56a9730c9aaf29a55d5c060bb8f0b7ee3b54c6
DIST emutos-src-0.9.3.tar.gz 935570 SHA256 a22098e732e59d979a34c1131a87bca9701bd26a616df20329286cdcb9c9ed8c SHA512 45e19a9f8ebbd1675059a78d1416d0571bc54c3979b36c684f2394f508f48f6f1dae10f4eb966e1757ff10698644302c788ee3e51bf42fe10d131d87508d9824 WHIRLPOOL 07e2d054c4dd395594e264ebccecacb44479e9981b3f162025b2ebfaa9b5c0c83475bd751c4423f6a7d60bc6701d8205a7898a40f7b8f09dbba0ee0b6c889d05
diff --git a/games-emulation/emutos/emutos-0.8.7.ebuild b/games-emulation/emutos/emutos-0.8.7.ebuild
deleted file mode 100644
index 28e4b5061ac7..000000000000
--- a/games-emulation/emutos/emutos-0.8.7.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/games-emulation/emutos/emutos-0.8.7.ebuild,v 1.1 2013/02/02 00:04:07 hasufell Exp $
-
-inherit games
-
-DESCRIPTION="a single-user single-tasking operating system for 32 bit Atari computer emulators"
-HOMEPAGE="http://emutos.sourceforge.net"
-SRC_URI="mirror://sourceforge/emutos/emutos-512k-${PV}.zip
- mirror://sourceforge/emutos/emutos-256k-${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-src_install() {
- dogameslib */*.img || die "dogameslib failed"
- dodoc emutos-512k-${PV}/{readme.txt,doc/{announce,authors,changelog,status}.txt}
- prepgamesdirs
-}
diff --git a/games-emulation/hatari/Manifest b/games-emulation/hatari/Manifest
index b9904acc79f4..8af91ede7498 100644
--- a/games-emulation/hatari/Manifest
+++ b/games-emulation/hatari/Manifest
@@ -1,3 +1,2 @@
-DIST hatari-1.5.0.tar.bz2 1570048 SHA256 0cb9c627ea6942bc60908c3a59b4b5c86a54e5bd0551cd95d8cff76bbde61e7f SHA512 a0f2351de3dde79e0f5e204ffb8b13574b1cab43e1c5d4190411afc934398bfe2b6b389285b99722d01f7b9eebc1166690e84e0fddf6fe62c32a9cc33c356bca WHIRLPOOL 43776691ad1b62647c001dfc7b489cc29e6c9fcb2ee1f300227e776b62177de31ab85fdd9f68f640882c0a99e50ddd301adcd65e6c770754a1e23582fdaaef55
-DIST hatari-1.6.1.tar.bz2 1777736 SHA256 f6142b4d0c8f1731f990fcc4cf125d9b7a1822384c46e6af79058a461443e853 SHA512 e21ccc30dded5b28471246ee1b941981d9736f6cdc915b642fe987f9d36e712bc58f874a43807e64f32e581032d1593672651faad5616dec2fdf5741ce15824e WHIRLPOOL c639a238d6cef8ad918ad608c75b1a64b959fbeb3f108a43b65668ae5b0099dd68544e351c9efd5e02469fb1ec83833702d6ef09212921b30918fe18be732c54
DIST hatari-1.6.2.tar.bz2 1739570 SHA256 20de0430eb8950d206e9df4d8088fa759625e23390e7604484e351d030761b3f SHA512 b6486f0f29fd63458a9b8a040ba26d4902754186e00bfd296d3ddb47b9ff58073f9afb450248ecb715f0d00f754895ba14fc9c8867bb1ddb0cc15d9efa8d4827 WHIRLPOOL 27298778609295ade265e36f7536d4ce9b7b88fd51f47f9288c1c05b6f2ab6c604ced225b709de73278724f71f70a7d6ed145590df5cd9e0f420a7839ae5b85d
+DIST hatari-1.7.0.tar.bz2 2254241 SHA256 2056d12807cb827585f337912238492f8b66b7ff3d9d0628090e58209a519e4d SHA512 bb142e4c2264752e465d9916ab7569db0179e4ac42d6bd197421e434bd58cc8c6ce82285b9d4983b648c3e79f1f39e7ade8f1b7a598664063f812dc6941d898c WHIRLPOOL c2941ea31d042622fc6f19d495595ce4d61efa6089cc6d536fef2cbc710ddbb6c259989838590bc9ac711cdf08be392553534b27a799e31eebaccbae3ba76d2f
diff --git a/games-emulation/hatari/files/hatari-1.6.1-gentoo.patch b/games-emulation/hatari/files/hatari-1.6.1-gentoo.patch
deleted file mode 100644
index 4f10d6d9e3ce..000000000000
--- a/games-emulation/hatari/files/hatari-1.6.1-gentoo.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- hatari-1.4.0.orig/src/paths.c
-+++ hatari-1.4.0/src/paths.c
-@@ -109,71 +109,6 @@
- free(pTmpName);
- }
-
--
--/**
-- * Locate the directory where the hatari executable resides
-- */
--static char *Paths_InitExecDir(const char *argv0)
--{
-- char *psExecDir; /* Path string where the hatari executable can be found */
--
-- /* Allocate memory for storing the path string of the executable */
-- psExecDir = malloc(FILENAME_MAX);
-- if (!psExecDir)
-- {
-- fprintf(stderr, "Out of memory (Paths_Init)\n");
-- exit(-1);
-- }
--
-- /* Determine the bindir...
-- * Start with empty string, then try to use OS specific functions,
-- * and finally analyze the PATH variable if it has not been found yet. */
-- psExecDir[0] = '\0';
--
--#if defined(__linux__)
-- {
-- int i;
-- /* On Linux, we can analyze the symlink /proc/self/exe */
-- i = readlink("/proc/self/exe", psExecDir, FILENAME_MAX);
-- if (i > 0)
-- {
-- char *p;
-- psExecDir[i] = '\0';
-- p = strrchr(psExecDir, '/'); /* Search last slash */
-- if (p)
-- *p = 0; /* Strip file name from path */
-- }
-- }
--//#elif defined(WIN32) || defined(__CEGCC__)
--// /* On Windows we can use GetModuleFileName for getting the exe path */
--// GetModuleFileName(NULL, psExecDir, FILENAME_MAX);
--#endif
--
-- /* If we do not have the execdir yet, analyze argv[0] and the PATH: */
-- if (psExecDir[0] == 0)
-- {
-- if (strchr(argv0, PATHSEP) == 0)
-- {
-- /* No separator in argv[0], we have to explore PATH... */
-- Paths_GetExecDirFromPATH(argv0, psExecDir, FILENAME_MAX);
-- }
-- else
-- {
-- /* There was a path separator in argv[0], so let's assume a
-- * relative or absolute path to the current directory in argv[0] */
-- char *p;
-- strncpy(psExecDir, argv0, FILENAME_MAX);
-- psExecDir[FILENAME_MAX-1] = 0;
-- p = strrchr(psExecDir, PATHSEP); /* Search last slash */
-- if (p)
-- *p = 0; /* Strip file name from path */
-- }
-- }
--
-- return psExecDir;
--}
--
--
- /**
- * Initialize the users home directory string
- * and Hatari's home directory (~/.hatari)
-@@ -226,8 +161,6 @@
- */
- void Paths_Init(const char *argv0)
- {
-- char *psExecDir; /* Path string where the hatari executable can be found */
--
- /* Init working directory string */
- if (getcwd(sWorkingDir, FILENAME_MAX) == NULL)
- {
-@@ -238,27 +171,11 @@
- /* Init the user's home directory string */
- Paths_InitHomeDirs();
-
-- /* Get the directory where the executable resides */
-- psExecDir = Paths_InitExecDir(argv0);
--
-- /* Now create the datadir path name from the bindir path name: */
-- if (psExecDir && strlen(psExecDir) > 0)
-- {
-- snprintf(sDataDir, sizeof(sDataDir), "%s%c%s",
-- psExecDir, PATHSEP, BIN2DATADIR);
-- }
-- else
-- {
-- /* bindir could not be determined, let's assume datadir is relative
-- * to current working directory... */
-- strcpy(sDataDir, BIN2DATADIR);
-- }
-+ strcpy(sDataDir, BIN2DATADIR);
-
- /* And finally make a proper absolute path out of datadir: */
- File_MakeAbsoluteName(sDataDir);
-
-- free(psExecDir);
--
- /* fprintf(stderr, " WorkingDir = %s\n DataDir = %s\n UserHomeDir = %s\n HatariHomeDir = %s\n",
- sWorkingDir, sDataDir, sUserHomeDir, sHatariHomeDir); */
- }
diff --git a/games-emulation/hatari/files/hatari-1.6.1-gentoo-docdir.patch b/games-emulation/hatari/files/hatari-1.7.0-gentoo-docdir.patch
similarity index 100%
rename from games-emulation/hatari/files/hatari-1.6.1-gentoo-docdir.patch
rename to games-emulation/hatari/files/hatari-1.7.0-gentoo-docdir.patch
diff --git a/games-emulation/hatari/files/hatari-1.5.0-gentoo.patch b/games-emulation/hatari/files/hatari-1.7.0-gentoo.patch
similarity index 100%
rename from games-emulation/hatari/files/hatari-1.5.0-gentoo.patch
rename to games-emulation/hatari/files/hatari-1.7.0-gentoo.patch
diff --git a/games-emulation/hatari/hatari-1.5.0.ebuild b/games-emulation/hatari/hatari-1.5.0.ebuild
deleted file mode 100644
index 4c143bd4bf3c..000000000000
--- a/games-emulation/hatari/hatari-1.5.0.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/games-emulation/hatari/hatari-1.5.0.ebuild,v 1.8 2014/05/15 16:37:13 ulm Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs cmake-utils games
-
-DESCRIPTION="Atari ST emulator"
-HOMEPAGE="http://hatari.berlios.de/"
-SRC_URI="mirror://berlios/hatari/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="media-libs/libsdl[X,sound,video]
- sys-libs/readline
- media-libs/libpng
- sys-libs/zlib"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-RDEPEND="${RDEPEND}
- games-emulation/emutos"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.patch
- # build with newer zlib (bug #387829)
- sed -i -e '1i#define OF(x) x' src/includes/unzip.h || die
- rm -f doc/CMakeLists.txt
-}
-
-src_configure() {
- mycmakeargs=(
- "-DCMAKE_VERBOSE_MAKEFILE=TRUE"
- "-DCMAKE_BUILD_TYPE:STRING=Release"
- "-DDATADIR=${GAMES_DATADIR}/${PN}"
- "-DBIN2DATADIR=${GAMES_DATADIR}/${PN}"
- "-DBINDIR=${GAMES_BINDIR}"
- "-DICONDIR=/usr/share/pixmaps"
- "-DDESKTOPDIR=/usr/share/applications"
- "-DMANDIR=/usr/share/man/man1"
- "-DDOCDIR=/usr/share/doc/${PF}"
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- DOCS="readme.txt doc/*.txt" cmake-utils_src_install
- dohtml -r doc/
- prepgamesdirs
-}
-
-pkg_postinst() {
- games_pkg_postinst
- echo
- elog "You need a TOS ROM to run hatari. EmuTOS, a free TOS implementation,"
- elog "has been installed in $(games_get_libdir) with a .img extension (there"
- elog "are several from which to choose)."
- elog
- elog "Another option is to go to http://www.atari.st/ and get a real TOS:"
- elog " http://www.atari.st/"
- elog
- elog "The first time you run hatari, you should configure it to find the"
- elog "TOS you prefer to use. Be sure to save your settings."
- echo
-}
diff --git a/games-emulation/hatari/hatari-1.6.1.ebuild b/games-emulation/hatari/hatari-1.6.1.ebuild
deleted file mode 100644
index 3685ae03b8d9..000000000000
--- a/games-emulation/hatari/hatari-1.6.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/hatari/hatari-1.6.1.ebuild,v 1.7 2014/05/15 16:37:13 ulm Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs cmake-utils games
-
-DESCRIPTION="Atari ST emulator"
-HOMEPAGE="http://hatari.berlios.de/"
-SRC_URI="http://download.tuxfamily.org/hatari/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="media-libs/libsdl[X,sound,video]
- sys-libs/readline
- media-libs/libpng
- sys-libs/zlib"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-RDEPEND="${RDEPEND}
- games-emulation/emutos"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.patch
- # build with newer zlib (bug #387829)
- sed -i -e '1i#define OF(x) x' src/includes/unzip.h || die
- sed -i -e '/Encoding/d' ./python-ui/hatariui.desktop || die
- rm -f doc/CMakeLists.txt
-}
-
-src_configure() {
- mycmakeargs=(
- "-DCMAKE_VERBOSE_MAKEFILE=TRUE"
- "-DCMAKE_BUILD_TYPE:STRING=Release"
- "-DDATADIR=${GAMES_DATADIR}/${PN}"
- "-DBIN2DATADIR=${GAMES_DATADIR}/${PN}"
- "-DBINDIR=${GAMES_BINDIR}"
- "-DICONDIR=/usr/share/pixmaps"
- "-DDESKTOPDIR=/usr/share/applications"
- "-DMANDIR=/usr/share/man/man1"
- "-DDOCDIR=/usr/share/doc/${PF}"
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- DOCS="readme.txt doc/*.txt" cmake-utils_src_install
- dohtml -r doc/
- prepgamesdirs
-}
-
-pkg_postinst() {
- games_pkg_postinst
- echo
- elog "You need a TOS ROM to run hatari. EmuTOS, a free TOS implementation,"
- elog "has been installed in $(games_get_libdir) with a .img extension (there"
- elog "are several from which to choose)."
- elog
- elog "Another option is to go to http://www.atari.st/ and get a real TOS:"
- elog " http://www.atari.st/"
- elog
- elog "The first time you run hatari, you should configure it to find the"
- elog "TOS you prefer to use. Be sure to save your settings."
- echo
-}
diff --git a/games-emulation/hatari/hatari-1.6.1-r1.ebuild b/games-emulation/hatari/hatari-1.7.0.ebuild
similarity index 95%
rename from games-emulation/hatari/hatari-1.6.1-r1.ebuild
rename to games-emulation/hatari/hatari-1.7.0.ebuild
index 35289d6f5356..b2ffd566ef74 100644
--- a/games-emulation/hatari/hatari-1.6.1-r1.ebuild
+++ b/games-emulation/hatari/hatari-1.7.0.ebuild
@@ -1,14 +1,13 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/hatari/hatari-1.6.1-r1.ebuild,v 1.2 2014/05/15 16:37:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/hatari/hatari-1.7.0.ebuild,v 1.1 2014/07/16 02:48:29 mr_bones_ Exp $
EAPI=5
-
PYTHON_COMPAT=( python2_6 python2_7 )
inherit eutils toolchain-funcs cmake-utils python-single-r1 games
DESCRIPTION="Atari ST emulator"
-HOMEPAGE="http://hatari.berlios.de/"
+HOMEPAGE="http://hatari.tuxfamily.org/"
SRC_URI="http://download.tuxfamily.org/hatari/${PV}/${P}.tar.bz2"
LICENSE="GPL-2"
@@ -66,7 +65,7 @@ src_configure() {
src_install() {
DOCS="readme.txt doc/*.txt" cmake-utils_src_install
dohtml -r doc/
- python_fix_shebang "${ED%/}"/usr/share/games/hatari/{hatariui,hconsole}/*.py
+ python_fix_shebang "${ED%/}"/usr/share/games/hatari/{hatariui,hconsole}/
prepgamesdirs
}
diff --git a/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild b/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild
index 9ffd9f590107..3261b18c8303 100644
--- a/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild
+++ b/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild
@@ -1,7 +1,8 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild,v 1.7 2014/05/06 16:06:44 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild,v 1.8 2014/07/16 00:36:31 mr_bones_ Exp $
+EAPI=5
inherit eutils unpacker games
MY_P="mindrover_demo.run"
@@ -26,18 +27,18 @@ src_install() {
dodir "${dir}"
- tar -zxf data.tar.gz -C "${Ddir}"/ || die "untar failed"
- tar -zxf music.tar.gz -C "${Ddir}"/ || die "untar failed"
+ tar -zxf data.tar.gz -C "${Ddir}"/ || die
+ tar -zxf music.tar.gz -C "${Ddir}"/ || die
dodoc README
- newicon icon.xpm ${PN}.xpm || die "doins failed"
+ newicon icon.xpm ${PN}.xpm || die
exeinto "${dir}"
doexe bin/Linux/x86/glibc-2.1/mindrover_demo \
- bin/Linux/x86/glibc-2.1/lib/libopenal.so.0.0.6 || die "doexe failed"
+ bin/Linux/x86/glibc-2.1/lib/libopenal.so.0.0.6 || die
dosym "${dir}"/libopenal.so.0.0.6 "${dir}"/libopenal.so.0
games_make_wrapper ${PN} ./mindrover_demo "${dir}" "${dir}"
+ make_desktop_entry ${PN} "Mindrover: Europa Project (Demo)"
prepgamesdirs
- make_desktop_entry ${PN} "Mindrover: Europa Project (Demo)"
}
diff --git a/games-util/joystick/Manifest b/games-util/joystick/Manifest
index 0d1dd61a3e3f..c8d07b6c51ba 100644
--- a/games-util/joystick/Manifest
+++ b/games-util/joystick/Manifest
@@ -1,3 +1,2 @@
-DIST joystick-20060731.tar.bz2 27411 SHA256 17aa3ca45f6bbd2004d0cede4a0f1c32b4cabb946628a85602d89c45d874006b
-DIST linuxconsoletools-1.4.2.tar.bz2 39818 SHA256 af85bac15df35dac00191a717813a49294402dc3ee556a4fd8f0e191feb21763 SHA512 4e3acadb9540a21c3b8578f69aab02cb20977be528b4e7f4f928c27724bfbe3e17969b4e61dab35500af2e11e48ce4bf3a206fa7272aa4cc3fb9db1ab48a5ae4 WHIRLPOOL 4201de313af70bfb1e2d7815fcde903b6a73db36cde434552f981d8095360857827d44f7f2ff79d825c0c6b977b74e60e02331267ba89e70bdcaa99bd1c43131
DIST linuxconsoletools-1.4.4.tar.bz2 40867 SHA256 61ac023a6944c1bc1c3ac56b9c281a3148f4d63557a1e239523d4de638dac4a8 SHA512 ab2f15e26da3705cea35e26dda149f83d5792b0643aa8f684854be26d98a69943cfac3f07c8eac83485a289c9bdc7d41ad3af8990cec0a168b6b6e30381ee33a WHIRLPOOL 6347a4e2dbfb518da9f1ad9e3f7c45c59c49e64b4fe025927f26c7ddec52dad0507a58790a27f6d7077e1a314d5e812219d6132104720c4ea55205fc295a69d3
+DIST linuxconsoletools-1.4.7.tar.bz2 42698 SHA256 4493cfda044be8067517e03b15abc86a043c0fc00fee2fcd8070701c65adecf1 SHA512 7e2c08f9c2a5e4a996870913257c7bc7874101780c9656e0fa34d035f8c696717a0906bdbe0e8c7e9c8fe7fce65b9df8b09da7b1b894ede34aa8bcabffdd39bd WHIRLPOOL e66d72f9ae80391baa5178ed7869a86ed75b9c4a66f743dab72229777a3dacce46aa425e54309276735a5d243764c3e908b4d5001882ad8ebebf62fd9bc5bb9c
diff --git a/games-util/joystick/files/joystick-1.4.2-build.patch b/games-util/joystick/files/joystick-1.4.2-build.patch
deleted file mode 100644
index 6e3d5774e5e4..000000000000
--- a/games-util/joystick/files/joystick-1.4.2-build.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/docs/Makefile
-+++ b/docs/Makefile
-@@ -20,13 +20,16 @@
- # 02110-1301 USA.
-
- MANPAGES = inputattach.1 jstest.1 jscal.1 fftest.1 \
-- ffmvforce.1 ffset.1 ffcfstress.1 jscal-store.1 \
-+ ffset.1 ffcfstress.1 jscal-store.1 \
- jscal-restore.1
-+ifneq ($(USE_SDL),no)
-+MANPAGES += ffmvforce.1
-+endif
-
- PREFIX ?= /usr/local
-
- install:
- install -d $(DESTDIR)$(PREFIX)/share/man/man1
-- install $(MANPAGES) $(DESTDIR)$(PREFIX)/share/man/man1
-+ install -m 644 $(MANPAGES) $(DESTDIR)$(PREFIX)/share/man/man1
-
- .PHONY: install
---- a/utils/Makefile
-+++ b/utils/Makefile
-@@ -25,11 +25,19 @@
- # Edit the options below to suit your needs
- #
-
--CC = gcc
--CFLAGS = -g -O2 -Wall -I../linux/include
-+CC ?= gcc
-+PKG_CONFIG ?= pkg-config
-+CFLAGS ?= -g -O2
-+CFLAGS += -Wall
-+CPPFLAGS += -I../linux/include
-+SDL_CFLAGS = $(shell $(PKG_CONFIG) --cflags sdl)
-+SDL_LIBS = $(shell $(PKG_CONFIG) --libs sdl)
-
--PROGRAMS = inputattach jstest jscal fftest ffmvforce ffset \
-+PROGRAMS = inputattach jstest jscal fftest ffset \
- ffcfstress jscal-restore jscal-store
-+ifneq ($(USE_SDL),no)
-+PROGRAMS += ffmvforce
-+endif
-
- PREFIX ?= /usr/local
-
-@@ -40,27 +48,27 @@
- $(RM) *.o *.swp $(PROGRAMS) *.orig *.rej map *~
-
- ffcfstress: ffcfstress.c
-- $(CC) -O2 -funsigned-char ffcfstress.c -lm -o ffcfstress
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -funsigned-char ffcfstress.c -lm -o ffcfstress
-
- ffmvforce.o: ffmvforce.c
-- $(CC) -c $(CFLAGS) $(CPPFLAGS) $^ -o $@ `sdl-config --cflags`
-+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $(SDL_CFLAGS) $^ -o $@
-
- ffmvforce: ffmvforce.o
-- $(CC) $^ -o $@ $(LDFLAGS) -g -lm `sdl-config --libs`
-+ $(CC) $^ -o $@ $(CFLAGS) $(LDFLAGS) -lm $(SDL_LIBS)
-
- axbtnmap.o: axbtnmap.c axbtnmap.h
-
- jscal.o: jscal.c axbtnmap.h
-
- jscal: jscal.o axbtnmap.o
-- $(CC) $(CFLAGS) $(CPPFLAGS) $^ -lm -o $@
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $^ -lm -o $@
-
- jstest.o: jstest.c axbtnmap.h
-
- jstest: jstest.o axbtnmap.o
-
- gencodes: gencodes.c scancodes.h
-- $(CC) $(CFLAGS) $(CPPFLAGS) gencodes.c -o gencodes
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) gencodes.c -o gencodes
-
- jscal-restore: jscal-restore.in
- sed "s^@@PREFIX@@^$(PREFIX)^g" < $^ > $@
diff --git a/games-util/joystick/files/joystick-1.4.4-build.patch b/games-util/joystick/files/joystick-1.4.4-build.patch
index 8a74e82a4dba..f888ccd18812 100644
--- a/games-util/joystick/files/joystick-1.4.4-build.patch
+++ b/games-util/joystick/files/joystick-1.4.4-build.patch
@@ -1,6 +1,5 @@
-diff -ru linuxconsoletools-1.4.4.orig/docs/Makefile linuxconsoletools-1.4.4/docs/Makefile
---- linuxconsoletools-1.4.4.orig/docs/Makefile 2011-12-15 10:49:01.000000000 -0500
-+++ linuxconsoletools-1.4.4/docs/Makefile 2013-01-23 01:09:34.963691526 -0500
+--- linuxconsoletools-1.4.4.orig/docs/Makefile
++++ linuxconsoletools-1.4.4/docs/Makefile
@@ -20,13 +20,17 @@
# 02110-1301 USA.
@@ -21,9 +20,8 @@ diff -ru linuxconsoletools-1.4.4.orig/docs/Makefile linuxconsoletools-1.4.4/docs
+ install -m 644 $(MANPAGES) $(DESTDIR)$(PREFIX)/share/man/man1
.PHONY: install
-diff -ru linuxconsoletools-1.4.4.orig/utils/Makefile linuxconsoletools-1.4.4/utils/Makefile
---- linuxconsoletools-1.4.4.orig/utils/Makefile 2012-09-05 02:34:53.000000000 -0400
-+++ linuxconsoletools-1.4.4/utils/Makefile 2013-01-23 01:11:02.112760453 -0500
+--- linuxconsoletools-1.4.4.orig/utils/Makefile
++++ linuxconsoletools-1.4.4/utils/Makefile
@@ -27,9 +27,13 @@
CFLAGS ?= -g -O2 -Wall
diff --git a/games-util/joystick/files/joystick-1.4.7-build.patch b/games-util/joystick/files/joystick-1.4.7-build.patch
new file mode 100644
index 000000000000..f888ccd18812
--- /dev/null
+++ b/games-util/joystick/files/joystick-1.4.7-build.patch
@@ -0,0 +1,39 @@
+--- linuxconsoletools-1.4.4.orig/docs/Makefile
++++ linuxconsoletools-1.4.4/docs/Makefile
+@@ -20,13 +20,17 @@
+ # 02110-1301 USA.
+
+ MANPAGES = inputattach.1 jstest.1 jscal.1 fftest.1 \
+- ffmvforce.1 ffset.1 ffcfstress.1 jscal-store.1 \
++ ffset.1 ffcfstress.1 jscal-store.1 \
+ jscal-restore.1
+
++ifneq ($(USE_SDL),no)
++MANPAGES += ffmvforce.1
++endif
++
+ PREFIX ?= /usr/local
+
+ install:
+ install -d $(DESTDIR)$(PREFIX)/share/man/man1
+- install $(MANPAGES) $(DESTDIR)$(PREFIX)/share/man/man1
++ install -m 644 $(MANPAGES) $(DESTDIR)$(PREFIX)/share/man/man1
+
+ .PHONY: install
+--- linuxconsoletools-1.4.4.orig/utils/Makefile
++++ linuxconsoletools-1.4.4/utils/Makefile
+@@ -27,9 +27,13 @@
+
+ CFLAGS ?= -g -O2 -Wall
+
+-PROGRAMS = inputattach jstest jscal fftest ffmvforce ffset \
++PROGRAMS = inputattach jstest jscal fftest ffset \
+ ffcfstress jscal-restore jscal-store
+
++ifneq ($(USE_SDL),no)
++PROGRAMS += ffmvforce
++endif
++
+ PREFIX ?= /usr/local
+
+ compile: $(PROGRAMS)
diff --git a/games-util/joystick/files/joystick-20060731-asneeded.patch b/games-util/joystick/files/joystick-20060731-asneeded.patch
deleted file mode 100644
index d9bbc07240ae..000000000000
--- a/games-util/joystick/files/joystick-20060731-asneeded.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- utils.orig/Makefile 2006-07-31 06:50:01.000000000 +0200
-+++ utils/Makefile 2009-12-09 20:11:17.962976029 +0100
-@@ -46,7 +45,7 @@
-
- ffcfstress: ffcfstress.c
- $(CC) $(CFLAGS) -funsigned-char \
-- -lm ffcfstress.c -o ffcfstress
-+ ffcfstress.c -o ffcfstress $(LDFLAGS) -lm
-
- ffmvforce.o: ffmvforce.c
- $(CC) -c $(CFLAGS) $(CPPFLAGS) $^ -o $@ `sdl-config --cflags`
-@@ -55,13 +54,13 @@
- $(CC) $^ -o $@ $(LDFLAGS) $(CFLAGS) -lm `sdl-config --libs`
-
- jscal: jscal.o
-- $(CC) $(CFLAGS) $(CPPFLAGS) -lm $^ -o $@
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $^ -o $@ -lm
-
- gencodes: gencodes.c scancodes.h
- $(CC) $(CFLAGS) $(CPPFLAGS) gencodes.c -o gencodes
-
- acceltest: acceltest.c
-- $(CC) $(CFLAGS) $(CPPFLAGS) -lm $^ -o $@
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $^ -o $@ -lm
-
- dist:
- tar jcf ../joystick-`date +%Y%m%d`.tar.bz2 -C .. utils
diff --git a/games-util/joystick/files/joystick-MCS-defines.patch b/games-util/joystick/files/joystick-MCS-defines.patch
deleted file mode 100644
index 9fa8aad16880..000000000000
--- a/games-util/joystick/files/joystick-MCS-defines.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-http://bugs.gentoo.org/103270
-
---- evtest.c
-+++ evtest.c
-@@ -254,6 +254,22 @@
- [ABS_VOLUME] = "Volume", [ABS_MISC] = "Misc",
- };
-
-+/* many of these MSC defines are only in newer linux headers */
-+#ifndef MSC_SERIAL
-+# define MSC_SERIAL
-+#endif 0x00
-+#ifndef MSC_PULSELED
-+# define MSC_PULSELED 0x01
-+#endif
-+#ifndef MSC_GESTURE
-+# define MSC_GESTURE 0x02
-+#endif
-+#ifndef MSC_RAW
-+# define MSC_RAW 0x03
-+#endif
-+#ifndef MSC_SCAN
-+# define MSC_SCAN 0x04
-+#endif
- char *misc[MSC_MAX + 1] = {
- [ 0 ... MSC_MAX] = NULL,
- [MSC_SERIAL] = "Serial", [MSC_PULSELED] = "Pulseled",
diff --git a/games-util/joystick/files/joystick-jstest-segv.patch b/games-util/joystick/files/joystick-jstest-segv.patch
deleted file mode 100644
index fa1e4cdd6cbd..000000000000
--- a/games-util/joystick/files/joystick-jstest-segv.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-fix segfault when JSIOCGAXMAP/JSIOCGBTNMAP dont work
-
-http://bugs.gentoo.org/132607
-
-patch by Matt Anderson
-
---- utils/jstest.c
-+++ utils/jstest.c
-@@ -76,6 +76,7 @@ int main (int argc, char **argv)
- char name[NAME_LENGTH] = "Unknown";
- uint16_t btnmap[KEY_MAX - BTN_MISC + 1];
- uint8_t axmap[ABS_MAX + 1];
-+ int btnmap_ok, axismap_ok;
-
- if (argc < 2 || argc > 3 || !strcmp("--help", argv[1])) {
- puts("");
-@@ -99,21 +100,29 @@ int main (int argc, char **argv)
- ioctl(fd, JSIOCGAXES, &axes);
- ioctl(fd, JSIOCGBUTTONS, &buttons);
- ioctl(fd, JSIOCGNAME(NAME_LENGTH), name);
-- ioctl(fd, JSIOCGAXMAP, axmap);
-- ioctl(fd, JSIOCGBTNMAP, btnmap);
-+ axismap_ok = ioctl(fd, JSIOCGAXMAP, axmap);
-+ btnmap_ok = ioctl(fd, JSIOCGBTNMAP, btnmap);
-
-
- printf("Driver version is %d.%d.%d.\n",
- version >> 16, (version >> 8) & 0xff, version & 0xff);
-
- printf("Joystick (%s) has %d axes (", name, axes);
-- for (i = 0; i < axes; i++)
-- printf("%s%s", i > 0 ? ", " : "", axis_names[axmap[i]]);
-+ if (!axismap_ok) {
-+ for (i = 0; i < axes; i++)
-+ printf("%s%s", i > 0 ? ", " : "", axis_names[axmap[i]]);
-+ } else {
-+ printf(" axismap never defined ");
-+ }
- puts(")");
-
- printf("and %d buttons (", buttons);
-- for (i = 0; i < buttons; i++)
-- printf("%s%s", i > 0 ? ", " : "", button_names[btnmap[i] - BTN_MISC]);
-+ if (!btnmap_ok) {
-+ for (i = 0; i < buttons; i++)
-+ printf("%s%s", i > 0 ? ", " : "", button_names[btnmap[i] - BTN_MISC]);
-+ } else {
-+ printf(" buttonmap never defined ");
-+ }
- puts(").");
-
- printf("Testing ... (interrupt to exit)\n");
diff --git a/games-util/joystick/joystick-0_pre20060731.ebuild b/games-util/joystick/joystick-0_pre20060731.ebuild
deleted file mode 100644
index 54092da1fd69..000000000000
--- a/games-util/joystick/joystick-0_pre20060731.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/games-util/joystick/joystick-0_pre20060731.ebuild,v 1.3 2012/06/14 14:45:16 xmw Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION="joystick testing utilities"
-HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~vojtech/input/"
-SRC_URI="mirror://gentoo/${P/0_pre}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="sdl"
-
-DEPEND="sdl? ( media-libs/libsdl[video] )
- !x11-libs/tslib"
-
-S=${WORKDIR}/utils
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/joystick-MCS-defines.patch \
- "${FILESDIR}"/joystick-jstest-segv.patch \
- "${FILESDIR}"/${P/0_pre}-asneeded.patch
- sed -i \
- -e '/^CC/d' \
- Makefile \
- || die 'sed failed'
-}
-
-src_compile() {
- local SDL
- tc-export CC
- use sdl && SDL=1 || SDL=0
- emake SDL=${SDL} || die "emake failed"
- emake inputattach || die "inputattach failed"
-}
-
-src_install() {
- dobin $(find . -type f -a -perm +1) || die "dobin"
- dodoc README
-}
diff --git a/games-util/joystick/joystick-1.4.2.ebuild b/games-util/joystick/joystick-1.4.7.ebuild
similarity index 78%
rename from games-util/joystick/joystick-1.4.2.ebuild
rename to games-util/joystick/joystick-1.4.7.ebuild
index 2279cc606e0d..0e13afc4745a 100644
--- a/games-util/joystick/joystick-1.4.2.ebuild
+++ b/games-util/joystick/joystick-1.4.7.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/games-util/joystick/joystick-1.4.2.ebuild,v 1.6 2012/06/13 06:43:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/joystick-1.4.7.ebuild,v 1.1 2014/07/16 01:19:15 mr_bones_ Exp $
-EAPI=4
+EAPI=5
inherit eutils toolchain-funcs
MY_P="linuxconsoletools-${PV}"
@@ -12,10 +12,10 @@ SRC_URI="mirror://sourceforge/linuxconsole/files/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
IUSE="sdl"
-DEPEND="sdl? ( media-libs/libsdl[video] )
+DEPEND="sdl? ( media-libs/libsdl:0[video] )
!=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ sed -e 's:$(top_builddir)/nice/libnice.la:$(NICE_LIBS):' \
+ -i gst/Makefile.{am,in} || die "sed failed"
+}
+
+multilib_src_configure() {
+ # gupnp is not used in the gst plugin
+ ECONF_SOURCE=${S} \
+ econf \
+ --disable-static \
+ --without-gstreamer-0.10 \
+ --with-gstreamer \
+ --disable-gupnp
+}
+
+multilib_src_compile() {
+ emake -C gst \
+ NICE_LIBS="$($(tc-getPKG_CONFIG) --libs-only-l nice)"
+}
+
+multilib_src_test() {
+ :
+}
+
+multilib_src_install() {
+ emake -C gst DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+ prune_libtool_files --modules
+}
diff --git a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.7.ebuild b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.7.ebuild
new file mode 100644
index 000000000000..7f66d680a064
--- /dev/null
+++ b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.7.ebuild,v 1.1 2014/07/15 12:24:41 pacho Exp $
+
+EAPI=5
+inherit eutils multilib-minimal toolchain-funcs
+
+DESCRIPTION="GStreamer plugin for ICE (RFC 5245) support"
+HOMEPAGE="http://nice.freedesktop.org/wiki/"
+MY_P=libnice-${PV}
+SRC_URI="http://nice.freedesktop.org/releases/${MY_P}.tar.gz"
+
+LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
+SLOT="0.10"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="
+ ~net-libs/libnice-${PV}[${MULTILIB_USEDEP}]
+ media-libs/gstreamer:${SLOT}[${MULTILIB_USEDEP}]
+ media-libs/gst-plugins-base:${SLOT}[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ sed -e 's:$(top_builddir)/nice/libnice.la:$(NICE_LIBS):' \
+ -i gst/Makefile.{am,in} || die "sed failed"
+}
+
+multilib_src_configure() {
+ # gupnp is not used in the gst plugin
+ ECONF_SOURCE=${S} \
+ econf \
+ --disable-static \
+ --with-gstreamer-0.10 \
+ --without-gstreamer \
+ --disable-gupnp
+}
+
+multilib_src_compile() {
+ emake -C gst \
+ NICE_LIBS="$($(tc-getPKG_CONFIG) --libs-only-l nice)"
+}
+
+multilib_src_test() {
+ :
+}
+
+multilib_src_install() {
+ emake -C gst DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+ prune_libtool_files --modules
+}
diff --git a/media-plugins/mythplugins/Manifest b/media-plugins/mythplugins/Manifest
index 096eefa7343e..5ee0bd1451d6 100644
--- a/media-plugins/mythplugins/Manifest
+++ b/media-plugins/mythplugins/Manifest
@@ -12,5 +12,6 @@ DIST mythplugins-0.27-552fdc0e1eb538db847f2aedd54a12764b609a76.tar.xz 50680 SHA2
DIST mythplugins-0.27-583395f5a376637efcd408a102fa64d0f188c12f.tar.xz 58328 SHA256 b8d7b2338236baeb20a26d2c83eb3c92b9a6f0aa96c66542e47018e4c833a213 SHA512 1ed2786f9c1fd0f7d607806b6ca34100ec116191e02573cc5def18c2581bb841e6f7e5b9fe066bfb9f52931b314ead157a64ab84a27bae06610282237d249dfc WHIRLPOOL 56977fab1cb93768164c4e3feb2fe503d22d44e70fd046cdbe3b05de0066a8792afd1097721029713b3f4f30c79e34d8ba617afe4c1241af0f1a741854cc3349
DIST mythplugins-0.27-d9561055abeec11fba234c9bdfbde5e79e695803.tar.xz 40336 SHA256 e23f9748b6775cd448771204a06586e4870b3196d14196dcede8c379d50506c8 SHA512 03d981c8971a8fdea08a9fbbbd0fffa38521e7ace54a31a35ba9ac96e2ba29df66251faf1d0c3580fab39675d5d70a5abc56e55e733e439105b63da3a619fa58 WHIRLPOOL c354370b7c1ec9375906403476d490653b1adceeb28474b3f17e9b841d676feda4528ab0137d1dcb5f30e8b916d1f3c17dc9b2c2b2c2ef250e717ed3fbfacb70
DIST mythplugins-0.27.1-4f4b6744637cceafd5ec6d82e24a9c34ba7c93b5.tar.xz 240 SHA256 b56cc7c8ea6e7aca4227de8fa537e9fd74bc873b8e6606a5f549e44b5f2ca44d SHA512 f768e7bf91ad4c66e3c29331e13eab292d59013c6f56f665c29d4442b1a725a48b176f9095fb20c5e6f74c4420457ac30b5f4370c21b8de56d060e9606d5c84e WHIRLPOOL 4a1472bbb48f24c3a46a1daf9d4e6d62393354c9838709e6f4729896176fb87153409d3efc1f64eb5d4b171270a8846efe5611c77f5592770939c9cca7c8ac4c
+DIST mythplugins-0.27.1-aaae611819c6a6f92a55d5c82efb8738ec9a23df.tar.xz 10264 SHA256 fd44b36152d52a2754c0f293159e47b8bc9e688833a08c0475153e346ac53209 SHA512 9df9048f787e39decc0b9efa885c7077ad0a99cea874ba770cf1df121028473f7aa7b90ae5d5e7ac45ee7ab85a663fa1e31be9b28ef6945e51b76a907dc00b26 WHIRLPOOL be56f2afba07b3fba683133dbb9d697c1a3ad3d6c951262bdc67e4ee375a541d9c02fb55a0099cfbefae2c028f5a43c969d6796e24edff08ae5245571c16583d
DIST mythtv-0.27.1.tar.gz 85612356 SHA256 a7039ba46347f1d6a0ed392a53117639c8cba6bc458a6ad30082046d8ad85de7 SHA512 f2c79765948c0a00c7a92f24d2315b5af3044333f67ed8925a59c5bebbdebf98792ef05e2bc8864bfbe77be8cc8ff530e3f4e8761320cfe5ed21369341d8915e WHIRLPOOL 938e0e77070473a523323fe64e40eb416809b40b16943d66a5914d65caa7530dd4b5ba5209919050a7b4968c9e5ca5155ee970f165b39a5c77392debb20bf0ad
DIST mythtv-0.27.tar.gz 85904162 SHA256 494ebd7ee384e751c05ee0a1b3dcd3618caf72f1e94810381c09c2b5d1c799f0 SHA512 2ea070497a7610b8e1548112d9925a28aeedba819c2d063e88cc63daf69947379ce7213e357c26bf2221f8a8e865c937dee3b9bf2695644f2f1adeadf6d11116 WHIRLPOOL 74c4fade0d0f93a64e5f1da3120358f15f6f8891f53b7c74b41a286369e192790cae87829b79a3a90ce3ca23ede63b3dfa809b514b68cee220432794414b8a47
diff --git a/media-plugins/mythplugins/mythplugins-0.27.1_p20140713.ebuild b/media-plugins/mythplugins/mythplugins-0.27.1_p20140713.ebuild
new file mode 100644
index 000000000000..f2bc18be05be
--- /dev/null
+++ b/media-plugins/mythplugins/mythplugins-0.27.1_p20140713.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythplugins/mythplugins-0.27.1_p20140713.ebuild,v 1.1 2014/07/15 16:45:00 rich0 Exp $
+
+EAPI=5
+
+PYTHON_DEPEND="2:2.6"
+BACKPORTS="aaae611819c6a6f92a55d5c82efb8738ec9a23df"
+MY_P=${P%_p*}
+
+inherit eutils python
+
+DESCRIPTION="Official MythTV plugins"
+HOMEPAGE="http://www.mythtv.org"
+SRC_URI="https://github.com/MythTV/mythtv/archive/v0.27.1.tar.gz -> mythtv-0.27.1.tar.gz
+ ${BACKPORTS:+http://dev.gentoo.org/~rich0/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+MYTHPLUGINS="mytharchive mythbrowser mythgallery mythgame \
+mythmusic mythnetvision mythnews mythweather mythzoneminder"
+
+IUSE="${MYTHPLUGINS} cdda cdr exif fftw raw"
+
+DEPEND="!media-plugins/mytharchive
+ !media-plugins/mythbrowser
+ !media-plugins/mythgallery
+ !media-plugins/mythgame
+ !media-plugins/mythmovies
+ !media-plugins/mythmusic
+ !media-plugins/mythnetvision
+ !media-plugins/mythnews
+ !media-plugins/mythweather
+ =media-tv/mythtv-${PV}*:=[python]
+ mytharchive? (
+ app-cdr/dvd+rw-tools
+ virtual/python-imaging:=
+ media-video/dvdauthor
+ media-video/mjpegtools[png]
+ media-video/transcode
+ virtual/cdrtools
+ )
+ mythgallery? (
+ media-libs/tiff:=
+ virtual/opengl
+ exif? ( >media-libs/libexif-0.6.9:= )
+ raw? ( media-gfx/dcraw )
+ )
+ mythmusic? (
+ >=media-libs/flac-1.1.2:=
+ >=media-libs/libvorbis-1.0:=
+ >=media-libs/taglib-1.6:=
+ media-sound/lame
+ virtual/opengl
+ cdda? (
+ dev-libs/libcdio:=
+ cdr? ( virtual/cdrtools )
+ )
+ fftw? ( sci-libs/fftw:= )
+ )
+ mythnetvision? (
+ =dev-lang/python-2*:=[xml]
+ dev-python/lxml:=
+ dev-python/mysql-python:=
+ dev-python/oauth:=
+ dev-python/pycurl:=
+ )
+ mythweather? (
+ dev-perl/DateManip
+ dev-perl/DateTime-Format-ISO8601
+ >=dev-perl/DateTime-1
+ dev-perl/ImageSize
+ dev-perl/JSON
+ dev-perl/SOAP-Lite
+ dev-perl/XML-Simple
+ dev-perl/XML-Parser
+ dev-perl/XML-SAX
+ dev-perl/XML-XPath
+ )"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="
+ cdda? ( mythmusic )
+ cdr? ( mythmusic cdda )
+ exif? ( mythgallery )
+ fftw? ( mythmusic )
+ mythnews? ( mythbrowser )
+ raw? ( mythgallery )"
+
+S="${WORKDIR}/mythtv-0.27.1/mythplugins"
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ [[ -n ${BACKPORTS} ]] && \
+ EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${WORKDIR}/${MY_P}/patches" \
+ epatch
+
+ epatch_user
+}
+
+src_configure() {
+ ./configure \
+ --prefix=/usr \
+ --python=python2 \
+ --enable-opengl \
+ $(use_enable mythzoneminder) \
+ $(use_enable mytharchive) \
+ $(use_enable mythbrowser) \
+ $(use_enable mythgallery) \
+ $(use_enable mythgame) \
+ $(use_enable mythmusic) \
+ $(use_enable mythnetvision) \
+ $(use_enable mythnews) \
+ $(use_enable mythweather) \
+ $(use_enable cdda cdio) \
+ $(use_enable exif) \
+ $(use_enable exif new-exif) \
+ $(use_enable raw dcraw) \
+ || die "configure failed"
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install || die "make install failed"
+}
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
index 3bbb5be228c9..0e6a72565b63 100644
--- a/media-sound/pavucontrol/Manifest
+++ b/media-sound/pavucontrol/Manifest
@@ -1,3 +1,2 @@
-DIST pavucontrol-0.9.10.tar.gz 227735 SHA256 7ee96d2ddc28f53e392a1bc51a7316d2a9087ea2ad18e611f6f6725e756a5a3c
DIST pavucontrol-1.0.tar.xz 179596 SHA256 3dbe2865b6e3a195a8951967d9234f62cd254c30b08bdea1ecf8997b58f68cde SHA512 ff17e452426ff11da9a3215232b4742c88dd84ea3d2f55f8e6e6459f0edbe1323ad4ee8a3403db9a22a72eadae60baa6ecabfa502c005fde4c92ae3bf4aac007 WHIRLPOOL 07f32ee76b44f290eb6ffbf0bf4f9419e3bc26efbef2c54fb0a711d492a0de79300d84181c8fae0f8ada5111931464d199e8b4d9deccd64ee721894a44f7cc0a
DIST pavucontrol-2.0.tar.xz 151560 SHA256 22f29dd81b4a1a34ec7bffe9b027aff2a37fc76ccded4539d43a8c126a39470b SHA512 2b5f83f79cf6d7ce94bd836278274acb09824af389f5a7ad7d3977db743d8f9c5def78d8e9dea901a7e05355cfebb060f513cf01997baf546fd2dd2ada0513b1 WHIRLPOOL f85b60363ea30aee976e4e704bddf607b4e18ea9f9041d63acd0dc36183e103435f37c70e3b55b6327b7b1c7291c898b8167742cbcc7c47ebcd83a10f790d33c
diff --git a/media-sound/pavucontrol/pavucontrol-0.9.10.ebuild b/media-sound/pavucontrol/pavucontrol-0.9.10.ebuild
deleted file mode 100644
index 8ecd28f382d7..000000000000
--- a/media-sound/pavucontrol/pavucontrol-0.9.10.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/media-sound/pavucontrol/pavucontrol-0.9.10.ebuild,v 1.5 2012/05/05 08:46:01 mgorny Exp $
-
-EAPI=2
-
-DESCRIPTION="Pulseaudio Volume Control, GTK based mixer for Pulseaudio"
-HOMEPAGE="http://0pointer.de/lennart/projects/pavucontrol/"
-SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd"
-IUSE="nls"
-
-RDEPEND=">=dev-cpp/gtkmm-2.16:2.4
- dev-cpp/libglademm:2.4
- >=dev-libs/libsigc++-2.2:2
- >=x11-libs/gtk+-2.16:2
- >=media-sound/pulseaudio-0.9.16[glib]
- >=media-libs/libcanberra-0.16[gtk]
- || ( x11-themes/tango-icon-theme x11-themes/gnome-icon-theme )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext
- dev-util/intltool )
- virtual/pkgconfig"
-
-src_configure() {
- econf \
- --docdir=/usr/share/doc/${PF} \
- --htmldir=/usr/share/doc/${PF}/html \
- --disable-dependency-tracking \
- --disable-lynx \
- $(use_enable nls)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-}
diff --git a/media-sound/pavucontrol/pavucontrol-2.0.ebuild b/media-sound/pavucontrol/pavucontrol-2.0.ebuild
index 3ca50d674604..f71a8b2da115 100644
--- a/media-sound/pavucontrol/pavucontrol-2.0.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-2.0.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/media-sound/pavucontrol/pavucontrol-2.0.ebuild,v 1.1 2013/04/05 08:37:06 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pavucontrol/pavucontrol-2.0.ebuild,v 1.2 2014/07/15 15:14:17 pacho Exp $
-EAPI=4
+EAPI=5
DESCRIPTION="Pulseaudio Volume Control, GTK based mixer for Pulseaudio"
HOMEPAGE="http://freedesktop.org/software/pulseaudio/pavucontrol/"
@@ -13,17 +13,20 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="nls"
-RDEPEND=">=dev-cpp/gtkmm-3.0:3.0
+RDEPEND="
+ >=dev-cpp/gtkmm-3.0:3.0
>=dev-libs/libsigc++-2.2:2
>=media-libs/libcanberra-0.16[gtk3]
- >=media-sound/pulseaudio-0.9.16[glib]
- virtual/freedesktop-icon-theme"
+ >=media-sound/pulseaudio-3[glib]
+ virtual/freedesktop-icon-theme
+"
DEPEND="${RDEPEND}
virtual/pkgconfig
nls? (
dev-util/intltool
sys-devel/gettext
- )"
+ )
+"
src_configure() {
econf \
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 20d3ed9621da..397111b311b5 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -13,5 +13,6 @@ DIST mythtv-0.27-552fdc0e1eb538db847f2aedd54a12764b609a76.tar.xz 209012 SHA256 c
DIST mythtv-0.27-583395f5a376637efcd408a102fa64d0f188c12f.tar.xz 298048 SHA256 2b18428980fe8951694eb9c8594aa2559df491b029987e1a4b983128fdea4f51 SHA512 1d8c2a61bd91d7116ba3b43251d517bda3c8db3c235e73dde66116dc02d14806db9c80bacf6e19eaf816c4765d8e51fe9b53900efa3112134c564c08cc0ca012 WHIRLPOOL 3d50908d085f844cd210c568b50c55c47e4fe8dd8423ffe18303a7c799a45e24dfceaa5221e6f59596394484162d9992f46d5f66b0ad3c57fbb5a240def68dec
DIST mythtv-0.27-d9561055abeec11fba234c9bdfbde5e79e695803.tar.xz 185868 SHA256 a7ef60df55f60a20a66cee2f0f0fb48840060fc73269e9ee8cb12df3b3a1deff SHA512 353b8acf847e0e35c96759ba90dce50e58e9cf24d5ff96f42fcf2d8e09e36da57fa8394512375a3c598fbf1aa066ac5137781d866f4401b60591b6bc94e52e3b WHIRLPOOL 29804d3d792b33640ae8a2cf908a2a799148051e05a8bdefc7467854c0bac6268efdde5b41536f2316f80f317f41a2011192e99d6fb14b979431a961868716dd
DIST mythtv-0.27.1-4f4b6744637cceafd5ec6d82e24a9c34ba7c93b5.tar.xz 544 SHA256 68cd596983c64755bd2117c9348e080248344092f6ad7abf2a37f5681f4a6940 SHA512 40e6be3cad2c88b5317929170c81a5cfe192e84ed929be2b74b4c9c35266a6016cdf06fd6f512f4ac5f45a83d08cd0911a8470093fc8f2aa67ca614582b44d7a WHIRLPOOL c3a2bba4bd97a13d998a7036ad92ab988ed899ed49c51b50d36321fdf6da3e37c48e0eded3fcc182e2b07dd8aea7bbfbd95adb5ef32153b887bab7656c351ee8
+DIST mythtv-0.27.1-aaae611819c6a6f92a55d5c82efb8738ec9a23df.tar.xz 148364 SHA256 ca09cf37ef0bf8b4ca2ff54416b66126229680bef7e687f6b1f0b215250c0f12 SHA512 bc5d719a10e683b13170975d39d2d57547f7935007697c3f1d002067bffb63fe1b6375e834c4c0aea765c54ef35085d6f46cea1b5744605eae616d939fcb795d WHIRLPOOL 5ff8be973fe9a59cab833025e3cfe5c38dd8a3b4a9af83e2a584350f9b5389d82ec32738f66d91c633fa3f01dbf27c69d723023c72e554e1feec2687a3cdfb1a
DIST mythtv-0.27.1.tar.gz 85612356 SHA256 a7039ba46347f1d6a0ed392a53117639c8cba6bc458a6ad30082046d8ad85de7 SHA512 f2c79765948c0a00c7a92f24d2315b5af3044333f67ed8925a59c5bebbdebf98792ef05e2bc8864bfbe77be8cc8ff530e3f4e8761320cfe5ed21369341d8915e WHIRLPOOL 938e0e77070473a523323fe64e40eb416809b40b16943d66a5914d65caa7530dd4b5ba5209919050a7b4968c9e5ca5155ee970f165b39a5c77392debb20bf0ad
DIST mythtv-0.27.tar.gz 85904162 SHA256 494ebd7ee384e751c05ee0a1b3dcd3618caf72f1e94810381c09c2b5d1c799f0 SHA512 2ea070497a7610b8e1548112d9925a28aeedba819c2d063e88cc63daf69947379ce7213e357c26bf2221f8a8e865c937dee3b9bf2695644f2f1adeadf6d11116 WHIRLPOOL 74c4fade0d0f93a64e5f1da3120358f15f6f8891f53b7c74b41a286369e192790cae87829b79a3a90ce3ca23ede63b3dfa809b514b68cee220432794414b8a47
diff --git a/media-tv/mythtv/files/mythbackend.service b/media-tv/mythtv/files/mythbackend.service
index 8db861286091..87703ae6be23 100644
--- a/media-tv/mythtv/files/mythbackend.service
+++ b/media-tv/mythtv/files/mythbackend.service
@@ -52,7 +52,7 @@ Environment=MYTHCONFDIR=/etc/mythtv
# Default setting assumes a system wide install. Otherwise it should be set to
# the folder containing the .mythtv subfolder containing the config.xml file
# Such as
-Environment=HOME=/usr/share/mythtv
+#Environment=HOME=/usr/share/mythtv
# or
Environment=HOME=/~/.mythtv
@@ -76,7 +76,7 @@ StandardOutput=null
ExecStart=/usr/bin/mythbackend --logpath /var/log/mythtv --loglevel crit
# Whether systemd will continue over-watch and restart on any halt
-#Restart=Restart-always
+#Restart=always
[Install]
WantedBy=multi-user.target
diff --git a/media-tv/mythtv/mythtv-0.27.1_p20140713.ebuild b/media-tv/mythtv/mythtv-0.27.1_p20140713.ebuild
new file mode 100644
index 000000000000..ad508b9d51ef
--- /dev/null
+++ b/media-tv/mythtv/mythtv-0.27.1_p20140713.ebuild
@@ -0,0 +1,350 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.27.1_p20140713.ebuild,v 1.1 2014/07/15 16:44:35 rich0 Exp $
+
+EAPI=5
+
+PYTHON_DEPEND="python? 2:2.6"
+BACKPORTS="aaae611819c6a6f92a55d5c82efb8738ec9a23df"
+MY_P=${P%_p*}
+
+inherit flag-o-matic multilib eutils python user systemd
+
+MYTHTV_VERSION="v0.27.1"
+MYTHTV_BRANCH="fixes/0.27"
+
+DESCRIPTION="Homebrew PVR project"
+HOMEPAGE="http://www.mythtv.org"
+SRC_URI="https://github.com/MythTV/mythtv/archive/v0.27.1.tar.gz -> mythtv-0.27.1.tar.gz
+ ${BACKPORTS:+http://dev.gentoo.org/~rich0/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE_INPUT_DEVICES="input_devices_joystick"
+IUSE="alsa altivec libass autostart bluray cec crystalhd debug dvb dvd \
+egl fftw +hls ieee1394 jack lcd lirc perl pulseaudio python raop +theora \
+vaapi vdpau +vorbis +xml xmltv +xvid ${IUSE_INPUT_DEVICES}"
+
+REQUIRED_USE="
+ bluray? ( xml )
+ theora? ( vorbis )"
+
+COMMON="
+ >=media-libs/freetype-2.0:=
+ sys-libs/zlib:=
+ x11-libs/libX11:=
+ x11-libs/libXext:=
+ x11-libs/libXinerama:=
+ x11-libs/libXv:=
+ x11-libs/libXrandr:=
+ x11-libs/libXxf86vm:=
+ >=dev-qt/qtcore-4.7.2:4=
+ >=dev-qt/qtdbus-4.7.2:4=
+ >=dev-qt/qtgui-4.7.2:4=
+ >=dev-qt/qtscript-4.7.2:4=
+ >=dev-qt/qtsql-4.7.2:4=[mysql]
+ >=dev-qt/qtopengl-4.7.2:4=[egl?]
+ >=dev-qt/qtwebkit-4.7.2:4=
+ x11-misc/wmctrl:=
+ virtual/mysql:=
+ virtual/opengl:=
+ alsa? ( >=media-libs/alsa-lib-1.0.24:= )
+ bluray? (
+ dev-libs/libcdio:=
+ media-libs/libbluray:=
+ )
+ cec? ( dev-libs/libcec:= )
+ dvb? (
+ media-libs/libdvb:=
+ virtual/linuxtv-dvb-headers:=
+ )
+ dvd? ( dev-libs/libcdio:= )
+ egl? ( media-libs/mesa:=[egl] )
+ fftw? ( sci-libs/fftw:3.0= )
+ hls? (
+ media-libs/faac:=
+ media-libs/libvpx:=
+ >=media-libs/x264-0.0.20111220:=
+ >=media-sound/lame-3.93.1
+ )
+ ieee1394? (
+ >=sys-libs/libraw1394-1.2.0:=
+ >=sys-libs/libavc1394-0.5.3:=
+ >=media-libs/libiec61883-1.0.0:=
+ )
+ jack? ( media-sound/jack-audio-connection-kit )
+ lcd? ( app-misc/lcdproc )
+ libass? ( >=media-libs/libass-0.9.11:= )
+ lirc? ( app-misc/lirc )
+ perl? (
+ dev-perl/DBD-mysql
+ dev-perl/Net-UPnP
+ dev-perl/LWP-Protocol-https
+ dev-perl/HTTP-Message
+ dev-perl/IO-Socket-INET6
+ >=dev-perl/libwww-perl-5
+ )
+ pulseaudio? ( media-sound/pulseaudio )
+ python? (
+ dev-python/mysql-python
+ dev-python/lxml
+ dev-python/urlgrabber
+ )
+ raop? (
+ dev-libs/openssl:=
+ net-dns/avahi[mdnsresponder-compat]
+ )
+ theora? ( media-libs/libtheora:= media-libs/libogg:= )
+ vaapi? ( x11-libs/libva:= )
+ vdpau? ( x11-libs/libvdpau:= )
+ vorbis? ( >=media-libs/libvorbis-1.0:= media-libs/libogg:= )
+ xml? ( >=dev-libs/libxml2-2.6.0:= )
+ xvid? ( >=media-libs/xvid-1.1.0:= )
+ !media-tv/mythtv-bindings
+ !x11-themes/mythtv-themes
+ media-libs/taglib:=
+ dev-libs/glib:=
+ "
+
+RDEPEND="${COMMON}
+ media-fonts/corefonts
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ x11-apps/xinit
+ autostart? (
+ net-dialup/mingetty
+ x11-wm/evilwm
+ x11-apps/xset
+ )
+ dvd? ( media-libs/libdvdcss:= )
+ xmltv? ( >=media-tv/xmltv-0.5.43 )
+ "
+
+DEPEND="${COMMON}
+ dev-lang/yasm
+ x11-proto/xineramaproto
+ x11-proto/xf86vidmodeproto
+ "
+
+S="${WORKDIR}/${MY_P}/mythtv"
+
+MYTHTV_GROUPS="video,audio,tty,uucp"
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+ enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
+ usermod -a -G ${MYTHTV_GROUPS} mythtv
+}
+
+src_prepare() {
+ [[ -n ${BACKPORTS} ]] && \
+ EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/../patches" \
+ epatch
+
+ # Perl bits need to go into vender_perl and not site_perl
+ sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
+ -i "${S}"/bindings/perl/Makefile
+
+ # Fix up the version info since we are using the fixes/${PV} branch
+ echo "SOURCE_VERSION=\"${MYTHTV_VERSION}\"" > "${S}"/VERSION
+ echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/VERSION
+
+ echo "setting.extra -= -ldconfig" >> "${S}"/programs/mythfrontend/mythfrontend.pro
+
+ epatch "${FILESDIR}/libdir-27.patch"
+
+ epatch_user
+}
+
+src_configure() {
+ local myconf=
+
+ # Setup paths
+ myconf="${myconf} --prefix=${EPREFIX}/usr"
+ myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)"
+ myconf="${myconf} --libdir-name=$(get_libdir)"
+ myconf="${myconf} --mandir=${EPREFIX}/usr/share/man"
+
+ # Audio
+ myconf="${myconf} $(use_enable alsa audio-alsa)"
+ myconf="${myconf} $(use_enable jack audio-jack)"
+ use pulseaudio || myconf="${myconf} --disable-audio-pulseoutput"
+
+ use altivec || myconf="${myconf} --disable-altivec"
+ myconf="${myconf} $(use_enable dvb)"
+ myconf="${myconf} $(use_enable ieee1394 firewire)"
+ myconf="${myconf} $(use_enable lirc)"
+ myconf="${myconf} $(use_enable xvid libxvid)"
+ myconf="${myconf} --dvb-path=/usr/include"
+ myconf="${myconf} --enable-xrandr"
+ myconf="${myconf} --enable-xv"
+ myconf="${myconf} --enable-x11"
+ myconf="${myconf} --enable-nonfree"
+ use cec || myconf="${myconf} --disable-libcec"
+ use raop || myconf="${myconf} --disable-libdns-sd"
+ myconf="${myconf} $(use_enable theora libtheora)"
+ myconf="${myconf} $(use_enable vorbis libvorbis)"
+
+ if use hls; then
+ myconf="${myconf} --enable-libmp3lame"
+ myconf="${myconf} --enable-libx264"
+ myconf="${myconf} --enable-libvpx"
+ myconf="${myconf} --enable-libfaac"
+ fi
+
+ if use perl && use python; then
+ myconf="${myconf} --with-bindings=perl,python"
+ elif use perl; then
+ myconf="${myconf} --without-bindings=python"
+ myconf="${myconf} --with-bindings=perl"
+ elif use python; then
+ myconf="${myconf} --without-bindings=perl"
+ myconf="${myconf} --with-bindings=python"
+ else
+ myconf="${myconf} --without-bindings=perl,python"
+ fi
+
+ use python && myconf="${myconf} --python=$(PYTHON)"
+
+ if use debug; then
+ myconf="${myconf} --compile-type=debug"
+ else
+ myconf="${myconf} --compile-type=release"
+ #myconf="${myconf} --enable-debug" does nothing per sphery
+ #myconf="${myconf} --disable-stripping" does nothing per sphery
+ fi
+
+ # Video
+ use vdpau && myconf="${myconf} --enable-vdpau"
+ myconf="${myconf} $(use_enable vaapi)"
+ use crystalhd && myconf="${myconf} --enable-crystalhd"
+
+ # Input
+ use input_devices_joystick || myconf="${myconf} --disable-joystick-menu"
+
+ # Clean up DSO load times and other compiler bits
+ myconf="${myconf} --enable-symbol-visibility"
+ myconf="${myconf} --enable-pic"
+
+ # CPU settings
+ for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
+ [ "${i}" = "native" ] && i="host"
+ myconf="${myconf} --cpu=${i}"
+ break
+ done
+
+ if tc-is-cross-compiler ; then
+ myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel)"
+ myconf="${myconf} --cross-prefix=${CHOST}-"
+ fi
+
+ # Build boosters
+ has distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
+ has ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
+
+ chmod +x ./external/FFmpeg/version.sh
+
+ einfo "Running ./configure ${myconf}"
+ ./configure \
+ --cc="$(tc-getCC)" \
+ --cxx="$(tc-getCXX)" \
+ --ar="$(tc-getAR)" \
+ --extra-cflags="${CFLAGS}" \
+ --extra-cxxflags="${CXXFLAGS}" \
+ --extra-ldflags="${LDFLAGS}" \
+ ${myconf} || die "configure died"
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install || die "install failed"
+ dodoc AUTHORS UPGRADING README
+
+ insinto /usr/share/mythtv/database
+ doins database/*
+
+ newinitd "${FILESDIR}"/mythbackend.init mythbackend
+ newconfd "${FILESDIR}"/mythbackend.conf mythbackend
+ systemd_dounit "${FILESDIR}"/mythbackend.service
+
+ dodoc keys.txt
+
+ keepdir /etc/mythtv
+ chown -R mythtv "${ED}"/etc/mythtv
+ keepdir /var/log/mythtv
+ chown -R mythtv "${ED}"/var/log/mythtv
+ dodir /var/log/mythtv/old
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/mythtv.logrotate.d-r4 mythtv
+
+ insinto /usr/share/mythtv/contrib
+ doins -r contrib/*
+
+ # Install our mythfrontend wrapper which is similar to Mythbuntu's
+ mv "${ED}/usr/bin/mythfrontend" "${ED}/usr/bin/mythfrontend.real"
+ newbin "${FILESDIR}"/mythfrontend.wrapper mythfrontend
+ newconfd "${FILESDIR}"/mythfrontend.conf mythfrontend
+
+ if use autostart; then
+ dodir /etc/env.d/
+ echo 'CONFIG_PROTECT="/home/mythtv/"' > "${ED}"/etc/env.d/95mythtv
+
+ insinto /home/mythtv
+ newins "${FILESDIR}"/bash_profile .bash_profile
+ newins "${FILESDIR}"/xinitrc-r1 .xinitrc
+ fi
+
+ # Make Python files executable
+ find "${ED}/usr/share/mythtv" -type f -name '*.py' | while read file; do
+ if [[ ! "${file##*/}" = "__init__.py" ]]; then
+ chmod a+x "${file}"
+ fi
+ done
+
+ # Ensure that Python scripts are executed by Python 2
+ python_convert_shebangs -q -r 2 "${ED}/usr/share/mythtv"
+
+ # Make shell & perl scripts executable
+ find "${ED}" -type f -name '*.sh' -o -type f -name '*.pl' | \
+ while read file; do
+ chmod a+x "${file}"
+ done
+}
+
+pkg_preinst() {
+ export CONFIG_PROTECT="${CONFIG_PROTECT} ${EROOT}/home/mythtv/"
+}
+
+pkg_postinst() {
+ use python && python_mod_optimize MythTV
+
+ elog "To have this machine operate as recording host for MythTV, "
+ elog "mythbackend must be running. Run the following:"
+ elog "rc-update add mythbackend default"
+ elog
+ elog "Your recordings folder must be owned 'mythtv'. e.g."
+ elog "chown -R mythtv /var/lib/mythtv"
+
+ elog "Want mythfrontend to start automatically?"
+ elog "Set USE=autostart. Details can be found at:"
+ elog "http://dev.gentoo.org/~cardoe/mythtv/autostart.html"
+}
+
+pkg_postrm() {
+ use python && python_mod_cleanup MythTV
+}
+
+pkg_info() {
+ if [[ -f "${EROOT}"/usr/bin/mythfrontend ]]; then
+ "${EROOT}"/usr/bin/mythfrontend --version
+ fi
+}
+
+pkg_config() {
+ echo "Creating mythtv MySQL user and mythconverg database if it does not"
+ echo "already exist. You will be prompted for your MySQL root password."
+ "${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql
+}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 1d752e5b93d1..5e471b560b42 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 15 Jul 2014 12:07:02 +0000
+Wed, 16 Jul 2014 04:37:13 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 1d752e5b93d1..5e471b560b42 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 15 Jul 2014 12:07:02 +0000
+Wed, 16 Jul 2014 04:37:13 +0000
diff --git a/metadata/md5-cache/app-admin/keepass-2.24 b/metadata/md5-cache/app-admin/keepass-2.24
deleted file mode 100644
index 92197f03f261..000000000000
--- a/metadata/md5-cache/app-admin/keepass-2.24
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=>=dev-lang/mono-2.10.5 app-arch/unzip >=sys-apps/sed-4
-DESCRIPTION=A free, open source, light-weight and easy-to-use password manager
-EAPI=5
-HOMEPAGE=http://keepass.info/
-IUSE=aot
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/mono-2.10.5 dev-dotnet/libgdiplus[cairo]
-SLOT=0
-SRC_URI=mirror://sourceforge/keepass/KeePass-2.24-Source.zip
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils f658eba3cc594a21cf6eef4af47daa90 mono-env 59ca1177366cc9e14521d3501e9bb281 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=55ec1029df7fa81baa8ecca8b3f9a472
diff --git a/metadata/md5-cache/app-admin/keepass-2.25 b/metadata/md5-cache/app-admin/keepass-2.27
similarity index 86%
rename from metadata/md5-cache/app-admin/keepass-2.25
rename to metadata/md5-cache/app-admin/keepass-2.27
index ad8613d0e43f..bf525cd41260 100644
--- a/metadata/md5-cache/app-admin/keepass-2.25
+++ b/metadata/md5-cache/app-admin/keepass-2.27
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=>=dev-lang/mono-2.10.5 dev-dotnet/libgdiplus[cairo]
SLOT=0
-SRC_URI=mirror://sourceforge/keepass/KeePass-2.25-Source.zip
+SRC_URI=mirror://sourceforge/keepass/KeePass-2.27-Source.zip
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils f658eba3cc594a21cf6eef4af47daa90 mono-env 59ca1177366cc9e14521d3501e9bb281 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=0af6f2f2b638c13e29a581e4a089a18f
+_md5_=65bed02f8fb17f00a282ab54c9e81853
diff --git a/metadata/md5-cache/app-admin/lib_users-0.8 b/metadata/md5-cache/app-admin/lib_users-0.9
similarity index 95%
rename from metadata/md5-cache/app-admin/lib_users-0.8
rename to metadata/md5-cache/app-admin/lib_users-0.9
index cf7b77a64182..c3bc339582b4 100644
--- a/metadata/md5-cache/app-admin/lib_users-0.8
+++ b/metadata/md5-cache/app-admin/lib_users-0.9
@@ -9,6 +9,6 @@ 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 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 )
SLOT=0
-SRC_URI=http://schwarzvogel.de/pkgs/lib_users-0.8.tar.gz
+SRC_URI=http://schwarzvogel.de/pkgs/lib_users-0.9.tar.gz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=7852f42a6479ac03110a3f3b6bc8b580
+_md5_=0da7181d219c16df82810f976118b728
diff --git a/metadata/md5-cache/app-admin/recursos-2.0 b/metadata/md5-cache/app-admin/recursos-2.0
index b2874657722a..04b6c7952246 100644
--- a/metadata/md5-cache/app-admin/recursos-2.0
+++ b/metadata/md5-cache/app-admin/recursos-2.0
@@ -4,7 +4,7 @@ EAPI=4
HOMEPAGE=http://www.josealberto.org
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
-RDEPEND=|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) app-shells/bash net-analyzer/rrdtool
+RDEPEND=|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) app-shells/bash net-analyzer/rrdtool[graph]
SLOT=0
SRC_URI=mirror://gentoo/recursos-2.0.tbz2
-_md5_=c36183258f4a74c58fd36a888ed35dc4
+_md5_=79d92c474c98adc00a5acdff4d3f035f
diff --git a/metadata/md5-cache/app-editors/moe-1.6 b/metadata/md5-cache/app-editors/moe-1.6
new file mode 100644
index 000000000000..98a147b2c5fe
--- /dev/null
+++ b/metadata/md5-cache/app-editors/moe-1.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare unpack
+DEPEND=|| ( app-arch/plzip app-arch/pdlzip app-arch/lzip ) sys-libs/ncurses
+DESCRIPTION=A powerful and user-friendly console text editor
+EAPI=5
+HOMEPAGE=http://www.gnu.org/software/moe/
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=|| ( app-arch/plzip app-arch/pdlzip app-arch/lzip ) sys-libs/ncurses
+SLOT=0
+SRC_URI=mirror://gnu/moe/moe-1.6.tar.lz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 unpacker f300a7ca9131b1024a79762e8edd3c52
+_md5_=9a5065ad19e5a13d3cd216691dd3c7f8
diff --git a/metadata/md5-cache/app-i18n/enca-1.14-r1 b/metadata/md5-cache/app-i18n/enca-1.14-r1
index 4bdfcb51353b..e7f7fba8c552 100644
--- a/metadata/md5-cache/app-i18n/enca-1.14-r1
+++ b/metadata/md5-cache/app-i18n/enca-1.14-r1
@@ -4,10 +4,10 @@ DESCRIPTION=ENCA detects the character coding of a file and converts it if desir
EAPI=4
HOMEPAGE=http://gitorious.org/enca
IUSE=doc +recode 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 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=recode? ( >=app-text/recode-3.6_p15 ) sys-devel/gettext
SLOT=0
SRC_URI=http://dl.cihar.com/enca/enca-1.14.tar.bz2
_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_=8da41cc9f7d03c8bdc13ce3767baa840
+_md5_=3eb3934eb99a9f575ef180209c242475
diff --git a/metadata/md5-cache/app-i18n/man-pages-de-1.7 b/metadata/md5-cache/app-i18n/man-pages-de-1.7
new file mode 100644
index 000000000000..3b6164e7f336
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/man-pages-de-1.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=virtual/man app-text/po4a !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=A somewhat comprehensive collection of Linux german man page translations
+EAPI=5
+HOMEPAGE=http://alioth.debian.org/projects/manpages-de/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-3+ man-pages GPL-2+ GPL-2 BSD
+RDEPEND=virtual/man
+SLOT=0
+SRC_URI=http://manpages-de.alioth.debian.org/downloads/manpages-de-1.7.tar.xz
+_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=98ead7ead45adb7961956854cf2f03cf
diff --git a/metadata/md5-cache/app-i18n/scim-tables-0.5.13 b/metadata/md5-cache/app-i18n/scim-tables-0.5.13
index 74be888b365a..829e7b104ad8 100644
--- a/metadata/md5-cache/app-i18n/scim-tables-0.5.13
+++ b/metadata/md5-cache/app-i18n/scim-tables-0.5.13
@@ -3,10 +3,10 @@ DEPEND=>=app-i18n/scim-1.4.7-r2 nls? ( virtual/libintl ) virtual/pkgconfig nls?
DESCRIPTION=Smart Common Input Method (SCIM) Generic Table Input Method Server
HOMEPAGE=http://www.scim-im.org/
IUSE=nls linguas_am linguas_ar linguas_bn linguas_gu linguas_hi linguas_ja linguas_kn linguas_ko linguas_ml linguas_ne linguas_pa linguas_ru linguas_ta linguas_te linguas_th linguas_uk linguas_vi linguas_zh
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=>=app-i18n/scim-1.4.7-r2 nls? ( virtual/libintl )
SLOT=0
SRC_URI=mirror://sourceforge/scim/scim-tables-0.5.13.tar.gz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=a745187ae0f0bca9b0ddbffe3009e4c9
+_md5_=fe691d21e635f142d58e715a30806a32
diff --git a/metadata/md5-cache/app-misc/vifm-0.7.6 b/metadata/md5-cache/app-misc/vifm-0.7.6
index 64c7adbe1812..32a382a3ebaa 100644
--- a/metadata/md5-cache/app-misc/vifm-0.7.6
+++ b/metadata/md5-cache/app-misc/vifm-0.7.6
@@ -4,10 +4,10 @@ DESCRIPTION=Console file manager with vi(m)-like keybindings
EAPI=5
HOMEPAGE=http://vifm.sourceforge.net/
IUSE=X developer +extended-keys gtk +magic vim vim-syntax
-KEYWORDS=amd64 ppc ~s390 ~x86
+KEYWORDS=amd64 ppc ~s390 x86
LICENSE=GPL-2
RDEPEND=>=sys-libs/ncurses-5.7-r7 magic? ( sys-apps/file ) gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 ) vim? ( || ( app-editors/vim app-editors/gvim ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
SLOT=0
SRC_URI=mirror://sourceforge/vifm/vifm-0.7.6.tar.bz2
_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 vim-doc 1c18baeec98cec3287524cbf2fee2bd2
-_md5_=72d6f258f104c47a182368f1c8bc342c
+_md5_=9eff38f4af653d0afcee291c3c721c52
diff --git a/metadata/md5-cache/dev-lang/nasm-2.10.09 b/metadata/md5-cache/dev-lang/nasm-2.10.09
deleted file mode 100644
index ed5205d50837..000000000000
--- a/metadata/md5-cache/dev-lang/nasm-2.10.09
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=dev-lang/perl doc? ( app-text/ghostscript-gpl sys-apps/texinfo )
-DESCRIPTION=groovy little assembler
-EAPI=5
-HOMEPAGE=http://nasm.sourceforge.net/
-IUSE=doc
-KEYWORDS=-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=http://www.nasm.us/pub/nasm/releasebuilds/2.10.09/nasm-2.10.09.tar.xz
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=e37b2c1320900f9dd6d4eec8785f943f
diff --git a/metadata/md5-cache/dev-lang/nasm-2.11.03 b/metadata/md5-cache/dev-lang/nasm-2.11.05
similarity index 81%
rename from metadata/md5-cache/dev-lang/nasm-2.11.03
rename to metadata/md5-cache/dev-lang/nasm-2.11.05
index e0f0d9d3d20d..ede4da3a2714 100644
--- a/metadata/md5-cache/dev-lang/nasm-2.11.03
+++ b/metadata/md5-cache/dev-lang/nasm-2.11.05
@@ -7,6 +7,6 @@ IUSE=doc
KEYWORDS=~amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos
LICENSE=BSD-2
SLOT=0
-SRC_URI=http://www.nasm.us/pub/nasm/releasebuilds/2.11.03/nasm-2.11.03.tar.xz
+SRC_URI=http://www.nasm.us/pub/nasm/releasebuilds/2.11.05/nasm-2.11.05.tar.xz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=347823c9ae02d65419d08e7db35f1571
+_md5_=0269c256f585fca9f9fa747e347eb5e1
diff --git a/metadata/md5-cache/dev-lang/yasm-1.2.0-r1 b/metadata/md5-cache/dev-lang/yasm-1.2.0-r1
index 8904bd6c9007..c3cc9a187f23 100644
--- a/metadata/md5-cache/dev-lang/yasm-1.2.0-r1
+++ b/metadata/md5-cache/dev-lang/yasm-1.2.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=An assembler for x86 and x86_64 instruction sets
EAPI=5
HOMEPAGE=http://yasm.tortall.net/
IUSE=nls python python_targets_python2_7
-KEYWORDS=-* ~amd64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=-* amd64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
LICENSE=BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )
RDEPEND=nls? ( virtual/libintl )
REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
SLOT=0
SRC_URI=http://www.tortall.net/projects/yasm/releases/yasm-1.2.0.tar.gz mirror://gentoo/yasm-1.2.0-x32.patch.xz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=15760bb1007f895d791d9a1ef780eec4
+_md5_=6de4a0fb931e727d858faecdeae455f0
diff --git a/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r1 b/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r1
deleted file mode 100644
index 2afa93e8e980..000000000000
--- a/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=perl? ( || ( >=dev-lang/perl-5.16 =sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Library for locking devices
-EAPI=2
-HOMEPAGE=http://packages.debian.org/source/sid/lockdev
-IUSE=perl
-KEYWORDS=~alpha amd64 ~arm ~ia64 x86
-LICENSE=LGPL-2.1
-RDEPEND=perl? ( || ( >=dev-lang/perl-5.16 =net-analyzer/rrdtool-1.4.5-r1 !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+DEPEND=>=net-analyzer/rrdtool-1.4.5-r1[graph] !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
DESCRIPTION=RRDtool bindings for PHP
EAPI=5
HOMEPAGE=http://pecl.php.net/rrd
IUSE=php_targets_php5-3
KEYWORDS=~amd64 ~x86
LICENSE=BSD
-RDEPEND=>=net-analyzer/rrdtool-1.4.5-r1 php_targets_php5-3? ( dev-lang/php:5.3 )
+RDEPEND=>=net-analyzer/rrdtool-1.4.5-r1[graph] php_targets_php5-3? ( dev-lang/php:5.3 )
REQUIRED_USE=|| ( php_targets_php5-3 )
SLOT=0
SRC_URI=http://pecl.php.net/get/rrd-1.0.5.tgz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 php-ext-pecl-r2 de1308bcf4fef59a8ee8793efc7c3051 php-ext-source-r2 39437168059a2166e012420b3ba12815 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=8b4234142b8ec6e9dd11e0c04afeb800
+_md5_=293dd341d5ebdd8e440f339cdfec8c5b
diff --git a/metadata/md5-cache/dev-php/pecl-rrd-1.1.0 b/metadata/md5-cache/dev-php/pecl-rrd-1.1.0
index 789ec630d885..a6efc50ccea3 100644
--- a/metadata/md5-cache/dev-php/pecl-rrd-1.1.0
+++ b/metadata/md5-cache/dev-php/pecl-rrd-1.1.0
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=net-analyzer/rrdtool-1.4.5-r1 !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-5? ( dev-lang/php:5.5 )
+DEPEND=>=net-analyzer/rrdtool-1.4.5-r1[graph] !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-5? ( dev-lang/php:5.5 )
DESCRIPTION=RRDtool bindings for PHP
EAPI=5
HOMEPAGE=http://pecl.php.net/rrd
IUSE=php_targets_php5-4 php_targets_php5-5
KEYWORDS=~amd64 ~x86
LICENSE=BSD
-RDEPEND=>=net-analyzer/rrdtool-1.4.5-r1 php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-5? ( dev-lang/php:5.5 )
+RDEPEND=>=net-analyzer/rrdtool-1.4.5-r1[graph] php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-5? ( dev-lang/php:5.5 )
REQUIRED_USE=|| ( php_targets_php5-4 php_targets_php5-5 )
SLOT=0
SRC_URI=http://pecl.php.net/get/rrd-1.1.0.tgz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 php-ext-pecl-r2 de1308bcf4fef59a8ee8793efc7c3051 php-ext-source-r2 39437168059a2166e012420b3ba12815 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=2d5e0eb806d9acfffc85d508eba72fa7
+_md5_=a4a770778b0b28d454f3c77d70bac230
diff --git a/metadata/md5-cache/dev-python/PyQt4-4.11 b/metadata/md5-cache/dev-python/PyQt4-4.11
index d1f505854b93..0add704dc38a 100644
--- a/metadata/md5-cache/dev-python/PyQt4-4.11
+++ b/metadata/md5-cache/dev-python/PyQt4-4.11
@@ -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.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-qt/qtcore-4.8.0:4 X? ( >=dev-qt/qtgui-4.8.0:4 >=dev-qt/qttest-4.8.0:4 ) dbus? ( >=dev-python/dbus-python-0.80[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/qtdbus-4.8.0:4 ) declarative? ( >=dev-qt/qtdeclarative-4.8.0:4 ) designer? ( || ( dev-qt/designer:4 =dev-qt/qthelp-4.8.0:4 ) multimedia? ( >=dev-qt/qtmultimedia-4.8.0:4 ) opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) phonon? ( kde? ( media-libs/phonon ) !kde? ( || ( >=dev-qt/qtphonon-4.8.0:4 media-libs/phonon ) ) ) script? ( >=dev-qt/qtscript-4.8.0:4 ) sql? ( >=dev-qt/qtsql-4.8.0:4 ) svg? ( >=dev-qt/qtsvg-4.8.0:4 ) webkit? ( >=dev-qt/qtwebkit-4.8.0:4 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-4.8.0:4 ) dbus? ( virtual/pkgconfig )
+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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sip-4.16:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-qt/qtcore-4.8.0:4 X? ( >=dev-qt/qtgui-4.8.0:4 >=dev-qt/qttest-4.8.0:4 ) dbus? ( >=dev-python/dbus-python-0.80[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-qt/qtdbus-4.8.0:4 ) declarative? ( >=dev-qt/qtdeclarative-4.8.0:4 ) designer? ( || ( dev-qt/designer:4 =dev-qt/qthelp-4.8.0:4 ) multimedia? ( >=dev-qt/qtmultimedia-4.8.0:4 ) opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) phonon? ( kde? ( media-libs/phonon ) !kde? ( || ( >=dev-qt/qtphonon-4.8.0:4 media-libs/phonon ) ) ) script? ( >=dev-qt/qtscript-4.8.0:4 ) sql? ( >=dev-qt/qtsql-4.8.0:4 ) svg? ( >=dev-qt/qtsvg-4.8.0:4 ) webkit? ( >=dev-qt/qtwebkit-4.8.0:4 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-4.8.0:4 ) dbus? ( virtual/pkgconfig )
DESCRIPTION=Python bindings for the Qt toolkit
EAPI=5
HOMEPAGE=http://www.riverbankcomputing.co.uk/software/pyqt/intro/ https://pypi.python.org/pypi/PyQt4
-IUSE=X dbus debug declarative designer doc examples help kde multimedia opengl phonon script scripttools sql svg webkit xmlpatterns python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+IUSE=X dbus debug declarative designer doc examples help kde multimedia opengl phonon script scripttools sql svg webkit xmlpatterns python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
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.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-qt/qtcore-4.8.0:4 X? ( >=dev-qt/qtgui-4.8.0:4 >=dev-qt/qttest-4.8.0:4 ) dbus? ( >=dev-python/dbus-python-0.80[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/qtdbus-4.8.0:4 ) declarative? ( >=dev-qt/qtdeclarative-4.8.0:4 ) designer? ( || ( dev-qt/designer:4 =dev-qt/qthelp-4.8.0:4 ) multimedia? ( >=dev-qt/qtmultimedia-4.8.0:4 ) opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) phonon? ( kde? ( media-libs/phonon ) !kde? ( || ( >=dev-qt/qtphonon-4.8.0:4 media-libs/phonon ) ) ) script? ( >=dev-qt/qtscript-4.8.0:4 ) sql? ( >=dev-qt/qtsql-4.8.0:4 ) svg? ( >=dev-qt/qtsvg-4.8.0:4 ) webkit? ( >=dev-qt/qtwebkit-4.8.0:4 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-4.8.0:4 )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 ) declarative? ( X ) designer? ( X ) help? ( X ) multimedia? ( X ) opengl? ( X ) phonon? ( X ) scripttools? ( X script ) sql? ( X ) svg? ( X ) webkit? ( X )
+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 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sip-4.16:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-qt/qtcore-4.8.0:4 X? ( >=dev-qt/qtgui-4.8.0:4 >=dev-qt/qttest-4.8.0:4 ) dbus? ( >=dev-python/dbus-python-0.80[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-qt/qtdbus-4.8.0:4 ) declarative? ( >=dev-qt/qtdeclarative-4.8.0:4 ) designer? ( || ( dev-qt/designer:4 =dev-qt/qthelp-4.8.0:4 ) multimedia? ( >=dev-qt/qtmultimedia-4.8.0:4 ) opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) phonon? ( kde? ( media-libs/phonon ) !kde? ( || ( >=dev-qt/qtphonon-4.8.0:4 media-libs/phonon ) ) ) script? ( >=dev-qt/qtscript-4.8.0:4 ) sql? ( >=dev-qt/qtsql-4.8.0:4 ) svg? ( >=dev-qt/qtsvg-4.8.0:4 ) webkit? ( >=dev-qt/qtwebkit-4.8.0:4 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-4.8.0:4 )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 ) declarative? ( X ) designer? ( X ) help? ( X ) multimedia? ( X ) opengl? ( X ) phonon? ( X ) scripttools? ( X script ) sql? ( X ) svg? ( X ) webkit? ( X )
SLOT=0
SRC_URI=mirror://sourceforge/pyqt/PyQt-x11-gpl-4.11.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_=59e9df7af3f01cac5c5e4ac444806666
+_md5_=8d1fabcb7a9de47279430c64c491fea6
diff --git a/metadata/md5-cache/dev-python/PyQt4-4.11.1 b/metadata/md5-cache/dev-python/PyQt4-4.11.1
new file mode 100644
index 000000000000..9806051bcbb7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PyQt4-4.11.1
@@ -0,0 +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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sip-4.16:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-qt/qtcore-4.8.0:4 X? ( >=dev-qt/qtgui-4.8.0:4 >=dev-qt/qttest-4.8.0:4 ) dbus? ( >=dev-python/dbus-python-0.80[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-qt/qtdbus-4.8.0:4 ) declarative? ( >=dev-qt/qtdeclarative-4.8.0:4 ) designer? ( || ( dev-qt/designer:4 =dev-qt/qthelp-4.8.0:4 ) multimedia? ( >=dev-qt/qtmultimedia-4.8.0:4 ) opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) phonon? ( kde? ( media-libs/phonon ) !kde? ( || ( >=dev-qt/qtphonon-4.8.0:4 media-libs/phonon ) ) ) script? ( >=dev-qt/qtscript-4.8.0:4 ) sql? ( >=dev-qt/qtsql-4.8.0:4 ) svg? ( >=dev-qt/qtsvg-4.8.0:4 ) webkit? ( >=dev-qt/qtwebkit-4.8.0:4 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-4.8.0:4 ) dbus? ( virtual/pkgconfig )
+DESCRIPTION=Python bindings for the Qt toolkit
+EAPI=5
+HOMEPAGE=http://www.riverbankcomputing.co.uk/software/pyqt/intro/ https://pypi.python.org/pypi/PyQt4
+IUSE=X dbus debug declarative designer doc examples help kde multimedia opengl phonon script scripttools sql svg webkit xmlpatterns python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sip-4.16:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-qt/qtcore-4.8.0:4 X? ( >=dev-qt/qtgui-4.8.0:4 >=dev-qt/qttest-4.8.0:4 ) dbus? ( >=dev-python/dbus-python-0.80[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-qt/qtdbus-4.8.0:4 ) declarative? ( >=dev-qt/qtdeclarative-4.8.0:4 ) designer? ( || ( dev-qt/designer:4 =dev-qt/qthelp-4.8.0:4 ) multimedia? ( >=dev-qt/qtmultimedia-4.8.0:4 ) opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) phonon? ( kde? ( media-libs/phonon ) !kde? ( || ( >=dev-qt/qtphonon-4.8.0:4 media-libs/phonon ) ) ) script? ( >=dev-qt/qtscript-4.8.0:4 ) sql? ( >=dev-qt/qtsql-4.8.0:4 ) svg? ( >=dev-qt/qtsvg-4.8.0:4 ) webkit? ( >=dev-qt/qtwebkit-4.8.0:4 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-4.8.0:4 )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 ) declarative? ( X ) designer? ( X ) help? ( X ) multimedia? ( X ) opengl? ( X ) phonon? ( X ) scripttools? ( X script ) sql? ( X ) svg? ( X ) webkit? ( X )
+SLOT=0
+SRC_URI=mirror://sourceforge/pyqt/PyQt-x11-gpl-4.11.1.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_=8618d433d9ccfa6253ce35f344eda117
diff --git a/metadata/md5-cache/dev-python/pycurl-7.19.3.1-r1 b/metadata/md5-cache/dev-python/pycurl-7.19.3.1-r1
index 38751bd0d141..f5b50c5f4cac 100644
--- a/metadata/md5-cache/dev-python/pycurl-7.19.3.1-r1
+++ b/metadata/md5-cache/dev-python/pycurl-7.19.3.1-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-misc/curl-7.25.0-r1[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 ) ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/bottle[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) 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 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DEPEND=>=net-misc/curl-7.25.0-r1[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 ) ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/bottle-0.12.7[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) 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 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
DESCRIPTION=python binding for curl/libcurl
EAPI=5
HOMEPAGE=https://github.com/pycurl/pycurl http://pypi.python.org/pypi/pycurl
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targe
SLOT=0
SRC_URI=http://pycurl.sourceforge.net/download/pycurl-7.19.3.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
-_md5_=2b8e0ca7a1acde3ff3e412bbb1c90622
+_md5_=ed703d20fcba8bb858909c29dee26f52
diff --git a/metadata/md5-cache/dev-python/sip-4.16.2 b/metadata/md5-cache/dev-python/sip-4.16.2
new file mode 100644
index 000000000000..bb1b09f70011
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sip-4.16.2
@@ -0,0 +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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Python extension module generator for C and C++ libraries
+EAPI=5
+HOMEPAGE=http://www.riverbankcomputing.co.uk/software/sip/intro http://pypi.python.org/pypi/SIP
+IUSE=debug doc python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=|| ( GPL-2 GPL-3 sip )
+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 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0/11
+SRC_URI=mirror://sourceforge/pyqt/sip-4.16.2.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=7be7535bad26f8a482ed7c3a6404b807
diff --git a/metadata/md5-cache/dev-python/wheel-0.24.0 b/metadata/md5-cache/dev-python/wheel-0.24.0
new file mode 100644
index 000000000000..795491153b2d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/wheel-0.24.0
@@ -0,0 +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(-)] 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=A built-package format for Python
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/wheel
+IUSE=doc python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
+KEYWORDS=~amd64 ~x86
+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/w/wheel/wheel-0.24.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_=347dbd5d5f23e10d3b736fdd69cac99a
diff --git a/metadata/md5-cache/dev-ruby/celluloid-io-0.15.0 b/metadata/md5-cache/dev-ruby/celluloid-io-0.15.0
new file mode 100644
index 000000000000..4467565cbdeb
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/celluloid-io-0.15.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/celluloid[ruby_targets_ruby19] dev-ruby/nio4r[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/celluloid[ruby_targets_ruby20] dev-ruby/nio4r[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) 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=Evented IO for Celluloid actors
+EAPI=5
+HOMEPAGE=https://github.com/celluloid/celluloid-io
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( dev-ruby/celluloid[ruby_targets_ruby19] dev-ruby/nio4r[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/celluloid[ruby_targets_ruby20] dev-ruby/nio4r[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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://rubygems/celluloid-io-0.15.0.gem
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem 738ee4b7f8b16d4a734b4d37717db89b ruby-ng 14f0490e24cbad7c17cece628b3d111e toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=b7f25292a90e84fcc0798ff9e00cabe6
diff --git a/metadata/md5-cache/dev-ruby/coderay-1.1.0-r1 b/metadata/md5-cache/dev-ruby/coderay-1.1.0-r1
index 30a7fa29a4cb..4aef5c5c5883 100644
--- a/metadata/md5-cache/dev-ruby/coderay-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/coderay-1.1.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Ruby library for syntax highlighting.
EAPI=5
HOMEPAGE=http://coderay.rubychan.de/
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 ~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 ~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=0
SRC_URI=https://github.com/rubychan/coderay/tarball/v1.1.0 -> coderay-1.1.0.tgz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem 738ee4b7f8b16d4a734b4d37717db89b ruby-ng 14f0490e24cbad7c17cece628b3d111e toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=fbc65b24d5d9a1b6f6d2f339c0c04167
+_md5_=a78dcac9b91bc52bc515d98180c710f2
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.10.5-r1 b/metadata/md5-cache/dev-ruby/mocha-0.10.5-r1
index 23f612dd20e0..bb08b80ba75b 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.10.5-r1
+++ b/metadata/md5-cache/dev-ruby/mocha-0.10.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Ruby library for mocking and stubbing using a syntax like that of
EAPI=5
HOMEPAGE=http://mocha.rubyforge.org/
IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
-KEYWORDS=~alpha ~amd64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~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-ruby/metaclass[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/metaclass[ruby_targets_ruby20] ) ruby_targets_jruby? ( dev-ruby/metaclass[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 )
SLOT=0.10
SRC_URI=mirror://rubygems/mocha-0.10.5.gem
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem 738ee4b7f8b16d4a734b4d37717db89b ruby-ng 14f0490e24cbad7c17cece628b3d111e toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b87cb8896792ad77ae21d2b95f8d016b
+_md5_=4efbd51d8e7116f20e9fc7081d789ba9
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.12.10 b/metadata/md5-cache/dev-ruby/mocha-0.12.10
index 92f9d6dc535c..8c38409050f0 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.12.10
+++ b/metadata/md5-cache/dev-ruby/mocha-0.12.10
@@ -4,11 +4,11 @@ DESCRIPTION=A Ruby library for mocking and stubbing using a syntax like that of
EAPI=5
HOMEPAGE=http://gofreerange.com/mocha/docs/
IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ruby20 doc test test
-KEYWORDS=~alpha ~amd64 arm ~hppa ia64 ~ppc ~ppc64 ~x86 ~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 x86 ~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-ruby/metaclass[ruby_targets_ruby19] ) ruby_targets_jruby? ( dev-ruby/metaclass[ruby_targets_jruby] ) ruby_targets_ruby20? ( dev-ruby/metaclass[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ruby20 )
SLOT=0.12
SRC_URI=mirror://rubygems/mocha-0.12.10.gem
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem 738ee4b7f8b16d4a734b4d37717db89b ruby-ng 14f0490e24cbad7c17cece628b3d111e toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7afc868feab3d785f30ed0429f5fbd9f
+_md5_=0b3c44c70349264a65ebe3a2e772484b
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.13.3-r1 b/metadata/md5-cache/dev-ruby/mocha-0.13.3-r1
index b5c0275c0415..2a37d7db0b41 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.13.3-r1
+++ b/metadata/md5-cache/dev-ruby/mocha-0.13.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Ruby library for mocking and stubbing using a syntax like that of
EAPI=5
HOMEPAGE=http://gofreerange.com/mocha/docs/
IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
-KEYWORDS=~alpha ~amd64 arm ~hppa ia64 ~ppc ~ppc64 ~x86 ~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 x86 ~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-ruby/metaclass[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/metaclass[ruby_targets_ruby20] ) ruby_targets_jruby? ( dev-ruby/metaclass[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 )
SLOT=0.13
SRC_URI=mirror://rubygems/mocha-0.13.3.gem
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem 738ee4b7f8b16d4a734b4d37717db89b ruby-ng 14f0490e24cbad7c17cece628b3d111e toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=bbf3f1b60c998c9fbbe64ffda93b5391
+_md5_=551db42a58320041ab96b796b04fe6fb
diff --git a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.8_p20140630 b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.8_p20140630
new file mode 100644
index 000000000000..0f89de210c01
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.8_p20140630
@@ -0,0 +1,14 @@
+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_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[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=The posix-spawn library aims to implement a subset of the Ruby 1.9 Process::spawn
+EAPI=5
+HOMEPAGE=https://github.com/rtomayko/posix-spawn/
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
+KEYWORDS=~amd64
+LICENSE=MIT LGPL-2.1
+RDEPEND=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=https://github.com/rtomayko/posix-spawn/archive/25a0806ce0335faf958834d9dd6a41ff2288fa56.tar.gz -> posix-spawn-0.3.8_p20140630.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem 738ee4b7f8b16d4a734b4d37717db89b ruby-ng 14f0490e24cbad7c17cece628b3d111e toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=60ae9ccf7b93389d931a435258ceae7b
diff --git a/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r1 b/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r1
index 5bdb3072dd5e..7033266a06f8 100644
--- a/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r1
+++ b/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A module for using Textile in Ruby
EAPI=5
HOMEPAGE=http://redcloth.org/
IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=~alpha ~amd64 arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~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 ~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_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=https://github.com/jgarber/redcloth/tarball/v4.2.9 -> RedCloth-git-4.2.9.tgz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem 738ee4b7f8b16d4a734b4d37717db89b ruby-ng 14f0490e24cbad7c17cece628b3d111e toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=477fa428611e529b59b316ab915d46ef
+_md5_=64b0c1492cfb64af2c1d998e8a117076
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 ef6b85ea4441..dbf5c14090ca 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 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 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
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
LICENSE=GPL-2
-RDEPEND=net-analyzer/rrdtool !! circuit_macros-7.9.2.tar.gz
+_eclasses_=texlive-common d2656dc15155203f2fa36efbef32c282
+_md5_=824f5710614fb1de19c5d3f438c8ed44
diff --git a/metadata/md5-cache/games-action/extreme-tuxracer-0.4 b/metadata/md5-cache/games-action/extreme-tuxracer-0.4
deleted file mode 100644
index 452ce7b8e0a8..000000000000
--- a/metadata/md5-cache/games-action/extreme-tuxracer-0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=virtual/opengl dev-lang/tcl virtual/glu media-libs/libsdl[X] media-libs/sdl-mixer[mod] >=media-libs/freetype-2 media-libs/libpng x11-libs/libXmu x11-libs/libXi virtual/pkgconfig
-DESCRIPTION=High speed arctic racing game based on Tux Racer
-EAPI=2
-HOMEPAGE=http://www.extremetuxracer.com/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=virtual/opengl dev-lang/tcl virtual/glu media-libs/libsdl[X] media-libs/sdl-mixer[mod] >=media-libs/freetype-2 media-libs/libpng x11-libs/libXmu x11-libs/libXi games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/extremetuxracer/extremetuxracer-0.4.tar.gz
-_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 06133990e861be0fe60c2b428fd025d9 games e221fed675714bd5545b7488aed9f822 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747
-_md5_=15345012fad1a98f3428ebc3e8fa3800
diff --git a/metadata/md5-cache/games-action/extreme-tuxracer-0.5_beta b/metadata/md5-cache/games-action/extreme-tuxracer-0.5_beta
deleted file mode 100644
index 8101545ccee5..000000000000
--- a/metadata/md5-cache/games-action/extreme-tuxracer-0.5_beta
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=virtual/opengl virtual/glu dev-lang/tcl media-libs/libsdl[X,sound,video] media-libs/sdl-mixer[mod,vorbis] media-libs/freetype:2 media-libs/libpng x11-libs/libXmu x11-libs/libXi virtual/libintl nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=High speed arctic racing game based on Tux Racer
-EAPI=2
-HOMEPAGE=http://www.extremetuxracer.com/
-IUSE=nls
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=virtual/opengl virtual/glu dev-lang/tcl media-libs/libsdl[X,sound,video] media-libs/sdl-mixer[mod,vorbis] media-libs/freetype:2 media-libs/libpng x11-libs/libXmu x11-libs/libXi virtual/libintl games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/extremetuxracer/extremetuxracer-0.5beta.tar.gz
-_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 06133990e861be0fe60c2b428fd025d9 games e221fed675714bd5545b7488aed9f822 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747
-_md5_=bd3906f8a1bc8ce7a293fc30a7c3d2c0
diff --git a/metadata/md5-cache/games-action/slune-1.0.15 b/metadata/md5-cache/games-action/slune-1.0.15
deleted file mode 100644
index 29cbd5736434..000000000000
--- a/metadata/md5-cache/games-action/slune-1.0.15
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=virtual/opengl >=media-libs/libsdl-1.2.6 >=dev-python/soya-0.9 >=dev-python/py2play-0.1.9 >=dev-python/pyopenal-0.1.3 >=dev-python/pyogg-1.1 >=dev-python/pyvorbis-1.1 =dev-lang/python-2*
-DESCRIPTION=A 3D action game with multiplayer mode and amazing graphics
-EAPI=3
-HOMEPAGE=http://oomadness.tuxfamily.org/en/slune/
-KEYWORDS=x86
-LICENSE=GPL-2
-RDEPEND=virtual/opengl >=media-libs/libsdl-1.2.6 >=dev-python/soya-0.9 >=dev-python/py2play-0.1.9 >=dev-python/pyopenal-0.1.3 >=dev-python/pyogg-1.1 >=dev-python/pyvorbis-1.1 =dev-lang/python-2*
-SLOT=0
-SRC_URI=http://download.gna.org/slune/Slune-1.0.15.tar.bz2
-_eclasses_=distutils 34e0f373c466bb0e97ba194735f1acf2 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python be9965681d83c3980660a2660ac95e95 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=cefdb6677c1550d886a16bb821c39a9f
diff --git a/metadata/md5-cache/games-arcade/vor-0.5.4 b/metadata/md5-cache/games-arcade/vor-0.5.4
deleted file mode 100644
index 96a58b4c65f4..000000000000
--- a/metadata/md5-cache/games-arcade/vor-0.5.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer[mod]
-DESCRIPTION=Variations on Rockdodger: Dodge the rocks until you die
-EAPI=2
-HOMEPAGE=http://jasonwoof.org/vor
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer[mod] games-misc/games-envd
-SLOT=0
-SRC_URI=http://qualdan.com/vor/vor-0.5.4.tar.bz2
-_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 06133990e861be0fe60c2b428fd025d9 games e221fed675714bd5545b7488aed9f822 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747
-_md5_=780e942761f605de39bde0313e02a85c
diff --git a/metadata/md5-cache/games-board/domination-1.1.1.2 b/metadata/md5-cache/games-board/domination-1.1.1.2
deleted file mode 100644
index f82ae092736c..000000000000
--- a/metadata/md5-cache/games-board/domination-1.1.1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=The well-known board game, written in java
-HOMEPAGE=http://domination.sourceforge.net
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86 ~x86-fbsd
-LICENSE=GPL-3
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/domination/Domination_1.1.1.2.zip
-_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 06133990e861be0fe60c2b428fd025d9 games e221fed675714bd5545b7488aed9f822 java-ant-2 5f5bada6517ed26bc25083134e42b146 java-pkg-2 65bbb59987d777c1106ae8aa4bf36e7b java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8225652f261fc3eec2aa806aa43479f1
diff --git a/metadata/md5-cache/games-board/pokerth-1.0.1 b/metadata/md5-cache/games-board/pokerth-1.0.1
deleted file mode 100644
index 1b9e25281bd9..000000000000
--- a/metadata/md5-cache/games-board/pokerth-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-db/sqlite:3 dev-libs/boost[threads(+)] dev-libs/protobuf dev-libs/libgcrypt:0 dev-libs/tinyxml[stl] amd64? ( net-libs/libircclient ) ppc? ( >=net-libs/libircclient-1.6-r2 ) x86? ( net-libs/libircclient ) >=net-misc/curl-7.16 dev-qt/qtcore:4 virtual/gsasl !dedicated? ( media-libs/libsdl:0 media-libs/sdl-mixer[mod,vorbis] dev-qt/qtgui:4 ) !dedicated? ( dev-qt/qtsql:4 ) virtual/pkgconfig
-DESCRIPTION=Texas Hold'em poker game
-EAPI=5
-HOMEPAGE=http://www.pokerth.net/
-IUSE=dedicated
-KEYWORDS=amd64 ~ppc x86
-LICENSE=AGPL-3 GPL-1 GPL-2 GPL-3 BitstreamVera public-domain
-RDEPEND=dev-db/sqlite:3 dev-libs/boost[threads(+)] dev-libs/protobuf dev-libs/libgcrypt:0 dev-libs/tinyxml[stl] amd64? ( net-libs/libircclient ) ppc? ( >=net-libs/libircclient-1.6-r2 ) x86? ( net-libs/libircclient ) >=net-misc/curl-7.16 dev-qt/qtcore:4 virtual/gsasl !dedicated? ( media-libs/libsdl:0 media-libs/sdl-mixer[mod,vorbis] dev-qt/qtgui:4 ) games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/pokerth/PokerTH-1.0.1-src.tar.bz2
-_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be games e221fed675714bd5545b7488aed9f822 multilib 3bf24e6abb9b76d9f6c20600f0b716bf qmake-utils dd0375da11f79aa416ff97913c59d01c qt4-r2 b40473dafd07d7c5fe4aef1c1b902f39 toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747
-_md5_=5e72f3b2bb5d0cb6c7cd60a781c40efa
diff --git a/metadata/md5-cache/games-emulation/emutos-0.8.7 b/metadata/md5-cache/games-emulation/emutos-0.8.7
deleted file mode 100644
index b44a71d7e337..000000000000
--- a/metadata/md5-cache/games-emulation/emutos-0.8.7
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=a single-user single-tasking operating system for 32 bit Atari computer emulators
-HOMEPAGE=http://emutos.sourceforge.net
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/emutos/emutos-512k-0.8.7.zip mirror://sourceforge/emutos/emutos-256k-0.8.7.zip
-_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 06133990e861be0fe60c2b428fd025d9 games e221fed675714bd5545b7488aed9f822 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747
-_md5_=79eebc20ca04a6deae87d2d25b23d57c
diff --git a/metadata/md5-cache/games-emulation/hatari-1.5.0 b/metadata/md5-cache/games-emulation/hatari-1.5.0
deleted file mode 100644
index e8e959401867..000000000000
--- a/metadata/md5-cache/games-emulation/hatari-1.5.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=media-libs/libsdl[X,sound,video] sys-libs/readline media-libs/libpng sys-libs/zlib virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Atari ST emulator
-EAPI=2
-HOMEPAGE=http://hatari.berlios.de/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[X,sound,video] sys-libs/readline media-libs/libpng sys-libs/zlib games-emulation/emutos games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://berlios/hatari/hatari-1.5.0.tar.bz2
-_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 cmake-utils 10b6a99f9058ac1b830d00b3421f04e4 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be games e221fed675714bd5545b7488aed9f822 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747
-_md5_=987205a8f2fad6b800abdc1f8cc46ec6
diff --git a/metadata/md5-cache/games-emulation/hatari-1.6.1 b/metadata/md5-cache/games-emulation/hatari-1.6.1
deleted file mode 100644
index 8bed33dcf978..000000000000
--- a/metadata/md5-cache/games-emulation/hatari-1.6.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=media-libs/libsdl[X,sound,video] sys-libs/readline media-libs/libpng sys-libs/zlib virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Atari ST emulator
-EAPI=2
-HOMEPAGE=http://hatari.berlios.de/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[X,sound,video] sys-libs/readline media-libs/libpng sys-libs/zlib games-emulation/emutos games-misc/games-envd
-SLOT=0
-SRC_URI=http://download.tuxfamily.org/hatari/1.6.1/hatari-1.6.1.tar.bz2
-_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 cmake-utils 10b6a99f9058ac1b830d00b3421f04e4 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be games e221fed675714bd5545b7488aed9f822 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747
-_md5_=c03646ace832855fa2c9aea52ffcd9d5
diff --git a/metadata/md5-cache/games-emulation/hatari-1.6.1-r1 b/metadata/md5-cache/games-emulation/hatari-1.7.0
similarity index 91%
rename from metadata/md5-cache/games-emulation/hatari-1.6.1-r1
rename to metadata/md5-cache/games-emulation/hatari-1.7.0
index b7d056ae11b6..1966608bb326 100644
--- a/metadata/md5-cache/games-emulation/hatari-1.6.1-r1
+++ b/metadata/md5-cache/games-emulation/hatari-1.7.0
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install postinst preinst prepare setup test unp
DEPEND=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(+)?] media-libs/libsdl[X,sound,video] sys-libs/readline media-libs/libpng sys-libs/zlib virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
DESCRIPTION=Atari ST emulator
EAPI=5
-HOMEPAGE=http://hatari.berlios.de/
+HOMEPAGE=http://hatari.tuxfamily.org/
IUSE=python_targets_python2_7 python_single_target_python2_7
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=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(+)?] media-libs/libsdl[X,sound,video] sys-libs/readline media-libs/libpng sys-libs/zlib dev-python/pygtk[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] games-emulation/emutos games-misc/games-envd
REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 )
SLOT=0
-SRC_URI=http://download.tuxfamily.org/hatari/1.6.1/hatari-1.6.1.tar.bz2
+SRC_URI=http://download.tuxfamily.org/hatari/1.7.0/hatari-1.7.0.tar.bz2
_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 cmake-utils 10b6a99f9058ac1b830d00b3421f04e4 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be games e221fed675714bd5545b7488aed9f822 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-single-r1 a71a169a881e0a11d04a7fe12dc39f6e python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747
-_md5_=0dd2ec62312c324a68ffe9f04a607974
+_md5_=a954b3ffb2a851cb82ec08aeea8497d2
diff --git a/metadata/md5-cache/games-strategy/mindrover-demo-1.07b b/metadata/md5-cache/games-strategy/mindrover-demo-1.07b
index 500b5d705dd1..0ef22fb0ae39 100644
--- a/metadata/md5-cache/games-strategy/mindrover-demo-1.07b
+++ b/metadata/md5-cache/games-strategy/mindrover-demo-1.07b
@@ -1,5 +1,6 @@
-DEFINED_PHASES=compile install postinst preinst setup unpack
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
DESCRIPTION=Control a robot as it races across Europa
+EAPI=5
HOMEPAGE=http://www.linuxgamepublishing.com/info.php?id=9
KEYWORDS=x86
LICENSE=all-rights-reserved GPL-2+
@@ -8,4 +9,4 @@ RESTRICT=mirror bindist strip
SLOT=0
SRC_URI=http://demos.linuxgamepublishing.com/mindrover/mindrover_demo.run
_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 06133990e861be0fe60c2b428fd025d9 games e221fed675714bd5545b7488aed9f822 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 unpacker f300a7ca9131b1024a79762e8edd3c52 user f54e098dd38ba1c0847a13e685b87747
-_md5_=290521c49a820ae490df9c3249ddc83b
+_md5_=39275c6f49d3ac56aa9b4bea52e45eab
diff --git a/metadata/md5-cache/games-util/joystick-0_pre20060731 b/metadata/md5-cache/games-util/joystick-0_pre20060731
deleted file mode 100644
index d332842c5e8d..000000000000
--- a/metadata/md5-cache/games-util/joystick-0_pre20060731
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sdl? ( media-libs/libsdl[video] ) !x11-libs/tslib
-DESCRIPTION=joystick testing utilities
-EAPI=2
-HOMEPAGE=http://atrey.karlin.mff.cuni.cz/~vojtech/input/
-IUSE=sdl
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=sdl? ( media-libs/libsdl[video] ) !x11-libs/tslib
-SLOT=0
-SRC_URI=mirror://gentoo/joystick-20060731.tar.bz2
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=b2e07a95adac8f221fcfce9acd3241dd
diff --git a/metadata/md5-cache/games-util/joystick-1.4.2 b/metadata/md5-cache/games-util/joystick-1.4.7
similarity index 63%
rename from metadata/md5-cache/games-util/joystick-1.4.2
rename to metadata/md5-cache/games-util/joystick-1.4.7
index b45d6fdc7bed..6b94fd0a2bfc 100644
--- a/metadata/md5-cache/games-util/joystick-1.4.2
+++ b/metadata/md5-cache/games-util/joystick-1.4.7
@@ -1,13 +1,13 @@
DEFINED_PHASES=prepare
-DEPEND=sdl? ( media-libs/libsdl[video] ) !=sys-libs/db-3.2 ) !berkdb? ( sqlite? ( >=de
SLOT=0
SRC_URI=mirror://sourceforge/bogofilter/bogofilter-1.2.4.tar.bz2
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 db-use 1c719875d6599536f956fafea9e1f404 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=999f89cf572a78cc26efccec98361d50
+_md5_=6ff41f498be19ac6e69b0cff821d8e0f
diff --git a/metadata/md5-cache/media-gfx/librecad-2.0.3 b/metadata/md5-cache/media-gfx/librecad-2.0.3
index 0921a2c520d9..d21f890c82b2 100644
--- a/metadata/md5-cache/media-gfx/librecad-2.0.3
+++ b/metadata/md5-cache/media-gfx/librecad-2.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=Generic 2D CAD program
EAPI=5
HOMEPAGE=http://www.librecad.org/
IUSE=debug doc tools
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=dev-cpp/muParser dev-qt/qtgui:4 dev-qt/qthelp:4 dev-qt/qtsvg:4 dev-libs/boost media-libs/freetype
SLOT=0
SRC_URI=https://github.com/LibreCAD/LibreCAD/archive/2.0.3.zip -> librecad-2.0.3.zip
_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf qmake-utils dd0375da11f79aa416ff97913c59d01c qt4-r2 b40473dafd07d7c5fe4aef1c1b902f39 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=7eaf8f359b608af1c896d60cee4a39f9
+_md5_=16d4607cb472c8e0960b0f942bd73ad0
diff --git a/metadata/md5-cache/media-gfx/qrencode-3.4.3 b/metadata/md5-cache/media-gfx/qrencode-3.4.3
index 8253d0f0c25d..e6885643f25a 100644
--- a/metadata/md5-cache/media-gfx/qrencode-3.4.3
+++ b/metadata/md5-cache/media-gfx/qrencode-3.4.3
@@ -3,10 +3,10 @@ DEPEND=media-libs/libpng virtual/pkgconfig !=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(-)?] 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(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-0.9.12[truetype,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.2.51[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(-)?] ) utils? ( 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/libXau-1.0.7-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/libXdmcp-1.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(-)?] ) ) infinality? ( media-libs/fontconfig-infinality ) abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
REQUIRED_USE=harfbuzz? ( auto-hinter )
SLOT=2
SRC_URI=mirror://sourceforge/freetype/freetype-2.5.3.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.5.3.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.5.3.tar.bz2 ) infinality? ( https://raw.github.com/bohoomil/fontconfig-ultimate/ddda669247330d1a1b8c9473cfe5052d42e1b313/01_lib32-freetype2-iu-2.5.1-2/infinality-2.5.1.patch -> freetype-2.5.1-infinality.patch )
_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
-_md5_=e4f098974476692440575693abd3378e
+_md5_=2fd56a546aaa43313814b6b3dea19999
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 b3a220c31234..dbf69ce016d3 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_=ed514cc25edca5a3dea362adf40f863e
+_md5_=571badc077401a3abecdf3a6c4126bb5
diff --git a/metadata/md5-cache/media-libs/libexif-0.6.21-r1 b/metadata/md5-cache/media-libs/libexif-0.6.21-r1
index b3132940c565..8c2af08296a8 100644
--- a/metadata/md5-cache/media-libs/libexif-0.6.21-r1
+++ b/metadata/md5-cache/media-libs/libexif-0.6.21-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Library for parsing, editing, and saving EXIF data
EAPI=5
HOMEPAGE=http://libexif.sourceforge.net/
IUSE=doc 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
LICENSE=LGPL-2.1
RDEPEND=nls? ( virtual/libintl )
SLOT=0
SRC_URI=mirror://sourceforge/libexif/libexif-0.6.21.tar.bz2
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build fbb9baa0b4039304643e36e9820fdecf multilib-minimal 5bbdc77877c1aa3c6bd89ca3f9196d11 multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=4baadb1e4ad939fc851caa3b24fc0cad
+_md5_=8e3ed54f44a788287414c4b69e678029
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.7 b/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.7
new file mode 100644
index 000000000000..45bcbb59824c
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~net-libs/libnice-0.1.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(-)?] media-libs/gstreamer:0.10[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(-)?] media-libs/gst-plugins-base:0.10[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(-)?] >=virtual/pkgconfig-0-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(-)?]
+DESCRIPTION=GStreamer plugin for ICE (RFC 5245) support
+EAPI=5
+HOMEPAGE=http://nice.freedesktop.org/wiki/
+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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=|| ( MPL-1.1 LGPL-2.1 )
+RDEPEND=~net-libs/libnice-0.1.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(-)?] media-libs/gstreamer:0.10[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(-)?] media-libs/gst-plugins-base:0.10[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.10
+SRC_URI=http://nice.freedesktop.org/releases/libnice-0.1.7.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build fbb9baa0b4039304643e36e9820fdecf multilib-minimal 5bbdc77877c1aa3c6bd89ca3f9196d11 multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=82d1d28d2bc42eb77662dfa16effcb22
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.7-r100 b/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.7-r100
new file mode 100644
index 000000000000..6e6252f71706
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.7-r100
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~net-libs/libnice-0.1.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(-)?] media-libs/gstreamer: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(-)?] media-libs/gst-plugins-base: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(-)?] >=virtual/pkgconfig-0-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(-)?]
+DESCRIPTION=GStreamer plugin for ICE (RFC 5245) support
+EAPI=5
+HOMEPAGE=http://nice.freedesktop.org/wiki/
+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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=|| ( MPL-1.1 LGPL-2.1 )
+RDEPEND=~net-libs/libnice-0.1.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(-)?] media-libs/gstreamer: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(-)?] media-libs/gst-plugins-base: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(-)?]
+SLOT=1.0
+SRC_URI=http://nice.freedesktop.org/releases/libnice-0.1.7.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build fbb9baa0b4039304643e36e9820fdecf multilib-minimal 5bbdc77877c1aa3c6bd89ca3f9196d11 multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=c35dc8bef29699356b1ea854bf183072
diff --git a/metadata/md5-cache/media-plugins/mythplugins-0.27.1_p20140713 b/metadata/md5-cache/media-plugins/mythplugins-0.27.1_p20140713
new file mode 100644
index 000000000000..80eadde48f93
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/mythplugins-0.27.1_p20140713
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather =media-tv/mythtv-0.27.1_p20140713*:=[python] mytharchive? ( app-cdr/dvd+rw-tools virtual/python-imaging:= media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff:= virtual/opengl exif? ( >media-libs/libexif-0.6.9:= ) raw? ( media-gfx/dcraw ) ) mythmusic? ( >=media-libs/flac-1.1.2:= >=media-libs/libvorbis-1.0:= >=media-libs/taglib-1.6:= media-sound/lame virtual/opengl cdda? ( dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) fftw? ( sci-libs/fftw:= ) ) mythnetvision? ( =dev-lang/python-2*:=[xml] dev-python/lxml:= dev-python/mysql-python:= dev-python/oauth:= dev-python/pycurl:= ) mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 >=dev-perl/DateTime-1 dev-perl/ImageSize dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DESCRIPTION=Official MythTV plugins
+EAPI=5
+HOMEPAGE=http://www.mythtv.org
+IUSE=mytharchive mythbrowser mythgallery mythgame mythmusic mythnetvision mythnews mythweather mythzoneminder cdda cdr exif fftw raw
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather =media-tv/mythtv-0.27.1_p20140713*:=[python] mytharchive? ( app-cdr/dvd+rw-tools virtual/python-imaging:= media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff:= virtual/opengl exif? ( >media-libs/libexif-0.6.9:= ) raw? ( media-gfx/dcraw ) ) mythmusic? ( >=media-libs/flac-1.1.2:= >=media-libs/libvorbis-1.0:= >=media-libs/taglib-1.6:= media-sound/lame virtual/opengl cdda? ( dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) fftw? ( sci-libs/fftw:= ) ) mythnetvision? ( =dev-lang/python-2*:=[xml] dev-python/lxml:= dev-python/mysql-python:= dev-python/oauth:= dev-python/pycurl:= ) mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 >=dev-perl/DateTime-1 dev-perl/ImageSize dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+REQUIRED_USE=cdda? ( mythmusic ) cdr? ( mythmusic cdda ) exif? ( mythgallery ) fftw? ( mythmusic ) mythnews? ( mythbrowser ) raw? ( mythgallery )
+SLOT=0
+SRC_URI=https://github.com/MythTV/mythtv/archive/v0.27.1.tar.gz -> mythtv-0.27.1.tar.gz http://dev.gentoo.org/~rich0/distfiles/mythplugins-0.27.1-aaae611819c6a6f92a55d5c82efb8738ec9a23df.tar.xz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python be9965681d83c3980660a2660ac95e95 toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=0124ccc1a3e0d5dbc226bdbc1458a72e
diff --git a/metadata/md5-cache/media-sound/pavucontrol-0.9.10 b/metadata/md5-cache/media-sound/pavucontrol-0.9.10
deleted file mode 100644
index 9534b398b953..000000000000
--- a/metadata/md5-cache/media-sound/pavucontrol-0.9.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-cpp/gtkmm-2.16:2.4 dev-cpp/libglademm:2.4 >=dev-libs/libsigc++-2.2:2 >=x11-libs/gtk+-2.16:2 >=media-sound/pulseaudio-0.9.16[glib] >=media-libs/libcanberra-0.16[gtk] || ( x11-themes/tango-icon-theme x11-themes/gnome-icon-theme ) nls? ( sys-devel/gettext dev-util/intltool ) virtual/pkgconfig
-DESCRIPTION=Pulseaudio Volume Control, GTK based mixer for Pulseaudio
-EAPI=2
-HOMEPAGE=http://0pointer.de/lennart/projects/pavucontrol/
-IUSE=nls
-KEYWORDS=amd64 ~ppc ~sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-cpp/gtkmm-2.16:2.4 dev-cpp/libglademm:2.4 >=dev-libs/libsigc++-2.2:2 >=x11-libs/gtk+-2.16:2 >=media-sound/pulseaudio-0.9.16[glib] >=media-libs/libcanberra-0.16[gtk] || ( x11-themes/tango-icon-theme x11-themes/gnome-icon-theme )
-SLOT=0
-SRC_URI=http://0pointer.de/lennart/projects/pavucontrol/pavucontrol-0.9.10.tar.gz
-_md5_=b7f025e539f6bf14863670a9519f60d9
diff --git a/metadata/md5-cache/media-sound/pavucontrol-2.0 b/metadata/md5-cache/media-sound/pavucontrol-2.0
index f0c5d4ecc8f4..3c8f74a50325 100644
--- a/metadata/md5-cache/media-sound/pavucontrol-2.0
+++ b/metadata/md5-cache/media-sound/pavucontrol-2.0
@@ -1,12 +1,12 @@
DEFINED_PHASES=configure
-DEPEND=>=dev-cpp/gtkmm-3.0:3.0 >=dev-libs/libsigc++-2.2:2 >=media-libs/libcanberra-0.16[gtk3] >=media-sound/pulseaudio-0.9.16[glib] virtual/freedesktop-icon-theme virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext )
+DEPEND=>=dev-cpp/gtkmm-3.0:3.0 >=dev-libs/libsigc++-2.2:2 >=media-libs/libcanberra-0.16[gtk3] >=media-sound/pulseaudio-3[glib] virtual/freedesktop-icon-theme virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext )
DESCRIPTION=Pulseaudio Volume Control, GTK based mixer for Pulseaudio
-EAPI=4
+EAPI=5
HOMEPAGE=http://freedesktop.org/software/pulseaudio/pavucontrol/
IUSE=nls
KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
LICENSE=GPL-2
-RDEPEND=>=dev-cpp/gtkmm-3.0:3.0 >=dev-libs/libsigc++-2.2:2 >=media-libs/libcanberra-0.16[gtk3] >=media-sound/pulseaudio-0.9.16[glib] virtual/freedesktop-icon-theme
+RDEPEND=>=dev-cpp/gtkmm-3.0:3.0 >=dev-libs/libsigc++-2.2:2 >=media-libs/libcanberra-0.16[gtk3] >=media-sound/pulseaudio-3[glib] virtual/freedesktop-icon-theme
SLOT=0
SRC_URI=http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-2.0.tar.xz
-_md5_=5b6a9476a995dba512adde439e2ed16d
+_md5_=3a9a1da8971fcbb593f98242809eb932
diff --git a/metadata/md5-cache/media-tv/mythtv-0.27.1_p20140713 b/metadata/md5-cache/media-tv/mythtv-0.27.1_p20140713
new file mode 100644
index 000000000000..d33706452411
--- /dev/null
+++ b/metadata/md5-cache/media-tv/mythtv-0.27.1_p20140713
@@ -0,0 +1,14 @@
+DEFINED_PHASES=config configure info install postinst postrm preinst prepare setup
+DEPEND=>=media-libs/freetype-2.0:= sys-libs/zlib:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXv:= x11-libs/libXrandr:= x11-libs/libXxf86vm:= >=dev-qt/qtcore-4.7.2:4= >=dev-qt/qtdbus-4.7.2:4= >=dev-qt/qtgui-4.7.2:4= >=dev-qt/qtscript-4.7.2:4= >=dev-qt/qtsql-4.7.2:4=[mysql] >=dev-qt/qtopengl-4.7.2:4=[egl?] >=dev-qt/qtwebkit-4.7.2:4= x11-misc/wmctrl:= virtual/mysql:= virtual/opengl:= alsa? ( >=media-libs/alsa-lib-1.0.24:= ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:= ) cec? ( dev-libs/libcec:= ) dvb? ( media-libs/libdvb:= virtual/linuxtv-dvb-headers:= ) dvd? ( dev-libs/libcdio:= ) egl? ( media-libs/mesa:=[egl] ) fftw? ( sci-libs/fftw:3.0= ) hls? ( media-libs/faac:= media-libs/libvpx:= >=media-libs/x264-0.0.20111220:= >=media-sound/lame-3.93.1 ) ieee1394? ( >=sys-libs/libraw1394-1.2.0:= >=sys-libs/libavc1394-0.5.3:= >=media-libs/libiec61883-1.0.0:= ) jack? ( media-sound/jack-audio-connection-kit ) lcd? ( app-misc/lcdproc ) libass? ( >=media-libs/libass-0.9.11:= ) lirc? ( app-misc/lirc ) perl? ( dev-perl/DBD-mysql dev-perl/Net-UPnP dev-perl/LWP-Protocol-https dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 >=dev-perl/libwww-perl-5 ) pulseaudio? ( media-sound/pulseaudio ) python? ( dev-python/mysql-python dev-python/lxml dev-python/urlgrabber ) raop? ( dev-libs/openssl:= net-dns/avahi[mdnsresponder-compat] ) theora? ( media-libs/libtheora:= media-libs/libogg:= ) vaapi? ( x11-libs/libva:= ) vdpau? ( x11-libs/libvdpau:= ) vorbis? ( >=media-libs/libvorbis-1.0:= media-libs/libogg:= ) xml? ( >=dev-libs/libxml2-2.6.0:= ) xvid? ( >=media-libs/xvid-1.1.0:= ) !media-tv/mythtv-bindings !x11-themes/mythtv-themes media-libs/taglib:= dev-libs/glib:= dev-lang/yasm x11-proto/xineramaproto x11-proto/xf86vidmodeproto python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) virtual/pkgconfig
+DESCRIPTION=Homebrew PVR project
+EAPI=5
+HOMEPAGE=http://www.mythtv.org
+IUSE=alsa altivec libass autostart bluray cec crystalhd debug dvb dvd egl fftw +hls ieee1394 jack lcd lirc perl pulseaudio python raop +theora vaapi vdpau +vorbis +xml xmltv +xvid input_devices_joystick
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/freetype-2.0:= sys-libs/zlib:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXv:= x11-libs/libXrandr:= x11-libs/libXxf86vm:= >=dev-qt/qtcore-4.7.2:4= >=dev-qt/qtdbus-4.7.2:4= >=dev-qt/qtgui-4.7.2:4= >=dev-qt/qtscript-4.7.2:4= >=dev-qt/qtsql-4.7.2:4=[mysql] >=dev-qt/qtopengl-4.7.2:4=[egl?] >=dev-qt/qtwebkit-4.7.2:4= x11-misc/wmctrl:= virtual/mysql:= virtual/opengl:= alsa? ( >=media-libs/alsa-lib-1.0.24:= ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:= ) cec? ( dev-libs/libcec:= ) dvb? ( media-libs/libdvb:= virtual/linuxtv-dvb-headers:= ) dvd? ( dev-libs/libcdio:= ) egl? ( media-libs/mesa:=[egl] ) fftw? ( sci-libs/fftw:3.0= ) hls? ( media-libs/faac:= media-libs/libvpx:= >=media-libs/x264-0.0.20111220:= >=media-sound/lame-3.93.1 ) ieee1394? ( >=sys-libs/libraw1394-1.2.0:= >=sys-libs/libavc1394-0.5.3:= >=media-libs/libiec61883-1.0.0:= ) jack? ( media-sound/jack-audio-connection-kit ) lcd? ( app-misc/lcdproc ) libass? ( >=media-libs/libass-0.9.11:= ) lirc? ( app-misc/lirc ) perl? ( dev-perl/DBD-mysql dev-perl/Net-UPnP dev-perl/LWP-Protocol-https dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 >=dev-perl/libwww-perl-5 ) pulseaudio? ( media-sound/pulseaudio ) python? ( dev-python/mysql-python dev-python/lxml dev-python/urlgrabber ) raop? ( dev-libs/openssl:= net-dns/avahi[mdnsresponder-compat] ) theora? ( media-libs/libtheora:= media-libs/libogg:= ) vaapi? ( x11-libs/libva:= ) vdpau? ( x11-libs/libvdpau:= ) vorbis? ( >=media-libs/libvorbis-1.0:= media-libs/libogg:= ) xml? ( >=dev-libs/libxml2-2.6.0:= ) xvid? ( >=media-libs/xvid-1.1.0:= ) !media-tv/mythtv-bindings !x11-themes/mythtv-themes media-libs/taglib:= dev-libs/glib:= media-fonts/corefonts media-fonts/dejavu media-fonts/liberation-fonts x11-apps/xinit autostart? ( net-dialup/mingetty x11-wm/evilwm x11-apps/xset ) dvd? ( media-libs/libdvdcss:= ) xmltv? ( >=media-tv/xmltv-0.5.43 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+REQUIRED_USE=bluray? ( xml ) theora? ( vorbis )
+SLOT=0
+SRC_URI=https://github.com/MythTV/mythtv/archive/v0.27.1.tar.gz -> mythtv-0.27.1.tar.gz http://dev.gentoo.org/~rich0/distfiles/mythtv-0.27.1-aaae611819c6a6f92a55d5c82efb8738ec9a23df.tar.xz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be multilib 3bf24e6abb9b76d9f6c20600f0b716bf python be9965681d83c3980660a2660ac95e95 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747
+_md5_=1b48d8ccddf0a485225fe18a2c3a4bb1
diff --git a/metadata/md5-cache/net-analyzer/cacti-0.8.8b-r2 b/metadata/md5-cache/net-analyzer/cacti-0.8.8b-r2
index e4a0d3ce57e5..4f5cc56344ce 100644
--- a/metadata/md5-cache/net-analyzer/cacti-0.8.8b-r2
+++ b/metadata/md5-cache/net-analyzer/cacti-0.8.8b-r2
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile install postinst prepare prerm setup unpack
-DEPEND=>=app-admin/webapp-config-1.50.15
+DEPEND=|| ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
DESCRIPTION=Cacti is a complete frontend to rrdtool
EAPI=4
HOMEPAGE=http://www.cacti.net/
IUSE=snmp doc vhosts
KEYWORDS=alpha amd64 ~arm hppa ~ppc ~ppc64 sparc x86
LICENSE=GPL-2
-RDEPEND=dev-lang/php[cli,mysql,session,sockets,xml] dev-php/adodb net-analyzer/rrdtool virtual/cron virtual/mysql snmp? ( >=net-analyzer/net-snmp-5.2.0 ) >=app-admin/webapp-config-1.50.15
+RDEPEND=dev-lang/php[cli,mysql,session,sockets,xml] dev-php/adodb net-analyzer/rrdtool[graph] virtual/cron virtual/mysql snmp? ( >=net-analyzer/net-snmp-5.2.0 ) >=app-admin/webapp-config-1.50.15
SLOT=0.8.8b-r2
SRC_URI=http://www.cacti.net/downloads/cacti-0.8.8b.tar.gz
_eclasses_=depend.php df169a364e191b840b695604097e3c21 eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf phpconfutils e108303831029e5b8a9d24b991b1d62a toolchain-funcs 0f1760274637a138b99bb649202ea402 webapp 25b9b1696f5e698711f47d45c3d45e3e
-_md5_=5247935365bc4e486cb7aed81c1a6123
+_md5_=c645f45ec9a3c17f8b720fc50b213e36
diff --git a/metadata/md5-cache/net-analyzer/iftop-1.0_pre4 b/metadata/md5-cache/net-analyzer/iftop-1.0_pre4
index 35f5186c6a02..71103b3abc09 100644
--- a/metadata/md5-cache/net-analyzer/iftop-1.0_pre4
+++ b/metadata/md5-cache/net-analyzer/iftop-1.0_pre4
@@ -3,10 +3,10 @@ DEPEND=net-libs/libpcap sys-libs/ncurses virtual/pkgconfig !=dev-perl/SNMP_Session-1.13-r2 >=dev-perl/Socket6-0.23 dev-lang/perl med
DESCRIPTION=A tool to monitor the traffic load on network-links
EAPI=5
HOMEPAGE=http://oss.oetiker.ch/mrtg/
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86
LICENSE=GPL-2
RDEPEND=>=dev-perl/SNMP_Session-1.13-r2 >=dev-perl/Socket6-0.23 dev-lang/perl media-libs/gd[png]
SLOT=0
SRC_URI=http://oss.oetiker.ch/mrtg/pub/mrtg-2.17.4.tar.gz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=e94f7a0db51c248bcdae9ff4f6aab168
+_md5_=f4222f781506c8211bd1a3176b4c1ce1
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.19 b/metadata/md5-cache/net-analyzer/munin-2.0.19
index 993a377522ea..3eca35d9a763 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.19
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.19
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile config configure install postinst preinst prepare setup test
-DEPEND=dev-lang/perl[berkdb] kernel_linux? ( sys-process/procps ) doc? ( dev-python/sphinx ) asterisk? ( dev-perl/Net-Telnet ) irc? ( dev-perl/Net-IRC ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) ssl? ( dev-perl/Net-SSLeay ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base ) memcached? ( dev-perl/Cache-Memcached ) cgi? ( dev-perl/FCGI ) apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) syslog? ( virtual/perl-Sys-Syslog ) http? ( dev-perl/libwww-perl ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/net-server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[perl] virtual/ssh ) virtual/perl-Module-Build java? ( >=virtual/jdk-1.5 ) test? ( dev-perl/Test-Deep dev-perl/Test-LongString dev-perl/Test-Differences dev-perl/Test-MockModule dev-perl/Test-MockObject dev-perl/File-Slurp dev-perl/IO-stringy dev-perl/IO-Socket-INET6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) virtual/pkgconfig
+DEPEND=dev-lang/perl[berkdb] kernel_linux? ( sys-process/procps ) doc? ( dev-python/sphinx ) asterisk? ( dev-perl/Net-Telnet ) irc? ( dev-perl/Net-IRC ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) ssl? ( dev-perl/Net-SSLeay ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base ) memcached? ( dev-perl/Cache-Memcached ) cgi? ( dev-perl/FCGI ) apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) syslog? ( virtual/perl-Sys-Syslog ) http? ( dev-perl/libwww-perl ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/net-server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) virtual/perl-Module-Build java? ( >=virtual/jdk-1.5 ) test? ( dev-perl/Test-Deep dev-perl/Test-LongString dev-perl/Test-Differences dev-perl/Test-MockModule dev-perl/Test-MockObject dev-perl/File-Slurp dev-perl/IO-stringy dev-perl/IO-Socket-INET6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) virtual/pkgconfig
DESCRIPTION=Munin Server Monitoring Tool
EAPI=5
HOMEPAGE=http://munin-monitoring.org/
IUSE=asterisk irc java memcached minimal mysql postgres ssl test cgi ipv6 syslog ipmi http dhcpd doc apache elibc_FreeBSD java
KEYWORDS=amd64 ~arm ~mips ppc x86
LICENSE=GPL-2
-RDEPEND=dev-lang/perl[berkdb] kernel_linux? ( sys-process/procps ) doc? ( dev-python/sphinx ) asterisk? ( dev-perl/Net-Telnet ) irc? ( dev-perl/Net-IRC ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) ssl? ( dev-perl/Net-SSLeay ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base ) memcached? ( dev-perl/Cache-Memcached ) cgi? ( dev-perl/FCGI ) apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) syslog? ( virtual/perl-Sys-Syslog ) http? ( dev-perl/libwww-perl ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/net-server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat6 net-analyzer/netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) !=dev-java/java-config-2.1.9-r1 )
+RDEPEND=dev-lang/perl[berkdb] kernel_linux? ( sys-process/procps ) doc? ( dev-python/sphinx ) asterisk? ( dev-perl/Net-Telnet ) irc? ( dev-perl/Net-IRC ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) ssl? ( dev-perl/Net-SSLeay ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base ) memcached? ( dev-perl/Cache-Memcached ) cgi? ( dev-perl/FCGI ) apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) syslog? ( virtual/perl-Sys-Syslog ) http? ( dev-perl/libwww-perl ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/net-server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat6 net-analyzer/netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) !=dev-java/java-config-2.1.9-r1 )
REQUIRED_USE=cgi? ( !minimal ) apache? ( cgi )
SLOT=0
SRC_URI=mirror://sourceforge/munin/munin-2.0.19.tar.gz http://dev.gentoo.org/~flameeyes/munin/munin-2.0.19-gentoo-1.tar.xz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=5ead2bb12377737e1bd7d6002300c563
+_md5_=61e3d5379d5b2aee3fc6913aa1db57b9
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.19-r1 b/metadata/md5-cache/net-analyzer/munin-2.0.19-r1
index f7d116d51454..e3da3a55475e 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.19-r1
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.19-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile config configure install postinst preinst prepare setup test
-DEPEND=dev-lang/perl[berkdb] kernel_linux? ( sys-process/procps ) doc? ( dev-python/sphinx ) asterisk? ( dev-perl/Net-Telnet ) irc? ( dev-perl/Net-IRC ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) ssl? ( dev-perl/Net-SSLeay ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base ) memcached? ( dev-perl/Cache-Memcached ) cgi? ( dev-perl/FCGI ) apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) syslog? ( virtual/perl-Sys-Syslog ) http? ( dev-perl/libwww-perl ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/net-server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[perl] virtual/ssh ) virtual/perl-Module-Build java? ( >=virtual/jdk-1.5 ) test? ( dev-perl/Test-Deep dev-perl/Test-LongString dev-perl/Test-Differences dev-perl/Test-MockModule dev-perl/Test-MockObject dev-perl/File-Slurp dev-perl/IO-stringy dev-perl/IO-Socket-INET6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) virtual/pkgconfig
+DEPEND=dev-lang/perl[berkdb] kernel_linux? ( sys-process/procps ) doc? ( dev-python/sphinx ) asterisk? ( dev-perl/Net-Telnet ) irc? ( dev-perl/Net-IRC ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) ssl? ( dev-perl/Net-SSLeay ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base ) memcached? ( dev-perl/Cache-Memcached ) cgi? ( dev-perl/FCGI ) apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) syslog? ( virtual/perl-Sys-Syslog ) http? ( dev-perl/libwww-perl ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/net-server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) virtual/perl-Module-Build java? ( >=virtual/jdk-1.5 ) test? ( dev-perl/Test-Deep dev-perl/Test-LongString dev-perl/Test-Differences dev-perl/Test-MockModule dev-perl/Test-MockObject dev-perl/File-Slurp dev-perl/IO-stringy dev-perl/IO-Socket-INET6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) virtual/pkgconfig
DESCRIPTION=Munin Server Monitoring Tool
EAPI=5
HOMEPAGE=http://munin-monitoring.org/
IUSE=asterisk irc java memcached minimal mysql postgres ssl test cgi ipv6 syslog ipmi http dhcpd doc apache elibc_FreeBSD java
KEYWORDS=~amd64 ~arm ~mips ~ppc ~x86
LICENSE=GPL-2
-RDEPEND=dev-lang/perl[berkdb] kernel_linux? ( sys-process/procps ) doc? ( dev-python/sphinx ) asterisk? ( dev-perl/Net-Telnet ) irc? ( dev-perl/Net-IRC ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) ssl? ( dev-perl/Net-SSLeay ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base ) memcached? ( dev-perl/Cache-Memcached ) cgi? ( dev-perl/FCGI ) apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) syslog? ( virtual/perl-Sys-Syslog ) http? ( dev-perl/libwww-perl ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/net-server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat6 net-analyzer/netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) !=dev-java/java-config-2.1.9-r1 )
+RDEPEND=dev-lang/perl[berkdb] kernel_linux? ( sys-process/procps ) doc? ( dev-python/sphinx ) asterisk? ( dev-perl/Net-Telnet ) irc? ( dev-perl/Net-IRC ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) ssl? ( dev-perl/Net-SSLeay ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base ) memcached? ( dev-perl/Cache-Memcached ) cgi? ( dev-perl/FCGI ) apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) syslog? ( virtual/perl-Sys-Syslog ) http? ( dev-perl/libwww-perl ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/net-server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat6 net-analyzer/netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) !=dev-java/java-config-2.1.9-r1 )
REQUIRED_USE=cgi? ( !minimal ) apache? ( cgi )
SLOT=0
SRC_URI=mirror://sourceforge/munin/munin-2.0.19.tar.gz http://dev.gentoo.org/~flameeyes/munin/munin-2.0.19-gentoo-1.tar.xz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a60370c5aa633744e16761f45f66e208
+_md5_=af4d60da793ac7bb13957b1ea2d8e7f1
diff --git a/metadata/md5-cache/net-analyzer/munin-2.1.9999 b/metadata/md5-cache/net-analyzer/munin-2.1.9999
index 3aed327a9964..12d334f6dd6e 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.1.9999
+++ b/metadata/md5-cache/net-analyzer/munin-2.1.9999
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack
-DEPEND=dev-lang/perl[berkdb] sys-process/procps doc? ( dev-python/sphinx ) irc? ( dev-perl/Net-IRC ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) ssl? ( dev-perl/Net-SSLeay ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base ) memcached? ( dev-perl/Cache-Memcached ) cgi? ( dev-perl/FCGI ) apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) syslog? ( virtual/perl-Sys-Syslog ) http? ( dev-perl/libwww-perl ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/net-server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[perl] virtual/ssh ) virtual/perl-Module-Build java? ( >=virtual/jdk-1.5 ) test? ( dev-perl/Test-Deep dev-perl/Test-LongString dev-perl/Test-Differences dev-perl/Test-MockModule dev-perl/Test-MockObject dev-perl/File-Slurp dev-perl/IO-stringy dev-perl/IO-Socket-INET6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) dev-vcs/git
+DEPEND=dev-lang/perl[berkdb] sys-process/procps doc? ( dev-python/sphinx ) irc? ( dev-perl/Net-IRC ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) ssl? ( dev-perl/Net-SSLeay ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base ) memcached? ( dev-perl/Cache-Memcached ) cgi? ( dev-perl/FCGI ) apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) syslog? ( virtual/perl-Sys-Syslog ) http? ( dev-perl/libwww-perl ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/net-server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) virtual/perl-Module-Build java? ( >=virtual/jdk-1.5 ) test? ( dev-perl/Test-Deep dev-perl/Test-LongString dev-perl/Test-Differences dev-perl/Test-MockModule dev-perl/Test-MockObject dev-perl/File-Slurp dev-perl/IO-stringy dev-perl/IO-Socket-INET6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) dev-vcs/git
DESCRIPTION=Munin Server Monitoring Tool
EAPI=5
HOMEPAGE=http://munin-monitoring.org/
IUSE=irc java memcached minimal mysql postgres ssl test cgi ipv6 syslog ipmi http dhcpd doc apache elibc_FreeBSD java
LICENSE=GPL-2
-RDEPEND=dev-lang/perl[berkdb] sys-process/procps doc? ( dev-python/sphinx ) irc? ( dev-perl/Net-IRC ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) ssl? ( dev-perl/Net-SSLeay ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base ) memcached? ( dev-perl/Cache-Memcached ) cgi? ( dev-perl/FCGI ) apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) syslog? ( virtual/perl-Sys-Syslog ) http? ( dev-perl/libwww-perl ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/net-server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat6 net-analyzer/netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) !=dev-java/java-config-2.1.9-r1 )
+RDEPEND=dev-lang/perl[berkdb] sys-process/procps doc? ( dev-python/sphinx ) irc? ( dev-perl/Net-IRC ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) ssl? ( dev-perl/Net-SSLeay ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base ) memcached? ( dev-perl/Cache-Memcached ) cgi? ( dev-perl/FCGI ) apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) syslog? ( virtual/perl-Sys-Syslog ) http? ( dev-perl/libwww-perl ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/net-server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat6 net-analyzer/netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) !=dev-java/java-config-2.1.9-r1 )
REQUIRED_USE=cgi? ( !minimal ) apache? ( cgi )
SLOT=0
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 git-2 2027b81a576527fa16bece425941e094 git-r3 49fc3d60d7bcd6f8913ad6ec0cb4c67b java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f3d3bdbc42270be091778eb55672bdb9
+_md5_=fcb7a765c922ab5f741de7866a29282a
diff --git a/metadata/md5-cache/net-analyzer/ntop-4.0.3 b/metadata/md5-cache/net-analyzer/ntop-4.0.3
index 990d46066c05..9da1ac55821a 100644
--- a/metadata/md5-cache/net-analyzer/ntop-4.0.3
+++ b/metadata/md5-cache/net-analyzer/ntop-4.0.3
@@ -1,13 +1,13 @@
DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=virtual/awk dev-lang/perl sys-libs/gdbm dev-libs/libevent net-libs/libpcap media-libs/gd media-libs/libpng net-analyzer/rrdtool ssl? ( dev-libs/openssl ) sys-libs/zlib >=dev-libs/geoip-1.4.5 >=dev-lang/lua-5.1.4 >=sys-devel/libtool-1.4 !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/awk dev-lang/perl sys-libs/gdbm dev-libs/libevent net-libs/libpcap media-libs/gd media-libs/libpng net-analyzer/rrdtool[graph] ssl? ( dev-libs/openssl ) sys-libs/zlib >=dev-libs/geoip-1.4.5 >=dev-lang/lua-5.1.4 >=sys-devel/libtool-1.4 !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Network traffic analyzer with web interface
EAPI=2
HOMEPAGE=http://www.ntop.org/products/ntop/
IUSE=ipv6 ssl
KEYWORDS=amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86
LICENSE=GPL-2
-RDEPEND=virtual/awk dev-lang/perl sys-libs/gdbm dev-libs/libevent net-libs/libpcap media-libs/gd media-libs/libpng net-analyzer/rrdtool ssl? ( dev-libs/openssl ) sys-libs/zlib >=dev-libs/geoip-1.4.5 >=dev-lang/lua-5.1.4 media-fonts/corefonts media-gfx/graphviz net-misc/wget app-arch/gzip
+RDEPEND=virtual/awk dev-lang/perl sys-libs/gdbm dev-libs/libevent net-libs/libpcap media-libs/gd media-libs/libpng net-analyzer/rrdtool[graph] ssl? ( dev-libs/openssl ) sys-libs/zlib >=dev-libs/geoip-1.4.5 >=dev-lang/lua-5.1.4 media-fonts/corefonts media-gfx/graphviz net-misc/wget app-arch/gzip
SLOT=0
SRC_URI=mirror://sourceforge/ntop/ntop-4.0.3.tgz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747
-_md5_=e5187adbc96d1388c4f425e26a75c9e6
+_md5_=799e1056b6aabb8a70b5ff8ee600d638
diff --git a/metadata/md5-cache/net-analyzer/ntop-4.1.0 b/metadata/md5-cache/net-analyzer/ntop-4.1.0
index 9f21b20b9f75..29d21b6e46d0 100644
--- a/metadata/md5-cache/net-analyzer/ntop-4.1.0
+++ b/metadata/md5-cache/net-analyzer/ntop-4.1.0
@@ -1,13 +1,13 @@
DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=virtual/awk dev-lang/perl sys-libs/gdbm dev-libs/libevent net-libs/libpcap media-libs/gd media-libs/libpng net-analyzer/rrdtool ssl? ( dev-libs/openssl ) sys-libs/zlib dev-libs/geoip dev-lang/lua snmp? ( net-analyzer/net-snmp[ipv6] ) >=sys-devel/libtool-1.5.26 !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/awk dev-lang/perl sys-libs/gdbm dev-libs/libevent net-libs/libpcap media-libs/gd media-libs/libpng net-analyzer/rrdtool[graph] ssl? ( dev-libs/openssl ) sys-libs/zlib dev-libs/geoip dev-lang/lua snmp? ( net-analyzer/net-snmp[ipv6] ) >=sys-devel/libtool-1.5.26 !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Network traffic analyzer with web interface
EAPI=2
HOMEPAGE=http://www.ntop.org/products/ntop/
IUSE=snmp ssl
KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
LICENSE=GPL-2
-RDEPEND=virtual/awk dev-lang/perl sys-libs/gdbm dev-libs/libevent net-libs/libpcap media-libs/gd media-libs/libpng net-analyzer/rrdtool ssl? ( dev-libs/openssl ) sys-libs/zlib dev-libs/geoip dev-lang/lua snmp? ( net-analyzer/net-snmp[ipv6] ) media-fonts/corefonts media-gfx/graphviz net-misc/wget app-arch/gzip dev-libs/glib:2 dev-python/mako
+RDEPEND=virtual/awk dev-lang/perl sys-libs/gdbm dev-libs/libevent net-libs/libpcap media-libs/gd media-libs/libpng net-analyzer/rrdtool[graph] ssl? ( dev-libs/openssl ) sys-libs/zlib dev-libs/geoip dev-lang/lua snmp? ( net-analyzer/net-snmp[ipv6] ) media-fonts/corefonts media-gfx/graphviz net-misc/wget app-arch/gzip dev-libs/glib:2 dev-python/mako
SLOT=0
SRC_URI=mirror://sourceforge/ntop/ntop/Stable/ntop-4.1.0.tar.gz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747
-_md5_=95f40ab177ce6c4c246b8c58379fae40
+_md5_=6d7208d2bcc1640aacea4518a48512d8
diff --git a/metadata/md5-cache/net-analyzer/ntop-5.0.1-r1 b/metadata/md5-cache/net-analyzer/ntop-5.0.1-r1
index 368cf2f9798b..2a22e08d373f 100644
--- a/metadata/md5-cache/net-analyzer/ntop-5.0.1-r1
+++ b/metadata/md5-cache/net-analyzer/ntop-5.0.1-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=virtual/awk dev-lang/perl sys-libs/gdbm dev-libs/libevent net-libs/libpcap media-libs/gd media-libs/libpng net-analyzer/rrdtool ssl? ( dev-libs/openssl ) sys-libs/zlib dev-libs/geoip dev-lang/lua snmp? ( net-analyzer/net-snmp[ipv6] ) >=sys-devel/libtool-1.5.26 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(+)?] !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/awk dev-lang/perl sys-libs/gdbm dev-libs/libevent net-libs/libpcap media-libs/gd media-libs/libpng net-analyzer/rrdtool[graph] ssl? ( dev-libs/openssl ) sys-libs/zlib dev-libs/geoip dev-lang/lua snmp? ( net-analyzer/net-snmp[ipv6] ) >=sys-devel/libtool-1.5.26 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(+)?] !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Network traffic analyzer with web interface
EAPI=5
HOMEPAGE=http://www.ntop.org/products/ntop/
IUSE=snmp ssl python_targets_python2_7 python_single_target_python2_7
KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
LICENSE=GPL-2
-RDEPEND=virtual/awk dev-lang/perl sys-libs/gdbm dev-libs/libevent net-libs/libpcap media-libs/gd media-libs/libpng net-analyzer/rrdtool ssl? ( dev-libs/openssl ) sys-libs/zlib dev-libs/geoip dev-lang/lua snmp? ( net-analyzer/net-snmp[ipv6] ) media-fonts/corefonts media-gfx/graphviz net-misc/wget app-arch/gzip dev-libs/glib:2 dev-python/mako
+RDEPEND=virtual/awk dev-lang/perl sys-libs/gdbm dev-libs/libevent net-libs/libpcap media-libs/gd media-libs/libpng net-analyzer/rrdtool[graph] ssl? ( dev-libs/openssl ) sys-libs/zlib dev-libs/geoip dev-lang/lua snmp? ( net-analyzer/net-snmp[ipv6] ) media-fonts/corefonts media-gfx/graphviz net-misc/wget app-arch/gzip dev-libs/glib:2 dev-python/mako
REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 )
SLOT=0
SRC_URI=mirror://sourceforge/ntop/ntop/Stable/ntop-5.0.1.tar.gz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-single-r1 a71a169a881e0a11d04a7fe12dc39f6e python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747
-_md5_=f7cdfc8db439286a3e19f9653cb06016
+_md5_=429c0534d0be76a955dbfa4c1904a7d3
diff --git a/metadata/md5-cache/net-analyzer/pnp4nagios-0.6.19-r1 b/metadata/md5-cache/net-analyzer/pnp4nagios-0.6.19-r1
index cd2e978ff3e8..92ac1c02fce4 100644
--- a/metadata/md5-cache/net-analyzer/pnp4nagios-0.6.19-r1
+++ b/metadata/md5-cache/net-analyzer/pnp4nagios-0.6.19-r1
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=dev-lang/php[json,simplexml,zlib,xml,filter] >=dev-lang/php-5.3 >=net-analyzer/rrdtool-1.2[perl] || ( net-analyzer/nagios-core net-analyzer/icinga ) apache2? ( =www-servers/apache-2* )
+DEPEND=dev-lang/php[json,simplexml,zlib,xml,filter] >=dev-lang/php-5.3 >=net-analyzer/rrdtool-1.2[graph,perl] || ( net-analyzer/nagios-core net-analyzer/icinga ) apache2? ( =www-servers/apache-2* )
DESCRIPTION=A performance data analyzer for nagios
EAPI=4
HOMEPAGE=http://www.pnp4nagios.org
IUSE=apache2
KEYWORDS=amd64 ppc ppc64 ~sparc x86
LICENSE=GPL-2
-RDEPEND=dev-lang/php[json,simplexml,zlib,xml,filter] >=dev-lang/php-5.3 >=net-analyzer/rrdtool-1.2[perl] || ( net-analyzer/nagios-core net-analyzer/icinga ) virtual/perl-Getopt-Long virtual/perl-Time-HiRes media-fonts/dejavu apache2? ( www-servers/apache[apache2_modules_rewrite] ) apache2? ( =www-servers/apache-2* )
+RDEPEND=dev-lang/php[json,simplexml,zlib,xml,filter] >=dev-lang/php-5.3 >=net-analyzer/rrdtool-1.2[graph,perl] || ( net-analyzer/nagios-core net-analyzer/icinga ) virtual/perl-Getopt-Long virtual/perl-Time-HiRes media-fonts/dejavu apache2? ( www-servers/apache[apache2_modules_rewrite] ) apache2? ( =www-servers/apache-2* )
SLOT=0
SRC_URI=mirror://sourceforge/pnp4nagios/PNP-0.6/pnp4nagios-0.6.19.tar.gz
_eclasses_=depend.apache 1a38534d3f755d1ab1d92ce120bd7dbd eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=80b68b05721acdfded6abf44214f6372
+_md5_=d4198ce13d931ea0fc52073f8901caee
diff --git a/metadata/md5-cache/net-analyzer/pnp4nagios-0.6.21 b/metadata/md5-cache/net-analyzer/pnp4nagios-0.6.21
index 5df4a17d0b03..37a4d4de42a9 100644
--- a/metadata/md5-cache/net-analyzer/pnp4nagios-0.6.21
+++ b/metadata/md5-cache/net-analyzer/pnp4nagios-0.6.21
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=dev-lang/php[json,simplexml,zlib,xml,filter] >=dev-lang/php-5.3 >=net-analyzer/rrdtool-1.2[perl] || ( net-analyzer/nagios-core net-analyzer/icinga ) apache2? ( =www-servers/apache-2* )
+DEPEND=dev-lang/php[json,simplexml,zlib,xml,filter] >=dev-lang/php-5.3 >=net-analyzer/rrdtool-1.2[graph,perl] || ( net-analyzer/nagios-core net-analyzer/icinga ) apache2? ( =www-servers/apache-2* )
DESCRIPTION=A performance data analyzer for nagios
EAPI=5
HOMEPAGE=http://www.pnp4nagios.org
IUSE=apache2
KEYWORDS=amd64 ppc ppc64 ~sparc x86
LICENSE=GPL-2
-RDEPEND=dev-lang/php[json,simplexml,zlib,xml,filter] >=dev-lang/php-5.3 >=net-analyzer/rrdtool-1.2[perl] || ( net-analyzer/nagios-core net-analyzer/icinga ) virtual/perl-Getopt-Long virtual/perl-Time-HiRes media-fonts/dejavu apache2? ( www-servers/apache[apache2_modules_rewrite] ) apache2? ( =www-servers/apache-2* )
+RDEPEND=dev-lang/php[json,simplexml,zlib,xml,filter] >=dev-lang/php-5.3 >=net-analyzer/rrdtool-1.2[graph,perl] || ( net-analyzer/nagios-core net-analyzer/icinga ) virtual/perl-Getopt-Long virtual/perl-Time-HiRes media-fonts/dejavu apache2? ( www-servers/apache[apache2_modules_rewrite] ) apache2? ( =www-servers/apache-2* )
SLOT=0
SRC_URI=mirror://sourceforge/pnp4nagios/PNP-0.6/pnp4nagios-0.6.21.tar.gz
_eclasses_=depend.apache 1a38534d3f755d1ab1d92ce120bd7dbd eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=f42cd77b5067729e16a605e613688349
+_md5_=fb86da56c33b06c1317e3291eb05c955
diff --git a/metadata/md5-cache/net-analyzer/rrdcollect-0.2.9 b/metadata/md5-cache/net-analyzer/rrdcollect-0.2.9
index 24f18408d7e0..322082d36b49 100644
--- a/metadata/md5-cache/net-analyzer/rrdcollect-0.2.9
+++ b/metadata/md5-cache/net-analyzer/rrdcollect-0.2.9
@@ -1,7 +1,7 @@
DEFINED_PHASES=configure install prepare
DEPEND=librrd? ( net-analyzer/rrdtool ) pcre? ( dev-libs/libpcre )
DESCRIPTION=Read system statistical data and feed it to RRDtool
-EAPI=3
+EAPI=5
HOMEPAGE=http://rrdcollect.sourceforge.net/
IUSE=exec librrd pcre
KEYWORDS=~x86
@@ -10,4 +10,4 @@ RDEPEND=librrd? ( net-analyzer/rrdtool ) pcre? ( dev-libs/libpcre )
SLOT=0
SRC_URI=mirror://sourceforge/rrdcollect/rrdcollect-0.2.9.tar.gz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=a133189d5bea58e271e6fb762be0d926
+_md5_=43fbfc02fa949527ff1d719586092d4c
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.4.8-r2 b/metadata/md5-cache/net-analyzer/rrdtool-1.4.8-r2
new file mode 100644
index 000000000000..12bcdb516849
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.4.8-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=>=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 ) sys-apps/groff virtual/pkgconfig virtual/awk !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+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 ruby 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
+LICENSE=GPL-2
+PDEPEND=ruby? ( ~dev-ruby/rrdtool-bindings-1.4.8 )
+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_=ad10f28072437af9ba51520b6d7d3db1
diff --git a/metadata/md5-cache/net-firewall/psad-2.2.3 b/metadata/md5-cache/net-firewall/psad-2.2.3
index 7050a882eb42..c2c9d01fc9dd 100644
--- a/metadata/md5-cache/net-firewall/psad-2.2.3
+++ b/metadata/md5-cache/net-firewall/psad-2.2.3
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker || ( >=dev-lang/perl-5.16 =dev-lang/perl-5.16 =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(-)?] upnp? ( >=net-libs/gupnp-igd-0.2.2-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/gtk-doc-am >=virtual/pkgconfig-0-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(-)?]
+DESCRIPTION=An implementation of the Interactice Connectivity Establishment standard (ICE)
+EAPI=5
+HOMEPAGE=http://nice.freedesktop.org/wiki/
+IUSE=+upnp 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=|| ( MPL-1.1 LGPL-2.1 )
+RDEPEND=>=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(-)?] upnp? ( >=net-libs/gupnp-igd-0.2.2-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
+SRC_URI=http://nice.freedesktop.org/releases/libnice-0.1.7.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build fbb9baa0b4039304643e36e9820fdecf multilib-minimal 5bbdc77877c1aa3c6bd89ca3f9196d11 multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=57d6066d92e3e735f1e837a43e28c3ee
diff --git a/metadata/md5-cache/net-libs/libwhisker-2.5 b/metadata/md5-cache/net-libs/libwhisker-2.5
index 9ff8f2e8eb94..b2dc9691569d 100644
--- a/metadata/md5-cache/net-libs/libwhisker-2.5
+++ b/metadata/md5-cache/net-libs/libwhisker-2.5
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=dev-lang/perl-5.16 =dev-lang/perl-5.16 =dev-perl/Mail-Mbox-MessageParser-1.40.01
-DESCRIPTION=Search normal or compressed mailbox using a regular expression or dates.
-HOMEPAGE=http://grepmail.sourceforge.net/
-KEYWORDS=~amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-perl/Inline dev-perl/TimeDate dev-perl/DateManip virtual/perl-Digest-MD5 >=dev-perl/Mail-Mbox-MessageParser-1.40.01
-SLOT=0
-SRC_URI=mirror://sourceforge/grepmail/grepmail-5.3033.tar.gz
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module a6a2d5c77bdaeba2794b167689cafb7a toolchain-funcs 0f1760274637a138b99bb649202ea402 unpacker f300a7ca9131b1024a79762e8edd3c52 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c31076d560cfc613822e0b917dcd94d8
diff --git a/metadata/md5-cache/net-mail/grepmail-5.30.33-r2 b/metadata/md5-cache/net-mail/grepmail-5.30.33-r2
index edff16dc44c5..a8c1e0b2f3ef 100644
--- a/metadata/md5-cache/net-mail/grepmail-5.30.33-r2
+++ b/metadata/md5-cache/net-mail/grepmail-5.30.33-r2
@@ -3,10 +3,10 @@ DEPEND=dev-perl/Inline dev-perl/TimeDate dev-perl/DateManip virtual/perl-Digest-
DESCRIPTION=Search normal or compressed mailbox using a regular expression or dates.
EAPI=5
HOMEPAGE=http://grepmail.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
RDEPEND=dev-perl/Inline dev-perl/TimeDate dev-perl/DateManip virtual/perl-Digest-MD5 >=dev-perl/Mail-Mbox-MessageParser-1.40.01 dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=mirror://sourceforge/grepmail/grepmail-5.3033.tar.gz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module a6a2d5c77bdaeba2794b167689cafb7a toolchain-funcs 0f1760274637a138b99bb649202ea402 unpacker f300a7ca9131b1024a79762e8edd3c52 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9eecb08dc0a3d1f287e9e9e8e3436050
+_md5_=edd7af5c160cc20047a81e0a46b16fb1
diff --git a/metadata/md5-cache/net-mail/mailgraph-1.14 b/metadata/md5-cache/net-mail/mailgraph-1.14
deleted file mode 100644
index 6b793865da11..000000000000
--- a/metadata/md5-cache/net-mail/mailgraph-1.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm setup unpack
-DEPEND=>=sys-apps/sed-4 >=app-admin/webapp-config-1.50.15
-DESCRIPTION=A mail statistics RRDtool frontend for Postfix
-HOMEPAGE=http://mailgraph.schweikert.ch/
-IUSE=vhosts
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-perl/File-Tail >=net-analyzer/rrdtool-1.2.2 >=app-admin/webapp-config-1.50.15
-SLOT=1.14
-SRC_URI=http://mailgraph.schweikert.ch//pub/mailgraph-1.14.tar.gz
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 webapp 25b9b1696f5e698711f47d45c3d45e3e
-_md5_=fb035efd8234a8d20852cc279ee6002c
diff --git a/metadata/md5-cache/net-mail/mailgraph-1.14-r2 b/metadata/md5-cache/net-mail/mailgraph-1.14-r2
index 5e247679d820..795a567ce79a 100644
--- a/metadata/md5-cache/net-mail/mailgraph-1.14-r2
+++ b/metadata/md5-cache/net-mail/mailgraph-1.14-r2
@@ -5,8 +5,8 @@ EAPI=4
HOMEPAGE=http://mailgraph.schweikert.ch/
KEYWORDS=amd64 x86
LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-perl/File-Tail >=net-analyzer/rrdtool-1.2.2[perl]
+RDEPEND=dev-lang/perl dev-perl/File-Tail >=net-analyzer/rrdtool-1.2.2[graph,perl]
SLOT=1.14
SRC_URI=http://mailgraph.schweikert.ch//pub/mailgraph-1.14.tar.gz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747
-_md5_=2c906ca3eb654d62663bbea399d5a7e0
+_md5_=a8c8732438f7fa7d3a905f58f845cca5
diff --git a/metadata/md5-cache/net-misc/curl-7.36.0 b/metadata/md5-cache/net-misc/curl-7.36.0
index 8e79e7bca781..aa6d4cc516a1 100644
--- a/metadata/md5-cache/net-misc/curl-7.36.0
+++ b/metadata/md5-cache/net-misc/curl-7.36.0
@@ -1,15 +1,15 @@
DEFINED_PHASES=configure install prepare
-DEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) curl_ssl_cyassl? ( net-libs/cyassl app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl:= app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) adns? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) metalink? ( >=media-libs/libmetalink-0.1.0 ) rtmp? ( media-video/rtmpdump ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl:= app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) adns? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) metalink? ( >=media-libs/libmetalink-0.1.0 ) rtmp? ( media-video/rtmpdump ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=A Client that groks URLs
EAPI=5
HOMEPAGE=http://curl.haxx.se/
-IUSE=adns idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl
+IUSE=adns idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl
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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
-RDEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) curl_ssl_cyassl? ( net-libs/cyassl app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl:= app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) adns? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) metalink? ( >=media-libs/libmetalink-0.1.0 ) rtmp? ( media-video/rtmpdump ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib
-REQUIRED_USE=threads? ( !adns ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_openssl curl_ssl_nss curl_ssl_polarssl ) )
+RDEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl:= app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) adns? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) metalink? ( >=media-libs/libmetalink-0.1.0 ) rtmp? ( media-video/rtmpdump ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib
+REQUIRED_USE=threads? ( !adns ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_gnutls curl_ssl_openssl curl_ssl_nss curl_ssl_polarssl ) )
RESTRICT=test
SLOT=0
SRC_URI=http://curl.haxx.se/download/curl-7.36.0.tar.bz2
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=12b03dd69af63cb57ab079148ca5c6b4
+_md5_=562e3505018ad7ce9f95a5c68fd5d031
diff --git a/metadata/md5-cache/net-misc/curl-7.36.0-r1 b/metadata/md5-cache/net-misc/curl-7.36.0-r1
index e7214cd363a1..8303df1b280e 100644
--- a/metadata/md5-cache/net-misc/curl-7.36.0-r1
+++ b/metadata/md5-cache/net-misc/curl-7.36.0-r1
@@ -1,15 +1,15 @@
DEFINED_PHASES=configure install prepare
-DEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) curl_ssl_cyassl? ( net-libs/cyassl app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl:= app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) adns? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) metalink? ( >=media-libs/libmetalink-0.1.0 ) rtmp? ( media-video/rtmpdump ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl:= app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) adns? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) metalink? ( >=media-libs/libmetalink-0.1.0 ) rtmp? ( media-video/rtmpdump ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=A Client that groks URLs
EAPI=5
HOMEPAGE=http://curl.haxx.se/
-IUSE=adns idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl elibc_Winnt
+IUSE=adns idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl elibc_Winnt
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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
-RDEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) curl_ssl_cyassl? ( net-libs/cyassl app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl:= app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) adns? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) metalink? ( >=media-libs/libmetalink-0.1.0 ) rtmp? ( media-video/rtmpdump ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib
-REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_openssl curl_ssl_nss curl_ssl_polarssl curl_ssl_winssl ) )
+RDEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl:= app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) adns? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) metalink? ( >=media-libs/libmetalink-0.1.0 ) rtmp? ( media-video/rtmpdump ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib
+REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_gnutls curl_ssl_openssl curl_ssl_nss curl_ssl_polarssl curl_ssl_winssl ) )
RESTRICT=test
SLOT=0
SRC_URI=http://curl.haxx.se/download/curl-7.36.0.tar.bz2
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=0de90b267f41cbc7f93c1f38b8f85263
+_md5_=931b868d164ee338f1303ad9f2033f75
diff --git a/metadata/md5-cache/net-misc/curl-7.37.0 b/metadata/md5-cache/net-misc/curl-7.37.0
index f176233237af..973f3ea1b1d4 100644
--- a/metadata/md5-cache/net-misc/curl-7.37.0
+++ b/metadata/md5-cache/net-misc/curl-7.37.0
@@ -1,15 +1,15 @@
DEFINED_PHASES=configure install prepare
-DEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) curl_ssl_cyassl? ( net-libs/cyassl app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl:= app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) adns? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) metalink? ( >=media-libs/libmetalink-0.1.0 ) rtmp? ( media-video/rtmpdump ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl:= app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) adns? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) metalink? ( >=media-libs/libmetalink-0.1.0 ) rtmp? ( media-video/rtmpdump ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=A Client that groks URLs
EAPI=5
HOMEPAGE=http://curl.haxx.se/
-IUSE=adns idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl elibc_Winnt
+IUSE=adns idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl elibc_Winnt
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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
-RDEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) curl_ssl_cyassl? ( net-libs/cyassl app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl:= app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) adns? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) metalink? ( >=media-libs/libmetalink-0.1.0 ) rtmp? ( media-video/rtmpdump ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib
-REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) metalink? ( !curl_ssl_axtls !curl_ssl_polarssl ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_openssl curl_ssl_nss curl_ssl_polarssl curl_ssl_winssl ) )
+RDEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl:= app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) adns? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) metalink? ( >=media-libs/libmetalink-0.1.0 ) rtmp? ( media-video/rtmpdump ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib
+REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) metalink? ( !curl_ssl_axtls !curl_ssl_polarssl ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_gnutls curl_ssl_openssl curl_ssl_nss curl_ssl_polarssl curl_ssl_winssl ) )
RESTRICT=test
SLOT=0
SRC_URI=http://curl.haxx.se/download/curl-7.37.0.tar.bz2
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=ee3960e171242989ddc101a8ce6dbb7a
+_md5_=ebea2676f45e269c5bd03fafc48de92f
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2014.06.19 b/metadata/md5-cache/net-misc/youtube-dl-2014.06.19
index b2cfda85759f..06bd8dcf0c82 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2014.06.19
+++ b/metadata/md5-cache/net-misc/youtube-dl-2014.06.19
@@ -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.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_=65afabab175c1ead1188ae2af29d6d20
+_md5_=33f1401f42ee38a32c1dbeb0a454d24f
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2014.07.11.3 b/metadata/md5-cache/net-misc/youtube-dl-2014.07.11.3
deleted file mode 100644
index b60524f2d14d..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2014.07.11.3
+++ /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.07.11.3/youtube-dl-2014.07.11.3.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_=0c91ef59902aff4438c6e7bae49ab0e5
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2014.06.26 b/metadata/md5-cache/net-misc/youtube-dl-2014.07.15
similarity index 94%
rename from metadata/md5-cache/net-misc/youtube-dl-2014.06.26
rename to metadata/md5-cache/net-misc/youtube-dl-2014.07.15
index 1e2485a42b4c..3dd426800049 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2014.06.26
+++ b/metadata/md5-cache/net-misc/youtube-dl-2014.07.15
@@ -9,6 +9,6 @@ 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.26/youtube-dl-2014.06.26.tar.gz
+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_=60f907039d7b0f39ee0003f5d1304d6c
+_md5_=3b3bd59459eee1f80f7995fd81e82e8d
diff --git a/metadata/md5-cache/net-print/cups-pk-helper-0.2.5 b/metadata/md5-cache/net-print/cups-pk-helper-0.2.5
new file mode 100644
index 000000000000..683c760c1d68
--- /dev/null
+++ b/metadata/md5-cache/net-print/cups-pk-helper-0.2.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2.30.0:2 net-print/cups >=sys-auth/polkit-0.97 >=dev-util/gdbus-codegen-2.30.0 >=dev-util/intltool-0.40.6 virtual/pkgconfig sys-devel/gettext app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=PolicyKit helper to configure cups with fine-grained privileges
+EAPI=5
+HOMEPAGE=http://www.freedesktop.org/wiki/Software/cups-pk-helper
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.30.0:2 net-print/cups >=sys-auth/polkit-0.97 sys-apps/dbus
+SLOT=0
+SRC_URI=http://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-0.2.5.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_=326a3f3e97ea695404f34ef2933ceedd
diff --git a/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.248 b/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.248
new file mode 100644
index 000000000000..e25f503d272e
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.248
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=virtual/linux-sources kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DESCRIPTION=Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver
+EAPI=5
+HOMEPAGE=http://www.broadcom.com/support/802.11/linux_sta.php
+IUSE=kernel_linux
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Broadcom
+RDEPEND=kernel_linux? ( virtual/modutils )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=x86? ( http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_248.tar.gz ) amd64? ( http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_248.tar.gz )
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 linux-info 2b8c53f6065bdee2d757472215a3088f linux-mod 101302d4b7b694ea9622bbffb187d0de multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=2b7c202f96c1573759e837d7da8157ba
diff --git a/metadata/md5-cache/perl-core/Thread-Queue-3.10.0 b/metadata/md5-cache/perl-core/Thread-Queue-3.10.0
deleted file mode 100644
index 940262950b82..000000000000
--- a/metadata/md5-cache/perl-core/Thread-Queue-3.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-lang/perl[ithreads] >=virtual/perl-threads-shared-1.21 virtual/perl-Scalar-List-Utils test? ( virtual/perl-Thread-Semaphore ) || ( >=dev-lang/perl-5.16 =virtual/perl-threads-shared-1.21 virtual/perl-Scalar-List-Utils || ( >=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 =dev-lang/perl-5.16 =dev-lang/perl-5.16 =virtual/perl-version-0.77 || ( >=dev-lang/perl-5.16 =virtual/perl-version-0.77 || ( >=dev-lang/perl-5.16 =virtual/perl-version-0.77 || ( >=dev-lang/perl-5.16 =virtual/perl-version-0.77 dev-lang/perl:=[-build(-)]
DESCRIPTION=A set of version requirements for a CPAN dist
-EAPI=4
+EAPI=5
HOMEPAGE=http://search.cpan.org/dist/Version-Requirements/
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
LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=virtual/perl-Scalar-List-Utils >=virtual/perl-version-0.77 || ( >=dev-lang/perl-5.16 =virtual/perl-version-0.77 dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Version-Requirements-0.101021.tar.gz
_eclasses_=alternatives 326031758c86cd08f5844f475f03ac01 eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module a6a2d5c77bdaeba2794b167689cafb7a toolchain-funcs 0f1760274637a138b99bb649202ea402 unpacker f300a7ca9131b1024a79762e8edd3c52
-_md5_=79f5f321ffad65e39c20f7c3a75c62fb
+_md5_=69bc9f16b5b3f7babe0cb9940aa74912
diff --git a/metadata/md5-cache/perl-core/autodie-2.160.0 b/metadata/md5-cache/perl-core/autodie-2.160.0
deleted file mode 100644
index 8ead771de5ee..000000000000
--- a/metadata/md5-cache/perl-core/autodie-2.160.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Replace functions with ones that succeed or die with lexical scope
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/autodie/
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PJ/PJF/autodie-2.16.tar.gz
-_eclasses_=alternatives 326031758c86cd08f5844f475f03ac01 eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module a6a2d5c77bdaeba2794b167689cafb7a toolchain-funcs 0f1760274637a138b99bb649202ea402 unpacker f300a7ca9131b1024a79762e8edd3c52
-_md5_=08983a36e938ad6608f85077b6853c85
diff --git a/metadata/md5-cache/perl-core/autodie-2.200.0 b/metadata/md5-cache/perl-core/autodie-2.200.0
deleted file mode 100644
index a3c94f44041f..000000000000
--- a/metadata/md5-cache/perl-core/autodie-2.200.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Replace functions with ones that succeed or die with lexical scope
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/autodie/
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PJ/PJF/autodie-2.20.tar.gz
-_eclasses_=alternatives 326031758c86cd08f5844f475f03ac01 eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module a6a2d5c77bdaeba2794b167689cafb7a toolchain-funcs 0f1760274637a138b99bb649202ea402 unpacker f300a7ca9131b1024a79762e8edd3c52
-_md5_=08d064f2be577459268ec5578d7eb4fd
diff --git a/metadata/md5-cache/perl-core/autodie-2.210.0 b/metadata/md5-cache/perl-core/autodie-2.210.0
deleted file mode 100644
index 9485ed836d2b..000000000000
--- a/metadata/md5-cache/perl-core/autodie-2.210.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Replace functions with ones that succeed or die with lexical scope
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/autodie/
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PJ/PJF/autodie-2.21.tar.gz
-_eclasses_=alternatives 326031758c86cd08f5844f475f03ac01 eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module a6a2d5c77bdaeba2794b167689cafb7a toolchain-funcs 0f1760274637a138b99bb649202ea402 unpacker f300a7ca9131b1024a79762e8edd3c52
-_md5_=9b43c2b4d79baf0dcb23d2e596693203
diff --git a/metadata/md5-cache/perl-core/libnet-1.270.0 b/metadata/md5-cache/perl-core/libnet-1.270.0
new file mode 100644
index 000000000000..bed69f8f36a5
--- /dev/null
+++ b/metadata/md5-cache/perl-core/libnet-1.270.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-lang/perl:=[-build(-)]
+DESCRIPTION=A URI Perl Module
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/libnet/
+IUSE=sasl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-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
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=sasl? ( dev-perl/Authen-SASL ) dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SH/SHAY/libnet-1.27.tar.gz
+_eclasses_=alternatives 326031758c86cd08f5844f475f03ac01 eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module a6a2d5c77bdaeba2794b167689cafb7a toolchain-funcs 0f1760274637a138b99bb649202ea402 unpacker f300a7ca9131b1024a79762e8edd3c52
+_md5_=cb6576b64459bbafd91f3725da00975e
diff --git a/metadata/md5-cache/sci-biology/diya-1.0_rc4 b/metadata/md5-cache/sci-biology/diya-1.0_rc4
index 5ae8ca02f026..863b9afd5712 100644
--- a/metadata/md5-cache/sci-biology/diya-1.0_rc4
+++ b/metadata/md5-cache/sci-biology/diya-1.0_rc4
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sci-biology/bioperl dev-perl/Data-Utilities dev-perl/XML-Simple || ( >=dev-lang/perl-5.16 =dev-lang/perl-5.16 =sci-libs/libticables2-1.3.3 >=sci-libs/libticonv-1.1.3 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DEPEND=app-arch/libarchive dev-libs/glib:2 >=sci-libs/libticables2-1.3.3 >=sci-libs/libticonv-1.1.3 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext )
DESCRIPTION=Library for TI calculator files
EAPI=5
HOMEPAGE=http://lpg.ticalc.org/prj_tilp/
IUSE=doc nls static-libs
KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 >=sci-libs/libticables2-1.3.3 >=sci-libs/libticonv-1.1.3 nls? ( virtual/libintl )
+RDEPEND=app-arch/libarchive dev-libs/glib:2 >=sci-libs/libticables2-1.3.3 >=sci-libs/libticonv-1.1.3 nls? ( virtual/libintl )
SLOT=0
SRC_URI=mirror://sourceforge/tilp/tilp2-linux/libtifiles2-1.1.6.tar.bz2
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 autotools-utils fb74970befc9b65ceec689d2ccff3022 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=74ffbb5f3354d774a8a47644ad191a6c
+_md5_=0b611794332ec62c694468c1da756afa
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 a51675073c04..34cd277173b4 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_=69e635c9abe979bd3536896790cd21af
+_md5_=e64392f83ec1d60cce72b5215dd1bcce
diff --git a/metadata/md5-cache/sys-apps/fwts-14.03.01 b/metadata/md5-cache/sys-apps/fwts-14.06.00
similarity index 93%
rename from metadata/md5-cache/sys-apps/fwts-14.03.01
rename to metadata/md5-cache/sys-apps/fwts-14.06.00
index 9174d9615235..23331c3c0895 100644
--- a/metadata/md5-cache/sys-apps/fwts-14.03.01
+++ b/metadata/md5-cache/sys-apps/fwts-14.06.00
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
LICENSE=GPL-2
RDEPEND=dev-libs/json-c dev-libs/libpcre sys-apps/pciutils sys-power/iasl sys-power/pmtools sys-apps/dmidecode
SLOT=0
-SRC_URI=http://launchpad.net/ubuntu/+archive/primary/+files/fwts_14.03.01.orig.tar.gz
+SRC_URI=http://launchpad.net/ubuntu/+archive/primary/+files/fwts_14.06.00.orig.tar.gz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=49b71c8ed64b39115c836ce721f7799d
+_md5_=eb34b5d32c74957c826783c7a1122667
diff --git a/metadata/md5-cache/sys-apps/kmod-18-r1 b/metadata/md5-cache/sys-apps/kmod-18-r1
index 9c6b380d1ec8..375acc5cab47 100644
--- a/metadata/md5-cache/sys-apps/kmod-18-r1
+++ b/metadata/md5-cache/sys-apps/kmod-18-r1
@@ -4,7 +4,7 @@ DESCRIPTION=library and tools for managing linux kernel modules
EAPI=5
HOMEPAGE=http://git.kernel.org/?p=utils/kernel/kmod/kmod.git
IUSE=debug doc lzma python static-libs +tools zlib python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
-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=LGPL-2
RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils !=app-arch/xz-utils-5.0.4-r1 ) python? ( 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 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) zlib? ( >=sys-libs/zlib-1.2.6 )
REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://kernel/linux/utils/kernel/kmod/kmod-18.tar.xz
_eclasses_=bash-completion-r1 db412e427e3317ffd3e15f17df269c5e eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=bd9ba197108bb87739955f6194cb1558
+_md5_=f430c576209f6442ddb6b004ee58ff7f
diff --git a/metadata/md5-cache/sys-apps/systemd-208-r3 b/metadata/md5-cache/sys-apps/systemd-208-r3
deleted file mode 100644
index f81793af40a2..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-208-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm pretend setup test
-DEPEND=>=sys-apps/dbus-1.6.8-r1 >=sys-apps/util-linux-2.20 sys-libs/libcap acl? ( sys-apps/acl ) audit? ( >=sys-process/audit-2 ) cryptsetup? ( >=sys-fs/cryptsetup-1.6 ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0 ) gudev? ( >=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(-)?] ) http? ( net-libs/libmicrohttpd ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-14-r1 ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) pam? ( virtual/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_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(+)?] ) qrcode? ( media-gfx/qrencode ) selinux? ( sys-libs/libselinux ) tcpd? ( sys-apps/tcp-wrappers ) xattr? ( sys-apps/attr ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-arch/xz-utils app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gperf >=dev-util/intltool-0.50 >=sys-devel/binutils-2.23.1 >=sys-devel/gcc-4.6 >=sys-kernel/linux-headers-3.0 ia64? ( >=sys-kernel/linux-headers-3.9 ) virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.18 ) filecaps? ( sys-libs/libcap ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=System and service manager for Linux
-EAPI=5
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection +kmod lzma pam policykit python qrcode selinux tcpd test vanilla xattr +filecaps 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_targets_python3_2 python_targets_python3_3 python_single_target_python2_7 python_single_target_python3_2 python_single_target_python3_3
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=>=sys-apps/hwids-20130717-r1[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
-RDEPEND=>=sys-apps/dbus-1.6.8-r1 >=sys-apps/util-linux-2.20 sys-libs/libcap acl? ( sys-apps/acl ) audit? ( >=sys-process/audit-2 ) cryptsetup? ( >=sys-fs/cryptsetup-1.6 ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0 ) gudev? ( >=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(-)?] ) http? ( net-libs/libmicrohttpd ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-14-r1 ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) pam? ( virtual/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_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(+)?] ) qrcode? ( media-gfx/qrencode ) selinux? ( sys-libs/libselinux ) tcpd? ( sys-apps/tcp-wrappers ) xattr? ( sys-apps/attr ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 || ( >=sys-apps/util-linux-2.22 systemd-208-r1.tar.xz http://dev.gentoo.org/~mgorny/dist/systemd-gentoo-patchset-208_p19.tar.bz2
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 autotools-utils fb74970befc9b65ceec689d2ccff3022 bash-completion-r1 db412e427e3317ffd3e15f17df269c5e eutils 06133990e861be0fe60c2b428fd025d9 fcaps 05f6960b564e59207815cb297af5357a flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be 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 udev 8cd692457c1524c7be9af69831698a78 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=672108a4f50701319d9dad738e231626
diff --git a/metadata/md5-cache/sys-apps/systemd-214 b/metadata/md5-cache/sys-apps/systemd-214
deleted file mode 100644
index 2ab24f1584b7..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-214
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm pretend setup test
-DEPEND=>=sys-apps/util-linux-2.20:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0= ) 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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) pam? ( virtual/pam:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_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(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-arch/xz-utils:0 dev-util/gperf >=dev-util/intltool-0.50 >=sys-devel/binutils-2.23.1 >=sys-devel/gcc-4.6 >=sys-kernel/linux-headers-3.10 ia64? ( >=sys-kernel/linux-headers-3.9 ) virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.18 ) python? ( dev-python/lxml[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(+)?] ) test? ( >=sys-apps/dbus-1.6.8-r1:0 ) filecaps? ( sys-libs/libcap ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=System and service manager for Linux
-EAPI=5
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection kdbus +kmod lzma pam policykit python qrcode +seccomp selinux ssl test vanilla +filecaps 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_targets_python3_2 python_targets_python3_3 python_single_target_python2_7 python_single_target_python3_2 python_single_target_python3_3
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=>=sys-apps/dbus-1.6.8-r1:0 >=sys-apps/hwids-20130717-r1[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
-RDEPEND=>=sys-apps/util-linux-2.20:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0= ) 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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) pam? ( virtual/pam:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_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(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 || ( >=sys-apps/util-linux-2.22 =sys-apps/util-linux-2.20:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0= ) 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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) pam? ( virtual/pam:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_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(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-arch/xz-utils:0 dev-util/gperf >=dev-util/intltool-0.50 >=sys-devel/binutils-2.23.1 >=sys-devel/gcc-4.6 >=sys-kernel/linux-headers-3.10 ia64? ( >=sys-kernel/linux-headers-3.9 ) virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.18 ) python? ( dev-python/lxml[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(+)?] ) test? ( >=sys-apps/dbus-1.6.8-r1:0 ) filecaps? ( sys-libs/libcap ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=System and service manager for Linux
-EAPI=5
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection kdbus +kmod lzma pam policykit python qrcode +seccomp selinux ssl test vanilla +filecaps 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_targets_python3_2 python_targets_python3_3 python_single_target_python2_7 python_single_target_python3_2 python_single_target_python3_3
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=>=sys-apps/dbus-1.6.8-r1:0 >=sys-apps/hwids-20130717-r1[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
-RDEPEND=>=sys-apps/util-linux-2.20:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0= ) 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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) pam? ( virtual/pam:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_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(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 || ( >=sys-apps/util-linux-2.22 =sys-apps/util-linux-2.20:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0=
SLOT=0/2
SRC_URI=http://www.freedesktop.org/software/systemd/systemd-215.tar.xz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 autotools-utils fb74970befc9b65ceec689d2ccff3022 bash-completion-r1 db412e427e3317ffd3e15f17df269c5e eutils 06133990e861be0fe60c2b428fd025d9 fcaps 05f6960b564e59207815cb297af5357a flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be 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 udev 8cd692457c1524c7be9af69831698a78 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=53654557ab9031d175da5805c4f72b6e
+_md5_=e60507a3e4edbc8c42350d12b8ff450e
diff --git a/metadata/md5-cache/sys-block/megactl-0.4.1-r2 b/metadata/md5-cache/sys-block/megactl-0.4.1-r2
new file mode 100644
index 000000000000..6aa89f1f284e
--- /dev/null
+++ b/metadata/md5-cache/sys-block/megactl-0.4.1-r2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=LSI MegaRAID control utility
+EAPI=2
+HOMEPAGE=http://sourceforge.net/projects/megactl/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/megactl/megactl-0.4.1.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
+_md5_=1da58a35a3835d32c5c62e7daf4145ba
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.4 b/metadata/md5-cache/sys-devel/gcc-4.6.4
index 0c8ffd9f8f5c..fb81e1f921cc 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.4
@@ -4,7 +4,7 @@ DESCRIPTION=The GNU Compiler Collection
EAPI=2
HOMEPAGE=http://gcc.gnu.org/
IUSE=multislot regression-test vanilla altivec nopie nossp doc gcj awt hardened multilib objc objc-gc mudflap libssp objc++ fixed-point graphite +nls +nptl +cxx +fortran +openmp
-KEYWORDS=alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
@@ -12,4 +12,4 @@ RESTRICT=strip
SLOT=4.6
SRC_URI=mirror://gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.bz2 mirror://gentoo/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.6.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.6.4-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.4-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.6.4-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.4-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-piepatches-v0.5.2.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 fixheadtails c6fd1fc49c9dc11924f28a1406f251a0 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf pax-utils 51ad5130f4a69b1a118ca5296de276ae toolchain d6c75fc785526c5dc2a980c94ce6b3d5 toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9c94c3f05f9d6194869a253aa022d999
+_md5_=b924f9f77c4a33ec3002743375764021
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.42.10 b/metadata/md5-cache/sys-fs/e2fsprogs-1.42.10
index fb8d95447c8d..f58096cf689c 100644
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.42.10
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.42.10
@@ -4,10 +4,10 @@ DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities
EAPI=4
HOMEPAGE=http://e2fsprogs.sourceforge.net/
IUSE=nls static-libs elibc_FreeBSD
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint
LICENSE=GPL-2 BSD
RDEPEND=~sys-libs/e2fsprogs-libs-1.42.10 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl )
SLOT=0
SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.42.10.tar.gz elibc_mintlib? ( https://498412.bugs.gentoo.org/attachment.cgi?id=368058 -> e2fsprogs-1.42.9-mint-r1.patch )
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=54296c827eab719c7d33bfdee2d85a70
+_md5_=6991667bbf5f1917ae1bb1a477c9e666
diff --git a/metadata/md5-cache/sys-fs/eudev-1.9-r1 b/metadata/md5-cache/sys-fs/eudev-1.9-r1
index 545512e0fea5..38a4983784c0 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.20 gudev? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(
REQUIRED_USE=keymap? ( hwdb )
SLOT=0
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 git-2 2027b81a576527fa16bece425941e094 git-r3 49fc3d60d7bcd6f8913ad6ec0cb4c67b libtool 52d0e17251d04645ffaa61bfdd858944 linux-info 2b8c53f6065bdee2d757472215a3088f multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build fbb9baa0b4039304643e36e9820fdecf multilib-minimal 5bbdc77877c1aa3c6bd89ca3f9196d11 multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1b21e1ff6e1101b1d9e1dc34562e47da
+_md5_=0ccab99c9c5b30720963f276367fa548
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.107 b/metadata/md5-cache/sys-fs/lvm2-2.02.107
new file mode 100644
index 000000000000..b27c5e5618f6
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.107
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline ) udev? ( >=virtual/udev-200[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( selinux? ( sys-libs/libselinux[static-libs] ) udev? ( virtual/udev[static-libs] ) >=sys-apps/util-linux-2.16[static-libs] ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=User-land utilities for LVM2 (device-mapper) software.
+EAPI=5
+HOMEPAGE=http://sources.redhat.com/lvm2/
+IUSE=readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline ) udev? ( >=virtual/udev-200[static-libs?] ) >=sys-apps/baselayout-2.2 !=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
+REQUIRED_USE=device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )
+SLOT=0
+SRC_URI=ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.107.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.107.tgz
+_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be libtool 52d0e17251d04645ffaa61bfdd858944 linux-info 2b8c53f6065bdee2d757472215a3088f multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402 udev 8cd692457c1524c7be9af69831698a78 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=cdca66fc2bdc60250958157ee4207d3a
diff --git a/metadata/md5-cache/sys-fs/udev-215 b/metadata/md5-cache/sys-fs/udev-215
index bfd5be82d8f8..4dd4426b33d3 100644
--- a/metadata/md5-cache/sys-fs/udev-215
+++ b/metadata/md5-cache/sys-fs/udev-215
@@ -4,12 +4,12 @@ DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace de
EAPI=5
HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
IUSE=acl doc +firmware-loader gudev introspection +kmod selinux 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
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
LICENSE=LGPL-2.1 MIT GPL-2
PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-26
RDEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Hardened kernel sources (kernel series 3.14)
+EAPI=5
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.14.12-r1
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.14.N/deblob-3.14 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.14.N/deblob-check -> deblob-check-3.14 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.14.12-2.extras.tar.bz2 mirror://gentoo/genpatches-3.14-16.base.tar.xz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 kernel-2 6fb31411472936acc8287129d3df7f43 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-any-r1 4560effd96d3d2a82e50af7cf87166da python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=d3ac5dc533a2e450c3c90d09cd2341b4
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.15.5-r1 b/metadata/md5-cache/sys-kernel/hardened-sources-3.15.5-r1
new file mode 100644
index 000000000000..813f1af19f54
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.15.5-r1
@@ -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 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Hardened kernel sources (kernel series 3.15)
+EAPI=5
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.15.5-r1
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.15.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.15.N/deblob-3.15 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.15.N/deblob-check -> deblob-check-3.15 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.15.5-2.extras.tar.bz2 mirror://gentoo/genpatches-3.15-7.base.tar.xz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 kernel-2 6fb31411472936acc8287129d3df7f43 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-any-r1 4560effd96d3d2a82e50af7cf87166da python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=c97fefc73cc82fb2ceb9eb342321af68
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.61-r1 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.61-r1
new file mode 100644
index 000000000000..1eeb3f0619bd
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.61-r1
@@ -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 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Hardened kernel sources (kernel series 3.2)
+EAPI=5
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.2.61-r1
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.61-2.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 kernel-2 6fb31411472936acc8287129d3df7f43 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-any-r1 4560effd96d3d2a82e50af7cf87166da python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=202429a2980e400cea7cf5ac3dee3a12
diff --git a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.10 b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.10
index ec9ef3184cfd..54fe16b4b60b 100644
--- a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.10
+++ b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.10
@@ -4,10 +4,10 @@ DESCRIPTION=e2fsprogs libraries (common error and subsystem)
EAPI=4
HOMEPAGE=http://e2fsprogs.sourceforge.net/
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-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~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 ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris
LICENSE=GPL-2
RDEPEND=!sys-libs/com_err !sys-libs/ss !perl-core/Thread-Queue-2.120.0-r999
+SLOT=0
+_md5_=78954cd3dea88c6306ed179a4e8a6648
diff --git a/metadata/md5-cache/virtual/perl-Thread-Queue-3.10.0 b/metadata/md5-cache/virtual/perl-Thread-Queue-3.10.0
deleted file mode 100644
index b88a832e218d..000000000000
--- a/metadata/md5-cache/virtual/perl-Thread-Queue-3.10.0
+++ /dev/null
@@ -1,6 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Thread-Queue
-KEYWORDS=~amd64 ~ppc ~x86
-RDEPEND=~perl-core/Thread-Queue-3.10.0
-SLOT=0
-_md5_=83fef9743baf8491a4b551c5dfcf8708
diff --git a/metadata/md5-cache/virtual/perl-Thread-Queue-3.20.0 b/metadata/md5-cache/virtual/perl-Thread-Queue-3.20.0
deleted file mode 100644
index 76ebc100acf0..000000000000
--- a/metadata/md5-cache/virtual/perl-Thread-Queue-3.20.0
+++ /dev/null
@@ -1,6 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Thread-Queue
-KEYWORDS=~amd64 ~ppc ~x86
-RDEPEND=~perl-core/Thread-Queue-3.20.0
-SLOT=0
-_md5_=504d9ed7135d5d2c5ea1650b3a06be19
diff --git a/metadata/md5-cache/virtual/perl-Thread-Queue-3.20.0-r1 b/metadata/md5-cache/virtual/perl-Thread-Queue-3.20.0-r1
new file mode 100644
index 000000000000..888861894a53
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-Thread-Queue-3.20.0-r1
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Thread-Queue
+EAPI=5
+KEYWORDS=~amd64 ~ppc ~x86
+RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/Thread-Queue-3.20.0 ) !perl-core/Thread-Queue-3.20.0-r999
+SLOT=0
+_md5_=6b06c2bf3b90949b35524948543012d1
diff --git a/metadata/md5-cache/virtual/perl-Thread-Queue-3.50.0 b/metadata/md5-cache/virtual/perl-Thread-Queue-3.50.0
new file mode 100644
index 000000000000..1770d9ede5ef
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-Thread-Queue-3.50.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Thread-Queue
+EAPI=5
+KEYWORDS=~amd64 ~ppc ~x86
+RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Thread-Queue-3.50.0 ) !perl-core/Thread-Queue-3.50.0-r999
+SLOT=0
+_md5_=78b7f8ee55bc726e257b5335b7366e64
diff --git a/metadata/md5-cache/virtual/perl-Thread-Semaphore-2.120.0-r2 b/metadata/md5-cache/virtual/perl-Thread-Semaphore-2.120.0-r2
deleted file mode 100644
index 6c7bd97c047b..000000000000
--- a/metadata/md5-cache/virtual/perl-Thread-Semaphore-2.120.0-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Thread-Semaphore
-KEYWORDS=~amd64 ~ppc ~x86
-RDEPEND=|| ( =dev-lang/perl-5.16* =dev-lang/perl-5.14* ~perl-core/Thread-Semaphore-2.120.0 )
-SLOT=0
-_md5_=7bb24fa6a243e8e00952df6c7ca2dc35
diff --git a/metadata/md5-cache/virtual/perl-Thread-Semaphore-2.120.0-r3 b/metadata/md5-cache/virtual/perl-Thread-Semaphore-2.120.0-r3
new file mode 100644
index 000000000000..33adfb8cc4ae
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-Thread-Semaphore-2.120.0-r3
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Thread-Semaphore
+EAPI=5
+KEYWORDS=amd64 ppc x86
+RDEPEND=|| ( =dev-lang/perl-5.20* =dev-lang/perl-5.18* =dev-lang/perl-5.16* ~perl-core/Thread-Semaphore-2.120.0 ) !perl-core/Thread-Semaphore-2.120.0-r999
+SLOT=0
+_md5_=1939131ae8a894f7c2151efebc314f2e
diff --git a/metadata/md5-cache/virtual/perl-Tie-RefHash-1.390.0-r1 b/metadata/md5-cache/virtual/perl-Tie-RefHash-1.390.0-r1
deleted file mode 100644
index eff66d61afc1..000000000000
--- a/metadata/md5-cache/virtual/perl-Tie-RefHash-1.390.0-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Tie-RefHash
-KEYWORDS=~amd64 ~x86
-RDEPEND=|| ( =dev-lang/perl-5.18* =dev-lang/perl-5.16* =dev-lang/perl-5.14* ~perl-core/Tie-RefHash-1.390.0 )
-SLOT=0
-_md5_=c97c5bd24b48248422229c2fda785048
diff --git a/metadata/md5-cache/virtual/perl-Tie-RefHash-1.390.0-r2 b/metadata/md5-cache/virtual/perl-Tie-RefHash-1.390.0-r2
new file mode 100644
index 000000000000..61ce10735c10
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-Tie-RefHash-1.390.0-r2
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Tie-RefHash
+EAPI=5
+KEYWORDS=amd64 x86
+RDEPEND=|| ( =dev-lang/perl-5.20* =dev-lang/perl-5.18* =dev-lang/perl-5.16* ~perl-core/Tie-RefHash-1.390.0 ) !perl-core/Tie-RefHash-1.390.0-r999
+SLOT=0
+_md5_=dede4fc87c526b181d32473c78e9383a
diff --git a/metadata/md5-cache/virtual/perl-Time-HiRes-1.972.500-r1 b/metadata/md5-cache/virtual/perl-Time-HiRes-1.972.500-r2
similarity index 50%
rename from metadata/md5-cache/virtual/perl-Time-HiRes-1.972.500-r1
rename to metadata/md5-cache/virtual/perl-Time-HiRes-1.972.500-r2
index 069adb59ca4d..85ddea06ceca 100644
--- a/metadata/md5-cache/virtual/perl-Time-HiRes-1.972.500-r1
+++ b/metadata/md5-cache/virtual/perl-Time-HiRes-1.972.500-r2
@@ -1,6 +1,7 @@
DEFINED_PHASES=-
DESCRIPTION=Virtual for Time-HiRes
+EAPI=5
KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.16* ~perl-core/Time-HiRes-1.972.500 )
+RDEPEND=|| ( =dev-lang/perl-5.18* =dev-lang/perl-5.16* ~perl-core/Time-HiRes-1.972.500 ) !perl-core/Time-HiRes-1.972.500-r999
SLOT=0
-_md5_=89164c60fe6feff5b5cb4c592bafa112
+_md5_=10e9706c8ee044bc0b5c869ed241f0c9
diff --git a/metadata/md5-cache/virtual/perl-Time-HiRes-1.972.600 b/metadata/md5-cache/virtual/perl-Time-HiRes-1.972.600-r1
similarity index 54%
rename from metadata/md5-cache/virtual/perl-Time-HiRes-1.972.600
rename to metadata/md5-cache/virtual/perl-Time-HiRes-1.972.600-r1
index 2ff6550bd3f5..67fa1af95eb3 100644
--- a/metadata/md5-cache/virtual/perl-Time-HiRes-1.972.600
+++ b/metadata/md5-cache/virtual/perl-Time-HiRes-1.972.600-r1
@@ -1,6 +1,7 @@
DEFINED_PHASES=-
DESCRIPTION=Virtual for Time-HiRes
+EAPI=5
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.18* =dev-lang/perl-5.16* ~perl-core/Time-HiRes-1.972.600 )
+RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Time-HiRes-1.972.600 ) !perl-core/Time-HiRes-1.972.600-r999
SLOT=0
-_md5_=07d4617a4a5f1cae0d1ecb0e061fc4e6
+_md5_=b1b3a1e1e0186d784deba8eb8cbbbe95
diff --git a/metadata/md5-cache/virtual/perl-Time-Local-1.200.0-r2 b/metadata/md5-cache/virtual/perl-Time-Local-1.200.0-r2
deleted file mode 100644
index 30d8482412e0..000000000000
--- a/metadata/md5-cache/virtual/perl-Time-Local-1.200.0-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Time-Local
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.16* =dev-lang/perl-5.14* ~perl-core/Time-Local-1.200.0 )
-SLOT=0
-_md5_=58163918a364ef33b800555fed5235c2
diff --git a/metadata/md5-cache/virtual/perl-Time-Local-1.220.0 b/metadata/md5-cache/virtual/perl-Time-Local-1.220.0
deleted file mode 100644
index a71dc01c94a0..000000000000
--- a/metadata/md5-cache/virtual/perl-Time-Local-1.220.0
+++ /dev/null
@@ -1,6 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Time-Local
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=~perl-core/Time-Local-1.220.0
-SLOT=0
-_md5_=02c77fa8a66da5e0cb09d21354c2b0d5
diff --git a/metadata/md5-cache/virtual/perl-Time-Local-1.230.0 b/metadata/md5-cache/virtual/perl-Time-Local-1.230.0-r1
similarity index 60%
rename from metadata/md5-cache/virtual/perl-Time-Local-1.230.0
rename to metadata/md5-cache/virtual/perl-Time-Local-1.230.0-r1
index 1e3902c14545..7eedcfd1f0ef 100644
--- a/metadata/md5-cache/virtual/perl-Time-Local-1.230.0
+++ b/metadata/md5-cache/virtual/perl-Time-Local-1.230.0-r1
@@ -1,6 +1,7 @@
DEFINED_PHASES=-
DESCRIPTION=Virtual for Time-Local
+EAPI=5
KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=~perl-core/Time-Local-1.230.0
+RDEPEND=|| ( =dev-lang/perl-5.20* =dev-lang/perl-5.18* ~perl-core/Time-Local-1.230.0 ) !perl-core/Time-Local-1.230.0-r999
SLOT=0
-_md5_=0f31007241722f7fe8522b812e43d6e4
+_md5_=28c21796e80f7d2359d2a823358ce28c
diff --git a/metadata/md5-cache/virtual/perl-Time-Piece-1.20 b/metadata/md5-cache/virtual/perl-Time-Piece-1.20
deleted file mode 100644
index ab2572fe6b1b..000000000000
--- a/metadata/md5-cache/virtual/perl-Time-Piece-1.20
+++ /dev/null
@@ -1,6 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Object Oriented time objects
-KEYWORDS=alpha amd64 arm64 ia64 ppc ppc64 sparc x86 ~x86-solaris
-RDEPEND=~perl-core/Time-Piece-1.20
-SLOT=0
-_md5_=a740567a8909ca28b2931f1bfb78fbac
diff --git a/metadata/md5-cache/virtual/perl-Time-Piece-1.20-r1 b/metadata/md5-cache/virtual/perl-Time-Piece-1.20-r1
new file mode 100644
index 000000000000..3cfc467693c6
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-Time-Piece-1.20-r1
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Time-Piece
+EAPI=5
+KEYWORDS=alpha amd64 arm64 ia64 ppc ppc64 sparc x86 ~x86-solaris
+RDEPEND=|| ( =dev-lang/perl-5.18* =dev-lang/perl-5.16* ~perl-core/Time-Piece-1.20 ) !perl-core/Time-Piece-1.20-r999
+SLOT=0
+_md5_=7939443643901e61af804e072d4964b3
diff --git a/metadata/md5-cache/virtual/perl-Time-Piece-1.22 b/metadata/md5-cache/virtual/perl-Time-Piece-1.22
deleted file mode 100644
index dfc7fb008543..000000000000
--- a/metadata/md5-cache/virtual/perl-Time-Piece-1.22
+++ /dev/null
@@ -1,6 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Object Oriented time objects
-KEYWORDS=~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris
-RDEPEND=~perl-core/Time-Piece-1.22
-SLOT=0
-_md5_=8ce43c1aa709c8dc96b060f6f58c7025
diff --git a/metadata/md5-cache/virtual/perl-Time-Piece-1.230.0 b/metadata/md5-cache/virtual/perl-Time-Piece-1.230.0
deleted file mode 100644
index b15c0ce56dcc..000000000000
--- a/metadata/md5-cache/virtual/perl-Time-Piece-1.230.0
+++ /dev/null
@@ -1,6 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Object Oriented time objects
-KEYWORDS=~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris
-RDEPEND=~perl-core/Time-Piece-1.230.0
-SLOT=0
-_md5_=19a38458fd3efd261bb4d8adae29b959
diff --git a/metadata/md5-cache/virtual/perl-Time-Piece-1.270.0 b/metadata/md5-cache/virtual/perl-Time-Piece-1.270.0
new file mode 100644
index 000000000000..941f69c2b241
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-Time-Piece-1.270.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Time-Piece
+EAPI=5
+KEYWORDS=~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris
+RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Time-Piece-1.270.0 ) !perl-core/Time-Piece-1.270.0-r999
+SLOT=0
+_md5_=13e89dd153db9a84e2f56f456e6679ab
diff --git a/metadata/md5-cache/virtual/perl-Version-Requirements-0.101.21 b/metadata/md5-cache/virtual/perl-Version-Requirements-0.101.21
deleted file mode 100644
index 3b137857218f..000000000000
--- a/metadata/md5-cache/virtual/perl-Version-Requirements-0.101.21
+++ /dev/null
@@ -1,6 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Version-Requirements
-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=~perl-core/Version-Requirements-0.101.21
-SLOT=0
-_md5_=84b4033e34b871c2dfbb6a16ac815de8
diff --git a/metadata/md5-cache/virtual/perl-Version-Requirements-0.101.20-r2 b/metadata/md5-cache/virtual/perl-Version-Requirements-0.101.22
similarity index 61%
rename from metadata/md5-cache/virtual/perl-Version-Requirements-0.101.20-r2
rename to metadata/md5-cache/virtual/perl-Version-Requirements-0.101.22
index d5bdccc98230..565b5f321724 100644
--- a/metadata/md5-cache/virtual/perl-Version-Requirements-0.101.20-r2
+++ b/metadata/md5-cache/virtual/perl-Version-Requirements-0.101.22
@@ -1,6 +1,7 @@
DEFINED_PHASES=-
DESCRIPTION=Virtual for Version-Requirements
+EAPI=5
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.14* ~perl-core/Version-Requirements-0.101.20 )
+RDEPEND=|| ( =dev-lang/perl-5.16* ~perl-core/Version-Requirements-0.101.22 ) !perl-core/Version-Requirements-0.101.22-r999
SLOT=0
-_md5_=8092a07d62694380c5638b97962eef1a
+_md5_=750f35e5334d2a4c5f1c56a118ed790b
diff --git a/metadata/md5-cache/virtual/perl-XSLoader-0.160.0 b/metadata/md5-cache/virtual/perl-XSLoader-0.160.0-r1
similarity index 51%
rename from metadata/md5-cache/virtual/perl-XSLoader-0.160.0
rename to metadata/md5-cache/virtual/perl-XSLoader-0.160.0-r1
index 2e2d307d4f57..61c8d31c56d8 100644
--- a/metadata/md5-cache/virtual/perl-XSLoader-0.160.0
+++ b/metadata/md5-cache/virtual/perl-XSLoader-0.160.0-r1
@@ -1,6 +1,7 @@
DEFINED_PHASES=-
DESCRIPTION=Virtual for XSLoader
+EAPI=5
KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-RDEPEND=~perl-core/XSLoader-0.160.0
+RDEPEND=|| ( =dev-lang/perl-5.18* =dev-lang/perl-5.16* ~perl-core/XSLoader-0.160.0 ) !perl-core/XSLoader-0.160.0-r999
SLOT=0
-_md5_=7ae7a60a1c33d9e9ca53644b95f33b7d
+_md5_=4efa0bb52dc1ed6d66b83f041940ebda
diff --git a/metadata/md5-cache/virtual/perl-XSLoader-0.170.0 b/metadata/md5-cache/virtual/perl-XSLoader-0.170.0
new file mode 100644
index 000000000000..9900f2caac3e
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-XSLoader-0.170.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for XSLoader
+EAPI=5
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/XSLoader-0.170.0 ) !perl-core/XSLoader-0.170.0-r999
+SLOT=0
+_md5_=69a1a2f14aedf65f3eaea4fb3ce24e1b
diff --git a/metadata/md5-cache/virtual/perl-autodie-2.160.0 b/metadata/md5-cache/virtual/perl-autodie-2.160.0
deleted file mode 100644
index c1efaf33b537..000000000000
--- a/metadata/md5-cache/virtual/perl-autodie-2.160.0
+++ /dev/null
@@ -1,6 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for autodie
-KEYWORDS=~amd64 ~x86
-RDEPEND=~perl-core/autodie-2.160.0
-SLOT=0
-_md5_=06bdd20d3199039db9d67ebb31ad4840
diff --git a/metadata/md5-cache/virtual/perl-autodie-2.200.0 b/metadata/md5-cache/virtual/perl-autodie-2.200.0
deleted file mode 100644
index 6e06ae0df283..000000000000
--- a/metadata/md5-cache/virtual/perl-autodie-2.200.0
+++ /dev/null
@@ -1,6 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for autodie
-KEYWORDS=~amd64 ~x86
-RDEPEND=~perl-core/autodie-2.200.0
-SLOT=0
-_md5_=452c2f829e1765edc3a6dad9f2298d2d
diff --git a/metadata/md5-cache/virtual/perl-autodie-2.210.0 b/metadata/md5-cache/virtual/perl-autodie-2.210.0
deleted file mode 100644
index 2e5cde4eacb9..000000000000
--- a/metadata/md5-cache/virtual/perl-autodie-2.210.0
+++ /dev/null
@@ -1,6 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for autodie
-KEYWORDS=~amd64 ~x86
-RDEPEND=~perl-core/autodie-2.210.0
-SLOT=0
-_md5_=df48c26d4f4c8bd202b1dc430d29afb7
diff --git a/metadata/md5-cache/virtual/perl-autodie-2.230.0 b/metadata/md5-cache/virtual/perl-autodie-2.230.0
new file mode 100644
index 000000000000..646eec59e9f5
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-autodie-2.230.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for autodie
+EAPI=5
+KEYWORDS=~amd64 ~x86
+RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/autodie-2.230.0 ) !perl-core/autodie-2.230.0-r999
+SLOT=0
+_md5_=a2d9e6558238fdb398f2cf76eacc91ce
diff --git a/metadata/md5-cache/virtual/perl-i18n-langtags-0.35 b/metadata/md5-cache/virtual/perl-i18n-langtags-0.35
deleted file mode 100644
index 63f32c418bbd..000000000000
--- a/metadata/md5-cache/virtual/perl-i18n-langtags-0.35
+++ /dev/null
@@ -1,6 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for I18N-LangTags
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
-RDEPEND=|| ( ~dev-lang/perl-5.12.4 ~dev-lang/perl-5.12.3 ~dev-lang/perl-5.12.2 ~perl-core/i18n-langtags-0.35 )
-SLOT=0
-_md5_=6a35978574ca48e808757a49bd14b998
diff --git a/metadata/md5-cache/virtual/perl-i18n-langtags-0.380.0 b/metadata/md5-cache/virtual/perl-i18n-langtags-0.380.0
new file mode 100644
index 000000000000..1e6514c55598
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-i18n-langtags-0.380.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for I18N-LangTags
+EAPI=5
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
+RDEPEND=|| ( =dev-lang/perl-5.16* ~perl-core/i18n-langtags-0.380.0 ) !perl-core/i18n-langtags-0.380.0-r999
+SLOT=0
+_md5_=167305f21f7760741e3b976cf340ad85
diff --git a/metadata/md5-cache/virtual/perl-i18n-langtags-0.390.0 b/metadata/md5-cache/virtual/perl-i18n-langtags-0.390.0
new file mode 100644
index 000000000000..e2ee19cd4652
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-i18n-langtags-0.390.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for I18N-LangTags
+EAPI=5
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
+RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/i18n-langtags-0.390.0 ) !perl-core/i18n-langtags-0.390.0-r999
+SLOT=0
+_md5_=25fb19b18ad10fe2239f8310df74a91c
diff --git a/metadata/md5-cache/virtual/perl-i18n-langtags-0.400.0 b/metadata/md5-cache/virtual/perl-i18n-langtags-0.400.0
new file mode 100644
index 000000000000..3383dc4eb30c
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-i18n-langtags-0.400.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for I18N-LangTags
+EAPI=5
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
+RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/i18n-langtags-0.400.0 ) !perl-core/i18n-langtags-0.400.0-r999
+SLOT=0
+_md5_=38f72aabde3edab93bec413c85635aaa
diff --git a/metadata/md5-cache/virtual/perl-if-0.60.200 b/metadata/md5-cache/virtual/perl-if-0.60.200
deleted file mode 100644
index 1baa8b947f6b..000000000000
--- a/metadata/md5-cache/virtual/perl-if-0.60.200
+++ /dev/null
@@ -1,6 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for perl-core/if
-KEYWORDS=~x86 ~amd64
-RDEPEND=|| ( =dev-lang/perl-5.18* =dev-lang/perl-5.16* ~perl-core/if-0.60.200 )
-SLOT=0
-_md5_=26b414b82bdfea74b507066408371a44
diff --git a/metadata/md5-cache/virtual/perl-if-0.60.200-r1 b/metadata/md5-cache/virtual/perl-if-0.60.200-r1
new file mode 100644
index 000000000000..668cff015b56
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-if-0.60.200-r1
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for if
+EAPI=5
+KEYWORDS=x86 amd64
+RDEPEND=|| ( =dev-lang/perl-5.18* =dev-lang/perl-5.16* ~perl-core/if-0.60.200 ) !perl-core/if-0.60.200-r999
+SLOT=0
+_md5_=36215ef2d9c1438c1c5bab64cde62524
diff --git a/metadata/md5-cache/virtual/perl-if-0.60.300 b/metadata/md5-cache/virtual/perl-if-0.60.300
new file mode 100644
index 000000000000..053daa5cb81c
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-if-0.60.300
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for if
+EAPI=5
+KEYWORDS=~x86 ~amd64
+RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/if-0.60.300 ) !perl-core/if-0.60.300-r999
+SLOT=0
+_md5_=eaad403093e704acdff53e1d9c60df8a
diff --git a/metadata/md5-cache/virtual/perl-libnet-1.220.0-r1 b/metadata/md5-cache/virtual/perl-libnet-1.220.0-r2
similarity index 65%
rename from metadata/md5-cache/virtual/perl-libnet-1.220.0-r1
rename to metadata/md5-cache/virtual/perl-libnet-1.220.0-r2
index 090d8ab52a9f..ca37799d9a63 100644
--- a/metadata/md5-cache/virtual/perl-libnet-1.220.0-r1
+++ b/metadata/md5-cache/virtual/perl-libnet-1.220.0-r2
@@ -1,6 +1,7 @@
DEFINED_PHASES=-
DESCRIPTION=Virtual for libnet
+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.16* =dev-lang/perl-5.14* ~dev-lang/perl-5.12.4 ~dev-lang/perl-5.12.3 ~dev-lang/perl-5.12.2 ~perl-core/libnet-1.220.0 )
+RDEPEND=|| ( =dev-lang/perl-5.18* =dev-lang/perl-5.16* ~perl-core/libnet-1.220.0 ) !perl-core/libnet-1.220.0-r999
SLOT=0
-_md5_=76cda079c2942c0795dab88a88dc1b51
+_md5_=2ed724af297cff79319cfd6567cb74ce
diff --git a/metadata/md5-cache/virtual/perl-libnet-1.230.0 b/metadata/md5-cache/virtual/perl-libnet-1.230.0
deleted file mode 100644
index c40af1132f48..000000000000
--- a/metadata/md5-cache/virtual/perl-libnet-1.230.0
+++ /dev/null
@@ -1,6 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for libnet
-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* =dev-lang/perl-5.16* =dev-lang/perl-5.14* ~dev-lang/perl-5.12.4 ~dev-lang/perl-5.12.3 ~dev-lang/perl-5.12.2 ~perl-core/libnet-1.230.0 )
-SLOT=0
-_md5_=4b8f1964e4cdbd3188872ea0f85440fa
diff --git a/metadata/md5-cache/virtual/perl-libnet-1.230.0-r1 b/metadata/md5-cache/virtual/perl-libnet-1.230.0-r1
new file mode 100644
index 000000000000..a466b35b1096
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-libnet-1.230.0-r1
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for libnet
+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=~perl-core/libnet-1.230.0
+SLOT=0
+_md5_=afea0b7eee15825f954b07917e2ec0cb
diff --git a/metadata/md5-cache/virtual/perl-libnet-1.270.0 b/metadata/md5-cache/virtual/perl-libnet-1.270.0
new file mode 100644
index 000000000000..0ef33e1ae53b
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-libnet-1.270.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for libnet
+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=~perl-core/libnet-1.270.0
+SLOT=0
+_md5_=d9cde0c6dec3fcc703c6399b256822b4
diff --git a/metadata/md5-cache/virtual/perl-locale-maketext-1.230.0 b/metadata/md5-cache/virtual/perl-locale-maketext-1.230.0
deleted file mode 100644
index c684aecb3e17..000000000000
--- a/metadata/md5-cache/virtual/perl-locale-maketext-1.230.0
+++ /dev/null
@@ -1,6 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for locale-maketext
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ppc s390 sh sparc x86 ~amd64-fbsd
-RDEPEND=~perl-core/locale-maketext-1.230.0
-SLOT=0
-_md5_=a3ac227b5e79872623684537db8e79bf
diff --git a/metadata/md5-cache/virtual/perl-locale-maketext-1.230.0-r1 b/metadata/md5-cache/virtual/perl-locale-maketext-1.230.0-r1
new file mode 100644
index 000000000000..a897454b2b66
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-locale-maketext-1.230.0-r1
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for locale-maketext
+EAPI=5
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ppc s390 sh sparc x86 ~amd64-fbsd
+RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/locale-maketext-1.230.0 ) !perl-core/locale-maketext-1.230.0-r999
+SLOT=0
+_md5_=8baaef1101dce9407ed737b88471f828
diff --git a/metadata/md5-cache/virtual/perl-locale-maketext-1.250.0 b/metadata/md5-cache/virtual/perl-locale-maketext-1.250.0
new file mode 100644
index 000000000000..48c48e65b582
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-locale-maketext-1.250.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for locale-maketext
+EAPI=5
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
+RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/locale-maketext-1.250.0 ) !perl-core/locale-maketext-1.250.0-r999
+SLOT=0
+_md5_=ca581e486df9564ec3966dc2e14f9dcd
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-36.0.1985.103_p1 b/metadata/md5-cache/www-client/google-chrome-beta-36.0.1985.125_p1
similarity index 92%
rename from metadata/md5-cache/www-client/google-chrome-beta-36.0.1985.103_p1
rename to metadata/md5-cache/www-client/google-chrome-beta-36.0.1985.125_p1
index 0674fb7d3c64..8e04fd4d6333 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-36.0.1985.103_p1
+++ b/metadata/md5-cache/www-client/google-chrome-beta-36.0.1985.125_p1
@@ -9,6 +9,6 @@ LICENSE=google-chrome
RDEPEND=app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 || ( dev-libs/libgcrypt:11 dev-libs/libgcrypt:0/11 ) dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-print/cups sys-apps/dbus >=sys-devel/gcc-4.4.0[cxx] sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango x11-misc/xdg-utils
RESTRICT=bindist mirror strip
SLOT=0
-SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_36.0.1985.103-1_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_36.0.1985.103-1_i386.deb )
+SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_36.0.1985.125-1_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_36.0.1985.125-1_i386.deb )
_eclasses_=chromium 4a9f555199b35aa57f60b0e9b9627d2a eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils f658eba3cc594a21cf6eef4af47daa90 linux-info 2b8c53f6065bdee2d757472215a3088f multilib 3bf24e6abb9b76d9f6c20600f0b716bf pax-utils 51ad5130f4a69b1a118ca5296de276ae readme.gentoo 106edea5533517715013de909a333abd toolchain-funcs 0f1760274637a138b99bb649202ea402 unpacker f300a7ca9131b1024a79762e8edd3c52 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=84ad08828af459f6b5a524b9dcbb4476
+_md5_=d040eed3b683288a730eaaab21a4cf85
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-37.0.2062.3_p1 b/metadata/md5-cache/www-client/google-chrome-unstable-37.0.2062.20_p1
similarity index 89%
rename from metadata/md5-cache/www-client/google-chrome-unstable-37.0.2062.3_p1
rename to metadata/md5-cache/www-client/google-chrome-unstable-37.0.2062.20_p1
index 7390f4c1fd7e..9d51369d21cc 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-37.0.2062.3_p1
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-37.0.2062.20_p1
@@ -9,6 +9,6 @@ LICENSE=google-chrome
RDEPEND=app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 || ( dev-libs/libgcrypt:11 dev-libs/libgcrypt:0/11 ) dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-print/cups sys-apps/dbus >=sys-devel/gcc-4.4.0[cxx] sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango x11-misc/xdg-utils
RESTRICT=bindist mirror strip
SLOT=0
-SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_37.0.2062.3-1_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_37.0.2062.3-1_i386.deb )
+SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_37.0.2062.20-1_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_37.0.2062.20-1_i386.deb )
_eclasses_=chromium 4a9f555199b35aa57f60b0e9b9627d2a eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils f658eba3cc594a21cf6eef4af47daa90 linux-info 2b8c53f6065bdee2d757472215a3088f multilib 3bf24e6abb9b76d9f6c20600f0b716bf pax-utils 51ad5130f4a69b1a118ca5296de276ae readme.gentoo 106edea5533517715013de909a333abd toolchain-funcs 0f1760274637a138b99bb649202ea402 unpacker f300a7ca9131b1024a79762e8edd3c52 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2a34f30003ac982a27b346073581b1bc
+_md5_=4d127ff4a10fce3f9a54845681416788
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-36.0.1985.103_beta1 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-36.0.1985.125_beta1
similarity index 80%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-36.0.1985.103_beta1
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-36.0.1985.125_beta1
index f774786d861e..e4a0021835f9 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-36.0.1985.103_beta1
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-36.0.1985.125_beta1
@@ -8,6 +8,6 @@ LICENSE=google-chrome
RDEPEND=!www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
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_36.0.1985.103-1_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_36.0.1985.103-1_i386.deb )
+SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_36.0.1985.125-1_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_36.0.1985.125-1_i386.deb )
_eclasses_=multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 unpacker f300a7ca9131b1024a79762e8edd3c52
-_md5_=b836242991451e57eebf315dc0af53b8
+_md5_=8a8faf0ff9d2af70ef3112ab18c1c8ea
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-37.0.2062.3_alpha1 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-37.0.2062.20_alpha1
similarity index 71%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-37.0.2062.3_alpha1
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-37.0.2062.20_alpha1
index f174ffbd58fa..4493bff22414 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-37.0.2062.3_alpha1
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-37.0.2062.20_alpha1
@@ -8,6 +8,6 @@ LICENSE=google-chrome
RDEPEND=!www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
RESTRICT=bindist mirror strip
SLOT=unstable
-SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_37.0.2062.3-1_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_37.0.2062.3-1_i386.deb )
+SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_37.0.2062.20-1_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_37.0.2062.20-1_i386.deb )
_eclasses_=multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 unpacker f300a7ca9131b1024a79762e8edd3c52
-_md5_=bf3178ace6ecca9b80d8ac5bd0975113
+_md5_=6265161238700a9fb67a53badbf6df68
diff --git a/metadata/md5-cache/x11-libs/libva-1.3.1 b/metadata/md5-cache/x11-libs/libva-1.3.1
index e47254e1a43b..3bc8b7c8d9ee 100644
--- a/metadata/md5-cache/x11-libs/libva-1.3.1
+++ b/metadata/md5-cache/x11-libs/libva-1.3.1
@@ -4,7 +4,7 @@ DESCRIPTION=Video Acceleration (VA) API for Linux
EAPI=5
HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
IUSE=+drm egl opengl vdpau wayland X video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx 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 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
LICENSE=MIT
PDEPEND=video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.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(-)?] ) vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.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(-)?] ) video_cards_fglrx? ( >=x11-libs/xvba-video-0.8.0-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(-)?] ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-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(-)?] )
RDEPEND=>=x11-libs/libdrm-2.4.46[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(-)?] >=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(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,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(-)?] ) opengl? ( >=virtual/opengl-7.0-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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[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(-)?] )
@@ -12,4 +12,4 @@ REQUIRED_USE=opengl? ( X )
SLOT=0
SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva/libva-1.3.1.tar.bz2
_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_=876bcb8d21a978bd58d7a1ce193f4460
+_md5_=702f876350470f52db2b521faeeaebf0
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-1.3.0 b/metadata/md5-cache/x11-libs/libva-intel-driver-1.3.0
index d09863981027..fc8f9a9252d5 100644
--- a/metadata/md5-cache/x11-libs/libva-intel-driver-1.3.0
+++ b/metadata/md5-cache/x11-libs/libva-intel-driver-1.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=HW video decode support for Intel integrated graphics
EAPI=5
HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
IUSE=+drm wayland 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=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
LICENSE=MIT
RDEPEND=>=x11-libs/libva-1.3.0[X?,wayland?,drm?,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.46[video_cards_intel,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? ( >=media-libs/mesa-9.1.6[egl,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/wayland-1.0.6[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
SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/libva-intel-driver-1.3.0.tar.bz2
_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_=b51726505793ed73d1309e253ef4f3ff
+_md5_=84542e4c687fe36b5a9c1a24524cafde
diff --git a/metadata/md5-cache/x11-libs/libva-vdpau-driver-0.7.4-r1 b/metadata/md5-cache/x11-libs/libva-vdpau-driver-0.7.4-r1
index 14922976a92e..8d7d5371fbc4 100644
--- a/metadata/md5-cache/x11-libs/libva-vdpau-driver-0.7.4-r1
+++ b/metadata/md5-cache/x11-libs/libva-vdpau-driver-0.7.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=VDPAU Backend for Video Acceleration (VA) API
EAPI=5
HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
IUSE=debug opengl 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=GPL-2
RDEPEND=>=x11-libs/libva-1.2.1-r1[X,opengl?,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(-)?] opengl? ( >=virtual/opengl-7.0-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/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(-)?] !x11-libs/vdpau-video
SLOT=0
SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/libva-vdpau-driver-0.7.4.tar.bz2
_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_=bf095903eb5cecf716e44e9c28109799
+_md5_=cfa1bcb4ffbc2f175f4750d52d498329
diff --git a/metadata/md5-cache/x11-wm/muffin-2.2.3 b/metadata/md5-cache/x11-wm/muffin-2.2.3
deleted file mode 100644
index c8a84ebca906..000000000000
--- a/metadata/md5-cache/x11-wm/muffin-2.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.10:=[X] x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.3.7:3[X,introspection?] >=dev-libs/glib-2.25.10:2 >=gnome-extra/cinnamon-desktop-1.0:0=[introspection?] >=media-libs/clutter-1.9.10:1.0=[introspection?] >=media-libs/cogl-1.9.6:1.0=[introspection?] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7:= >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender virtual/opengl gnome-extra/zenity introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) xinerama? ( x11-libs/libXinerama ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-text/gnome-doc-utils-0.8 sys-devel/gettext >=dev-util/intltool-0.35 virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.5 ) xinerama? ( x11-proto/xineramaproto ) x11-proto/xextproto 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 app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=Compositing window manager forked from Mutter for use with Cinnamon
-EAPI=5
-HOMEPAGE=http://cinnamon.linuxmint.com/
-IUSE=+introspection test xinerama
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.10:=[X] x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.3.7:3[X,introspection?] >=dev-libs/glib-2.25.10:2 >=gnome-extra/cinnamon-desktop-1.0:0=[introspection?] >=media-libs/clutter-1.9.10:1.0=[introspection?] >=media-libs/cogl-1.9.6:1.0=[introspection?] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7:= >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender virtual/opengl gnome-extra/zenity introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) xinerama? ( x11-libs/libXinerama ) !x11-misc/expocity
-SLOT=0
-SRC_URI=https://github.com/linuxmint/muffin/archive/2.2.3.tar.gz -> muffin-2.2.3.tar.gz
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 9637c29fc715b17a6328f24251129557 gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-any-r1 4560effd96d3d2a82e50af7cf87166da python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e8d50ed44aba89b7063a94f67f0670fe
diff --git a/metadata/md5-cache/x11-wm/muffin-2.2.2 b/metadata/md5-cache/x11-wm/muffin-2.2.6
similarity index 95%
rename from metadata/md5-cache/x11-wm/muffin-2.2.2
rename to metadata/md5-cache/x11-wm/muffin-2.2.6
index 69d4391077ff..6868bb157042 100644
--- a/metadata/md5-cache/x11-wm/muffin-2.2.2
+++ b/metadata/md5-cache/x11-wm/muffin-2.2.6
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
RDEPEND=>=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.10:=[X] x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.3.7:3[X,introspection?] >=dev-libs/glib-2.25.10:2 >=gnome-extra/cinnamon-desktop-1.0:0=[introspection?] >=media-libs/clutter-1.9.10:1.0=[introspection?] >=media-libs/cogl-1.9.6:1.0=[introspection?] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7:= >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender virtual/opengl gnome-extra/zenity introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) xinerama? ( x11-libs/libXinerama ) !x11-misc/expocity
SLOT=0
-SRC_URI=https://github.com/linuxmint/muffin/archive/2.2.2.tar.gz -> muffin-2.2.2.tar.gz
+SRC_URI=https://github.com/linuxmint/muffin/archive/2.2.6.tar.gz -> muffin-2.2.6.tar.gz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 9637c29fc715b17a6328f24251129557 gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-any-r1 4560effd96d3d2a82e50af7cf87166da python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3b04b67347787952fae19db212a93cce
+_md5_=f9513270ac68100ce0d8329015d5308c
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index ce39685dbe79..50a856954a60 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 15 Jul 2014 12:07:05 +0000
+Wed, 16 Jul 2014 04:37:16 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 64bd3175bf27..0497eb5980e1 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Jul 15 12:07:01 UTC 2014
+Wed Jul 16 04:37:13 UTC 2014
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2c02afd1e00a..6333c6871263 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 15 Jul 2014 12:30:01 +0000
+Wed, 16 Jul 2014 05:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 0198fb437e07..f4af243cd0b8 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1405425901 Tue 15 Jul 2014 12:05:01 PM UTC UTC
+1405485301 Wed 16 Jul 2014 04:35:01 AM UTC UTC
diff --git a/net-analyzer/cacti/cacti-0.8.8b-r2.ebuild b/net-analyzer/cacti/cacti-0.8.8b-r2.ebuild
index 65bc39ed4904..0313401b96a4 100644
--- a/net-analyzer/cacti/cacti-0.8.8b-r2.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.8b-r2.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-analyzer/cacti/cacti-0.8.8b-r2.ebuild,v 1.6 2013/09/14 10:40:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.8b-r2.ebuild,v 1.7 2014/07/15 16:31:34 jer Exp $
EAPI="4"
@@ -27,11 +27,10 @@ IUSE="snmp doc"
need_httpd
-DEPEND=""
RDEPEND="
dev-lang/php[cli,mysql,session,sockets,xml]
dev-php/adodb
- net-analyzer/rrdtool
+ net-analyzer/rrdtool[graph]
virtual/cron
virtual/mysql
snmp? ( >=net-analyzer/net-snmp-5.2.0 )
diff --git a/net-analyzer/iftop/iftop-1.0_pre4.ebuild b/net-analyzer/iftop/iftop-1.0_pre4.ebuild
index a179dbd21fe2..1e10a729dd24 100644
--- a/net-analyzer/iftop/iftop-1.0_pre4.ebuild
+++ b/net-analyzer/iftop/iftop-1.0_pre4.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/iftop/iftop-1.0_pre4.ebuild,v 1.4 2014/06/15 14:44:29 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iftop/iftop-1.0_pre4.ebuild,v 1.5 2014/07/15 18:54:17 nimiux Exp $
EAPI=5
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
RDEPEND="
diff --git a/net-analyzer/jffnms/jffnms-0.9.4.ebuild b/net-analyzer/jffnms/jffnms-0.9.4.ebuild
index 7a44498c42b3..069f16544ef7 100644
--- a/net-analyzer/jffnms/jffnms-0.9.4.ebuild
+++ b/net-analyzer/jffnms/jffnms-0.9.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-analyzer/jffnms/jffnms-0.9.4.ebuild,v 1.1 2014/04/12 18:15:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/jffnms/jffnms-0.9.4.ebuild,v 1.2 2014/07/15 16:34:58 jer Exp $
EAPI=5
inherit user
@@ -23,7 +23,7 @@ RDEPEND="
net-analyzer/fping
net-analyzer/net-snmp
net-analyzer/nmap
- net-analyzer/rrdtool
+ net-analyzer/rrdtool[graph]
sys-apps/diffutils
"
diff --git a/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild b/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild
index b08017841734..9d8f65784051 100644
--- a/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild
+++ b/net-analyzer/mrtg/mrtg-2.17.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/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild,v 1.5 2014/06/14 10:17:06 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild,v 1.7 2014/07/15 16:23:26 jer Exp $
EAPI=5
inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="http://oss.oetiker.ch/mrtg/pub/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86"
DEPEND="
>=dev-perl/SNMP_Session-1.13-r2
@@ -31,7 +31,7 @@ src_install () {
default
- mv "${ED}/usr/share/doc/"{mrtg2,${PF}}
+ mv "${ED}"/usr/share/doc/{mrtg2,${PF}} || die
newinitd "${FILESDIR}/mrtg.rc" ${PN}
newconfd "${FILESDIR}/mrtg.confd" ${PN}
diff --git a/net-analyzer/munin/munin-2.0.19-r1.ebuild b/net-analyzer/munin/munin-2.0.19-r1.ebuild
index c4c984db6e77..644c572fed76 100644
--- a/net-analyzer/munin/munin-2.0.19-r1.ebuild
+++ b/net-analyzer/munin/munin-2.0.19-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/munin/munin-2.0.19-r1.ebuild,v 1.1 2014/01/12 11:10:54 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.19-r1.ebuild,v 1.2 2014/07/15 16:45:14 jer Exp $
EAPI=5
@@ -65,7 +65,7 @@ DEPEND_COM="dev-lang/perl[berkdb]
dev-perl/HTML-Template
dev-perl/IO-Socket-INET6
dev-perl/URI
- >=net-analyzer/rrdtool-1.3[perl]
+ >=net-analyzer/rrdtool-1.3[graph,perl]
virtual/ssh
)"
diff --git a/net-analyzer/munin/munin-2.0.19.ebuild b/net-analyzer/munin/munin-2.0.19.ebuild
index 1af45465d0e6..f7ff9b1a97de 100644
--- a/net-analyzer/munin/munin-2.0.19.ebuild
+++ b/net-analyzer/munin/munin-2.0.19.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-analyzer/munin/munin-2.0.19.ebuild,v 1.4 2013/12/23 13:26:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.19.ebuild,v 1.5 2014/07/15 16:45:14 jer Exp $
EAPI=5
@@ -65,7 +65,7 @@ DEPEND_COM="dev-lang/perl[berkdb]
dev-perl/HTML-Template
dev-perl/IO-Socket-INET6
dev-perl/URI
- >=net-analyzer/rrdtool-1.3[perl]
+ >=net-analyzer/rrdtool-1.3[graph,perl]
virtual/ssh
)"
diff --git a/net-analyzer/munin/munin-2.1.9999.ebuild b/net-analyzer/munin/munin-2.1.9999.ebuild
index c7b29544ddb4..82ac99986941 100644
--- a/net-analyzer/munin/munin-2.1.9999.ebuild
+++ b/net-analyzer/munin/munin-2.1.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/net-analyzer/munin/munin-2.1.9999.ebuild,v 1.2 2014/01/12 11:10:54 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.1.9999.ebuild,v 1.3 2014/07/15 16:45:14 jer Exp $
EAPI=5
@@ -59,7 +59,7 @@ DEPEND_COM="dev-lang/perl[berkdb]
dev-perl/HTML-Template
dev-perl/IO-Socket-INET6
dev-perl/URI
- >=net-analyzer/rrdtool-1.3[perl]
+ >=net-analyzer/rrdtool-1.3[graph,perl]
virtual/ssh
)"
diff --git a/net-analyzer/ntop/files/ntop-4.0.3-gentoo.patch b/net-analyzer/ntop/files/ntop-4.0.3-gentoo.patch
index 5de51c016c2b..6cd03512adf9 100644
--- a/net-analyzer/ntop/files/ntop-4.0.3-gentoo.patch
+++ b/net-analyzer/ntop/files/ntop-4.0.3-gentoo.patch
@@ -1,5 +1,5 @@
---- ntop-4.0.3.orig/configure.in
-+++ ntop-4.0.3/configure.in
+--- a/configure.in
++++ b/configure.in
@@ -57,6 +57,7 @@
dnl>
umask 002
@@ -63,8 +63,8 @@
AC_SUBST(GETOPT_H)
AC_SUBST(GETOPT_C)
---- ntop-4.0.3.orig/globals-core.c
-+++ ntop-4.0.3/globals-core.c
+--- a/globals-core.c
++++ b/globals-core.c
@@ -372,7 +372,7 @@
_mtuSize[DLT_ATM_RFC1483] = 9180 /* LLC/SNAP encapsulated atm */;
_headerSize[DLT_ATM_RFC1483] = 0;
@@ -119,8 +119,8 @@
}
}
}
---- ntop-4.0.3.orig/Makefile.am
-+++ ntop-4.0.3/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
@@ -43,7 +43,6 @@
#AM_CFLAGS =
@@ -219,8 +219,8 @@
# ntop census
census-fail:
---- ntop-4.0.3.orig/report.c
-+++ ntop-4.0.3/report.c
+--- a/report.c
++++ b/report.c
@@ -2353,7 +2353,7 @@
if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
snprintf(dotPath, sizeof(dotPath), "%s", buf);
diff --git a/net-analyzer/ntop/files/ntop-4.1.0-gentoo.patch b/net-analyzer/ntop/files/ntop-4.1.0-gentoo.patch
index 45d73be16486..10b93b92e90d 100644
--- a/net-analyzer/ntop/files/ntop-4.1.0-gentoo.patch
+++ b/net-analyzer/ntop/files/ntop-4.1.0-gentoo.patch
@@ -1,6 +1,5 @@
-diff -Nru ntop-4.1.0.orig//configure.in ntop-4.1.0/configure.in
---- ntop-4.1.0.orig//configure.in 2011-08-15 10:34:28.000000000 +0200
-+++ ntop-4.1.0/configure.in 2011-11-08 23:22:13.000000000 +0100
+--- a/configure.in
++++ b/configure.in
@@ -469,11 +469,6 @@
LOCALEDIR="/usr/lib/locale"
fi
@@ -54,9 +53,8 @@ diff -Nru ntop-4.1.0.orig//configure.in ntop-4.1.0/configure.in
AC_SUBST(GETOPT_H)
AC_SUBST(GETOPT_C)
-diff -Nru ntop-4.1.0.orig//globals-core.c ntop-4.1.0/globals-core.c
---- ntop-4.1.0.orig//globals-core.c 2011-03-03 22:00:04.000000000 +0100
-+++ ntop-4.1.0/globals-core.c 2011-11-08 23:22:13.000000000 +0100
+--- a/globals-core.c
++++ b/globals-core.c
@@ -367,7 +367,7 @@
_mtuSize[DLT_ATM_RFC1483] = 9180 /* LLC/SNAP encapsulated atm */;
_headerSize[DLT_ATM_RFC1483] = 0;
@@ -111,9 +109,8 @@ diff -Nru ntop-4.1.0.orig//globals-core.c ntop-4.1.0/globals-core.c
}
}
}
-diff -Nru ntop-4.1.0.orig//Makefile.am ntop-4.1.0/Makefile.am
---- ntop-4.1.0.orig//Makefile.am 2011-03-03 14:44:59.000000000 +0100
-+++ ntop-4.1.0/Makefile.am 2011-11-08 23:22:42.000000000 +0100
+--- a/Makefile.am
++++ b/Makefile.am
@@ -36,7 +36,6 @@
#AM_CFLAGS =
@@ -230,9 +227,8 @@ diff -Nru ntop-4.1.0.orig//Makefile.am ntop-4.1.0/Makefile.am
# ntop census
census-fail:
-diff -Nru ntop-4.1.0.orig//report.c ntop-4.1.0/report.c
---- ntop-4.1.0.orig//report.c 2011-06-29 18:29:46.000000000 +0200
-+++ ntop-4.1.0/report.c 2011-11-08 23:22:13.000000000 +0100
+--- a/report.c
++++ b/report.c
@@ -2091,7 +2091,7 @@
if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
snprintf(dotPath, sizeof(dotPath), "%s", buf);
diff --git a/net-analyzer/ntop/files/ntop-5.0.1-gentoo.patch b/net-analyzer/ntop/files/ntop-5.0.1-gentoo.patch
index dee04ed96de8..57f136971cfc 100644
--- a/net-analyzer/ntop/files/ntop-5.0.1-gentoo.patch
+++ b/net-analyzer/ntop/files/ntop-5.0.1-gentoo.patch
@@ -1,5 +1,5 @@
---- ntop-5.0.1/configure.in
-+++ ntop-5.0.1/configure.in
+--- a/configure.in
++++ b/configure.in
@@ -469,11 +469,6 @@
LOCALEDIR="/usr/lib/locale"
fi
@@ -53,8 +53,8 @@
AC_SUBST(GETOPT_H)
AC_SUBST(GETOPT_C)
AC_SUBST(NDPI_LIB)
---- ntop-5.0.1/globals-core.c
-+++ ntop-5.0.1/globals-core.c
+--- a/globals-core.c
++++ b/globals-core.c
@@ -369,7 +369,7 @@
_mtuSize[DLT_ATM_RFC1483] = 9180 /* LLC/SNAP encapsulated atm */;
_headerSize[DLT_ATM_RFC1483] = 0;
@@ -109,8 +109,8 @@
}
}
}
---- ntop-5.0.1/Makefile.am
-+++ ntop-5.0.1/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
@@ -36,7 +36,6 @@
#AM_CFLAGS =
@@ -227,8 +227,8 @@
# ntop census
census-fail:
---- ntop-5.0.1/report.c
-+++ ntop-5.0.1/report.c
+--- a/report.c
++++ b/report.c
@@ -2299,7 +2299,7 @@
if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
snprintf(dotPath, sizeof(dotPath), "%s", buf);
diff --git a/net-analyzer/ntop/ntop-4.0.3.ebuild b/net-analyzer/ntop/ntop-4.0.3.ebuild
index d071199e2b93..8a70618be613 100644
--- a/net-analyzer/ntop/ntop-4.0.3.ebuild
+++ b/net-analyzer/ntop/ntop-4.0.3.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-analyzer/ntop/ntop-4.0.3.ebuild,v 1.10 2013/03/10 01:38:36 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-4.0.3.ebuild,v 1.11 2014/07/15 17:45:44 jer Exp $
EAPI="2"
@@ -24,7 +24,7 @@ COMMON_DEPEND="virtual/awk
net-libs/libpcap
media-libs/gd
media-libs/libpng
- net-analyzer/rrdtool
+ net-analyzer/rrdtool[graph]
ssl? ( dev-libs/openssl )
sys-libs/zlib
>=dev-libs/geoip-1.4.5
diff --git a/net-analyzer/ntop/ntop-4.1.0.ebuild b/net-analyzer/ntop/ntop-4.1.0.ebuild
index 969ff1705167..1398a36d9146 100644
--- a/net-analyzer/ntop/ntop-4.1.0.ebuild
+++ b/net-analyzer/ntop/ntop-4.1.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/net-analyzer/ntop/ntop-4.1.0.ebuild,v 1.5 2013/03/10 01:38:36 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-4.1.0.ebuild,v 1.6 2014/07/15 17:45:44 jer Exp $
EAPI="2"
@@ -23,7 +23,7 @@ COMMON_DEPEND="
net-libs/libpcap
media-libs/gd
media-libs/libpng
- net-analyzer/rrdtool
+ net-analyzer/rrdtool[graph]
ssl? ( dev-libs/openssl )
sys-libs/zlib
dev-libs/geoip
diff --git a/net-analyzer/ntop/ntop-5.0.1-r1.ebuild b/net-analyzer/ntop/ntop-5.0.1-r1.ebuild
index b7e9d5ebea75..093757bd3e96 100644
--- a/net-analyzer/ntop/ntop-5.0.1-r1.ebuild
+++ b/net-analyzer/ntop/ntop-5.0.1-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-analyzer/ntop/ntop-5.0.1-r1.ebuild,v 1.1 2013/08/06 06:28:07 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-5.0.1-r1.ebuild,v 1.2 2014/07/15 17:45:44 jer Exp $
EAPI=5
PYTHON_COMPAT=( python2_{6,7} )
@@ -24,7 +24,7 @@ COMMON_DEPEND="
net-libs/libpcap
media-libs/gd
media-libs/libpng
- net-analyzer/rrdtool
+ net-analyzer/rrdtool[graph]
ssl? ( dev-libs/openssl )
sys-libs/zlib
dev-libs/geoip
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.19-r1.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.19-r1.ebuild
index cdb9fadec1c8..3eb49bad2506 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.19-r1.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.19-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-analyzer/pnp4nagios/pnp4nagios-0.6.19-r1.ebuild,v 1.5 2012/11/29 17:01:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.6.19-r1.ebuild,v 1.6 2014/07/15 17:52:24 jer Exp $
EAPI="4"
@@ -18,7 +18,7 @@ KEYWORDS="amd64 ppc ppc64 ~sparc x86"
DEPEND="dev-lang/php[json,simplexml,zlib,xml,filter]
>=dev-lang/php-5.3
- >=net-analyzer/rrdtool-1.2[perl]
+ >=net-analyzer/rrdtool-1.2[graph,perl]
|| ( net-analyzer/nagios-core net-analyzer/icinga )"
RDEPEND="${DEPEND}
virtual/perl-Getopt-Long
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.21.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.21.ebuild
index 485547d47658..78d1d86574b1 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.21.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.21.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/pnp4nagios/pnp4nagios-0.6.21.ebuild,v 1.5 2014/03/14 10:14:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.6.21.ebuild,v 1.6 2014/07/15 17:52:24 jer Exp $
EAPI="5"
@@ -18,7 +18,7 @@ KEYWORDS="amd64 ppc ppc64 ~sparc x86"
DEPEND="dev-lang/php[json,simplexml,zlib,xml,filter]
>=dev-lang/php-5.3
- >=net-analyzer/rrdtool-1.2[perl]
+ >=net-analyzer/rrdtool-1.2[graph,perl]
|| ( net-analyzer/nagios-core net-analyzer/icinga )"
RDEPEND="${DEPEND}
virtual/perl-Getopt-Long
diff --git a/net-analyzer/rrdcollect/Manifest b/net-analyzer/rrdcollect/Manifest
index ea2ad1eaded6..9f86921450bf 100644
--- a/net-analyzer/rrdcollect/Manifest
+++ b/net-analyzer/rrdcollect/Manifest
@@ -1 +1 @@
-DIST rrdcollect-0.2.9.tar.gz 137397 RMD160 cb20c07421509aed721e6cec684801f9cb482245 SHA1 726ca783635bef9e2f2459974657d701a211fdbd SHA256 df738369c4f7c642e85ee1e0314c29cca19534c4d53074295b25c3b309ea1a50
+DIST rrdcollect-0.2.9.tar.gz 137397 SHA256 df738369c4f7c642e85ee1e0314c29cca19534c4d53074295b25c3b309ea1a50 SHA512 5f01b93a469d32f095b501c3611d4e31d354025848aeffd913db9625d0186a3e7d394dae1a2383449836c37e758a39a3473710a1855411288659fa6ac249e10f WHIRLPOOL 746ad907ab98db872e498695f56cf0579141726eebe505f2fbeda78a9c46bb41b6d2b59ca2a9f21efa1e1903cc31bbdb7a6c56ac17f3a2ab25a164464a5d41fa
diff --git a/net-analyzer/rrdcollect/rrdcollect-0.2.9.ebuild b/net-analyzer/rrdcollect/rrdcollect-0.2.9.ebuild
index 0cb7c8a34693..41ff92060989 100644
--- a/net-analyzer/rrdcollect/rrdcollect-0.2.9.ebuild
+++ b/net-analyzer/rrdcollect/rrdcollect-0.2.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdcollect/rrdcollect-0.2.9.ebuild,v 1.2 2011/06/09 17:46:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdcollect/rrdcollect-0.2.9.ebuild,v 1.3 2014/07/15 17:57:14 jer Exp $
-EAPI="3"
+EAPI=5
inherit eutils
@@ -27,15 +27,15 @@ src_prepare() {
src_configure() {
econf \
- $(use_with pcre libpcre) \
- $(use_with librrd) \
$(use_enable exec) \
- || die "econf failed"
+ $(use_with librrd) \
+ $(use_with pcre libpcre)
}
+DOCS=( AUTHORS ChangeLog NEWS TODO )
+
src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog NEWS TODO || die
+ default
docinto examples
- dodoc doc/examples/* || die
+ dodoc doc/examples/*
}
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.4.8-disable-rrd_graph.patch b/net-analyzer/rrdtool/files/rrdtool-1.4.8-disable-rrd_graph.patch
new file mode 100644
index 000000000000..1af3d848147a
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdtool-1.4.8-disable-rrd_graph.patch
@@ -0,0 +1,189 @@
+--- a/bindings/perl-shared/RRDs.xs
++++ b/bindings/perl-shared/RRDs.xs
+@@ -189,6 +189,7 @@
+ OUTPUT:
+ RETVAL
+
++#ifdef HAVE_RRD_GRAPH
+ SV *
+ rrd_graph(...)
+ PROTOTYPE: @
+@@ -235,6 +236,8 @@
+ PUSHs(sv_2mortal(newSViv(xsize)));
+ PUSHs(sv_2mortal(newSViv(ysize)));
+
++#endif /* HAVE_RRD_GRAPH */
++
+ SV *
+ rrd_fetch(...)
+ PROTOTYPE: @
+@@ -397,6 +400,7 @@
+ OUTPUT:
+ RETVAL
+
++#ifdef HAVE_RRD_GRAPH
+ SV*
+ rrd_graphv(...)
+ PROTOTYPE: @
+@@ -410,6 +414,8 @@
+ OUTPUT:
+ RETVAL
+
++#endif /* HAVE_RRD_GRAPH */
++
+ int
+ rrd_dump(...)
+ PROTOTYPE: @
+--- a/bindings/lua/rrdlua.c
++++ b/bindings/lua/rrdlua.c
+@@ -267,6 +267,7 @@
+ return 1;
+ }
+
++#ifdef HAVE_RRD_GRAPH
+ static int
+ lua_rrd_graph (lua_State * L)
+ {
+@@ -291,6 +292,7 @@
+ rrd_freemem(calcpr);
+ return 3;
+ }
++#endif /* HAVE_RRD_GRAPH */
+
+ static int
+ lua_rrd_flushcached(lua_State *L)
+@@ -305,11 +307,13 @@
+ return lua_rrd_infocall(L, "info", rrd_info);
+ }
+
++#ifdef HAVE_RRD_GRAPH
+ static int
+ lua_rrd_graphv (lua_State * L)
+ {
+ return lua_rrd_infocall(L, "graphv", rrd_graph_v);
+ }
++#endif /* HAVE_RRD_GRAPH */
+
+ static int
+ lua_rrd_updatev (lua_State * L)
+@@ -347,7 +351,9 @@
+ {"dump", lua_rrd_dump},
+ {"fetch", lua_rrd_fetch},
+ {"first", lua_rrd_first},
++#ifdef HAVE_RRD_GRAPH
+ {"graph", lua_rrd_graph},
++#endif /* HAVE_RRD_GRAPH */
+ {"last", lua_rrd_last},
+ {"resize", lua_rrd_resize},
+ {"restore", lua_rrd_restore},
+@@ -357,7 +363,9 @@
+ #if defined(DINF)
+ {"info", lua_rrd_info},
+ {"updatev", lua_rrd_updatev},
++#ifdef HAVE_RRD_GRAPH
+ {"graphv", lua_rrd_graphv},
++#endif /* HAVE_RRD_GRAPH */
+ #endif
+ {NULL, NULL}
+ };
+--- a/bindings/python/rrdtoolmodule.c
++++ b/bindings/python/rrdtoolmodule.c
+@@ -261,6 +261,7 @@
+ return r;
+ }
+
++#ifdef HAVE_RRD_GRAPH
+ static char PyRRD_graph__doc__[] =
+ "graph(args..): Create a graph based on data from one or several RRD\n"
+ " graph filename [-s|--start seconds] "
+@@ -327,6 +328,7 @@
+ destroy_args(&argv);
+ return r;
+ }
++#endif /* HAVE_RRD_GRAPH */
+
+ static char PyRRD_tune__doc__[] =
+ "tune(args...): Modify some basic properties of a Round Robin Database\n"
+@@ -503,6 +505,7 @@
+ return r;
+ }
+
++#ifdef HAVE_RRD_GRAPH
+ static char PyRRD_graphv__doc__[] =
+ "graphv is called in the same manner as graph";
+
+@@ -530,6 +533,7 @@
+ destroy_args(&argv);
+ return r;
+ }
++#endif /* HAVE_RRD_GRAPH */
+
+ static char PyRRD_updatev__doc__[] =
+ "updatev is called in the same manner as update";
+@@ -672,13 +676,17 @@
+ meth("create", PyRRD_create, PyRRD_create__doc__),
+ meth("update", PyRRD_update, PyRRD_update__doc__),
+ meth("fetch", PyRRD_fetch, PyRRD_fetch__doc__),
++#ifdef HAVE_RRD_GRAPH
+ meth("graph", PyRRD_graph, PyRRD_graph__doc__),
++#endif /* HAVE_RRD_GRAPH */
+ meth("tune", PyRRD_tune, PyRRD_tune__doc__),
+ meth("first", PyRRD_first, PyRRD_first__doc__),
+ meth("last", PyRRD_last, PyRRD_last__doc__),
+ meth("resize", PyRRD_resize, PyRRD_resize__doc__),
+ meth("info", PyRRD_info, PyRRD_info__doc__),
++#ifdef HAVE_RRD_GRAPH
+ meth("graphv", PyRRD_graphv, PyRRD_graphv__doc__),
++#endif /* HAVE_RRD_GRAPH */
+ meth("updatev", PyRRD_updatev, PyRRD_updatev__doc__),
+ meth("flushcached", PyRRD_flushcached, PyRRD_flushcached__doc__),
+ meth("xport", PyRRD_xport, PyRRD_xport__doc__),
+--- a/src/rrd_cgi.c
++++ b/src/rrd_cgi.c
+@@ -56,6 +56,7 @@
+ const char **);
+
+ /* call rrd_graph and insert appropriate image tag */
++#ifdef HAVE_RRD_GRAPH
+ char *drawgraph(
+ long,
+ const char **);
+@@ -64,6 +65,7 @@
+ char *drawprint(
+ long,
+ const char **);
++#endif /* HAVE_RRD_GRAPH */
+
+ /* pretty-print the value for some.rrd via strftime() */
+ char *printtimelast(
+@@ -542,9 +544,13 @@
+ }
+ parse(&buffer, i, "=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_DEPS} )
+ tcl? ( dev-lang/tcl )
+ tcpd? ( sys-apps/tcp-wrappers )
+"
+
+DEPEND="
+ ${RDEPEND}
+ sys-apps/groff
+ virtual/pkgconfig
+ virtual/awk
+"
+
+python_compile() {
+ cd bindings/python || die 'can not enter to python bindings directory'
+ distutils-r1_python_compile
+}
+
+python_install() {
+ cd bindings/python || die 'can not enter to python bindings directory'
+ distutils-r1_python_install
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-1.4.7-configure.ac.patch \
+ "${FILESDIR}"/${P}-disable-rrd_graph.patch
+
+ # bug 456810
+ # no time to sleep
+ sed -i \
+ -e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
+ -e 's|^sleep 1$||g' \
+ configure.ac || die
+
+ # Python bindings are built/installed manually
+ sed -i \
+ -e '/^all-local:/s| @COMP_PYTHON@||' \
+ bindings/Makefile.am || die
+
+ eautoreconf
+}
+
+src_configure() {
+ filter-flags -ffast-math
+
+ export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
+
+ # to solve bug #260380
+ [[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
+
+ # Stub configure.ac
+ local myconf=()
+ if ! use tcpd; then
+ myconf+=( "--disable-libwrap" )
+ fi
+ if ! use dbi; then
+ myconf+=( "--disable-libdbi" )
+ fi
+
+ econf \
+ $(use_enable graph rrd_graph) \
+ $(use_enable lua lua-site-install) \
+ $(use_enable lua) \
+ $(use_enable perl perl-site-install) \
+ $(use_enable perl) \
+ $(use_enable python) \
+ $(use_enable rrdcgi) \
+ $(use_enable static-libs static) \
+ $(use_enable tcl) \
+ $(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
+ --with-perl-options=INSTALLDIRS=vendor \
+ --disable-ruby-site-install \
+ --disable-ruby \
+ ${myconf[@]}
+}
+
+src_compile() {
+ default
+
+ use python && distutils-r1_src_compile
+}
+
+src_install() {
+ default
+
+ if ! use doc ; then
+ rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
+ fi
+
+ if use !rrdcgi ; then
+ # uses rrdcgi, causes invalid shebang error in Prefix, useless
+ # without rrdcgi installed
+ rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi
+ fi
+
+ if use perl ; then
+ perl_delete_localpod
+ perl_delete_packlist
+ fi
+
+ use python && distutils-r1_src_install
+
+ dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO
+
+ find "${ED}"usr -name '*.la' -exec rm -f {} +
+
+ keepdir /var/lib/rrdcached/journal/
+ keepdir /var/lib/rrdcached/db/
+
+ newconfd "${FILESDIR}"/rrdcached.confd rrdcached
+ newinitd "${FILESDIR}"/rrdcached.init rrdcached
+}
+
+pkg_postinst() {
+ ewarn "Since version 1.3, rrdtool dump emits completely legal xml. Basically this"
+ ewarn "means that it contains an xml header and a DOCTYPE definition. Unfortunately"
+ ewarn "this causes older versions of rrdtool restore to be unhappy."
+ ewarn
+ ewarn "To restore a new dump with an old rrdtool restore version, either remove"
+ ewarn "the xml header and the doctype by hand (both on the first line of the dump)"
+ ewarn "or use rrdtool dump --no-header."
+ ewarn
+ ewarn ">=net-analyzer/rrdtool-1.3 does not have any default font bundled. Thus if"
+ ewarn ">you've upgraded from rrdtool-1.2.x and don't have any font installed to make"
+ ewarn ">lables visible, please, install some font, e.g. media-fonts/dejavu."
+}
diff --git a/net-firewall/psad/psad-2.2.3.ebuild b/net-firewall/psad/psad-2.2.3.ebuild
index 687a9da2dc64..5dc497ea249f 100644
--- a/net-firewall/psad/psad-2.2.3.ebuild
+++ b/net-firewall/psad/psad-2.2.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/net-firewall/psad/psad-2.2.3.ebuild,v 1.2 2014/06/14 09:58:08 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-2.2.3.ebuild,v 1.3 2014/07/15 18:31:24 nimiux Exp $
EAPI=4
#PERL_EXPORT_PHASE_FUNCTIONS=no
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.cipherdyne.org/psad"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
IUSE=""
DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/net-libs/libnice/Manifest b/net-libs/libnice/Manifest
index 7a9fce512671..184c8ed87796 100644
--- a/net-libs/libnice/Manifest
+++ b/net-libs/libnice/Manifest
@@ -1 +1,2 @@
DIST libnice-0.1.4.tar.gz 712256 SHA256 44e517de9c01203158f2a3d59f058706299a4ae41dfe1a7eeb72c290fcc8bf57 SHA512 ee0029e641c3dc15e5d7f878985f7d87b06e6f033fd14827094171299165120b3b1ffedc6bd036c998768cc9059d7e5dce2322799aa843b0f38487b7243bd40f WHIRLPOOL 1856bdcfe961d391a98d357c56bbbb22a8a110cfcf69deb9af2269a8a133c6657202231844b9ebd86a59e36ad0d68f5f6bffde9ab8bfb965a8a349935b40cc67
+DIST libnice-0.1.7.tar.gz 827258 SHA256 4ed165aa2203136dce548c7cef735d8becf5d9869793f96b99dcbbaa9acf78d8 SHA512 1976eba51b01ea7c7f8cf956afdf656538d15f19e04fdc1707f305b61b571fcaeba8688961a117559c02675610c341b3a88192f3e4eb8fa05fc63abb8891b424 WHIRLPOOL 873ebbc6d9cc172affccaad64af2ddae5226853efee76d7875927a9186dccfdd3663e4aea8ce664a695cf1667a3dbe7b6fb3be3628674d36a4d798c3f2746e61
diff --git a/net-libs/libnice/libnice-0.1.7.ebuild b/net-libs/libnice/libnice-0.1.7.ebuild
new file mode 100644
index 000000000000..f057bc1d9561
--- /dev/null
+++ b/net-libs/libnice/libnice-0.1.7.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/net-libs/libnice/libnice-0.1.7.ebuild,v 1.1 2014/07/15 12:23:41 pacho Exp $
+
+EAPI=5
+inherit eutils multilib-minimal
+
+DESCRIPTION="An implementation of the Interactice Connectivity Establishment standard (ICE)"
+HOMEPAGE="http://nice.freedesktop.org/wiki/"
+SRC_URI="http://nice.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+upnp"
+
+RDEPEND="
+ >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+ upnp? ( >=net-libs/gupnp-igd-0.2.2-r1:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+multilib_src_configure() {
+ # gstreamer plugin split off into media-plugins/gst-plugins-libnice
+ ECONF_SOURCE=${S} \
+ econf --disable-static \
+ --without-gstreamer \
+ --without-gstreamer-0.10 \
+ $(use_enable upnp gupnp)
+
+ if multilib_is_native_abi; then
+ ln -s {"${S}"/,}docs/reference/libnice/html || die
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files --modules
+}
diff --git a/net-libs/libwhisker/Manifest b/net-libs/libwhisker/Manifest
index af758422237d..8721832551e0 100644
--- a/net-libs/libwhisker/Manifest
+++ b/net-libs/libwhisker/Manifest
@@ -1 +1 @@
-DIST libwhisker2-2.5.tar.gz 207569 RMD160 fd8dc1552499119f3e7086860e9cbbfaf3bf6c25 SHA1 e5810210ed6adefadac028700d3e18b451215b3b SHA256 f45a1cf2ad2637b29dd1b13d7221ea12e3923ea09d107ced446400f19070a42f
+DIST libwhisker2-2.5.tar.gz 207569 SHA256 f45a1cf2ad2637b29dd1b13d7221ea12e3923ea09d107ced446400f19070a42f
diff --git a/net-libs/libwhisker/libwhisker-2.5.ebuild b/net-libs/libwhisker/libwhisker-2.5.ebuild
index d09e0afb9462..7897b8e0b740 100644
--- a/net-libs/libwhisker/libwhisker-2.5.ebuild
+++ b/net-libs/libwhisker/libwhisker-2.5.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-libs/libwhisker/libwhisker-2.5.ebuild,v 1.1 2010/02/20 09:02:59 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwhisker/libwhisker-2.5.ebuild,v 1.2 2014/07/15 13:05:55 zlogene Exp $
-EAPI=2
+EAPI=5
inherit perl-module
MY_P=${PN}2-${PV}
@@ -29,6 +29,6 @@ src_compile() {
src_install() {
perlinfo
insinto "${VENDOR_LIB}"
- doins LW2.pm || die
- dodoc CHANGES KNOWNBUGS README || die
+ doins LW2.pm
+ dodoc CHANGES KNOWNBUGS README
}
diff --git a/net-mail/grepmail/grepmail-5.30.33-r1.ebuild b/net-mail/grepmail/grepmail-5.30.33-r1.ebuild
deleted file mode 100644
index 7e24d8ca812b..000000000000
--- a/net-mail/grepmail/grepmail-5.30.33-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/grepmail/grepmail-5.30.33-r1.ebuild,v 1.5 2013/09/03 12:09:52 idella4 Exp $
-
-inherit versionator perl-module
-
-MY_P="${PN}-$(delete_version_separator 2)"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Search normal or compressed mailbox using a regular expression or dates."
-HOMEPAGE="http://grepmail.sourceforge.net/"
-SRC_URI="mirror://sourceforge/grepmail/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-RDEPEND="dev-perl/Inline
- dev-perl/TimeDate
- dev-perl/DateManip
- virtual/perl-Digest-MD5
- >=dev-perl/Mail-Mbox-MessageParser-1.40.01"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
-PATCHES=( "${FILESDIR}"/5.30.33-fix_nonexistent_mailbox_test.patch
- "${FILESDIR}"/5.30.33-midnight.patch )
diff --git a/net-mail/grepmail/grepmail-5.30.33-r2.ebuild b/net-mail/grepmail/grepmail-5.30.33-r2.ebuild
index 293b1e76170d..13832f8a187e 100644
--- a/net-mail/grepmail/grepmail-5.30.33-r2.ebuild
+++ b/net-mail/grepmail/grepmail-5.30.33-r2.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-mail/grepmail/grepmail-5.30.33-r2.ebuild,v 1.1 2013/09/03 12:09:52 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/grepmail/grepmail-5.30.33-r2.ebuild,v 1.2 2014/07/15 13:02:45 zlogene Exp $
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/grepmail/${MY_P}.tar.gz"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
IUSE=""
RDEPEND="dev-perl/Inline
diff --git a/net-mail/mailgraph/Manifest b/net-mail/mailgraph/Manifest
index 2cca239605bc..bedc68fefbbf 100644
--- a/net-mail/mailgraph/Manifest
+++ b/net-mail/mailgraph/Manifest
@@ -1 +1 @@
-DIST mailgraph-1.14.tar.gz 22014 SHA256 50ea6ea8a33f5015926edd8b70a4d954ac27df4863514bddc5e69c948a7aac81
+DIST mailgraph-1.14.tar.gz 22014 SHA256 50ea6ea8a33f5015926edd8b70a4d954ac27df4863514bddc5e69c948a7aac81 SHA512 3df0dae010ad166a157eb34a8b1fcf837ab42445d417855ea58937a75b74ca55c06044eefb6077a6117073c39a087bcdf5f58fe35c0e4d9c7d6b18bded7a0193 WHIRLPOOL 84540ee5138c5f311ab4b359732e1a267a19342b78cef8694d6bc5195db14fef877c0ec65b91ba8b9c5d7df1d388128ef123763ffe9b5f17a4141bc944445751
diff --git a/net-mail/mailgraph/mailgraph-1.14-r2.ebuild b/net-mail/mailgraph/mailgraph-1.14-r2.ebuild
index 487c02fe8efa..c4699bcac770 100644
--- a/net-mail/mailgraph/mailgraph-1.14-r2.ebuild
+++ b/net-mail/mailgraph/mailgraph-1.14-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-mail/mailgraph/mailgraph-1.14-r2.ebuild,v 1.6 2014/01/08 06:41:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/mailgraph-1.14-r2.ebuild,v 1.7 2014/07/16 02:06:16 jer Exp $
EAPI=4
inherit eutils user
@@ -17,7 +17,7 @@ IUSE=""
RDEPEND="dev-lang/perl
dev-perl/File-Tail
- >=net-analyzer/rrdtool-1.2.2[perl]"
+ >=net-analyzer/rrdtool-1.2.2[graph,perl]"
DEPEND=">=sys-apps/sed-4"
pkg_setup() {
diff --git a/net-mail/mailgraph/mailgraph-1.14.ebuild b/net-mail/mailgraph/mailgraph-1.14.ebuild
deleted file mode 100644
index 350a3e3f3c9d..000000000000
--- a/net-mail/mailgraph/mailgraph-1.14.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/mailgraph-1.14.ebuild,v 1.13 2014/01/08 06:41:44 vapier Exp $
-
-inherit eutils webapp user
-
-DESCRIPTION="A mail statistics RRDtool frontend for Postfix"
-HOMEPAGE="http://mailgraph.schweikert.ch/"
-SRC_URI="http://mailgraph.schweikert.ch//pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
- dev-perl/File-Tail
- >=net-analyzer/rrdtool-1.2.2"
-DEPEND=">=sys-apps/sed-4"
-
-user_group_setup() {
- # add user and group for mailgraph daemon
- # also add mgraph to the group adm so it's able to
- # read syslog logfile /var/log/messages (should be owned by
- # root:adm with permission 0640)
- enewgroup mgraph
- enewuser mgraph -1 -1 /var/empty mgraph,adm
-}
-
-pkg_setup() {
- webapp_pkg_setup
- built_with_use net-analyzer/rrdtool perl \
- || die "net-analyzer/rrdtool must be built with USE=perl"
- user_group_setup
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- sed -i \
- -e "s|\(my \$rrd = '\).*'|\1/var/lib/mailgraph/mailgraph.rrd'|" \
- -e "s|\(my \$rrd_virus = '\).*'|\1/var/lib/mailgraph/mailgraph_virus.rrd'|" \
- mailgraph.cgi || die "sed mailgraph.cgi failed"
-}
-
-src_install() {
- webapp_src_preinst
- # be sure to run webapp_src_install *before* doing the directories below
- # because it cripples all other permissions :-(
- webapp_src_install
-
- # for the RRDs
- dodir /var/lib
- diropts -omgraph -gmgraph -m0750
- dodir /var/lib/mailgraph
- keepdir /var/lib/mailgraph
-
- # log and pid file
- diropts ""
- dodir /var/log
- dodir /var/run
- diropts -omgraph -gadm -m0750
- dodir /var/log/mailgraph
- keepdir /var/log/mailgraph
- dodir /var/run/mailgraph
- keepdir /var/run/mailgraph
-
- # logrotate config for mailgraph log
- diropts ""
- dodir /etc/logrotate.d
- insopts -m0644
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/mailgraph.logrotate-new mailgraph
-
- # mailgraph daemon
- newbin mailgraph.pl mailgraph
-
- # mailgraph CGI script
- exeinto ${MY_CGIBINDIR}
- doexe mailgraph.cgi
-
- # init/conf files for mailgraph daemon
- newinitd "${FILESDIR}"/mailgraph.initd-new mailgraph
- newconfd "${FILESDIR}"/mailgraph.confd-new mailgraph
-
- # docs
- dodoc README CHANGES
-}
-
-pkg_preinst() {
- has_version "<=${CATEGORY}/${PN}-1.12"
- previous_less_or_equal_to_1_12=$?
-}
-
-pkg_postinst() {
- # Fix ownerships - previous versions installed these with
- # root as owner
- if [[ $previous_less_or_equal_to_1_12 = 0 ]] ; then
- if [[ -d /var/lib/mailgraph ]] ; then
- chown mgraph:mgraph /var/lib/mailgraph
- fi
- if [[ -d /var/log/mailgraph ]] ; then
- chown mgraph:adm /var/log/mailgraph
- fi
- if [[ -d /var/run/mailgraph ]] ; then
- chown mgraph:adm /var/run/mailgraph
- fi
- fi
- elog
- elog "Mailgraph will run as user mgraph with group adm by default."
- elog "This can be changed in /etc/conf.d/mailgraph if it doesn't fit."
- elog "Remember to adjust MG_DAEMON_LOG, MG_DAEMON_PID and MG_DAEMON_RRD"
- elog "as well!"
- elog
- elog
- ewarn
- ewarn "Please make sure the MG_LOGFILE (default: /var/log/messages) is readable"
- ewarn "by group adm or change MG_DAEMON_GID in /etc/conf.d/mailgraph accordingly!"
- ewarn
- ewarn "Please make sure *all* mail related logs (MTA, spamfilter, virus scanner)"
- ewarn "go to the file /var/log/messages or change MG_LOGFILE in"
- ewarn "/etc/conf.d/mailgraph accordingly! Otherwise mailgraph won't get to know"
- ewarn "the corresponding events (virus/spam mail found etc.)."
- ewarn
- ewarn
- elog
- elog "Checking for user apache"
- if egetent passwd apache >&/dev/null; then
- elog
- elog "Adding user apache to group mgraph so the included"
- elog "CGI script is able to read the mailgraph RRD files"
- elog
- if ! gpasswd -a apache mgraph >&/dev/null; then
- eerror "Failed to add user apache to group mgraph!"
- eerror "Please check manually."
- fi
- else
- elog
- elog "User apache not found, maybe we will be running a"
- elog "webserver with a different UID?"
- elog "If that's the case, please add that user to the"
- elog "group mgraph manually to enable the included"
- elog "CGI script to read the mailgraph RRD files:"
- elog
- elog "\tgpasswd -a mgraph"
- elog
- fi
-}
diff --git a/net-misc/curl/curl-7.36.0-r1.ebuild b/net-misc/curl/curl-7.36.0-r1.ebuild
index f1326d185cc1..8e831b891b28 100644
--- a/net-misc/curl/curl-7.36.0-r1.ebuild
+++ b/net-misc/curl/curl-7.36.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/net-misc/curl/curl-7.36.0-r1.ebuild,v 1.3 2014/07/15 09:40:13 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.36.0-r1.ebuild,v 1.4 2014/07/15 13:33:30 blueness Exp $
EAPI="5"
@@ -14,7 +14,7 @@ LICENSE="MIT"
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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="adns idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads"
-IUSE="${IUSE} curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
+IUSE="${IUSE} curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
IUSE="${IUSE} elibc_Winnt"
#lead to lots of false negatives, bug #285669
@@ -23,7 +23,6 @@ RESTRICT="test"
RDEPEND="ldap? ( net-nds/openldap )
ssl? (
curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates )
- curl_ssl_cyassl? ( net-libs/cyassl app-misc/ca-certificates )
curl_ssl_gnutls? (
|| (
( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle )
@@ -71,7 +70,6 @@ REQUIRED_USE="
ssl? (
^^ (
curl_ssl_axtls
- curl_ssl_cyassl
curl_ssl_gnutls
curl_ssl_openssl
curl_ssl_nss
@@ -103,7 +101,7 @@ src_configure() {
# We make use of the fact that later flags override earlier ones
# So start with all ssl providers off until proven otherwise
local myconf=()
- myconf+=( --without-axtls --without-cyassl --without-gnutls --without-nss --without-polarssl --without-ssl --without-winssl )
+ myconf+=( --without-axtls --without-gnutls --without-nss --without-polarssl --without-ssl --without-winssl )
myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
if use ssl ; then
if use curl_ssl_axtls; then
@@ -112,12 +110,6 @@ src_configure() {
einfo "may not be the best choice as an ssl provider"
myconf+=( --with-axtls )
fi
- if use curl_ssl_cyassl; then
- einfo "SSL provided by cyassl"
- einfo "NOTE: cyassl is meant for embedded systems and"
- einfo "may not be the best choice as an ssl provider"
- myconf+=( --with-cyassl )
- fi
if use curl_ssl_gnutls; then
einfo "SSL provided by gnutls"
if has_version ">=net-libs/gnutls-3" || has_version "=net-libs/gnutls-2.12*[nettle]"; then
@@ -187,6 +179,7 @@ src_configure() {
$(use_enable static-libs static) \
$(use_enable threads threaded-resolver) \
--disable-versioned-symbols \
+ --without-cyassl \
--without-darwinssl \
$(use_with idn libidn) \
$(use_with kerberos gssapi "${EPREFIX}"/usr) \
diff --git a/net-misc/curl/curl-7.36.0.ebuild b/net-misc/curl/curl-7.36.0.ebuild
index e3eeb16db595..4760ef1914af 100644
--- a/net-misc/curl/curl-7.36.0.ebuild
+++ b/net-misc/curl/curl-7.36.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/net-misc/curl/curl-7.36.0.ebuild,v 1.17 2014/07/15 09:40:13 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.36.0.ebuild,v 1.18 2014/07/15 13:33:30 blueness Exp $
EAPI="5"
@@ -14,7 +14,7 @@ LICENSE="MIT"
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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="adns idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads"
-IUSE="${IUSE} curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl"
+IUSE="${IUSE} curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl"
#lead to lots of false negatives, bug #285669
RESTRICT="test"
@@ -22,7 +22,6 @@ RESTRICT="test"
RDEPEND="ldap? ( net-nds/openldap )
ssl? (
curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates )
- curl_ssl_cyassl? ( net-libs/cyassl app-misc/ca-certificates )
curl_ssl_gnutls? (
|| (
( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle )
@@ -69,7 +68,6 @@ REQUIRED_USE="
ssl? (
^^ (
curl_ssl_axtls
- curl_ssl_cyassl
curl_ssl_gnutls
curl_ssl_openssl
curl_ssl_nss
@@ -100,7 +98,7 @@ src_configure() {
# We make use of the fact that later flags override earlier ones
# So start with all ssl providers off until proven otherwise
local myconf=()
- myconf+=( --without-axtls --without-cyassl --without-gnutls --without-nss --without-polarssl --without-ssl )
+ myconf+=( --without-axtls --without-gnutls --without-nss --without-polarssl --without-ssl )
myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
if use ssl ; then
if use curl_ssl_axtls; then
@@ -109,12 +107,6 @@ src_configure() {
einfo "may not be the best choice as an ssl provider"
myconf+=( --with-axtls )
fi
- if use curl_ssl_cyassl; then
- einfo "SSL provided by cyassl"
- einfo "NOTE: cyassl is meant for embedded systems and"
- einfo "may not be the best choice as an ssl provider"
- myconf+=( --with-cyassl )
- fi
if use curl_ssl_gnutls; then
einfo "SSL provided by gnutls"
if has_version ">=net-libs/gnutls-3" || has_version "=net-libs/gnutls-2.12*[nettle]"; then
@@ -180,6 +172,7 @@ src_configure() {
$(use_enable static-libs static) \
$(use_enable threads threaded-resolver) \
--disable-versioned-symbols \
+ --without-cyassl \
--without-darwinssl \
$(use_with idn libidn) \
$(use_with kerberos gssapi "${EPREFIX}"/usr) \
diff --git a/net-misc/curl/curl-7.37.0.ebuild b/net-misc/curl/curl-7.37.0.ebuild
index 50ec1ba4e739..22e07be37523 100644
--- a/net-misc/curl/curl-7.37.0.ebuild
+++ b/net-misc/curl/curl-7.37.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/net-misc/curl/curl-7.37.0.ebuild,v 1.4 2014/07/15 09:40:13 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.37.0.ebuild,v 1.5 2014/07/15 13:33:30 blueness Exp $
EAPI="5"
@@ -14,7 +14,7 @@ LICENSE="MIT"
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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="adns idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads"
-IUSE="${IUSE} curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
+IUSE="${IUSE} curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
IUSE="${IUSE} elibc_Winnt"
#lead to lots of false negatives, bug #285669
@@ -23,7 +23,6 @@ RESTRICT="test"
RDEPEND="ldap? ( net-nds/openldap )
ssl? (
curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates )
- curl_ssl_cyassl? ( net-libs/cyassl app-misc/ca-certificates )
curl_ssl_gnutls? (
|| (
( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle )
@@ -72,7 +71,6 @@ REQUIRED_USE="
ssl? (
^^ (
curl_ssl_axtls
- curl_ssl_cyassl
curl_ssl_gnutls
curl_ssl_openssl
curl_ssl_nss
@@ -103,7 +101,7 @@ src_configure() {
# We make use of the fact that later flags override earlier ones
# So start with all ssl providers off until proven otherwise
local myconf=()
- myconf+=( --without-axtls --without-cyassl --without-gnutls --without-nss --without-polarssl --without-ssl --without-winssl )
+ myconf+=( --without-axtls --without-gnutls --without-nss --without-polarssl --without-ssl --without-winssl )
myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
if use ssl ; then
if use curl_ssl_axtls; then
@@ -112,12 +110,6 @@ src_configure() {
einfo "may not be the best choice as an ssl provider"
myconf+=( --with-axtls )
fi
- if use curl_ssl_cyassl; then
- einfo "SSL provided by cyassl"
- einfo "NOTE: cyassl is meant for embedded systems and"
- einfo "may not be the best choice as an ssl provider"
- myconf+=( --with-cyassl )
- fi
if use curl_ssl_gnutls; then
einfo "SSL provided by gnutls"
if has_version ">=net-libs/gnutls-3" || has_version "=net-libs/gnutls-2.12*[nettle]"; then
@@ -187,6 +179,7 @@ src_configure() {
$(use_enable static-libs static) \
$(use_enable threads threaded-resolver) \
--disable-versioned-symbols \
+ --without-cyassl \
--without-darwinssl \
$(use_with idn libidn) \
$(use_with kerberos gssapi "${EPREFIX}"/usr) \
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index e9834a9488ad..a997a174bca1 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,5 +1,4 @@
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.06.26.tar.gz 853375 SHA256 8d953d3d9ed55fb409e90c745fc788fc5ae251512908c822afe4d7f4e805894a SHA512 408226135c8a15d4d6a262194c6b9eb7093089ad8a8d4f1b29e473a80dcfcbdc7d977a349428980216491e5d80662c0fa432fe457201660c1fe324493cfc9cfc WHIRLPOOL fd0994736a06c7bc0633a48e76ffc0d8ff5a906a399e2a51f0a812657fdf361af52e597e953759579d270837068452e7f6192dc8a5d2e3bf4cb30fdc2b168ee8
-DIST youtube-dl-2014.07.11.3.tar.gz 877211 SHA256 81e4b8c7697649518852caa0cb1cddc86b38c712c5a11c2e6a64ffe37d011936 SHA512 13b74ebc427575116c332c7246725c16b036cb5d8ceeceed7de3d0f352abcd71a05a6e21277f158b0a02f31a974e4308a1df25f0912ba2ac511f7dd5b4d85090 WHIRLPOOL fb28a1aa89afcaf8633a78de976b2e573e99ed408d1f82b8f505bc8979b93554dd16e54fb2957bd65d9d548082d34463973c863511c1b5fdd1cbbcedf26c5d3a
+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.06.19.ebuild b/net-misc/youtube-dl/youtube-dl-2014.06.19.ebuild
index 70c9b36755ec..b0aed5c4f0cb 100644
--- a/net-misc/youtube-dl/youtube-dl-2014.06.19.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2014.06.19.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.06.19.ebuild,v 1.2 2014/06/23 13:06:32 jer Exp $
+# $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
@@ -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-misc/youtube-dl/youtube-dl-2014.06.26.ebuild b/net-misc/youtube-dl/youtube-dl-2014.06.26.ebuild
deleted file mode 100644
index 325389cdbada..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2014.06.26.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.26.ebuild,v 1.1 2014/06/26 19:01:11 jer 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.11.3.ebuild b/net-misc/youtube-dl/youtube-dl-2014.07.15.ebuild
similarity index 96%
rename from net-misc/youtube-dl/youtube-dl-2014.07.11.3.ebuild
rename to net-misc/youtube-dl/youtube-dl-2014.07.15.ebuild
index 7fa0ae5a0a0b..4f3e6ae9b07a 100644
--- a/net-misc/youtube-dl/youtube-dl-2014.07.11.3.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.11.3.ebuild,v 1.1 2014/07/11 17:53:29 jer Exp $
+# $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 $
EAPI=5
diff --git a/net-print/cups-pk-helper/Manifest b/net-print/cups-pk-helper/Manifest
index 3ed19d49d692..608bff00ab1f 100644
--- a/net-print/cups-pk-helper/Manifest
+++ b/net-print/cups-pk-helper/Manifest
@@ -1 +1,2 @@
DIST cups-pk-helper-0.2.4.tar.xz 149828 SHA256 d187dc994ff64621aa090d114170b292daa11122481d8b8adb7613b32ca4e3c3 SHA512 0e071cad5cb8177caefa973de754f015fca3f6bc291ff1f30b978be990f45e443ca91999a2c733aff616cd9a5fc3b4074e1e01a18dd049f6d9b629171587ba02 WHIRLPOOL 7b34eba1fd4fc26c81dafe1eb118e2aec7b6f955a3f0323866a732c85ae3046236e87deb7f6c0427c02bfaff6e823182f42909ac8b19817c6cb089e90127da32
+DIST cups-pk-helper-0.2.5.tar.xz 152620 SHA256 19221eed65a1e1498d396f3f99a783a95b21b4385e63b57a1f16e8728b8ca118 SHA512 9fc0af517755482dc3787ce87df389adee41b826c4ccca25df69474812523fa265c3dcf31fbc1a75c1b680b9b6490a9c358ac30aed7570fa98f5287f02a2be40 WHIRLPOOL b97000a948cdd82c46e83ab1e2be936068fc2eb28af13f672495c5827fe7ac7ddc4c5ac8df5fe146686aec386f513a2e36609727077254911a12162818003932
diff --git a/net-print/cups-pk-helper/cups-pk-helper-0.2.5.ebuild b/net-print/cups-pk-helper/cups-pk-helper-0.2.5.ebuild
new file mode 100644
index 000000000000..b468de07bafe
--- /dev/null
+++ b/net-print/cups-pk-helper/cups-pk-helper-0.2.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-pk-helper/cups-pk-helper-0.2.5.ebuild,v 1.1 2014/07/15 12:29:50 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="PolicyKit helper to configure cups with fine-grained privileges"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/cups-pk-helper"
+SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+# Require {glib,gdbus-codegen}-2.30.0 due to GDBus changes between 2.29.92
+# and 2.30.0
+COMMON_DEPEND="
+ >=dev-libs/glib-2.30.0:2
+ net-print/cups
+ >=sys-auth/polkit-0.97
+"
+RDEPEND="${COMMON_DEPEND}
+ sys-apps/dbus
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/gdbus-codegen-2.30.0
+ >=dev-util/intltool-0.40.6
+ virtual/pkgconfig
+ sys-devel/gettext
+"
+
+src_prepare() {
+ DOCS="AUTHORS HACKING NEWS README"
+
+ # Regenerate dbus-codegen files to fix build with glib-2.30.x; bug #410773
+ rm -v src/cph-iface-mechanism.{c,h} || die
+
+ gnome2_src_prepare
+}
diff --git a/net-wireless/broadcom-sta/Manifest b/net-wireless/broadcom-sta/Manifest
index 3c91aeca1fa6..4a8b18e05fec 100644
--- a/net-wireless/broadcom-sta/Manifest
+++ b/net-wireless/broadcom-sta/Manifest
@@ -1,4 +1,6 @@
DIST bcmwl-kernel-source_6.30.223.30%2Bbdcom-0ubuntu1%7Eppa1_amd64.deb 1779122 SHA256 de6529ae67f339aee185be93e3c12ffa944ef6b4807d176d6fda661de52136ba SHA512 93b17029538ec17be61902f1e5237a300f532dc88fd7475ac202c249a9cec099c5d170b0ebc043e1bda1987f6f925b6a28d4aa80748218f735a3790ded0565cd WHIRLPOOL 47f54a2fc286e58adef1383496fe3e65430ef643d8e7b8830cb87c0558319780f71944296211c62ccccaa4e3a216019fc5a29dd48903240362c656bb79ae55c2
DIST bcmwl-kernel-source_6.30.223.30%2Bbdcom-0ubuntu1%7Eppa1_i386.deb 1732452 SHA256 d689040ac2ef67b9947f892b52764cd94c2090499747b57d63c2b40c7bc8eabb SHA512 323db5e6c8fc702990d7137bd11d2e8bba7ed073ee8da00125d147872edf90dd051a959198dbdaf92808403cdcfd582f17afb8a6f5e741382d3a0cffd6ce130a WHIRLPOOL db24f078e2639f609021028304e7caf48b9a3737b6fdf4b2522ab74606c6cb0b11a94706978b1fd1acdf66c59e351a4a433cf9e500862931a1e9dce6e5562c01
DIST hybrid-v35-nodebug-pcoem-6_30_223_141.tar.gz 1735911 SHA256 d57c33f6bf4ebe68cac67ffe39c2260b8990bb0f07413dfd021dd4db845199a7 SHA512 adb3d9d9375888df3317d6af3d6d45c53412a677e5431051cbfe8c9eac3b13760022fd9b970e77caaeb0fa010ee8bd32ad80076d7279b60719bfb8562c09951f WHIRLPOOL f037e26d7f85d9a1bf3f2638fa6d6bbda43384e24fb249e90afcfff792be8013f1e0f2a1876c4675e39911d4e4877f0ab785eab15f7a6460621fe14c21bab486
+DIST hybrid-v35-nodebug-pcoem-6_30_223_248.tar.gz 2824762 SHA256 b196543a429c22b2b8d75d0c1d9e6e7ff212c3d3e1f42cc6fd9e4858f01da1ad SHA512 9f067cf5e1be562c78252791c0b2324b568c8533903842e18e92f2b10c3277e1d15ed42a5925acbd443de373f5113d05447b885a8d52ef57695babe48d68a0ff WHIRLPOOL f3bfef5b3dcbf6d051facbda0078a9850a1cf2f851bca07fd7538ffc3d5c0bf118622d217bb7737fdd87825af73b61ddd2d9a52c3d13a8070be02d1a584a8b14
DIST hybrid-v35_64-nodebug-pcoem-6_30_223_141.tar.gz 1786627 SHA256 5f37b2b879e29b220dc64ce2e93d922dc231d4241da03bcbab15ced10e649b4a SHA512 a83defe4553f680b984bf49788377436c5f563f2920c129d87a3930fb6501d0f833d353acf229fa4f67b761e4564428c62bc1c8e3e23c0727d01b8c4f797f6af WHIRLPOOL d1ddc19e29a6927ae0f172613d429a92d5009515b4db1bc188b0ced41ff39565512d4f85721bcf4ddd0a951afadfd7bc303219ed93a20f83e1936a9c82717e47
+DIST hybrid-v35_64-nodebug-pcoem-6_30_223_248.tar.gz 2875739 SHA256 3d994cc6c05198f4b6f07a213ac1e9e45a45159899e6c4a7feca5e6c395c3022 SHA512 ce1e9f7f52cd98eaba5cf4ec0c7276bddf3ad906a0111eb236665daca72f36139ca4a8af72658cf91b0eaaa8479e54f5bb3bce77a0cc9bc1966f044b76b8295a WHIRLPOOL 6393507f340f4244d8e40c81102e37f9df0d5dbc0ce4e0fd3ed187ddde6faf3be9bfae59371eb307d031974b5b6d1417c7c11fbdd51b9f3b168ccd83d48276d9
diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.248.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.248.ebuild
new file mode 100644
index 000000000000..82870884c63f
--- /dev/null
+++ b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.248.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-6.30.223.248.ebuild,v 1.1 2014/07/15 23:59:47 mrueg Exp $
+
+EAPI=5
+inherit eutils linux-info linux-mod
+
+DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver"
+HOMEPAGE="http://www.broadcom.com/support/802.11/linux_sta.php"
+SRC_BASE="http://www.broadcom.com/docs/linux_sta/hybrid-v35"
+SRC_URI="x86? ( ${SRC_BASE}-nodebug-pcoem-${PV//\./_}.tar.gz )
+ amd64? ( ${SRC_BASE}_64-nodebug-pcoem-${PV//\./_}.tar.gz )"
+
+LICENSE="Broadcom"
+KEYWORDS="-* ~amd64 ~x86"
+
+RESTRICT="mirror"
+
+DEPEND="virtual/linux-sources"
+RDEPEND=""
+
+S="${WORKDIR}"
+
+MODULE_NAMES="wl(net/wireless)"
+MODULESD_WL_ALIASES=("wlan0 wl")
+
+pkg_setup() {
+ # bug #300570
+ # NOTE: module builds correctly anyway with b43 and SSB enabled
+ # make checks non-fatal. The correct fix is blackisting ssb and, perhaps
+ # b43 via udev rules. Moreover, previous fix broke binpkgs support.
+ CONFIG_CHECK="~!B43 ~!SSB"
+ CONFIG_CHECK2="LIB80211 ~!MAC80211 ~LIB80211_CRYPT_TKIP"
+ ERROR_B43="B43: If you insist on building this, you must blacklist it!"
+ ERROR_SSB="SSB: If you insist on building this, you must blacklist it!"
+ ERROR_LIB80211="LIB80211: Please enable it. If you can't find it: enabling the driver for \"Intel PRO/Wireless 2100\" or \"Intel PRO/Wireless 2200BG\" (IPW2100 or IPW2200) should suffice."
+ ERROR_MAC80211="MAC80211: If you insist on building this, you must blacklist it!"
+ ERROR_PREEMPT_RCU="PREEMPT_RCU: Please do not set the Preemption Model to \"Preemptible Kernel\"; choose something else."
+ ERROR_LIB80211_CRYPT_TKIP="LIB80211_CRYPT_TKIP: You will need this for WPA."
+ if kernel_is ge 3 8 8; then
+ CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211 ~!PREEMPT_RCU ~!PREEMPT"
+ elif kernel_is ge 2 6 32; then
+ CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211"
+ elif kernel_is ge 2 6 31; then
+ CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT ~!MAC80211"
+ elif kernel_is ge 2 6 29; then
+ CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT COMPAT_NET_DEV_OPS"
+ else
+ CONFIG_CHECK="${CONFIG_CHECK} IEEE80211 IEEE80211_CRYPT_TKIP"
+ fi
+
+ linux-mod_pkg_setup
+
+ BUILD_PARAMS="-C ${KV_DIR} M=${S}"
+ BUILD_TARGETS="wl.ko"
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}/${PN}-6.30.223.141-license.patch" \
+ "${FILESDIR}/${PN}-6.30.223.141-makefile.patch" \
+ "${FILESDIR}/${PN}-6.30.223.141-eth-to-wlan.patch" \
+ "${FILESDIR}/${PN}-6.30.223.141-gcc.patch" \
+ "${FILESDIR}/${PN}-6.30.223.141-linux-3.15.patch"
+
+ epatch_user
+}
diff --git a/perl-core/Thread-Queue/Manifest b/perl-core/Thread-Queue/Manifest
index cf77e2393c99..c48b16e61f58 100644
--- a/perl-core/Thread-Queue/Manifest
+++ b/perl-core/Thread-Queue/Manifest
@@ -1,3 +1,2 @@
DIST Thread-Queue-2.12.tar.gz 11751 SHA256 0f96a3ff648d46294efe826a85e4cba807072b001bf3f386b8f5265f8f0e9f7e SHA512 b94b665275d1f5fe4341fe857be3c654bc8be4b976d12c54caa2e8f0812a5841eb5a0c0195d5e507d51bec65736d78775f353b9163355a673b0989ca1726ef1a WHIRLPOOL e596d8959ee0dfbe2865f9899126f0c8a4383377a3815ad7b1b7cecd8741c72086e327603eec30c3f53ab2ee59aa2b57116783967f4be4b1f8272239115bbd41
-DIST Thread-Queue-3.01.tar.gz 13153 SHA256 0613ceb376c6f46c0cc0e77546bace4ce9d1ef5d51841edcfabc89c46c2af9d2 SHA512 2dc32c57685d4bed95e40a2550f332b80174694ea43f5797ea4e98da7936c0906f14e7730cf3c1539ef8cf3ea80ccaf234e5ab556ca3ab1e5ed8ab9b699c4c38 WHIRLPOOL 1196a242a50865fa7fd5c1544df1e1e73056fd945051bf0a910fcfc5fd281a595570d293ff742d27c07016a7fefa0438500d758a5da1ab2fbc1ea4b147065aed
DIST Thread-Queue-3.02.tar.gz 13850 SHA256 a3f5d61bc57e39e1ceb2e04babb680bf361a5ad3d579975a42cf7a39f6d3cb4b SHA512 88043f1f8c3762446319cfbb95634ca7db86b7d183a8781a3233b9a2a3ee7758b7ea641ab8a13098418390cddcef607216dcd60030f3663cd7f8e6b19bac3fc1 WHIRLPOOL f845bc3f94be9b043329d41d78ece2269b1ea20ea5d4ac299a5eae9247951c9e2a9255d6b3a0c047021f2a5da7753d21310602961eb78a77b590b1d0f58d2c38
diff --git a/perl-core/Thread-Queue/Thread-Queue-3.10.0.ebuild b/perl-core/Thread-Queue/Thread-Queue-3.10.0.ebuild
deleted file mode 100644
index 358922b8ba61..000000000000
--- a/perl-core/Thread-Queue/Thread-Queue-3.10.0.ebuild
+++ /dev/null
@@ -1,25 +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/Thread-Queue/Thread-Queue-3.10.0.ebuild,v 1.2 2012/12/22 18:26:02 ago Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=JDHEDDEN
-MODULE_VERSION=3.01
-inherit perl-module
-
-DESCRIPTION="Thread-safe queues"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test"
-
-RDEPEND="dev-lang/perl[ithreads]
- >=virtual/perl-threads-shared-1.21
- virtual/perl-Scalar-List-Utils"
-DEPEND="${RDEPEND}
- test? (
- virtual/perl-Thread-Semaphore
- )"
-
-SRC_TEST=do
diff --git a/perl-core/Time-Local/Manifest b/perl-core/Time-Local/Manifest
index 978df708217e..bd5728867b50 100644
--- a/perl-core/Time-Local/Manifest
+++ b/perl-core/Time-Local/Manifest
@@ -1,3 +1 @@
-DIST Time-Local-1.2000.tar.gz 18884 SHA256 418873d3692d3c758ec83f4b1c51390a867acf71370f4db421963788bb20a640 SHA512 a80e8b2025d3b30ca8b860e174ae8ff1e094abd4e526b8d93576ce71ae8009ee5a654f0da3a71206bbaa6f61a4b2130716cacdc60b9876794bcfedd6f04903cc WHIRLPOOL 3f0b3e25148842acab28eb850a3ab4eb011a1e3cb897da9e636d64645b482886b60fc00544ceb9581c4a2a32aeedf18a5caf9b78555278a6809dec8b6e4453e8
-DIST Time-Local-1.2200.tar.gz 19795 SHA256 37a0b47fbe73fe8bf9c7047e47ad6234a98cc160678e4ae9cc5f0caafa21c032 SHA512 04d11fdf7f6b1380437bf6da5067a4f1b61aca610407598903176163802429df3ca29a8d90f9bc88c7d80be9e6a848c9b78f2f1cc97079971d2091e98e51490d WHIRLPOOL e406cbbcc672d502976eb58654dd0bac6b8668f418a890bab62514edfcd770f7a509835ce7f70f61966f7d0e5e364508092bcf8782a1b6ab924a3bde0497ab16
DIST Time-Local-1.2300.tar.gz 19818 SHA256 b2acca03700a09f8ae737d3084f3f6287e983da9ab7b537c6599c291b669fb49 SHA512 812a4e1d8820becfc4c19a3a862e5234744b4124b99fd33c856e331e0f2f6131b98ae9e8cfde637c9db5b2de036f643424f4d2d15bdb47fa57dffd8f3bdeeb41 WHIRLPOOL 8e01c9bcc5da9caf95221e3d9e20d5e1b01ad5ebbb960a19f71ecef2354bcdde743a0ca11810e4f3987b361be63676f4fd4e2a3a3af34fe82af735ce7762978f
diff --git a/perl-core/Time-Local/Time-Local-1.200.0.ebuild b/perl-core/Time-Local/Time-Local-1.200.0.ebuild
deleted file mode 100644
index 7173c9788a6e..000000000000
--- a/perl-core/Time-Local/Time-Local-1.200.0.ebuild
+++ /dev/null
@@ -1,17 +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/Time-Local/Time-Local-1.200.0.ebuild,v 1.11 2014/01/20 20:47:08 vapier Exp $
-
-EAPI=3
-
-MODULE_AUTHOR=FLORA
-MODULE_VERSION=1.2000
-inherit perl-module
-
-DESCRIPTION="Implements timelocal() and timegm()"
-
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/perl-core/Time-Local/Time-Local-1.220.0.ebuild b/perl-core/Time-Local/Time-Local-1.220.0.ebuild
deleted file mode 100644
index dd51eaae4d37..000000000000
--- a/perl-core/Time-Local/Time-Local-1.220.0.ebuild
+++ /dev/null
@@ -1,17 +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/Time-Local/Time-Local-1.220.0.ebuild,v 1.2 2014/01/20 20:47:08 vapier Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=DROLSKY
-MODULE_VERSION=1.2200
-inherit perl-module
-
-DESCRIPTION="Implements timelocal() and timegm()"
-
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/perl-core/Time-Piece/Manifest b/perl-core/Time-Piece/Manifest
index 8f295b6d04a2..6638ebe2ec8f 100644
--- a/perl-core/Time-Piece/Manifest
+++ b/perl-core/Time-Piece/Manifest
@@ -1,3 +1 @@
DIST Time-Piece-1.20.tar.gz 24703 SHA256 da842a827289ed1f9afd63f1bbd26ac03a377a7ff3455c67169e0ab9ccd98b55 SHA512 1352032d89e49106cdd51576d7f18dac2adc5f737d35ad02d95b9e52b6efa73f29974dda1251294b7954478d833e4ab2d79153e2a1fff7af68ee3da0dfaeda84 WHIRLPOOL 29437c07a3697705b3eb8482aadb0fc3cda747549fad6fcafd4bc99cc1cb58ab82898118801afae78e86f83b901f3130dbf6d14fd747e555627d7aee3e460854
-DIST Time-Piece-1.22.tar.gz 24977 SHA256 35472960c12b4fddae7af8026e6c3fb14aaf6c33d78fc67e860a25213e59daa7 SHA512 9b89a453f0892dbd1f5af8da65a23e02093236de65c5c133060df3dbd8d4db1f173eeb27c9c330115073a448745be0c454d50dd253acff0f129e4f079948e2bc WHIRLPOOL fe92a5b4a259bba7b971969596bc3dc118be395d543abf8d1ce7a39b0d6d9fde1723b368b43cf11a6bb9a59649fa7aac52d176c49701adb0911b48f3779e9a6d
-DIST Time-Piece-1.23.tar.gz 26142 SHA256 76e0ff47edf4da2deb5d7c56f07761b8bea3483eba4803f43629729f68f3d6b2 SHA512 e5c9932f8d1a9ec521e47fea81bc952d461610599e5da65a09a2ee975bb7e8749ebb152d2a37480952a253b8fc7eb8096e40467634d17ada520ffabf551408ea WHIRLPOOL efabdc4a0231de2d3eb5ee4db467a5318a2ce65db910895c5920bf26813b701b90797b2f70a58debdff7aedfc3ac4d8c0d8d00d428768f8d9869c3fd11c6b4a7
diff --git a/perl-core/Time-Piece/Time-Piece-1.22.ebuild b/perl-core/Time-Piece/Time-Piece-1.22.ebuild
deleted file mode 100644
index 45086eaf43fe..000000000000
--- a/perl-core/Time-Piece/Time-Piece-1.22.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/perl-core/Time-Piece/Time-Piece-1.22.ebuild,v 1.2 2014/01/20 20:47:10 vapier Exp $
-
-EAPI=2
-
-MODULE_AUTHOR=RJBS
-inherit perl-module
-
-DESCRIPTION="Object Oriented time objects"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/perl-core/Time-Piece/Time-Piece-1.230.0.ebuild b/perl-core/Time-Piece/Time-Piece-1.230.0.ebuild
deleted file mode 100644
index e3a62012926d..000000000000
--- a/perl-core/Time-Piece/Time-Piece-1.230.0.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/perl-core/Time-Piece/Time-Piece-1.230.0.ebuild,v 1.2 2014/01/20 20:47:10 vapier Exp $
-
-EAPI=5
-MODULE_VERSION=1.23
-MODULE_AUTHOR=RJBS
-inherit perl-module
-
-DESCRIPTION="Object Oriented time objects"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/perl-core/Version-Requirements/Manifest b/perl-core/Version-Requirements/Manifest
index 948c0a63672a..d5e773e969c2 100644
--- a/perl-core/Version-Requirements/Manifest
+++ b/perl-core/Version-Requirements/Manifest
@@ -1,2 +1 @@
-DIST Version-Requirements-0.101020.tar.gz 14912 SHA256 a4037d014692ba6867bed71d882da748c728c8d5e11ab6008cec056179776ca1 SHA512 5ceda499a1f95d5e50daed6043c0125951a9641534582dd52484865e8c8c4ddb4fc3d3ade4fbc90bed9b02ea499548c3302d4b008d5419d9c9208d1654cae1eb WHIRLPOOL c39f3c90a91fde067ac5d146dcb87b603d918df9cbb7b776d55dc32cc0733868edd455573d54b07a47234b670139f8ffc2f16355d24b05f49560bf450b82e2c2
DIST Version-Requirements-0.101021.tar.gz 15550 SHA256 49d7cbf27e0fc51f34f1b3b5567373cc81259e111a3e43d53377c14253dba86d SHA512 fb61a45b2ecdce4b1a7dcb5cb6c1bf1a3fa91f03f70d33c0a2b66b87f7410f68b2b733a3284f659639b71d23f49e30c85fe331fd21b9cfd17ff1afee5f5318e4 WHIRLPOOL cac73bcef4f2d46ce30cf58fb9419fb60384d399b7e2443b548dd726b1a905cea4f7bd747429dfe7dad2b6bb01182eb074a3b7c51d4136a30ff3574185fbde99
diff --git a/perl-core/Version-Requirements/Version-Requirements-0.101.20.ebuild b/perl-core/Version-Requirements/Version-Requirements-0.101.20.ebuild
deleted file mode 100644
index f379c1b9495c..000000000000
--- a/perl-core/Version-Requirements/Version-Requirements-0.101.20.ebuild
+++ /dev/null
@@ -1,23 +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/Version-Requirements/Version-Requirements-0.101.20.ebuild,v 1.17 2013/01/07 17:24:42 vapier Exp $
-
-EAPI=3
-
-MODULE_AUTHOR=RJBS
-MODULE_VERSION=0.101020
-inherit perl-module
-
-DESCRIPTION="A set of version requirements 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-Scalar-List-Utils
- >=virtual/perl-version-0.77
-"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/perl-core/Version-Requirements/Version-Requirements-0.101.21.ebuild b/perl-core/Version-Requirements/Version-Requirements-0.101.22.ebuild
similarity index 83%
rename from perl-core/Version-Requirements/Version-Requirements-0.101.21.ebuild
rename to perl-core/Version-Requirements/Version-Requirements-0.101.22.ebuild
index 5e4ee909d9b6..67862dc541f6 100644
--- a/perl-core/Version-Requirements/Version-Requirements-0.101.21.ebuild
+++ b/perl-core/Version-Requirements/Version-Requirements-0.101.22.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/perl-core/Version-Requirements/Version-Requirements-0.101.21.ebuild,v 1.2 2013/01/07 17:24:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Version-Requirements/Version-Requirements-0.101.22.ebuild,v 1.1 2014/07/15 18:26:50 dilfridge Exp $
-EAPI=4
+EAPI=5
MODULE_AUTHOR=RJBS
MODULE_VERSION=0.101021
diff --git a/perl-core/autodie/Manifest b/perl-core/autodie/Manifest
index 2be301e88770..ca89836f750b 100644
--- a/perl-core/autodie/Manifest
+++ b/perl-core/autodie/Manifest
@@ -1,4 +1 @@
-DIST autodie-2.16.tar.gz 77284 SHA256 0513034c5ffce802de65efbea61baf7e02b0f3b10ad77a9c795be816798e9b66 SHA512 f17f9f212dc5d415557af2856e28cd93b3200ec2993625f0678b9ec2a06d260b5595f75c59101651e6069aafdae9c4158c0f6145adbdb0c2ad9d75422c84f046 WHIRLPOOL eef727533eb9badce30cdb1ba2d4398b2057050604e4a5d6f31ddf6c5be120221b4eb6efe014424e64d50be52584203ee030839b682a3057aa3ce33e8c676b2d
-DIST autodie-2.20.tar.gz 82597 SHA256 346763c582cd8066b4e5d07e4013202f9f9296d32b42343e117dbfb13ea6e4f0 SHA512 d46b980bea3c5356752413d13d11672a66d838d5caa59bbed068ce12076f2be44d8e35a3dfbcee3d898de725b2f9c0ed8e04f0cf9a13ee127b7633a7aa01f8a8 WHIRLPOOL 87dd2d3f6d78577404102743ae1e36d38d06277d823b46d1dd46ac02a537a46c2cb21df33d50a2fffab3ebda20f02c9164c4aefbd5daf6a95457984ee440a2fd
-DIST autodie-2.21.tar.gz 84469 SHA256 0e4d2ebe18e812bb7b1016840a46bd81ab497469a3aa9753d7e55cb7fef48015 SHA512 478d8842c1fb517f1027747455605242c83b80010e050dc195e7b3827be618a857c707d0043ed13a4f0f2d5ede1dd663d664530cc6124fc7ab99fd03e87d8dc2 WHIRLPOOL 19057b5a7aab9267e8a9096ba610bc790c12074c224f7c2433e6f38c52afc5af15a4cf101cbb9788279324fd6bbd22df540831c24549e0a017c3fd5da0332432
DIST autodie-2.22.tar.gz 84661 SHA256 4b08024899ce6130246014541f575d8cc6cedd4b5c78f72288fe9ead7ed6c786 SHA512 2c5c408d19a6142b95a77014892e42051b51477e0e5d43ca6c988bd1f09e15581c36bca8eb0101c668d1fa970e6aacc5f05d5d1af59504478a5156882cf987c8 WHIRLPOOL 7d2d1f79c5d5a565ac9575094b42d17b0ee7137b1d88d676906da9c5c43b05785cca471ac2159237992eea4c68aaf0c31292968ab66d8346257f8966440f2dce
diff --git a/perl-core/autodie/autodie-2.160.0.ebuild b/perl-core/autodie/autodie-2.160.0.ebuild
deleted file mode 100644
index 6e1a6fd2b3f9..000000000000
--- a/perl-core/autodie/autodie-2.160.0.ebuild
+++ /dev/null
@@ -1,17 +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/autodie/autodie-2.160.0.ebuild,v 1.1 2013/03/02 08:38:17 tove Exp $
-
-EAPI=5
-
-MODULE_AUTHOR=PJF
-MODULE_VERSION=2.16
-inherit perl-module
-
-DESCRIPTION='Replace functions with ones that succeed or die with lexical scope'
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/perl-core/autodie/autodie-2.200.0.ebuild b/perl-core/autodie/autodie-2.200.0.ebuild
deleted file mode 100644
index 4a9f84620a70..000000000000
--- a/perl-core/autodie/autodie-2.200.0.ebuild
+++ /dev/null
@@ -1,17 +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/autodie/autodie-2.200.0.ebuild,v 1.1 2013/08/14 07:23:31 patrick Exp $
-
-EAPI=5
-
-MODULE_AUTHOR=PJF
-MODULE_VERSION=2.20
-inherit perl-module
-
-DESCRIPTION='Replace functions with ones that succeed or die with lexical scope'
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/perl-core/autodie/autodie-2.210.0.ebuild b/perl-core/autodie/autodie-2.210.0.ebuild
deleted file mode 100644
index 0522820c5283..000000000000
--- a/perl-core/autodie/autodie-2.210.0.ebuild
+++ /dev/null
@@ -1,17 +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/autodie/autodie-2.210.0.ebuild,v 1.1 2013/09/18 02:25:07 patrick Exp $
-
-EAPI=5
-
-MODULE_AUTHOR=PJF
-MODULE_VERSION=2.21
-inherit perl-module
-
-DESCRIPTION='Replace functions with ones that succeed or die with lexical scope'
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/perl-core/libnet/Manifest b/perl-core/libnet/Manifest
index b8e648a7b2bf..893535be8cfb 100644
--- a/perl-core/libnet/Manifest
+++ b/perl-core/libnet/Manifest
@@ -1,2 +1,3 @@
DIST libnet-1.22.tar.gz 67836 SHA256 372c581d0c6b256952c774bfdbd8714e2a20d41251d4097d326d2f1ab1196c84 SHA512 d7d37817be14c5720578eae450266928d22edc739c0e9a51c88ef4399046e13624f8be8027085335f4db6f8517c2ba25a5b849582c4c3198b83fa32db4e59cbd WHIRLPOOL 6aca03c546e37ae18ca8f6be39dbccff429759ff278a54758464e39d42b034caac89cfa9940caf6dca94329ba1271a05a1d213f818683b07103b382c284edd0a
DIST libnet-1.23.tar.gz 67699 SHA256 67edd05f0a2b93ca8fe9ba98d45667df74b78b1eaeb502404ae511e7a5f6513c SHA512 14ab5ea24d2a85bfa53bd1fee342c1653466d65863099596ebc5b0ccee3dccb912bfb1e60e83f70a94684d4b75bd1dfa3e69ff08be5ea7dad75ea9ec233b868f WHIRLPOOL 22d01f445a5249df03892420a108873ed5e6da0c310686324987ab166c1c86f0bf8204058dcd3dfccca6a850b9b0a1ecc0d62dcb31847be1be8b75324e99c8b3
+DIST libnet-1.27.tar.gz 68615 SHA256 a6c8660844df64cd8389d2afddd596c9a5afb0cda8434b0b9313a53496cee803 SHA512 a81a4640f55212402dd741316991413a16f4e05781320abbd18eb9f450282275489a45167faecf587af66cabcb8f7f23653834081bf9fe0b490d419392b85b1b WHIRLPOOL 44fd5332bcc2f1fe8ef19453ffad927f1ef62e637807ddbcef831165be4f0e7991f6aa020e3911b1c2bb684e9001292bb9adcc00cbab43ff8ba3839e6cf50618
diff --git a/perl-core/libnet/libnet-1.270.0.ebuild b/perl-core/libnet/libnet-1.270.0.ebuild
new file mode 100644
index 000000000000..5ecf2ab94477
--- /dev/null
+++ b/perl-core/libnet/libnet-1.270.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/libnet/libnet-1.270.0.ebuild,v 1.1 2014/07/15 21:03:26 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=SHAY
+MODULE_VERSION=1.27
+inherit eutils perl-module
+
+DESCRIPTION="A URI Perl Module"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-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="sasl"
+
+RDEPEND="sasl? ( dev-perl/Authen-SASL )"
+DEPEND=""
+
+SRC_TEST="do"
+
+src_prepare() {
+ cp "${FILESDIR}"/libnet.cfg "${S}"
+}
diff --git a/profiles/hardened/linux/uclibc/ppc/package.mask b/profiles/hardened/linux/uclibc/ppc/package.mask
new file mode 100644
index 000000000000..75e0b33eb21d
--- /dev/null
+++ b/profiles/hardened/linux/uclibc/ppc/package.mask
@@ -0,0 +1,2 @@
+#Fails to find openssl headers, bug #517160
+net-misc/openssh
diff --git a/profiles/package.mask b/profiles/package.mask
index ea51c9652fcd..4197b311b33b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15896 2014/07/15 10:20:30 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15905 2014/07/15 21:25:09 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
@@ -30,6 +30,25 @@
#--- END OF EXAMPLES ---
+# Ulrich Müller (15 Jul 2014)
+# Permanently mask sys-libs/lib-compat and its reverse dependencies,
+# pending multiple security vulnerabilities and QA issues.
+# See bugs #515926 and #510960.
+sys-libs/lib-compat
+sys-libs/lib-compat-loki
+=app-emulation/emul-linux-x86-compat-20140508-r1
+=games-action/descent3-1.4.0b-r1
+games-action/phobiaii
+games-emulation/handy
+games-fps/rtcw
+games-fps/unreal
+games-server/mtavc
+games-sports/racer-bin
+games-strategy/heroes3
+games-strategy/heroes3-demo
+games-strategy/smac
+sys-block/afacli
+
# Ulrich Müller (13 Jul 2014)
# Development of stand-alone package stopped in 2004.
# sawfish.el is now provided by x11-wm/sawfish with USE=emacs.
@@ -62,11 +81,6 @@ app-emacs/sawfish
# removed. Please depend on dev-perl/Filter directly.
virtual/perl-Filter
-# Sergey Popov (7 Jul 2014)
-# Depends on really ancient libc, that have some nasty
-# vulnerabilities and QA issues. See bugs #515926 and #510960
-sys-block/afacli
-
# Michał Górny (6 Jul 2014)
# (on behalf of python@gentoo.org)
# The modules provided by those virtuals are built-in in all currently
@@ -265,7 +279,14 @@ dev-java/ibm-jdk-bin:1.5
=virtual/perl-Storable-2.490.0
=virtual/perl-Test-Harness-3.330.0
=virtual/perl-Test-Simple-1.1.2
+=virtual/perl-Thread-Queue-3.50.0
+=virtual/perl-Time-Piece-1.270.0
+=virtual/perl-XSLoader-0.170.0
+=virtual/perl-autodie-2.230.0
=virtual/perl-bignum-0.370.0
+=virtual/perl-i18n-langtags-0.400.0
+=virtual/perl-if-0.60.300
+=virtual/perl-locale-maketext-1.250.0
=perl-core/B-Debug-1.190.0
# Pawel Hajdan jr (24 May 2014)
diff --git a/sci-biology/diya/diya-1.0_rc4.ebuild b/sci-biology/diya/diya-1.0_rc4.ebuild
index 044b16b4a52d..7c436a79e404 100644
--- a/sci-biology/diya/diya-1.0_rc4.ebuild
+++ b/sci-biology/diya/diya-1.0_rc4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/diya/diya-1.0_rc4.ebuild,v 1.1 2009/09/28 00:16:02 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/diya/diya-1.0_rc4.ebuild,v 1.2 2014/07/15 12:59:44 zlogene Exp $
-EAPI="2"
+EAPI="5"
inherit perl-module
@@ -39,5 +39,5 @@ src_install() {
mydoc="INSTALL README docs/diya.html"
perl-module_src_install
insinto /usr/share/${PN}
- doins -r diya.conf docs examples scripts || die
+ doins -r diya.conf docs examples scripts
}
diff --git a/sci-libs/libtifiles2/libtifiles2-1.1.6-r1.ebuild b/sci-libs/libtifiles2/libtifiles2-1.1.6-r1.ebuild
index 3065616bf3da..e87297a0a17a 100644
--- a/sci-libs/libtifiles2/libtifiles2-1.1.6-r1.ebuild
+++ b/sci-libs/libtifiles2/libtifiles2-1.1.6-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/sci-libs/libtifiles2/libtifiles2-1.1.6-r1.ebuild,v 1.1 2013/07/10 21:45:43 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libtifiles2/libtifiles2-1.1.6-r1.ebuild,v 1.2 2014/07/15 14:37:09 jlec Exp $
EAPI=5
@@ -16,6 +16,7 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="doc nls static-libs"
RDEPEND="
+ app-arch/libarchive
dev-libs/glib:2
>=sci-libs/libticables2-1.3.3
>=sci-libs/libticonv-1.1.3
diff --git a/sci-libs/libtifiles2/metadata.xml b/sci-libs/libtifiles2/metadata.xml
index 664d1df39e99..89a9f8616c31 100644
--- a/sci-libs/libtifiles2/metadata.xml
+++ b/sci-libs/libtifiles2/metadata.xml
@@ -1,8 +1,8 @@
-sci
-
+ sci
+
The libtifiles is a library providing support for operations on Texas
Instruments calculators files. All formats for all calculators are
supported read/write ; the library is also able to manipulate the
diff --git a/sys-apps/acl/acl-2.2.52-r1.ebuild b/sys-apps/acl/acl-2.2.52-r1.ebuild
index 3b8401017818..1873d3b9e0a5 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.8 2014/07/14 13:35:45 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-2.2.52-r1.ebuild,v 1.9 2014/07/15 18:43:04 maekke 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/fwts/Manifest b/sys-apps/fwts/Manifest
index 88efa81a390d..dbd92388bafd 100644
--- a/sys-apps/fwts/Manifest
+++ b/sys-apps/fwts/Manifest
@@ -1,2 +1,2 @@
-DIST fwts_14.03.01.orig.tar.gz 2968052 SHA256 73d650fbd48d72c2308367cb42f16cd9f316c965699aee70139e84b2a14f17fc SHA512 abccf27a65af78ec9f0335ccb5036934ce3e8c7d7a2c5eb06e98b176de0d22fbd5bff680ead634216594c189d15d859041831f9b64c65838e022d590496d681e WHIRLPOOL 89b8648dca6d425e3ed205bacdccf6c1f6f8030b729aaeca7ea30d94b1b2eba3218c980b1063094692ebfa30b3309366b02b9fa334b2c7b419d83c26b57ea9ce
DIST fwts_14.05.00.orig.tar.gz 2971928 SHA256 962e9c67ff27e557ddf4841c8b74b30866ba1d923ea8aaec878f2584b4def611 SHA512 11cdd8daa59eeeaa2522da345af59c2e30f6212ea8b67d3dccf1e82498ab6794e1a9ddaef4998ddddf3b3529b084a14d710347b4a56a153dfdad13f0cb4328e0 WHIRLPOOL 4600c29c5b16616ccafa7d3dd7d1b51335651e82ce425fb2f4078bc9a4403eeffbd584fc7e37ea05ba643f1ff8cf9f1598113eba2298f54e1ac36d8577d36306
+DIST fwts_14.06.00.orig.tar.gz 2978775 SHA256 d5f16cea55ece613a5e2728c260a0507d0486343a2742bf2c72c4b3f568af561 SHA512 d1574c1c35eb9260c3c470bbd38689d14c4dce3016f97f220ac0cf85f6127fdc355c6f6edc9d3f6ae888d894942a03650a5298dcd31f459243a5e920b0a28281 WHIRLPOOL 9936f4f54fa9a6b8271f53929f5c2ddca6a646109c28366ef39497a8dac5d566e71cfdd1270964d279553c92c31868d16a28c2599e95fc827920dacedff2b50c
diff --git a/sys-apps/fwts/fwts-14.03.01.ebuild b/sys-apps/fwts/fwts-14.06.00.ebuild
similarity index 91%
rename from sys-apps/fwts/fwts-14.03.01.ebuild
rename to sys-apps/fwts/fwts-14.06.00.ebuild
index 31ccdf22d9f0..44a143d2af46 100644
--- a/sys-apps/fwts/fwts-14.03.01.ebuild
+++ b/sys-apps/fwts/fwts-14.06.00.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/fwts/fwts-14.03.01.ebuild,v 1.1 2014/03/28 16:11:20 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fwts/fwts-14.06.00.ebuild,v 1.1 2014/07/16 00:45:12 mrueg Exp $
EAPI=5
diff --git a/sys-apps/kmod/kmod-18-r1.ebuild b/sys-apps/kmod/kmod-18-r1.ebuild
index 72d6d8bc933d..457822059e15 100644
--- a/sys-apps/kmod/kmod-18-r1.ebuild
+++ b/sys-apps/kmod/kmod-18-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/kmod/kmod-18-r1.ebuild,v 1.3 2014/07/14 19:25:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-18-r1.ebuild,v 1.4 2014/07/15 15:02:52 blueness Exp $
EAPI=5
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
inherit autotools git-2
else
SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
- 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"
inherit libtool
fi
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 78cfefd2f521..46ea65607434 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,6 +1,2 @@
-DIST systemd-208-r1.tar.xz 2382904 SHA256 aa64fa864466fd5727005c55d61c092828b94b4f857272c0b503695022146390 SHA512 c21989b747f5e73ba2311919e1ae558132e4ab2e0d8715c25f51e5e90069e147a52e04280c736ecca6b675af7d79def576171a9b08aaeda45fcd52bcdca011cb WHIRLPOOL e86fdbf96c75c4c94c9507900a5696ff811f5439e0cb45bdc765dc42c62a855c9d2e7d3414df7ec7e18013d937c9148e42c861d0e28e8b4c2fabebd234fbee03
DIST systemd-212.tar.xz 2722692 SHA256 652906b43704fe705cb47757ea9bbbf3c1ab4a1d55ea38b0013a6f2d0863f2c2 SHA512 3e6dac77785cb2f928886886f92cdd11ed00a4db1453699e0102d3ecffa03d1795f44df10239105e4b2b039f0e3e4b5d44c9f876f25c10a6dc4f7e1fbf87c333 WHIRLPOOL 31d1a967435963155c60ca5016f207aa105e9ddcb7d73e9fcde20f7e1fb66701384b81ee01134bf4d75dfa1ea0d412bb352ff11ac6f8c05e836135baf94bbe37
-DIST systemd-214.tar.xz 2790264 SHA256 0e902796e1dc4e9cd3ee89793936166adb4a538605edd9692e271824c1579b15 SHA512 7e0a7541b7d423c9e8f9d97b8862bb68566bde24e0f6fbc4519c0b32da321d4339bad13dba55af6a45d61c713fbf49ad3e2018fcba1195b772392cbf3a87f83e WHIRLPOOL 443c42a53c0e2b5dd578fcae6155a757dfe98af4a29ac2d89d3030ed0d9b896342ccb048860bc4bc48abdb4d15755f474e3881a5fea2d69aa11c81d201f710f5
DIST systemd-215.tar.xz 2888652 SHA256 ce76a3c05e7d4adc806a3446a5510c0c9b76a33f19adc32754b69a0945124505 SHA512 58de0bf7c43c309c2f8e4b7af16b46608a4ea39cbb280496fe5d43d76ea25545484f4ef62efce18be487c69134e4a038d8787f2c262484f92f7fc6feb3ae2f11 WHIRLPOOL 07389822b9f09cd91f360f3cbdcd0b5bf46ba1750dd1a4ad44fd2813436ef40b447b954d33582ffe83aebde618ecbeac4d2f3231d8afbf3975caf84f52b1053a
-DIST systemd-gentoo-patchset-208_p19.tar.bz2 7351 SHA256 3fce1d7ff628b0f49d4bf45eb7beb7d3b4a45c219464be47e4b04e5e16ace335 SHA512 d2ee48a46a8dc097f41d23c58c2c8f40841b42ce175d633ba0090543164c353449a911c5f314b1d1aa7937e51b97cc2608aa4590f0ff56140b42108b0e76a2e8 WHIRLPOOL 934fd88ee12ed72709e0b7aabe01f9e21417480156049af80eaa5413d50726aa49abc03e756bdeff45a4f82decaafa1f76539f16b2319e3c42a0a593f2096417
-DIST systemd-stable-214_p57.tar.xz 30864 SHA256 620e132a6bf07e4896bbec9eecea6e67db745ce39de38522fc89a3b15533077a SHA512 1d99d38e89eb5debb2693a7c45d4247101557f5d5f256a3ae2915c2d42ffaf1e4eaba9de034176a31681a2430297cbaeeabf1c2c088b0a29bbb227bea847a004 WHIRLPOOL f67feb2548a317fd71d760f0efb7c9a8005511fdbca63f1698b6982bce37bcef9cd36201f22707ec130b776bf09efa0906f23cfe7e12c14e00824a43bd54eb67
diff --git a/sys-apps/systemd/files/215-0001-always-check-for-__BYTE_ORDER-__BIG_ENDIAN-when-chec.patch b/sys-apps/systemd/files/215-0001-always-check-for-__BYTE_ORDER-__BIG_ENDIAN-when-chec.patch
new file mode 100644
index 000000000000..b29c10de0c93
--- /dev/null
+++ b/sys-apps/systemd/files/215-0001-always-check-for-__BYTE_ORDER-__BIG_ENDIAN-when-chec.patch
@@ -0,0 +1,116 @@
+From 28f6bb18cdea297164763db94e2366ca4857c9c7 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering
+Date: Fri, 11 Jul 2014 15:56:16 +0200
+Subject: [PATCH 1/2] always check for __BYTE_ORDER == __BIG_ENDIAN when
+ checking for endianess
+
+Let's always stick to glibc's way to determine byte order, and not mix
+autoconf-specific checks with gcc checks.
+---
+ src/shared/architecture.h | 12 ++++++------
+ src/shared/gpt.h | 4 ++--
+ src/shared/time-dst.c | 6 +++---
+ 3 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/src/shared/architecture.h b/src/shared/architecture.h
+index 4821d5d..58e97e5 100644
+--- a/src/shared/architecture.h
++++ b/src/shared/architecture.h
+@@ -80,7 +80,7 @@ Architecture uname_architecture(void);
+ # define native_architecture() ARCHITECTURE_X86
+ # define LIB_ARCH_TUPLE "i386-linux-gnu"
+ #elif defined(__powerpc64__)
+-# if defined(WORDS_BIGENDIAN)
++# if __BYTE_ORDER == __BIG_ENDIAN
+ # define native_architecture() ARCHITECTURE_PPC64
+ # define LIB_ARCH_TUPLE "ppc64-linux-gnu"
+ # else
+@@ -88,7 +88,7 @@ Architecture uname_architecture(void);
+ # error "Missing LIB_ARCH_TUPLE for PPC64LE"
+ # endif
+ #elif defined(__powerpc__)
+-# if defined(WORDS_BIGENDIAN)
++# if __BYTE_ORDER == __BIG_ENDIAN
+ # define native_architecture() ARCHITECTURE_PPC
+ # define LIB_ARCH_TUPLE "powerpc-linux-gnu"
+ # else
+@@ -117,7 +117,7 @@ Architecture uname_architecture(void);
+ # define native_architecture() ARCHITECTURE_SPARC
+ # define LIB_ARCH_TUPLE "sparc-linux-gnu"
+ #elif defined(__mips64__)
+-# if defined(WORDS_BIGENDIAN)
++# if __BYTE_ORDER == __BIG_ENDIAN
+ # define native_architecture() ARCHITECTURE_MIPS64
+ # error "Missing LIB_ARCH_TUPLE for MIPS64"
+ # else
+@@ -125,7 +125,7 @@ Architecture uname_architecture(void);
+ # error "Missing LIB_ARCH_TUPLE for MIPS64_LE"
+ # endif
+ #elif defined(__mips__)
+-# if defined(WORDS_BIGENDIAN)
++# if __BYTE_ORDER == __BIG_ENDIAN
+ # define native_architecture() ARCHITECTURE_MIPS
+ # define LIB_ARCH_TUPLE "mips-linux-gnu"
+ # else
+@@ -136,7 +136,7 @@ Architecture uname_architecture(void);
+ # define native_architecture() ARCHITECTURE_ALPHA
+ # define LIB_ARCH_TUPLE "alpha-linux-gnu"
+ #elif defined(__aarch64__)
+-# if defined(WORDS_BIGENDIAN)
++# if __BYTE_ORDER == __BIG_ENDIAN
+ # define native_architecture() ARCHITECTURE_ARM64_BE
+ # define LIB_ARCH_TUPLE "aarch64_be-linux-gnu"
+ # else
+@@ -144,7 +144,7 @@ Architecture uname_architecture(void);
+ # define LIB_ARCH_TUPLE "aarch64-linux-gnu"
+ # endif
+ #elif defined(__arm__)
+-# if defined(WORDS_BIGENDIAN)
++# if __BYTE_ORDER == __BIG_ENDIAN
+ # define native_architecture() ARCHITECTURE_ARM_BE
+ # if defined(__ARM_EABI__)
+ # if defined(__ARM_PCS_VFP)
+diff --git a/src/shared/gpt.h b/src/shared/gpt.h
+index 64090e0..278940b 100644
+--- a/src/shared/gpt.h
++++ b/src/shared/gpt.h
+@@ -42,10 +42,10 @@
+ # define GPT_ROOT_NATIVE GPT_ROOT_X86
+ #endif
+
+-#if defined(__aarch64__) && !defined(WORDS_BIGENDIAN)
++#if defined(__aarch64__) && (__BYTE_ORDER != __BIG_ENDIAN)
+ # define GPT_ROOT_NATIVE GPT_ROOT_ARM_64
+ # define GPT_ROOT_SECONDARY GPT_ROOT_ARM
+-#elif defined(__arm__) && !defined(WORDS_BIGENDIAN)
++#elif defined(__arm__) && (__BYTE_ORDER != __BIG_ENDIAN)
+ # define GPT_ROOT_NATIVE GPT_ROOT_ARM
+ #endif
+
+diff --git a/src/shared/time-dst.c b/src/shared/time-dst.c
+index ceca2fa..6195b11 100644
+--- a/src/shared/time-dst.c
++++ b/src/shared/time-dst.c
+@@ -207,8 +207,8 @@ read_again:
+ if (type_idxs[i] >= num_types)
+ return -EINVAL;
+
+- if (BYTE_ORDER == BIG_ENDIAN ? sizeof(time_t) == 8 && trans_width == 4
+- : sizeof(time_t) == 4 || trans_width == 4) {
++ if (__BYTE_ORDER == __BIG_ENDIAN ? sizeof(time_t) == 8 && trans_width == 4
++ : sizeof(time_t) == 4 || trans_width == 4) {
+ /* Decode the transition times, stored as 4-byte integers in
+ network (big-endian) byte order. We work from the end of
+ the array so as not to clobber the next element to be
+@@ -216,7 +216,7 @@ read_again:
+ i = num_transitions;
+ while (i-- > 0)
+ transitions[i] = decode((char *)transitions + i * 4);
+- } else if (BYTE_ORDER != BIG_ENDIAN && sizeof(time_t) == 8) {
++ } else if (__BYTE_ORDER != __BIG_ENDIAN && sizeof(time_t) == 8) {
+ /* Decode the transition times, stored as 8-byte integers in
+ network (big-endian) byte order. */
+ for (i = 0; i < num_transitions; ++i)
+--
+1.8.5.5
+
diff --git a/sys-apps/systemd/files/215-0002-endian-explicitly-include-endian.h-wherever-we-want-.patch b/sys-apps/systemd/files/215-0002-endian-explicitly-include-endian.h-wherever-we-want-.patch
new file mode 100644
index 000000000000..71acac1b00d7
--- /dev/null
+++ b/sys-apps/systemd/files/215-0002-endian-explicitly-include-endian.h-wherever-we-want-.patch
@@ -0,0 +1,53 @@
+From 2281422746c00d2803911f2b4699eee6bc87ee04 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering
+Date: Fri, 11 Jul 2014 16:13:13 +0200
+Subject: [PATCH 2/2] endian: explicitly include endian.h wherever we want to
+ use __BYTE_ORDER
+
+---
+ src/libsystemd/sd-bus/bus-protocol.h | 1 +
+ src/shared/architecture.h | 2 ++
+ src/shared/gpt.h | 2 ++
+ 3 files changed, 5 insertions(+)
+
+diff --git a/src/libsystemd/sd-bus/bus-protocol.h b/src/libsystemd/sd-bus/bus-protocol.h
+index 5046d17..4f46468 100644
+--- a/src/libsystemd/sd-bus/bus-protocol.h
++++ b/src/libsystemd/sd-bus/bus-protocol.h
+@@ -21,6 +21,7 @@
+ along with systemd; If not, see .
+ ***/
+
++#include
+
+ /* Endianness */
+
+diff --git a/src/shared/architecture.h b/src/shared/architecture.h
+index 58e97e5..38780d1 100644
+--- a/src/shared/architecture.h
++++ b/src/shared/architecture.h
+@@ -21,6 +21,8 @@
+ along with systemd; If not, see .
+ ***/
+
++#include
++
+ #include "util.h"
+
+ /* A cleaned up architecture definition. We don't want to get lost in
+diff --git a/src/shared/gpt.h b/src/shared/gpt.h
+index 278940b..ef3444f 100644
+--- a/src/shared/gpt.h
++++ b/src/shared/gpt.h
+@@ -19,6 +19,8 @@
+ along with systemd; If not, see .
+ ***/
+
++#include
++
+ #include "sd-id128.h"
+
+ /* We only support root disk discovery for x86, x86-64 and ARM for
+--
+1.8.5.5
+
diff --git a/sys-apps/systemd/systemd-208-r3.ebuild b/sys-apps/systemd/systemd-208-r3.ebuild
deleted file mode 100644
index 1656cf12418d..000000000000
--- a/sys-apps/systemd/systemd-208-r3.ebuild
+++ /dev/null
@@ -1,394 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-208-r3.ebuild,v 1.8 2014/06/24 22:17:59 mgorny Exp $
-
-EAPI=5
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
-inherit autotools-utils bash-completion-r1 fcaps linux-info multilib \
- multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \
- user
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz -> ${P}-r1.tar.xz
- http://dev.gentoo.org/~mgorny/dist/${PN}-gentoo-patchset-${PV}_p19.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/1"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection
- +kmod lzma pam policykit python qrcode selinux tcpd test
- vanilla xattr"
-
-MINKV="3.0"
-
-COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1
- >=sys-apps/util-linux-2.20
- sys-libs/libcap
- acl? ( sys-apps/acl )
- audit? ( >=sys-process/audit-2 )
- cryptsetup? ( >=sys-fs/cryptsetup-1.6 )
- gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0 )
- gudev? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
- http? ( net-libs/libmicrohttpd )
- introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
- kmod? ( >=sys-apps/kmod-14-r1 )
- lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
- pam? ( virtual/pam )
- python? ( ${PYTHON_DEPS} )
- qrcode? ( media-gfx/qrencode )
- selinux? ( sys-libs/libselinux )
- tcpd? ( sys-apps/tcp-wrappers )
- xattr? ( sys-apps/attr )
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
- >=sys-apps/baselayout-2.2
- || (
- >=sys-apps/util-linux-2.22
- =sys-apps/hwids-20130717-r1[udev]
- >=sys-fs/udev-init-scripts-25
- policykit? ( sys-auth/polkit )
- !vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
- app-arch/xz-utils
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=dev-util/intltool-0.50
- >=sys-devel/binutils-2.23.1
- >=sys-devel/gcc-4.6
- >=sys-kernel/linux-headers-${MINKV}
- ia64? ( >=sys-kernel/linux-headers-3.9 )
- virtual/pkgconfig
- doc? ( >=dev-util/gtk-doc-1.18 )"
-
-pkg_pretend() {
- local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~DMIID
- ~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS
- ~SECCOMP ~SIGNALFD ~SYSFS ~TIMERFD
- ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2
- ~!GRKERNSEC_PROC"
-
- use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
- use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
- use xattr && CONFIG_CHECK+=" ~TMPFS_XATTR"
- kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
- use firmware-loader || CONFIG_CHECK+=" ~!FW_LOADER_USER_HELPER"
-
- if linux_config_exists; then
- local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
- if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
- ewarn "It's recommended to set an empty value to the following kernel config option:"
- ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
- fi
- fi
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- if [[ $(gcc-major-version) -lt 4
- || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]]
- then
- eerror "systemd requires at least gcc 4.6 to build. Please switch the active"
- eerror "gcc version using gcc-config."
- die "systemd requires at least gcc 4.6"
- fi
- fi
-
- if [[ ${MERGE_TYPE} != buildonly ]]; then
- if kernel_is -lt ${MINKV//./ }; then
- ewarn "Kernel version at least ${MINKV} required"
- fi
-
- if ! use firmware-loader && kernel_is -lt 3 8; then
- ewarn "You seem to be using kernel older than 3.8. Those kernel versions"
- ewarn "require systemd with USE=firmware-loader to support loading"
- ewarn "firmware. Missing this flag may cause some hardware not to work."
- fi
-
- check_extra_config
- fi
-}
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- local PATCHES=(
- "${WORKDIR}"/${PN}-gentoo-patchset*/*.patch
- )
-
- # Bug 463376
- sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- # Keep using the one where the rules were installed.
- MY_UDEVDIR=$(get_udevdir)
- # Fix systems broken by bug #509454.
- [[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --localstatedir=/var
- --with-pamlibdir=$(getpam_mod_dir)
- # avoid bash-completion dep
- --with-bashcompletiondir="$(get_bashcompdir)"
- # make sure we get /bin:/sbin in $PATH
- --enable-split-usr
- # disable sysv compatibility
- --with-sysvinit-path=
- --with-sysvrcnd-path=
- # no deps
- --enable-efi
- --enable-ima
- # optional components/dependencies
- $(use_enable acl)
- $(use_enable audit)
- $(use_enable cryptsetup libcryptsetup)
- $(use_enable doc gtk-doc)
- $(use_enable gcrypt)
- $(use_enable gudev)
- $(use_enable http microhttpd)
- $(use_enable introspection)
- $(use_enable kmod)
- $(use_enable lzma xz)
- $(use_enable pam)
- $(use_enable policykit polkit)
- $(use_enable python python-devel)
- $(use python && echo PYTHON_CONFIG=/usr/bin/python-config-${EPYTHON#python})
- $(use_enable qrcode qrencode)
- $(use_enable selinux)
- $(use_enable tcpd tcpwrap)
- $(use_enable test tests)
- $(use_enable xattr)
-
- # not supported (avoid automagic deps in the future)
- --disable-chkconfig
-
- # hardcode a few paths to spare some deps
- QUOTAON=/usr/sbin/quotaon
- QUOTACHECK=/usr/sbin/quotacheck
- )
-
- if use firmware-loader; then
- myeconfargs+=(
- --with-firmware-path="/lib/firmware/updates:/lib/firmware"
- )
- fi
-
- if ! multilib_is_native_abi; then
- myeconfargs+=(
- ac_cv_search_cap_init=
- ac_cv_header_sys_capability_h=yes
- DBUS_CFLAGS=' '
- DBUS_LIBS=' '
-
- --disable-acl
- --disable-audit
- --disable-gcrypt
- --disable-gtk-doc
- --disable-introspection
- --disable-kmod
- --disable-libcryptsetup
- --disable-microhttpd
- --disable-pam
- --disable-polkit
- --disable-qrencode
- --disable-selinux
- --disable-tcpwrap
- --disable-tests
- --disable-xattr
- --disable-xz
- --disable-python-devel
- )
- fi
-
- # Work around bug 463846.
- tc-export CC
-
- autotools-utils_src_configure
-}
-
-multilib_src_compile() {
- local mymakeopts=(
- udevlibexecdir="${MY_UDEVDIR}"
- )
-
- if multilib_is_native_abi; then
- emake "${mymakeopts[@]}"
- else
- # prerequisites for gudev
- use gudev && emake src/gudev/gudev{enumtypes,marshal}.{c,h}
-
- echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \
- emake "${mymakeopts[@]}" -f Makefile -f - gentoo
- fi
-}
-
-multilib_src_test() {
- multilib_is_native_abi || continue
-
- default
-}
-
-multilib_src_install() {
- local mymakeopts=(
- # automake fails with parallel libtool relinking
- # https://bugs.gentoo.org/show_bug.cgi?id=491398
- -j1
-
- udevlibexecdir="${MY_UDEVDIR}"
- dist_udevhwdb_DATA=
- DESTDIR="${D}"
- )
-
- if multilib_is_native_abi; then
- emake "${mymakeopts[@]}" install
- else
- mymakeopts+=(
- install-libLTLIBRARIES
- install-pkgconfiglibDATA
- install-includeHEADERS
- # safe to call unconditionally, 'installs' empty list
- install-libgudev_includeHEADERS
- install-pkgincludeHEADERS
- )
-
- emake "${mymakeopts[@]}"
- fi
-}
-
-multilib_src_install_all() {
- prune_libtool_files --modules
- einstalldocs
-
- # we just keep sysvinit tools, so no need for the mans
- rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
- || die
- rm "${D}"/usr/share/man/man1/init.1 || die
-
- # Disable storing coredumps in journald, bug #433457
- mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die
-
- # Preserve empty dirs in /etc & /var, bug #437008
- keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
- /etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd
-
- # Symlink /etc/sysctl.conf for easy migration.
- dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
-}
-
-migrate_locale() {
- local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
- local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
- local locale_conf="${EROOT%/}/etc/locale.conf"
-
- if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
- # if locale.conf does not exist...
- if [[ -e ${envd_locale} ]]; then
- # ...either copy env.d/??locale if there's one
- ebegin "Moving ${envd_locale} to ${locale_conf}"
- mv "${envd_locale}" "${locale_conf}"
- eend ${?} || FAIL=1
- else
- # ...or create a dummy default
- ebegin "Creating ${locale_conf}"
- cat > "${locale_conf}" <<-EOF
- # This file has been created by the sys-apps/systemd ebuild.
- # See locale.conf(5) and localectl(1).
-
- # LANG=${LANG}
- EOF
- eend ${?} || FAIL=1
- fi
- fi
-
- if [[ ! -L ${envd_locale} ]]; then
- # now, if env.d/??locale is not a symlink (to locale.conf)...
- if [[ -e ${envd_locale} ]]; then
- # ...warn the user that he has duplicate locale settings
- ewarn
- ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
- ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
- ewarn "and create the symlink with the following command:"
- ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
- ewarn
- else
- # ...or just create the symlink if there's nothing here
- ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
- ln -n -s ../locale.conf "${envd_locale_def}"
- eend ${?} || FAIL=1
- fi
- fi
-}
-
-pkg_postinst() {
- enewgroup systemd-journal
- if use http; then
- enewgroup systemd-journal-gateway
- enewuser systemd-journal-gateway -1 -1 -1 systemd-journal-gateway
- fi
- systemd_update_catalog
-
- # Keep this here in case the database format changes so it gets updated
- # when required. Despite that this file is owned by sys-apps/hwids.
- if has_version "sys-apps/hwids[udev]"; then
- udevadm hwdb --update --root="${ROOT%/}"
- fi
-
- udev_reload || FAIL=1
-
- # Bug 468876
- fcaps cap_dac_override,cap_sys_ptrace=ep usr/bin/systemd-detect-virt
-
- # Bug 465468, make sure locales are respect, and ensure consistency
- # between OpenRC & systemd
- migrate_locale
-
- if [[ ${FAIL} ]]; then
- eerror "One of the postinst commands failed. Please check the postinst output"
- eerror "for errors. You may need to clean up your system and/or try installing"
- eerror "systemd again."
- eerror
- fi
-
- if [[ ! -L "${ROOT}"/etc/mtab ]]; then
- ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts."
- ewarn "Not having it is not supported by upstream and will cause tools like 'df'"
- ewarn "and 'mount' to not work properly. Please run:"
- ewarn " # ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
- ewarn
- fi
-
- if ! has_version sys-apps/systemd-ui; then
- elog "To get additional features, a number of optional runtime dependencies may"
- elog "be installed:"
- elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent"
- fi
-}
-
-pkg_prerm() {
- # If removing systemd completely, remove the catalog database.
- if [[ ! ${REPLACED_BY_VERSION} ]]; then
- rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
- fi
-}
diff --git a/sys-apps/systemd/systemd-214.ebuild b/sys-apps/systemd/systemd-214.ebuild
deleted file mode 100644
index 5dc15e1a1cee..000000000000
--- a/sys-apps/systemd/systemd-214.ebuild
+++ /dev/null
@@ -1,461 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-214.ebuild,v 1.3 2014/06/24 22:17:59 mgorny Exp $
-
-EAPI=5
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
-inherit autotools-utils bash-completion-r1 fcaps linux-info multilib \
- multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \
- user
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection
- kdbus +kmod lzma pam policykit python qrcode +seccomp selinux ssl
- test vanilla"
-
-MINKV="3.10"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.20:0=
- sys-libs/libcap:0=
- acl? ( sys-apps/acl:0= )
- audit? ( >=sys-process/audit-2:0= )
- cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
- gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0= )
- gudev? ( >=dev-libs/glib-2.34.3:2=[${MULTILIB_USEDEP}] )
- http? (
- >=net-libs/libmicrohttpd-0.9.33:0=
- ssl? ( >=net-libs/gnutls-3.1.4:0= )
- )
- introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
- pam? ( virtual/pam:= )
- python? ( ${PYTHON_DEPS} )
- qrcode? ( media-gfx/qrencode:0= )
- seccomp? ( sys-libs/libseccomp:0= )
- selinux? ( sys-libs/libselinux:0= )
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
- >=sys-apps/baselayout-2.2
- || (
- >=sys-apps/util-linux-2.22
- =sys-apps/dbus-1.6.8-r1:0
- >=sys-apps/hwids-20130717-r1[udev]
- >=sys-fs/udev-init-scripts-25
- policykit? ( sys-auth/polkit )
- !vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
- app-arch/xz-utils:0
- dev-util/gperf
- >=dev-util/intltool-0.50
- >=sys-devel/binutils-2.23.1
- >=sys-devel/gcc-4.6
- >=sys-kernel/linux-headers-${MINKV}
- ia64? ( >=sys-kernel/linux-headers-3.9 )
- virtual/pkgconfig
- doc? ( >=dev-util/gtk-doc-1.18 )
- python? ( dev-python/lxml[${PYTHON_USEDEP}] )
- test? ( >=sys-apps/dbus-1.6.8-r1:0 )"
-
-src_prepare() {
- # Bug 463376
- sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
-
- autotools-utils_src_prepare
-}
-
-pkg_pretend() {
- local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~DMIID
- ~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS
- ~SECCOMP ~SIGNALFD ~SYSFS ~TIMERFD ~TMPFS_XATTR
- ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2
- ~!GRKERNSEC_PROC"
-
- use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
- kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
- use firmware-loader || CONFIG_CHECK+=" ~!FW_LOADER_USER_HELPER"
-
- if linux_config_exists; then
- local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
- if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
- ewarn "It's recommended to set an empty value to the following kernel config option:"
- ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
- fi
- fi
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- if [[ $(gcc-major-version) -lt 4
- || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]]
- then
- eerror "systemd requires at least gcc 4.6 to build. Please switch the active"
- eerror "gcc version using gcc-config."
- die "systemd requires at least gcc 4.6"
- fi
- fi
-
- if [[ ${MERGE_TYPE} != buildonly ]]; then
- if kernel_is -lt ${MINKV//./ }; then
- ewarn "Kernel version at least ${MINKV} required"
- fi
-
- if ! use firmware-loader && kernel_is -lt 3 8; then
- ewarn "You seem to be using kernel older than 3.8. Those kernel versions"
- ewarn "require systemd with USE=firmware-loader to support loading"
- ewarn "firmware. Missing this flag may cause some hardware not to work."
- fi
-
- check_extra_config
- fi
-}
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- # Keep using the one where the rules were installed.
- MY_UDEVDIR=$(get_udevdir)
- # Fix systems broken by bug #509454.
- [[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- # disable -flto since it is an optimization flag
- # and makes distcc less effective
- cc_cv_CFLAGS__flto=no
-
- --disable-maintainer-mode
- --localstatedir=/var
- --with-pamlibdir=$(getpam_mod_dir)
- # avoid bash-completion dep
- --with-bashcompletiondir="$(get_bashcompdir)"
- # make sure we get /bin:/sbin in $PATH
- --enable-split-usr
- # disable sysv compatibility
- --with-sysvinit-path=
- --with-sysvrcnd-path=
- # no deps
- --enable-efi
- --enable-ima
- # optional components/dependencies
- $(use_enable acl)
- $(use_enable audit)
- $(use_enable cryptsetup libcryptsetup)
- $(use_enable doc gtk-doc)
- $(use_enable gcrypt)
- $(use_enable gudev)
- $(use_enable http microhttpd)
- $(usex http $(use_enable ssl gnutls) --disable-gnutls)
- $(use_enable introspection)
- $(use_enable kdbus)
- $(use_enable kmod)
- $(use_enable lzma xz)
- $(use_enable pam)
- $(use_enable policykit polkit)
- $(use_with python)
- $(use_enable python python-devel)
- $(use_enable qrcode qrencode)
- $(use_enable seccomp)
- $(use_enable selinux)
- $(use_enable test tests)
-
- # not supported (avoid automagic deps in the future)
- --disable-chkconfig
-
- # hardcode a few paths to spare some deps
- QUOTAON=/usr/sbin/quotaon
- QUOTACHECK=/usr/sbin/quotacheck
-
- # dbus paths
- --with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d"
- --with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services"
- --with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services"
- --with-dbusinterfacedir="${EPREFIX}/usr/share/dbus-1/interfaces"
-
- --with-ntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
- )
-
- if use firmware-loader; then
- myeconfargs+=(
- --with-firmware-path="/lib/firmware/updates:/lib/firmware"
- )
- fi
-
- # Added for testing; this is UNSUPPORTED by the Gentoo systemd team!
- if [[ -n ${ROOTPREFIX+set} ]]; then
- myeconfargs+=(
- --with-rootprefix="${ROOTPREFIX}"
- --with-rootlibdir="${ROOTPREFIX}/$(get_libdir)"
- )
- fi
-
- if ! multilib_is_native_abi; then
- myeconfargs+=(
- ac_cv_search_cap_init=
- ac_cv_header_sys_capability_h=yes
- DBUS_CFLAGS=' '
- DBUS_LIBS=' '
-
- --disable-acl
- --disable-audit
- --disable-gcrypt
- --disable-gnutls
- --disable-gtk-doc
- --disable-introspection
- --disable-kmod
- --disable-libcryptsetup
- --disable-microhttpd
- --disable-networkd
- --disable-pam
- --disable-polkit
- --disable-qrencode
- --disable-seccomp
- --disable-selinux
- --disable-timesyncd
- --disable-tests
- --disable-xz
- --disable-python-devel
- )
- fi
-
- # Work around bug 463846.
- tc-export CC
-
- autotools-utils_src_configure
-}
-
-multilib_src_compile() {
- local mymakeopts=(
- udevlibexecdir="${MY_UDEVDIR}"
- )
-
- if multilib_is_native_abi; then
- emake "${mymakeopts[@]}"
- else
- # prerequisites for gudev
- use gudev && emake src/gudev/gudev{enumtypes,marshal}.{c,h}
-
- echo 'gentoo: $(BUILT_SOURCES)' | \
- emake "${mymakeopts[@]}" -f Makefile -f - gentoo
- echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \
- emake "${mymakeopts[@]}" -f Makefile -f - gentoo
- fi
-}
-
-multilib_src_test() {
- multilib_is_native_abi || continue
-
- default
-}
-
-multilib_src_install() {
- local mymakeopts=(
- # automake fails with parallel libtool relinking
- # https://bugs.gentoo.org/show_bug.cgi?id=491398
- -j1
-
- udevlibexecdir="${MY_UDEVDIR}"
- dist_udevhwdb_DATA=
- DESTDIR="${D}"
- )
-
- if multilib_is_native_abi; then
- emake "${mymakeopts[@]}" install
- # Even with --enable-networkd, it's not right to have this running by default
- # when it's unconfigured.
- rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service
- else
- mymakeopts+=(
- install-libLTLIBRARIES
- install-pkgconfiglibDATA
- install-includeHEADERS
- # safe to call unconditionally, 'installs' empty list
- install-libgudev_includeHEADERS
- install-pkgincludeHEADERS
- )
-
- emake "${mymakeopts[@]}"
- fi
-
- # install compat pkg-config files
- local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc )
- emake "${mymakeopts[@]}" install-pkgconfiglibDATA \
- pkgconfiglib_DATA="${pcfiles[*]}"
-}
-
-multilib_src_install_all() {
- prune_libtool_files --modules
- einstalldocs
-
- # we just keep sysvinit tools, so no need for the mans
- rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
- || die
- rm "${D}"/usr/share/man/man1/init.1 || die
-
- # Disable storing coredumps in journald, bug #433457
- mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die
-
- # Preserve empty dirs in /etc & /var, bug #437008
- keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
- /etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd
-
- # Symlink /etc/sysctl.conf for easy migration.
- dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
-}
-
-migrate_locale() {
- local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
- local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
- local locale_conf="${EROOT%/}/etc/locale.conf"
-
- if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
- # If locale.conf does not exist...
- if [[ -e ${envd_locale} ]]; then
- # ...either copy env.d/??locale if there's one
- ebegin "Moving ${envd_locale} to ${locale_conf}"
- mv "${envd_locale}" "${locale_conf}"
- eend ${?} || FAIL=1
- else
- # ...or create a dummy default
- ebegin "Creating ${locale_conf}"
- cat > "${locale_conf}" <<-EOF
- # This file has been created by the sys-apps/systemd ebuild.
- # See locale.conf(5) and localectl(1).
-
- # LANG=${LANG}
- EOF
- eend ${?} || FAIL=1
- fi
- fi
-
- if [[ ! -L ${envd_locale} ]]; then
- # now, if env.d/??locale is not a symlink (to locale.conf)...
- if [[ -e ${envd_locale} ]]; then
- # ...warn the user that he has duplicate locale settings
- ewarn
- ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
- ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
- ewarn "and create the symlink with the following command:"
- ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
- ewarn
- else
- # ...or just create the symlink if there's nothing here
- ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
- ln -n -s ../locale.conf "${envd_locale_def}"
- eend ${?} || FAIL=1
- fi
- fi
-}
-
-migrate_net_name_slot() {
- # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
- # do the same for 80-net-setup-link.rules to keep the old behavior
- local net_move=no
- local net_name_slot_sym=no
- local net_rules_path="${EROOT%/}"/etc/udev/rules.d
- local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
- local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
- if [[ -e ${net_setup_link} ]]; then
- net_move=no
- elif [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]]; then
- net_move=yes
- elif [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
- net_move=yes
- net_name_slot_sym=yes
- fi
- if [[ ${net_move} == yes ]]; then
- ebegin "Copying ${net_name_slot} to ${net_setup_link}"
-
- if [[ ${net_name_slot_sym} == yes ]]; then
- ln -nfs /dev/null "${net_setup_link}"
- else
- cp "${net_name_slot}" "${net_setup_link}"
- fi
- eend $? || FAIL=1
- fi
-}
-
-pkg_postinst() {
- newusergroup() {
- enewgroup "$1"
- enewuser "$1" -1 -1 -1 "$1"
- }
-
- enewgroup systemd-journal
- newusergroup systemd-bus-proxy
- newusergroup systemd-network
- newusergroup systemd-resolve
- newusergroup systemd-timesync
- use http && newusergroup systemd-journal-gateway
-
- systemd_update_catalog
-
- # Keep this here in case the database format changes so it gets updated
- # when required. Despite that this file is owned by sys-apps/hwids.
- if has_version "sys-apps/hwids[udev]"; then
- udevadm hwdb --update --root="${ROOT%/}"
- fi
-
- udev_reload || FAIL=1
-
- # Bug 468876
- fcaps cap_dac_override,cap_sys_ptrace=ep usr/bin/systemd-detect-virt
-
- # Bug 465468, make sure locales are respect, and ensure consistency
- # between OpenRC & systemd
- migrate_locale
-
- # Migrate 80-net-name-slot.rules -> 80-net-setup-link.rules
- migrate_net_name_slot
-
- if [[ ${FAIL} ]]; then
- eerror "One of the postinst commands failed. Please check the postinst output"
- eerror "for errors. You may need to clean up your system and/or try installing"
- eerror "systemd again."
- eerror
- fi
-
- if [[ ! -L "${ROOT}"/etc/mtab ]]; then
- ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts."
- ewarn "Not having it is not supported by upstream and will cause tools like 'df'"
- ewarn "and 'mount' to not work properly. Please run:"
- ewarn " # ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
- ewarn
- fi
-
- if ! has_version sys-apps/systemd-ui; then
- elog "To get additional features, a number of optional runtime dependencies may"
- elog "be installed:"
- elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent"
- fi
-}
-
-pkg_prerm() {
- # If removing systemd completely, remove the catalog database.
- if [[ ! ${REPLACED_BY_VERSION} ]]; then
- rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
- fi
-}
diff --git a/sys-apps/systemd/systemd-214_p57.ebuild b/sys-apps/systemd/systemd-214_p57.ebuild
deleted file mode 100644
index 6f458b4619b9..000000000000
--- a/sys-apps/systemd/systemd-214_p57.ebuild
+++ /dev/null
@@ -1,468 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-214_p57.ebuild,v 1.1 2014/07/04 03:10:20 floppym Exp $
-
-EAPI=5
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
-inherit autotools-utils bash-completion-r1 fcaps linux-info multilib \
- multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \
- user
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-MY_P=${P%_p*}
-SRC_URI="http://www.freedesktop.org/software/systemd/${MY_P}.tar.xz
- http://dev.gentoo.org/~floppym/dist/systemd-stable-${PV}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection
- kdbus +kmod lzma pam policykit python qrcode +seccomp selinux ssl
- test vanilla"
-
-MINKV="3.10"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.20:0=
- sys-libs/libcap:0=
- acl? ( sys-apps/acl:0= )
- audit? ( >=sys-process/audit-2:0= )
- cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
- gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0= )
- gudev? ( >=dev-libs/glib-2.34.3:2=[${MULTILIB_USEDEP}] )
- http? (
- >=net-libs/libmicrohttpd-0.9.33:0=
- ssl? ( >=net-libs/gnutls-3.1.4:0= )
- )
- introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
- pam? ( virtual/pam:= )
- python? ( ${PYTHON_DEPS} )
- qrcode? ( media-gfx/qrencode:0= )
- seccomp? ( sys-libs/libseccomp:0= )
- selinux? ( sys-libs/libselinux:0= )
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
- >=sys-apps/baselayout-2.2
- || (
- >=sys-apps/util-linux-2.22
- =sys-apps/dbus-1.6.8-r1:0
- >=sys-apps/hwids-20130717-r1[udev]
- >=sys-fs/udev-init-scripts-25
- policykit? ( sys-auth/polkit )
- !vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
- app-arch/xz-utils:0
- dev-util/gperf
- >=dev-util/intltool-0.50
- >=sys-devel/binutils-2.23.1
- >=sys-devel/gcc-4.6
- >=sys-kernel/linux-headers-${MINKV}
- ia64? ( >=sys-kernel/linux-headers-3.9 )
- virtual/pkgconfig
- doc? ( >=dev-util/gtk-doc-1.18 )
- python? ( dev-python/lxml[${PYTHON_USEDEP}] )
- test? ( >=sys-apps/dbus-1.6.8-r1:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- # Bug 463376
- sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
-
- EPATCH_FORCE=yes EPATCH_SUFFIX=patch epatch "${WORKDIR}/patches"
-
- autotools-utils_src_prepare
-}
-
-pkg_pretend() {
- local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~DMIID
- ~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS
- ~SECCOMP ~SIGNALFD ~SYSFS ~TIMERFD ~TMPFS_XATTR
- ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2
- ~!GRKERNSEC_PROC"
-
- use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
- kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
- use firmware-loader || CONFIG_CHECK+=" ~!FW_LOADER_USER_HELPER"
-
- if linux_config_exists; then
- local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
- if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
- ewarn "It's recommended to set an empty value to the following kernel config option:"
- ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
- fi
- fi
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- if [[ $(gcc-major-version) -lt 4
- || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]]
- then
- eerror "systemd requires at least gcc 4.6 to build. Please switch the active"
- eerror "gcc version using gcc-config."
- die "systemd requires at least gcc 4.6"
- fi
- fi
-
- if [[ ${MERGE_TYPE} != buildonly ]]; then
- if kernel_is -lt ${MINKV//./ }; then
- ewarn "Kernel version at least ${MINKV} required"
- fi
-
- if ! use firmware-loader && kernel_is -lt 3 8; then
- ewarn "You seem to be using kernel older than 3.8. Those kernel versions"
- ewarn "require systemd with USE=firmware-loader to support loading"
- ewarn "firmware. Missing this flag may cause some hardware not to work."
- fi
-
- check_extra_config
- fi
-}
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- # Keep using the one where the rules were installed.
- MY_UDEVDIR=$(get_udevdir)
- # Fix systems broken by bug #509454.
- [[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- # disable -flto since it is an optimization flag
- # and makes distcc less effective
- cc_cv_CFLAGS__flto=no
-
- --disable-maintainer-mode
- --localstatedir=/var
- --with-pamlibdir=$(getpam_mod_dir)
- # avoid bash-completion dep
- --with-bashcompletiondir="$(get_bashcompdir)"
- # make sure we get /bin:/sbin in $PATH
- --enable-split-usr
- # disable sysv compatibility
- --with-sysvinit-path=
- --with-sysvrcnd-path=
- # no deps
- --enable-efi
- --enable-ima
- # optional components/dependencies
- $(use_enable acl)
- $(use_enable audit)
- $(use_enable cryptsetup libcryptsetup)
- $(use_enable doc gtk-doc)
- $(use_enable gcrypt)
- $(use_enable gudev)
- $(use_enable http microhttpd)
- $(usex http $(use_enable ssl gnutls) --disable-gnutls)
- $(use_enable introspection)
- $(use_enable kdbus)
- $(use_enable kmod)
- $(use_enable lzma xz)
- $(use_enable pam)
- $(use_enable policykit polkit)
- $(use_with python)
- $(use_enable python python-devel)
- $(use_enable qrcode qrencode)
- $(use_enable seccomp)
- $(use_enable selinux)
- $(use_enable test tests)
-
- # not supported (avoid automagic deps in the future)
- --disable-chkconfig
-
- # hardcode a few paths to spare some deps
- QUOTAON=/usr/sbin/quotaon
- QUOTACHECK=/usr/sbin/quotacheck
-
- # dbus paths
- --with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d"
- --with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services"
- --with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services"
- --with-dbusinterfacedir="${EPREFIX}/usr/share/dbus-1/interfaces"
-
- --with-ntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
- )
-
- if use firmware-loader; then
- myeconfargs+=(
- --with-firmware-path="/lib/firmware/updates:/lib/firmware"
- )
- fi
-
- # Added for testing; this is UNSUPPORTED by the Gentoo systemd team!
- if [[ -n ${ROOTPREFIX+set} ]]; then
- myeconfargs+=(
- --with-rootprefix="${ROOTPREFIX}"
- --with-rootlibdir="${ROOTPREFIX}/$(get_libdir)"
- )
- fi
-
- if ! multilib_is_native_abi; then
- myeconfargs+=(
- ac_cv_search_cap_init=
- ac_cv_header_sys_capability_h=yes
- DBUS_CFLAGS=' '
- DBUS_LIBS=' '
-
- --disable-acl
- --disable-audit
- --disable-gcrypt
- --disable-gnutls
- --disable-gtk-doc
- --disable-introspection
- --disable-kmod
- --disable-libcryptsetup
- --disable-microhttpd
- --disable-networkd
- --disable-pam
- --disable-polkit
- --disable-qrencode
- --disable-seccomp
- --disable-selinux
- --disable-timesyncd
- --disable-tests
- --disable-xz
- --disable-python-devel
- )
- fi
-
- # Work around bug 463846.
- tc-export CC
-
- autotools-utils_src_configure
-}
-
-multilib_src_compile() {
- local mymakeopts=(
- udevlibexecdir="${MY_UDEVDIR}"
- )
-
- if multilib_is_native_abi; then
- emake "${mymakeopts[@]}"
- else
- # prerequisites for gudev
- use gudev && emake src/gudev/gudev{enumtypes,marshal}.{c,h}
-
- echo 'gentoo: $(BUILT_SOURCES)' | \
- emake "${mymakeopts[@]}" -f Makefile -f - gentoo
- echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \
- emake "${mymakeopts[@]}" -f Makefile -f - gentoo
- fi
-}
-
-multilib_src_test() {
- multilib_is_native_abi || continue
-
- default
-}
-
-multilib_src_install() {
- local mymakeopts=(
- # automake fails with parallel libtool relinking
- # https://bugs.gentoo.org/show_bug.cgi?id=491398
- -j1
-
- udevlibexecdir="${MY_UDEVDIR}"
- dist_udevhwdb_DATA=
- DESTDIR="${D}"
- )
-
- if multilib_is_native_abi; then
- emake "${mymakeopts[@]}" install
- # Even with --enable-networkd, it's not right to have this running by default
- # when it's unconfigured.
- rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service
- else
- mymakeopts+=(
- install-libLTLIBRARIES
- install-pkgconfiglibDATA
- install-includeHEADERS
- # safe to call unconditionally, 'installs' empty list
- install-libgudev_includeHEADERS
- install-pkgincludeHEADERS
- )
-
- emake "${mymakeopts[@]}"
- fi
-
- # install compat pkg-config files
- local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc )
- emake "${mymakeopts[@]}" install-pkgconfiglibDATA \
- pkgconfiglib_DATA="${pcfiles[*]}"
-}
-
-multilib_src_install_all() {
- prune_libtool_files --modules
- einstalldocs
-
- # we just keep sysvinit tools, so no need for the mans
- rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
- || die
- rm "${D}"/usr/share/man/man1/init.1 || die
-
- # Disable storing coredumps in journald, bug #433457
- mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die
-
- # Preserve empty dirs in /etc & /var, bug #437008
- keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
- /etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd
-
- # Symlink /etc/sysctl.conf for easy migration.
- dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
-}
-
-migrate_locale() {
- local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
- local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
- local locale_conf="${EROOT%/}/etc/locale.conf"
-
- if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
- # If locale.conf does not exist...
- if [[ -e ${envd_locale} ]]; then
- # ...either copy env.d/??locale if there's one
- ebegin "Moving ${envd_locale} to ${locale_conf}"
- mv "${envd_locale}" "${locale_conf}"
- eend ${?} || FAIL=1
- else
- # ...or create a dummy default
- ebegin "Creating ${locale_conf}"
- cat > "${locale_conf}" <<-EOF
- # This file has been created by the sys-apps/systemd ebuild.
- # See locale.conf(5) and localectl(1).
-
- # LANG=${LANG}
- EOF
- eend ${?} || FAIL=1
- fi
- fi
-
- if [[ ! -L ${envd_locale} ]]; then
- # now, if env.d/??locale is not a symlink (to locale.conf)...
- if [[ -e ${envd_locale} ]]; then
- # ...warn the user that he has duplicate locale settings
- ewarn
- ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
- ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
- ewarn "and create the symlink with the following command:"
- ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
- ewarn
- else
- # ...or just create the symlink if there's nothing here
- ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
- ln -n -s ../locale.conf "${envd_locale_def}"
- eend ${?} || FAIL=1
- fi
- fi
-}
-
-migrate_net_name_slot() {
- # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
- # do the same for 80-net-setup-link.rules to keep the old behavior
- local net_move=no
- local net_name_slot_sym=no
- local net_rules_path="${EROOT%/}"/etc/udev/rules.d
- local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
- local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
- if [[ -e ${net_setup_link} ]]; then
- net_move=no
- elif [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]]; then
- net_move=yes
- elif [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
- net_move=yes
- net_name_slot_sym=yes
- fi
- if [[ ${net_move} == yes ]]; then
- ebegin "Copying ${net_name_slot} to ${net_setup_link}"
-
- if [[ ${net_name_slot_sym} == yes ]]; then
- ln -nfs /dev/null "${net_setup_link}"
- else
- cp "${net_name_slot}" "${net_setup_link}"
- fi
- eend $? || FAIL=1
- fi
-}
-
-pkg_postinst() {
- newusergroup() {
- enewgroup "$1"
- enewuser "$1" -1 -1 -1 "$1"
- }
-
- enewgroup input
- enewgroup systemd-journal
- newusergroup systemd-bus-proxy
- newusergroup systemd-network
- newusergroup systemd-resolve
- newusergroup systemd-timesync
- use http && newusergroup systemd-journal-gateway
-
- systemd_update_catalog
-
- # Keep this here in case the database format changes so it gets updated
- # when required. Despite that this file is owned by sys-apps/hwids.
- if has_version "sys-apps/hwids[udev]"; then
- udevadm hwdb --update --root="${ROOT%/}"
- fi
-
- udev_reload || FAIL=1
-
- # Bug 468876
- fcaps cap_dac_override,cap_sys_ptrace=ep usr/bin/systemd-detect-virt
-
- # Bug 465468, make sure locales are respect, and ensure consistency
- # between OpenRC & systemd
- migrate_locale
-
- # Migrate 80-net-name-slot.rules -> 80-net-setup-link.rules
- migrate_net_name_slot
-
- if [[ ${FAIL} ]]; then
- eerror "One of the postinst commands failed. Please check the postinst output"
- eerror "for errors. You may need to clean up your system and/or try installing"
- eerror "systemd again."
- eerror
- fi
-
- if [[ ! -L "${ROOT}"/etc/mtab ]]; then
- ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts."
- ewarn "Not having it is not supported by upstream and will cause tools like 'df'"
- ewarn "and 'mount' to not work properly. Please run:"
- ewarn " # ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
- ewarn
- fi
-
- if ! has_version sys-apps/systemd-ui; then
- elog "To get additional features, a number of optional runtime dependencies may"
- elog "be installed:"
- elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent"
- fi
-}
-
-pkg_prerm() {
- # If removing systemd completely, remove the catalog database.
- if [[ ! ${REPLACED_BY_VERSION} ]]; then
- rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
- fi
-}
diff --git a/sys-apps/systemd/systemd-215-r1.ebuild b/sys-apps/systemd/systemd-215-r1.ebuild
index 1eccc1c3a344..bb4a31b61bd6 100644
--- a/sys-apps/systemd/systemd-215-r1.ebuild
+++ b/sys-apps/systemd/systemd-215-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/systemd/systemd-215-r1.ebuild,v 1.4 2014/07/15 10:01:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-215-r1.ebuild,v 1.5 2014/07/15 18:30:40 pacho Exp $
EAPI=5
@@ -79,6 +79,11 @@ DEPEND="${COMMON_DEPEND}
test? ( >=sys-apps/dbus-1.6.8-r1:0 )"
src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/${PV}-0001-always-check-for-__BYTE_ORDER-__BIG_ENDIAN-when-chec.patch"
+ "${FILESDIR}/${PV}-0002-endian-explicitly-include-endian.h-wherever-we-want-.patch"
+ )
+
# Bug 463376
sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
diff --git a/sys-block/megactl/files/megactl-0.4.1-gcc-fixes.patch b/sys-block/megactl/files/megactl-0.4.1-gcc-fixes.patch
new file mode 100644
index 000000000000..7ea6e8cac453
--- /dev/null
+++ b/sys-block/megactl/files/megactl-0.4.1-gcc-fixes.patch
@@ -0,0 +1,46 @@
+diff -Nuar --exclude '*.swp' --exclude '*.o' megactl-0.4.1.orig/src/callinfo.c megactl-0.4.1/src/callinfo.c
+--- megactl-0.4.1.orig/src/callinfo.c 2007-08-21 00:19:53.000000000 -0700
++++ megactl-0.4.1/src/callinfo.c 2014-07-13 22:05:06.585598812 -0700
+@@ -255,7 +255,12 @@
+ { SYS_setfsgid32, 0, "setfsgid32" },
+ { SYS_pivot_root, 0, "pivot_root" },
+ { SYS_mincore, 0, "mincore" },
++#ifdef SYS_madvise
++ { SYS_madvise, 0, "madvise" },
++#endif
++#ifdef SYS_madvise1
+ { SYS_madvise1, 0, "madvise1" },
++#endif
+ { SYS_getdents64, 0, "getdents64" },
+ { SYS_fcntl64, 0, "fcntl64" },
+ { 222, 0, NULL },
+diff -Nuar --exclude '*.swp' --exclude '*.o' megactl-0.4.1.orig/src/logpage.c megactl-0.4.1/src/logpage.c
+--- megactl-0.4.1.orig/src/logpage.c 2007-08-21 00:19:53.000000000 -0700
++++ megactl-0.4.1/src/logpage.c 2014-07-13 21:58:34.010848677 -0700
+@@ -20,6 +20,8 @@
+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
++#define __STDC_FORMAT_MACROS
++#include
+
+ #include "megaioctl.h"
+ #include "logpage.h"
+@@ -107,7 +109,7 @@
+
+ for (k = 0; (b >= 1024) && (k < sizeof (suffix) / sizeof (suffix[0]) - 1); ++k, b /= 1024)
+ ;
+- snprintf (bytes, sizeof bytes, "%3llu%s%s", b, suffix[k], unit);
++ snprintf (bytes, sizeof bytes, "%3" PRIu64 "%s%s", b, suffix[k], unit);
+ return bytes;
+ }
+
+@@ -378,7 +380,7 @@
+ default: result = "unknown result"; notice = 0; break;
+ }
+ if (verbosity > notice)
+- fprintf (f, " %2d: timestamp %4ud%02uh: %10s %-30s seg:%u lba:%-8lld sk:%u asc:%u ascq:%u vs:%u\n", k, t->timestamp / 24, t->timestamp % 24, test, result, t->number, t->lba, t->sense_key, t->additional_sense_code, t->additional_sense_code_qualifier, t->vendor_specific);
++ fprintf (f, " %2d: timestamp %4ud%02uh: %10s %-30s seg:%u lba:%-8"PRIu64" sk:%u asc:%u ascq:%u vs:%u\n", k, t->timestamp / 24, t->timestamp % 24, test, result, t->number, t->lba, t->sense_key, t->additional_sense_code, t->additional_sense_code_qualifier, t->vendor_specific);
+ }
+ }
+ break;
diff --git a/sys-block/megactl/files/megactl-0.4.1-tracefix.patch b/sys-block/megactl/files/megactl-0.4.1-tracefix.patch
new file mode 100644
index 000000000000..915cc2d2a20d
--- /dev/null
+++ b/sys-block/megactl/files/megactl-0.4.1-tracefix.patch
@@ -0,0 +1,232 @@
+diff -Nuar megactl-0.4.1.orig/src/megactl.c megactl-0.4.1/src/megactl.c
+--- megactl-0.4.1.orig/src/megactl.c 2007-08-21 00:19:53.000000000 -0700
++++ megactl-0.4.1/src/megactl.c 2014-07-14 11:15:14.538745305 -0700
+@@ -45,6 +45,9 @@
+
+ ********************************************************************/
+
++#define __STDC_FORMAT_MACROS
++#include
++
+ #include "mega.h"
+ #include "megaioctl.h"
+ #include "adapter.h"
+@@ -207,7 +210,7 @@
+
+ for (k = 0; (b >= 1024) && (k < sizeof (suffix) / sizeof (suffix[0]) - 1); ++k, b /= 1024)
+ ;
+- snprintf (bytes, sizeof bytes, "%3llu%s%s", b, suffix[k], unit);
++ snprintf (bytes, sizeof bytes, "%3"PRIu64"%s%s", b, suffix[k], unit);
+ return bytes;
+ }
+
+@@ -604,6 +607,8 @@
+ fprintf (stderr, "megaraid driver version %x too old.\n", driverVersion);
+ return 1;
+ }
++#else
++ driverVersion = 0;
+ #endif
+
+ if (megaGetNumAdapters (fd, &numAdapters, sas) < 0)
+diff -Nuar megactl-0.4.1.orig/src/megaioctl.c megactl-0.4.1/src/megaioctl.c
+--- megactl-0.4.1.orig/src/megaioctl.c 2014-07-14 11:30:03.590781305 -0700
++++ megactl-0.4.1/src/megaioctl.c 2014-07-14 11:31:36.410258930 -0700
+@@ -87,7 +87,11 @@
+ m->cmd = cmd;
+ m->opcode = opcode;
+ m->subopcode = subopcode;
++#ifdef __x86_64__
++ m->xferaddr = (uint64_t) data;
++#else
+ m->xferaddr = (uint32_t) data;
++#endif
+ if (data)
+ memset (data, 0, len);
+
+@@ -115,7 +119,11 @@
+ m->cmd = cmd;
+ m->opcode = opcode;
+ m->subopcode = subopcode;
++#ifdef __x86_64__
++ m->xferaddr = (uint64_t) data;
++#else
+ m->xferaddr = (uint32_t) data;
++#endif
+ if (data)
+ memset (data, 0, len);
+
+@@ -178,11 +186,19 @@
+ u.ui.fcs.adapno = MKADAP(adapter->adapno);
+ u.data = data;
+ m->cmd = MBOXCMD_PASSTHRU;
++#ifdef __x86_64__
++ m->xferaddr = (uint64_t) p;
++#else
+ m->xferaddr = (uint32_t) p;
++#endif
+ p->timeout = 3;
+ p->ars = 1;
+ p->target = target;
+- p->dataxferaddr = (uint32_t) data;
++#ifdef __x86_64__
++ p->dataxferaddr = (uint64_t) data;
++#else
++ p->dataxferaddr = (uint32_t) data;
++#endif
+ p->dataxferlen = len;
+ p->scsistatus = 239; /* HMMM */
+ memcpy (p->cdb, cdb, cdblen);
+diff -Nuar megactl-0.4.1.orig/src/megatrace.c megactl-0.4.1/src/megatrace.c
+--- megactl-0.4.1.orig/src/megatrace.c 2014-07-14 01:31:47.704312799 -0700
++++ megactl-0.4.1/src/megatrace.c 2014-07-14 11:37:20.570755832 -0700
+@@ -170,7 +170,11 @@
+ fprintf (stderr, "ptrace:getregs: %s\n", strerror (errno));
+ exit (1);
+ }
++#ifdef __x86_64__
++ call = r.orig_rax;
++#else
+ call = r.orig_eax;
++#endif
+ /*printthis = call == SYS_ioctl;*/
+
+ if (state == INBOUND)
+@@ -188,18 +192,30 @@
+ {
+ if ((call < 0) || (call > callmax) || (callinfo[call].name == NULL))
+ {
++#ifdef __x86_64__
++ fprintf (stderr, "= 0x%08llx\n", (unsigned long long) r.rax);
++#else
+ fprintf (stderr, "= 0x%08lx\n", (unsigned long) r.eax);
++#endif
+ }
+ else
+ {
+ if (callinfo[call].ptrval)
+ {
+ if (printcalls || printthis)
++#ifdef __x86_64__
++ fprintf (stderr, " = 0x%08llx\n", r.rax);
++#else
+ fprintf (stderr, " = 0x%08lx\n", r.eax);
++#endif
+ }
+ else
+ {
++#ifdef __x86_64__
++ long rv = r.rax;
++#else
+ long rv = r.eax;
++#endif
+ if (rv < 0)
+ {
+ if (printcalls || printthis)
+@@ -219,16 +235,22 @@
+ unsigned int len = 16;
+ unsigned char buf[65536];
+
++#ifdef __x86_64__
++ unsigned long long fd = r.rbx;
++ unsigned long long ioc = r.rcx;
++ unsigned long long arg = r.rdx;
++#else
+ unsigned long fd = r.ebx;
+-
+ unsigned long ioc = r.ecx;
++ unsigned long arg = r.edx;
++#endif
++
+ unsigned int iocdir = _IOC_DIR(ioc);
+ unsigned char ioctype = _IOC_TYPE(ioc);
+ unsigned int iocnr = _IOC_NR(ioc);
+ unsigned int iocsize = _IOC_SIZE(ioc);
+ char *iocdirname;
+
+- unsigned long arg = r.edx;
+
+ switch (iocdir)
+ {
+@@ -240,7 +262,11 @@
+
+ fprintf (stderr, "%s: ioctl(%ld, _IOC(\"%s\",'%c',0x%02x,0x%02x), 0x%08lx)", tbuf, fd, iocdirname, ioctype, iocnr, iocsize, arg);
+ if (state == OUTBOUND)
++#ifdef __x86_64__
++ fprintf (stderr, " = %lld\n", r.rax);
++#else
+ fprintf (stderr, " = %ld\n", r.eax);
++#endif
+ if (getenv ("LOG_INBOUND"))
+ fprintf (stderr, "\n");
+
+@@ -249,10 +275,18 @@
+ if (len > sizeof buf)
+ len = sizeof buf;
+
++#ifdef __x86_64__
++ if (printregs)
++ fprintf (stderr, " rbx=%08llx rcx=%08llx rdx=%08llx rsi=%08llx rdi=%08llx rbp=%08llx rax=%08llx ds=%08llx es=%08llx fs=%08llx gs=%08llx orig_rax=%08llx rip=%08llx cs=%08llx eflags=%08llx rsp=%08llx ss=%08llx\n", r.rbx, r.rcx, r.rdx, r.rsi, r.rdi, r.rbp, r.rax, r.ds, r.es, r.fs, r.gs, r.orig_rax, r.rip, r.cs, r.eflags, r.rsp, r.ss);
++
++ copyout (buf, len, pid, r.rdx);
++#else
+ if (printregs)
+ fprintf (stderr, " ebx=%08lx ecx=%08lx edx=%08lx esi=%08lx edi=%08lx ebp=%08lx eax=%08lx xds=%08lx xes=%08lx xfs=%08lx xgs=%08lx orig_eax=%08lx eip=%08lx xcs=%08lx eflags=%08lx esp=%08lx xss=%08lx\n", r.ebx, r.ecx, r.edx, r.esi, r.edi, r.ebp, r.eax, r.xds, r.xes, r.xfs, r.xgs, r.orig_eax, r.eip, r.xcs, r.eflags, r.esp, r.xss);
+
+ copyout (buf, len, pid, r.edx);
++#endif
++
+
+ if ((ioctype == 'm') && (iocnr == 0) && (iocsize == sizeof (struct uioctl_t)))
+ {
+@@ -405,7 +439,11 @@
+ else
+ {
+ fprintf (stderr, " host %d, off 0x%04x, count %d, sense_off 0x%08x, sense_len 0x%08x\n", iocp->host_no, iocp->sgl_off, iocp->sge_count, iocp->sense_off, iocp->sense_len);
++#ifdef __x86_64__
++ dumpbytes (stderr, buf, len, (void *) r.rdx, NULL);
++#else
+ dumpbytes (stderr, buf, len, (void *) r.edx, NULL);
++#endif
+ }
+ if (log)
+ {
+@@ -427,23 +465,38 @@
+ }
+ else
+ {
++#ifdef __x86_64__
++ dumpbytes (stderr, buf, len, (void *) r.rdx, NULL);
++#else
+ dumpbytes (stderr, buf, len, (void *) r.edx, NULL);
++#endif
+ }
+ fprintf (stderr, "\n");
+ }
+
+ switch (state)
+ {
++#ifdef __x86_64__
++ static u64 lastrip = 0;
++#else
+ static u32 lasteip = 0;
++#endif
++
+
+ case UNTRACED:
+ /* We don't know whether we were inbound or outbound on the first signal; this
+ appears to differ between kernels. So we defer until we see the same eip in
+ two successive traps, at which point we know we were outbound, so the next
+ trap is inbound. */
++#ifdef __x86_64__
++ if (lastrip == r.rip)
++ state = INBOUND;
++ lastrip = r.rip;
++#else
+ if (lasteip == r.eip)
+ state = INBOUND;
+ lasteip = r.eip;
++#endif
+ break;
+ case INBOUND: state = OUTBOUND; break;
+ case OUTBOUND: state = INBOUND; break;
diff --git a/sys-block/megactl/megactl-0.4.1-r2.ebuild b/sys-block/megactl/megactl-0.4.1-r2.ebuild
new file mode 100644
index 000000000000..41dc4c388a1f
--- /dev/null
+++ b/sys-block/megactl/megactl-0.4.1-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/megactl/megactl-0.4.1-r2.ebuild,v 1.1 2014/07/15 16:42:16 robbat2 Exp $
+
+EAPI=2
+
+inherit eutils
+
+IUSE=""
+DESCRIPTION="LSI MegaRAID control utility"
+HOMEPAGE="http://sourceforge.net/projects/megactl/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}.patch
+ epatch "${FILESDIR}"/${P}-Makefile.patch
+ epatch "${FILESDIR}"/${P}-gcc-fixes.patch
+ epatch "${FILESDIR}"/${P}-tracefix.patch
+}
+
+src_compile() {
+ cd src
+ use x86 && MY_MAKEOPTS="ARCH=-m32"
+ use amd64 && MY_MAKEOPTS="ARCH=-m64"
+ emake ${MY_MAKEOPTS} || die "make failed"
+}
+
+src_install() {
+ cd src
+ dosbin megactl megasasctl megarpt megasasrpt
+ # it's not quite fixed yet
+ [ -x megatrace ] && dosbin megatrace
+ dodoc ../README
+}
diff --git a/sys-devel/gcc/gcc-4.6.4.ebuild b/sys-devel/gcc/gcc-4.6.4.ebuild
index 7e8e335c32a0..1c662d8dc492 100644
--- a/sys-devel/gcc/gcc-4.6.4.ebuild
+++ b/sys-devel/gcc/gcc-4.6.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/sys-devel/gcc/gcc-4.6.4.ebuild,v 1.8 2014/07/08 11:35:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.6.4.ebuild,v 1.11 2014/07/15 20:19:29 zlogene Exp $
EAPI="2"
@@ -25,7 +25,7 @@ inherit eutils toolchain
DESCRIPTION="The GNU Compiler Collection"
LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+"
-KEYWORDS="alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild
index ef400a715da5..1dd236d390dc 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild,v 1.7 2014/07/13 09:54:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild,v 1.8 2014/07/15 18:42:28 maekke Exp $
EAPI=4
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
LICENSE="GPL-2 BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint"
IUSE="nls static-libs elibc_FreeBSD"
RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/eudev/eudev-1.9-r1.ebuild b/sys-fs/eudev/eudev-1.9-r1.ebuild
index 147432496a19..560a7dfcc216 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.3 2014/07/15 08:47:53 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.9-r1.ebuild,v 1.5 2014/07/15 14:46:04 blueness 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)"
@@ -214,6 +214,12 @@ multilib_src_install_all() {
insinto /lib/udev/rules.d
doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto /usr/share/doc/${PF}/html/gudev
+ doins "${S}"/docs/gudev/html/*
+
+ insinto /usr/share/doc/${PF}/html/libudev
+ doins "${S}"/docs/libudev/html/*
}
pkg_preinst() {
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index 1de44c1760be..09ff99ad56c0 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-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/sys-fs/eudev/eudev-9999.ebuild,v 1.58 2014/07/14 17:43:02 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.59 2014/07/15 12:53:53 blueness Exp $
EAPI="5"
@@ -214,6 +214,12 @@ multilib_src_install_all() {
insinto /lib/udev/rules.d
doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto /usr/share/doc/${PF}/html/gudev
+ doins "${S}"/docs/gudev/html/*
+
+ insinto /usr/share/doc/${PF}/html/libudev
+ doins "${S}"/docs/libudev/html/*
}
pkg_preinst() {
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 08e0cf6ec5d5..c4edb02e5b0c 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -1,3 +1,4 @@
DIST LVM2.2.02.103.tgz 1343887 SHA256 71c5a2e8842ed2f13f52e02b44eb183110a3410dedd1e117348e4eecc29d3c2a SHA512 1a9920947312e3e248bff7ff5d5eb54dec3f3b05eb3388fa92f95369b26ae8e6838186f87d817b09e8c635ddc3cdf51bc1d07c2a9d65fd7eab33598998bb7afe WHIRLPOOL de96dd8b7fb46ec777f34169759852ee5ef03ccdc93e110bf63c92dddb9cf4f805635444ceeead6b581610d2a23217d3b4729c286f016623f73b99c0b35a42a0
DIST LVM2.2.02.105.tgz 1374752 SHA256 d0700c7000ff6375c1c36cb2a89b97b9ae6757f4219fa9ec65f313d13d71e51e SHA512 fb2f4eaceb8e643c7e081b6d8d77daf387960c39f880f5600df40c7eb32d7908835114b8619805a814fc1c59ce920fa36d9afa72314dfabcb69ddf134833e1fa WHIRLPOOL b0dfea302e0afced489d96d14a04bddc48cfff540d26f69217787fe95b571d5600647162da84a95c6cb42e02fb83473a00257ab73e920b9a1b3c46f5ab12f02d
DIST LVM2.2.02.106.tgz 1426030 SHA256 6c83df279c2190543be750cda278c7d3e875dcadb5cbdc44c19f6040d718285b SHA512 52cfbe86ec89cebc639c6446195bba546fc5576165a38c5db6adf0d8aba6309a3140562d9c6a8bdc4ba415d91bb307989cdbb787cf4ec68dcacdcccbda71ae07 WHIRLPOOL 5853cd3e64ede16e21ee66a664cae222f707406e85379e051e72bf9264c8b6da83af9be7634d8d93c07bd772c395dc278ff37b55adc40f50b6e4c432e8e7a593
+DIST LVM2.2.02.107.tgz 1462424 SHA256 b1d6890e7a23c7a0bb7ed6be7f17a5e8f819da71d93f4a0b123661fe0f028820 SHA512 896c0f34d0134dfd985345e42e1381865e27ebdb7fa33b1e4ccf0b4dbd00bc708931f6827756778567092376ecb7f77bade7f93461a61b5e1e6b15c40b575bdd WHIRLPOOL c85c82e875c52a297cb8fd02eb7942906fee369506e5c51888a06c8c29361f5db2b59161d36ea085326fd83dc6371d6573bf298bd2d21c3aecacfcab674ebf6e
diff --git a/sys-fs/lvm2/files/lvm2-2.02.107-static-pkgconfig-libs.patch b/sys-fs/lvm2/files/lvm2-2.02.107-static-pkgconfig-libs.patch
new file mode 100644
index 000000000000..723cd0e276e2
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.107-static-pkgconfig-libs.patch
@@ -0,0 +1,104 @@
+diff -Nuar --exclude '*.orig' --exclude '*.rej' LVM2.2.02.107.orig/configure.in LVM2.2.02.107/configure.in
+--- LVM2.2.02.107.orig/configure.in 2014-07-15 12:57:55.867439868 -0700
++++ LVM2.2.02.107/configure.in 2014-07-15 17:24:02.662666091 -0700
+@@ -997,6 +997,7 @@
+ fi])
+ if test "$BLKID_WIPING" = yes; then
+ BLKID_PC="blkid"
++ BLKID_STATIC_LIBS=`$PKG_CONFIG --static --libs $BLKID_PC`
+ AC_DEFINE([BLKID_WIPING_SUPPORT], 1, [Define to 1 to use libblkid detection of signatures when wiping.])
+ fi
+ fi
+@@ -1022,6 +1023,7 @@
+ if test "$UDEV_SYNC" = yes; then
+ pkg_config_init
+ PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"])
++ UDEV_STATIC_LIBS=`$PKG_CONFIG --static --libs libudev`
+ AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.])
+ fi
+
+@@ -1242,19 +1244,32 @@
+ if test "$SELINUX" = yes; then
+ AC_CHECK_LIB([sepol], [sepol_check_context], [
+ AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context is available.])
+- SELINUX_LIBS="-lsepol"])
++ SEPOL_LIBS="-lsepol"])
++
++ dnl -- init pkgconfig if required
++ if test x$PKGCONFIG_INIT != x1; then
++ pkg_config_init
++ fi
++ PKG_CHECK_MODULES(SELINUX, libselinux, [
++ SELINUX_PC="libselinux"
++ SELINUX_STATIC_LIBS=`$PKG_CONFIG --static --libs libselinux`
++ SELINUX_LIBS="$SELINUX_LIBS $SEPOL_LIBS"
++ AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
++ ],[
++ dnl -- old non-pkgconfig method, is buggy with static builds
+
+ AC_CHECK_LIB([selinux], [is_selinux_enabled], [
+ AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout)
+ AC_CHECK_HEADERS([selinux/label.h])
+ AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
+- SELINUX_LIBS="-lselinux $SELINUX_LIBS"
++ SELINUX_LIBS="-lselinux $SEPOL_LIBS"
+ SELINUX_PC="libselinux"
+ HAVE_SELINUX=yes ], [
+ AC_MSG_WARN(Disabling selinux)
+ SELINUX_LIBS=
+ SELINUX_PC=
+ HAVE_SELINUX=no ])
++ ])
+ fi
+
+ ################################################################################
+@@ -1556,6 +1571,7 @@
+ ################################################################################
+ AC_SUBST(APPLIB)
+ AC_SUBST(AWK)
++AC_SUBST(BLKID_STATIC_LIBS)
+ AC_SUBST(BLKID_PC)
+ AC_SUBST(BLKID_WIPING)
+ AC_SUBST(BUILD_CMIRRORD)
+@@ -1651,6 +1667,7 @@
+ AC_SUBST(SALCK_CFLAGS)
+ AC_SUBST(SALCK_LIBS)
+ AC_SUBST(SELINUX_LIBS)
++AC_SUBST(SELINUX_STATIC_LIBS)
+ AC_SUBST(SELINUX_PC)
+ AC_SUBST(SNAPSHOTS)
+ AC_SUBST(STATICDIR)
+@@ -1662,6 +1679,7 @@
+ AC_SUBST(THIN_DUMP_CMD)
+ AC_SUBST(THIN_REPAIR_CMD)
+ AC_SUBST(THIN_RESTORE_CMD)
++AC_SUBST(UDEV_STATIC_LIBS)
+ AC_SUBST(UDEV_PC)
+ AC_SUBST(UDEV_RULES)
+ AC_SUBST(UDEV_SYNC)
+diff -Nuar --exclude '*.orig' --exclude '*.rej' LVM2.2.02.107.orig/make.tmpl.in LVM2.2.02.107/make.tmpl.in
+--- LVM2.2.02.107.orig/make.tmpl.in 2014-07-15 12:57:55.868439884 -0700
++++ LVM2.2.02.107/make.tmpl.in 2014-07-15 17:23:24.060055838 -0700
+@@ -44,7 +44,7 @@
+
+ LIBS = @LIBS@
+ # Extra libraries always linked with static binaries
+-STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS)
++STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS)
+ DEFS += @DEFS@
+ # FIXME set this only where it's needed, not globally?
+ CFLAGS += @CFLAGS@
+@@ -59,10 +59,13 @@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ READLINE_LIBS = @READLINE_LIBS@
+ SELINUX_LIBS = @SELINUX_LIBS@
++SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@
+ UDEV_CFLAGS = @UDEV_CFLAGS@
+ UDEV_LIBS = @UDEV_LIBS@
++UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@
+ BLKID_CFLAGS = @BLKID_CFLAGS@
+ BLKID_LIBS = @BLKID_LIBS@
++BLKID_STATIC_LIBS = @BLKID_STATIC_LIBS@
+ TESTING = @TESTING@
+
+ # Setup directory variables
diff --git a/sys-fs/lvm2/lvm2-2.02.107.ebuild b/sys-fs/lvm2/lvm2-2.02.107.ebuild
new file mode 100644
index 000000000000..4dedb969556a
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.107.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.107.ebuild,v 1.1 2014/07/16 00:28:28 robbat2 Exp $
+
+EAPI=5
+inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic
+
+DESCRIPTION="User-land utilities for LVM2 (device-mapper) software."
+HOMEPAGE="http://sources.redhat.com/lvm2/"
+SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
+ ftp://sources.redhat.com/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only"
+REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )"
+
+DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* )
+ readline? ( sys-libs/readline )
+ udev? ( >=virtual/udev-200[static-libs?] )"
+# /run is now required for locking during early boot. /var cannot be assumed to
+# be available -- thus, pull in recent enough baselayout for /run.
+# This version of LVM is incompatible with cryptsetup <1.1.2.
+RDEPEND="${DEPEND_COMMON}
+ >=sys-apps/baselayout-2.2
+ !=sys-apps/util-linux-2.16
+ lvm2create_initrd? ( sys-apps/makedev )
+ thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
+# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
+DEPEND="${DEPEND_COMMON}
+ virtual/pkgconfig
+ >=sys-devel/binutils-2.20.1-r1
+ static? (
+ selinux? ( sys-libs/libselinux[static-libs] )
+ udev? ( virtual/udev[static-libs] )
+ >=sys-apps/util-linux-2.16[static-libs]
+ )"
+
+S=${WORKDIR}/${PN/lvm/LVM}.${PV}
+
+pkg_setup() {
+ local CONFIG_CHECK="~SYSVIPC"
+
+ if use udev; then
+ local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
+ if linux_config_exists; then
+ local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+ if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
+ ewarn "It's recommended to set an empty value to the following kernel config option:"
+ ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+ fi
+ fi
+ fi
+
+ check_extra_config
+
+ # 1. Genkernel no longer copies /sbin/lvm blindly.
+ if use static; then
+ elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
+ elog "their static versions. If you need the static binaries,"
+ elog "you must append .static to the filename!"
+ fi
+}
+
+src_prepare() {
+ # Gentoo specific modification(s):
+ epatch "${FILESDIR}"/${PN}-2.02.99-example.conf.in.patch
+
+ sed -i \
+ -e "1iAR = $(tc-getAR)" \
+ -e "s:CC ?= @CC@:CC = $(tc-getCC):" \
+ make.tmpl.in || die #444082
+
+ sed -i -e '/FLAG/s:-O2::' configure{.in,} || die #480212
+
+ # For upstream -- review and forward:
+ epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
+ epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
+ epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
+ epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
+ epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
+ epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905
+ epatch "${FILESDIR}"/${PN}-2.02.107-static-pkgconfig-libs.patch #370217, #439414 + blkid
+ epatch "${FILESDIR}"/${PN}-2.02.106-pthread-pkgconfig.patch #492450
+ # Upstream never tested with USE="-thin" wrt #510202
+ sed -i -e 's|_man7: $(MAN8)|_man7: $(MAN7)|' man/Makefile.in || die
+ use thin || { sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die; }
+
+ eautoreconf
+}
+
+src_configure() {
+ filter-flags -flto
+ local myconf
+ local buildmode
+
+ myconf="${myconf} $(use_enable !device-mapper-only dmeventd)"
+ myconf="${myconf} $(use_enable !device-mapper-only cmdlib)"
+ myconf="${myconf} $(use_enable !device-mapper-only applib)"
+ myconf="${myconf} $(use_enable !device-mapper-only fsadm)"
+ myconf="${myconf} $(use_enable !device-mapper-only lvmetad)"
+ use device-mapper-only && myconf="${myconf} --disable-udev-systemd-background-jobs"
+
+ # Most of this package does weird stuff.
+ # The build options are tristate, and --without is NOT supported
+ # options: 'none', 'internal', 'shared'
+ if use static; then
+ buildmode="internal"
+ # This only causes the .static versions to become available
+ myconf="${myconf} --enable-static_link"
+ else
+ buildmode="shared"
+ fi
+ dmbuildmode=$(use !device-mapper-only && echo internal || echo none)
+
+ # dmeventd requires mirrors to be internal, and snapshot available
+ # so we cannot disable them
+ myconf="${myconf} --with-mirrors=${dmbuildmode}"
+ myconf="${myconf} --with-snapshots=${dmbuildmode}"
+ if use thin; then
+ myconf="${myconf} --with-thin=internal"
+ myconf="${myconf} --with-thin-check=${EPREFIX}/sbin/thin_check"
+ myconf="${myconf} --with-thin-dump=${EPREFIX}/sbin/thin_dump"
+ myconf="${myconf} --with-thin-repair=${EPREFIX}/sbin/thin_repair"
+ else
+ myconf="${myconf} --with-thin=none"
+ fi
+
+ if use lvm1; then
+ myconf="${myconf} --with-lvm1=${buildmode}"
+ else
+ myconf="${myconf} --with-lvm1=none"
+ fi
+
+ # disable O_DIRECT support on hppa, breaks pv detection (#99532)
+ use hppa && myconf="${myconf} --disable-o_direct"
+
+ if use clvm; then
+ myconf="${myconf} --with-cluster=${buildmode}"
+ # 4-state! Make sure we get it right, per bug 210879
+ # Valid options are: none, cman, gulm, all
+ #
+ # 2009/02:
+ # gulm is removed now, now dual-state:
+ # cman, none
+ # all still exists, but is not needed
+ #
+ # 2009/07:
+ # TODO: add corosync and re-enable ALL
+ local clvmd=""
+ use cman && clvmd="cman"
+ #clvmd="${clvmd/cmangulm/all}"
+ [ -z "${clvmd}" ] && clvmd="none"
+ myconf="${myconf} --with-clvmd=${clvmd}"
+ myconf="${myconf} --with-pool=${buildmode}"
+ else
+ myconf="${myconf} --with-clvmd=none --with-cluster=none"
+ fi
+
+ myconf="${myconf} --with-cache=${buildmode}"
+
+ econf \
+ $(use_enable readline) \
+ $(use_enable selinux) \
+ --enable-pkgconfig \
+ --with-confdir="${EPREFIX}"/etc \
+ --exec-prefix="${EPREFIX}" \
+ --sbindir="${EPREFIX}/sbin" \
+ --with-staticdir="${EPREFIX}"/sbin \
+ --libdir="${EPREFIX}/$(get_libdir)" \
+ --with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \
+ --with-default-dm-run-dir=/run \
+ --with-default-run-dir=/run/lvm \
+ --with-default-locking-dir=/run/lock/lvm \
+ --with-default-pid-dir=/run \
+ $(use_enable udev udev_rules) \
+ $(use_enable udev udev_sync) \
+ $(use_with udev udevdir "$(get_udevdir)"/rules.d) \
+ $(use_enable systemd udev-systemd-background-jobs) \
+ "$(systemd_with_unitdir)" \
+ ${myconf} \
+ CLDFLAGS="${LDFLAGS}"
+}
+
+src_compile() {
+ pushd include >/dev/null
+ emake
+ popd >/dev/null
+
+ if use device-mapper-only ; then
+ emake device-mapper
+ else
+ emake
+ emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
+ fi
+}
+
+src_install() {
+ local inst
+ INSTALL_TARGETS="install install_systemd_units install_systemd_generators install_tmpfiles_configuration"
+ use device-mapper-only && INSTALL_TARGETS="install_device-mapper"
+ for inst in ${INSTALL_TARGETS}; do
+ emake DESTDIR="${D}" ${inst}
+ done
+
+ newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
+ newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
+
+ if use !device-mapper-only ; then
+ newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd
+ newinitd "${FILESDIR}"/lvm.rc-2.02.105-r2 lvm
+ newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
+
+ newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
+ newinitd "${FILESDIR}"/lvmetad.initd-2.02.105-r2 lvmetad
+ fi
+
+ if use clvm; then
+ newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd
+ newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd
+ fi
+
+ if use static-libs; then
+ dolib.a libdm/ioctl/libdevmapper.a
+ dolib.a libdaemon/client/libdaemonclient.a #462908
+ #gen_usr_ldscript libdevmapper.so
+ dolib.a daemons/dmeventd/libdevmapper-event.a
+ #gen_usr_ldscript libdevmapper-event.so
+ else
+ rm -f "${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
+ fi
+
+ if use lvm2create_initrd; then
+ dosbin scripts/lvm2create_initrd/lvm2create_initrd
+ doman scripts/lvm2create_initrd/lvm2create_initrd.8
+ newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
+ fi
+
+ insinto /etc
+ doins "${FILESDIR}"/dmtab
+
+ dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
+}
+
+pkg_postinst() {
+ ewarn "Make sure the \"lvm\" init script is in the runlevels:"
+ ewarn "# rc-update add lvm boot"
+ ewarn
+ ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
+ ewarn "to enable lvm autoactivation and metadata caching."
+}
+
+src_test() {
+ einfo "Tests are disabled because of device-node mucking, if you want to"
+ einfo "run tests, compile the package and see ${S}/tests"
+}
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index a012b06dded6..6ab991e84bfc 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -5,4 +5,4 @@ DIST systemd-215.tar.xz 2888652 SHA256 ce76a3c05e7d4adc806a3446a5510c0c9b76a33f1
DIST udev-208-patches-1.tar.xz 964 SHA256 b2df84afd8631736aceee1317d332fd9bee347df503aa55cd78bcf1b375e8f75 SHA512 6e85daaf8639255bbaa76364cda02f8b034ec5f687730a7e3ea7427b53031b4cdcbe1b8758e1474104d52e04781605ee3c1e31bbec2df33c95e606cee8eb0f28 WHIRLPOOL 054d1e954c4eacd10fcdacf130bf6cf2dd165f3da10ba5629f4bd8e488a221e8e5d7db3ab821593af8dd92011dee98daadf09e5dd726a4c99861f4abaea6aca0
DIST udev-212-patches-1.tar.xz 600 SHA256 378b5c7d11730440dc14a8d57219924ce661695c05103f037c23bfc54ff6f28a SHA512 a57a872656852c8bc4b8df537c7fff7a94f492bcd157f1adfd2fdfa47937e96363ae5ab74788253d615e15fd871b0363f6976594949747dc25a7c32da5c853ba WHIRLPOOL b491dc0c9b416dbe7c3f476a82a8dd79bc62595bea208b1d15b046758d82db1ef1f176e2c1883d0d29c18765e7c2840a67f9ef677f24b675a8546c2dfeec6ce3
DIST udev-214-patches-1.tar.xz 604 SHA256 363d0331d618b8d731ae1db739f62acfd3df503e71afdf50a0b0d33bf78763c6 SHA512 0601ffa8849e14a56d99f69d1bee55d90e02fdd3bef6bc7f2a6e0ea06705e93e5e0c338aff64c6e0eb8dacebbd8e78cc707ffee214592100a9980cfa328a35ea WHIRLPOOL ead57d1f47361d052f5da038a034e8ab3c74f9055c88e9672ba212e00239873f2fcb778a98e2368551443a5a60aece35d00ba10434afe0752d5b4c7654053c39
-DIST udev-215-patches-1.tar.xz 604 SHA256 363d0331d618b8d731ae1db739f62acfd3df503e71afdf50a0b0d33bf78763c6 SHA512 0601ffa8849e14a56d99f69d1bee55d90e02fdd3bef6bc7f2a6e0ea06705e93e5e0c338aff64c6e0eb8dacebbd8e78cc707ffee214592100a9980cfa328a35ea WHIRLPOOL ead57d1f47361d052f5da038a034e8ab3c74f9055c88e9672ba212e00239873f2fcb778a98e2368551443a5a60aece35d00ba10434afe0752d5b4c7654053c39
+DIST udev-215-patches-2.tar.xz 2120 SHA256 044c4650bcaeb4bd57332ed50264a599fea34429caba93505ed9c56a4b31da32 SHA512 2a91172fd7d21475597303cd68906def282667c4fcd2451db1df90b8a7339a03371bd4856c8f86b67058f5d6bc468fa48d5f5ec5731b233c338888af183acd67 WHIRLPOOL 4e666aa3b8e7ba6b901d06891585854cc3ecfc4c9b80ca62040b67df1eabf4db156577f8345985990f257c97d288468939d1b7a8e6731b90c8c5a3442a6074a5
diff --git a/sys-fs/udev/udev-215.ebuild b/sys-fs/udev/udev-215.ebuild
index fd5dd5f3d5fb..a8ec460c1b85 100644
--- a/sys-fs/udev/udev-215.ebuild
+++ b/sys-fs/udev/udev-215.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/udev/udev-215.ebuild,v 1.4 2014/07/15 11:52:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-215.ebuild,v 1.6 2014/07/15 15:52:06 ssuominen Exp $
EAPI=5
@@ -11,14 +11,14 @@ if [[ ${PV} = 9999* ]]; then
inherit git-2
patchset=
else
- patchset=1
+ patchset=2
SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz"
if [[ -n "${patchset}" ]]; then
SRC_URI="${SRC_URI}
http://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
http://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
fi
- 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"
fi
DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index 6c9b631cd08e..2b9b28085d95 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -17,14 +17,17 @@ DIST genpatches-3.2-16.extras.tar.xz 16764 SHA256 c3f5adba6f1700c716354b91bc6241
DIST hardened-patches-3.13.10-1.extras.tar.bz2 806948 SHA256 a3eb7bb199370da6139d70489b009e93b2539cd31bf4540d0d4c60f72925020f SHA512 991c190540981bcf34c62ae27ed241ceb41848d479b332c9b1de83b498b86df9bf0d264a6b6e0c252c3460ae3446baf3a92d635027aae5440126be0cfa5c2915 WHIRLPOOL c03fe49f18bf9c735fdb616619c7892d3dfd868f59d2032d58f549b85dce0dcb418a8b0b3fd3fb283ca9a7c348efe2a4d5fcef9cd04b26305dbe185dc4c2e21b
DIST hardened-patches-3.14.11-2.extras.tar.bz2 819163 SHA256 f0a7fab960990a85d202b37555ef2a440f0f2e9659c80d0dced385074d9118c2 SHA512 743ca7907d45be8c83f7af6ad20a90dbf4a70351a410521cec23c0d23c5190b6aaa430c8fc00441e6762a3d1cd64f23ea0e04916e6d477654a85cfac9c245cca WHIRLPOOL b69ac068c110bd556134f0a1debddaee9ae882d6e7a62db6c356b54af2d5af70bca031faaf6956468387c1293f30790e8e01d929db1418198f76710335ea4ac8
DIST hardened-patches-3.14.12-1.extras.tar.bz2 820742 SHA256 21459075d627ca1d80f17fa12ee95a295a41ca0964f0993a7de2fb4ce238046d SHA512 c67fa5f126c1e148ae0626f4ffc684ceb552e9d2d631b11d61e29373568bf23606ea73ad1925e2e714c55078bf2e1c8479baf6bf6b769ba5c74ee6b48beb975e WHIRLPOOL 6f40c2a19191006e4ce5cd1efdbf6b33692762197cbbd64105555bf83e24901291de1bf212af1557af6a8533ba87150ab2acef838908acd40c35eb73a0114bce
+DIST hardened-patches-3.14.12-2.extras.tar.bz2 822371 SHA256 aeac3666e9ce78f28f5569cca1fc09884af527774fc16b25a71b22ffe53b2694 SHA512 eaf2c4281f53f2991240a5571a2da0178271e01e2eb7063ab4fb384ef6e1ad84bd66ee9a93c62b63f0b9f00a2e960b6726f1a0da95acd8caf7bbaec5e951a500 WHIRLPOOL 70f7dc78761ef9197ad43e3c114649f47a3390282a1ca18a934ab95e263d4a247ce9cd4f2c578067f63afeb18b21234bc70c6fa76571fd5b8dab7fd0c5412496
DIST hardened-patches-3.14.5-4.extras.tar.bz2 821438 SHA256 75ded742278c10071353bf62589413389ca1ee3db900441f946441959864b175 SHA512 832e52399b9265bca612291cef4f1a19b9db31ae3a1adb6d06f97ccf3878155113911287c06b379c14c5bf2974512d41de474ab379ab895a62c7231ab3480c06 WHIRLPOOL 5be37b567c482014de8e43aede3d192b5952965b0bd2cdf33afceb24555d511efaba498046ca2a3f8e822147b2d88d6086fca33721310078cb20ca416d657ff2
DIST hardened-patches-3.15.4-2.extras.tar.bz2 816362 SHA256 4f086a90d8515475c136b44be37ef41faa958bdb2683b219dba7f59b09ae4815 SHA512 cd7c18439897cb76b33d670954eb04cf4af3c5c50cf42a349c978a7fe130b7e981c3b5298d0c33039be2d20564f42b674533c720a5505e73c9f0d861fb703421 WHIRLPOOL 388c1284510fd8de163f88da2110ce181e76b3862d042c73e3545301b48e23dd45d0256264ab365623efd80805249ccf5f3bf2fc0fa07c65661f70ff0d30e870
DIST hardened-patches-3.15.5-1.extras.tar.bz2 816558 SHA256 dcd4bf26f012c2297784932c0476e170a305190d0f053e40aefb1c1d6208ed35 SHA512 2ed470b308398165e98265d46f2fedb7a13c157f278785c398a23504b667b9158e40e61ce17bdc08faaa3e91e1ce91c91d9de402a04d2a0a03c5078c126c4f5b WHIRLPOOL 50a664ece33427f2d6b3011cfbb8169ccf1fac9315e61a951f4b391e881fe1d68f282376ae09b0d8c2ed27f3ed2c0af62239aeed7127bb133f3a05bfe4c50ee8
+DIST hardened-patches-3.15.5-2.extras.tar.bz2 818995 SHA256 ce7acb08e0dcc7ea52633bb2fe196cbf124307b0ed0ab03e736853f887d432f7 SHA512 091c0b4122a5115d4cc90a9750df91bab2fe2a44057f1be90dbd05d583ddaaee745b1ee6f4a52f14d279750508d34a458c13a1fb144d897aa6bfe4cd88a76d8d WHIRLPOOL 0775c28708fb612a7682245e58cb7af8e16c2aee2094125cbfd3da5f7dd06c0486f32f53a001f3232b8cfd1c0a5a1b97953f1717d4389e43aa397e62b61f5cee
DIST hardened-patches-3.2.55-8.extras.tar.bz2 1798078 SHA256 d7ddc2b8984aa6cd57c5b188fefe60acae2f90ec3a6badbcda899bacd04dc0c2 SHA512 fbdae9dffc1d035a73fa7672734304b06d94e22407f37d9960b549cb6ce864546afb2a50a3f6da36b58eef2eb611d64ccd8e87ff0bb5e5118ecfe6171464331f WHIRLPOOL a1afae9d5b533c6a3c6d3ba2d72c344f17464e2077231f42aa3b2514412df0d6ba98227431fb0d7aa42e2c9e95e34550a74920c590b44a7188dd41ae67c1458d
DIST hardened-patches-3.2.59-7.extras.tar.bz2 1906081 SHA256 dd3631c2bc027d689aeb7846f5e1430e51a9829f4dfc5c6d77ff2f1ec389aa3f SHA512 a09d1ff7eecac76f17a823b45ded69618fd354a3425472fe2dfb546028a6b7f537fd6e55063b62e51cfce97a334d0f51067c76fd8d6526ddffae711ee988b113 WHIRLPOOL 1b502546ce349a75b0916d41539a56607765985649809328fc396ebbb110e16c7f87379c0aae45a7962d2da4acf5b438b1c71151f3df4fc7872242d4a3dbcbbd
DIST hardened-patches-3.2.60-10.extras.tar.bz2 1938825 SHA256 68523c091f735a26fbe4ce544ca6a531874befb856d69c1167b32e884e388875 SHA512 5c253dd0ae274611b600f075da1e36ab3505695bb5dd8af226bebac72c87e40e6f99272ce9a11c70218f78908eea702cad564e9101b1e3168635c30cdbb878b6 WHIRLPOOL 38d242de2f5e2ba1b38f44f38fe07d259219a27a9129134b4841a2f01a9778200010e8693a164ebfe7da437ac1361e102ecd1dbef7bb9b3d188b4a42d2161aa3
DIST hardened-patches-3.2.60-9.extras.tar.bz2 1936809 SHA256 b148f6a00e46f2b1c62dee8f9a82f55987e5cd3df3ae849681c3743060862fa7 SHA512 36ca5851fb005f560ae0ca1e5697bde08969b4ba0f33b9ec7e3aea71a3a10daab202671478778416245f8caf8b7c7472d48a5cead45a140da00d54be9c210216 WHIRLPOOL d0149095a5f4d2cf5faddfc5aabf2e23447b0f660c9dc515bd1717bf34cecfe7b0b3a49fe1ed846c9534f73ac4259bffafc30098e7c4fca6ac51235614246f0f
DIST hardened-patches-3.2.61-1.extras.tar.bz2 1970580 SHA256 778b2d813023c0a642922f9e566110f6c5abe38089ab8e47effd1427dfdfbda0 SHA512 67ed59d95202671dad3f7f8260229381ce140a1ae0f5d3f0a15a3e225e94a1fc127519967e6884331c5f4f0b1b41889b713b86fdc9f1b8bbc3c97c6d9c11c373 WHIRLPOOL c39ad747c1c5bce227117d21af8ac9da3d73cbb06ca2099fcffe9e6ad6f8279c8da06f01e49305d7f7be19ad1bef6ed89d44ab438cf394765597a9fa3d1a1266
+DIST hardened-patches-3.2.61-2.extras.tar.bz2 1957031 SHA256 5d6a4834e4fe7e037b589749e66e2ed104be2989cca2dfef9c58d9b429fc9d5c SHA512 bb1c5c25683186539ff9f596c4db3f6354521dc0b63f01133086e4067d68e6fd7e3464e21aefb31b6d5541a1bdd23af3990e7b0a06c2a0c38f9b6bbf8537cdd4 WHIRLPOOL 24821dc6b10693735c75f349779c83a8ca50dd8e020dcfa73ea0fcfc7c850958d7f7e5f1622b24cc893f77aa3ad2be7c3e21b81e7d18d976efaacfc55eecab9d
DIST linux-3.13.tar.xz 77187032 SHA256 4d5e5eee5f276424c32e9591f1b6c971baedc7b49f28ce03d1f48b1e5d6226a2 SHA512 1ba223bb4b885d691a67196d86a8aaf7b4a1c351bf2a762f50f1b0c32da00dd0c28895872a66b49e8d244498d996876609268e64861d28ac4048886ef9f79b87 WHIRLPOOL 2992257a17e85b3eb16fcaf21678fa6dbf31f80c2099fd1ad0ff9852ac1d16122ac8e2c0b46421d8895d4368253a724e439cd625307ee7af7bd1e50cb2c9b62a
DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
DIST linux-3.15.tar.xz 79676484 SHA256 c3927e87be4040fa8aca1b58663dc0776aaf00485604ff88a623be2f3fb07794 SHA512 d5dc477cad4584e56e2e2ef9e0950c2b22e76e5cf5090a896ba099cb7c5e5db1853a4aeb96b199189653dc66d461557e95198e37516a619f7ddc01ba6b308e02 WHIRLPOOL 7f3dfde1a23aab75b7f40770ae2ca77c1b28f845e4abe6296b2aec9b56fe94f7afa76b00eb6cc7475305c31b726ebeb4643107dd48c12ac04c933cf1856b8e77
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.14.12-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.14.12-r1.ebuild
new file mode 100644
index 000000000000..239977eef5ce
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-3.14.12-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.14.12-r1.ebuild,v 1.1 2014/07/15 15:18:19 blueness Exp $
+
+EAPI="5"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="16"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2"
+HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_EXCLUDE="
+ 1500_XATTR_USER_PREFIX.patch
+ 2900_dev-root-proc-mount-fix.patch"
+
+DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+IUSE="deblob"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=sys-devel/gcc-4.5"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+
+ local GRADM_COMPAT="sys-apps/gradm-3.0*"
+
+ ewarn
+ ewarn "Users of grsecurity's RBAC system must ensure they are using"
+ ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
+ ewarn "It is strongly recommended that the following command is issued"
+ ewarn "prior to booting a ${PF} kernel for the first time:"
+ ewarn
+ ewarn "emerge -na =${GRADM_COMPAT}"
+ ewarn
+}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.15.5-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.15.5-r1.ebuild
new file mode 100644
index 000000000000..5825396a220d
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-3.15.5-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.15.5-r1.ebuild,v 1.1 2014/07/15 15:19:43 blueness Exp $
+
+EAPI="5"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="7"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2"
+HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_EXCLUDE="
+ 1500_XATTR_USER_PREFIX.patch
+ 2900_dev-root-proc-mount-fix.patch"
+
+DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+IUSE="deblob"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=sys-devel/gcc-4.5"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+
+ local GRADM_COMPAT="sys-apps/gradm-3.0*"
+
+ ewarn
+ ewarn "Users of grsecurity's RBAC system must ensure they are using"
+ ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
+ ewarn "It is strongly recommended that the following command is issued"
+ ewarn "prior to booting a ${PF} kernel for the first time:"
+ ewarn
+ ewarn "emerge -na =${GRADM_COMPAT}"
+ ewarn
+}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.61-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.61-r1.ebuild
new file mode 100644
index 000000000000..bd7ce4e3abbc
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-3.2.61-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.61-r1.ebuild,v 1.1 2014/07/15 15:16:43 blueness Exp $
+
+EAPI="5"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="16"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2"
+HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
+
+DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+IUSE="deblob"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=sys-devel/gcc-4.5"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+
+ local GRADM_COMPAT="sys-apps/gradm-3.0*"
+
+ ewarn
+ ewarn "Users of grsecurity's RBAC system must ensure they are using"
+ ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
+ ewarn "It is strongly recommended that the following command is issued"
+ ewarn "prior to booting a ${PF} kernel for the first time:"
+ ewarn
+ ewarn "emerge -na =${GRADM_COMPAT}"
+ ewarn
+}
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.10.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.10.ebuild
index 81977d065ba5..3e5b929a3c1f 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.10.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.10.ebuild,v 1.5 2014/07/14 19:51:11 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.10.ebuild,v 1.6 2014/07/15 18:41:52 maekke Exp $
EAPI="4"
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz"
LICENSE="GPL-2"
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 ~arm-linux ~x86-linux ~m68k-mint ~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 ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris"
IUSE="nls static-libs"
RDEPEND="!sys-libs/com_err
diff --git a/virtual/perl-Thread-Queue/perl-Thread-Queue-2.120.0-r2.ebuild b/virtual/perl-Thread-Queue/perl-Thread-Queue-2.120.0-r2.ebuild
deleted file mode 100644
index 6e29b327ca12..000000000000
--- a/virtual/perl-Thread-Queue/perl-Thread-Queue-2.120.0-r2.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-Thread-Queue/perl-Thread-Queue-2.120.0-r2.ebuild,v 1.1 2012/05/21 11:50:35 tove Exp $
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="|| ( =dev-lang/perl-5.16* =dev-lang/perl-5.14* ~perl-core/${PN#perl-}-${PV} )"
diff --git a/virtual/perl-Thread-Queue/perl-Thread-Queue-2.120.0-r3.ebuild b/virtual/perl-Thread-Queue/perl-Thread-Queue-2.120.0-r3.ebuild
new file mode 100644
index 000000000000..d8e707a40ff5
--- /dev/null
+++ b/virtual/perl-Thread-Queue/perl-Thread-Queue-2.120.0-r3.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-Thread-Queue/perl-Thread-Queue-2.120.0-r3.ebuild,v 1.1 2014/07/15 17:59:28 dilfridge Exp $
+
+EAPI=5
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+ || ( =dev-lang/perl-5.16* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Thread-Queue/perl-Thread-Queue-3.10.0.ebuild b/virtual/perl-Thread-Queue/perl-Thread-Queue-3.10.0.ebuild
deleted file mode 100644
index 6933057b57a9..000000000000
--- a/virtual/perl-Thread-Queue/perl-Thread-Queue-3.10.0.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-Thread-Queue/perl-Thread-Queue-3.10.0.ebuild,v 1.2 2012/12/22 18:24:33 ago Exp $
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-Thread-Queue/perl-Thread-Queue-3.20.0-r1.ebuild b/virtual/perl-Thread-Queue/perl-Thread-Queue-3.20.0-r1.ebuild
new file mode 100644
index 000000000000..9a583648f7fc
--- /dev/null
+++ b/virtual/perl-Thread-Queue/perl-Thread-Queue-3.20.0-r1.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-Thread-Queue/perl-Thread-Queue-3.20.0-r1.ebuild,v 1.1 2014/07/15 17:59:28 dilfridge Exp $
+
+EAPI=5
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+ || ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Thread-Queue/perl-Thread-Queue-3.20.0.ebuild b/virtual/perl-Thread-Queue/perl-Thread-Queue-3.20.0.ebuild
deleted file mode 100644
index 9cafe262f5c4..000000000000
--- a/virtual/perl-Thread-Queue/perl-Thread-Queue-3.20.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Thread-Queue/perl-Thread-Queue-3.20.0.ebuild,v 1.1 2013/03/13 08:09:23 tove Exp $
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-Thread-Queue/perl-Thread-Queue-3.50.0.ebuild b/virtual/perl-Thread-Queue/perl-Thread-Queue-3.50.0.ebuild
new file mode 100644
index 000000000000..ec0968168d80
--- /dev/null
+++ b/virtual/perl-Thread-Queue/perl-Thread-Queue-3.50.0.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-Thread-Queue/perl-Thread-Queue-3.50.0.ebuild,v 1.1 2014/07/15 17:59:28 dilfridge Exp $
+
+EAPI=5
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+ || ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.120.0-r2.ebuild b/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.120.0-r2.ebuild
deleted file mode 100644
index 28853f2484fb..000000000000
--- a/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.120.0-r2.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-Thread-Semaphore/perl-Thread-Semaphore-2.120.0-r2.ebuild,v 1.2 2012/12/22 18:27:16 ago Exp $
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="|| ( =dev-lang/perl-5.16* =dev-lang/perl-5.14* ~perl-core/${PN#perl-}-${PV} )"
diff --git a/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.120.0-r3.ebuild b/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.120.0-r3.ebuild
new file mode 100644
index 000000000000..4d0673458903
--- /dev/null
+++ b/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.120.0-r3.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-Thread-Semaphore/perl-Thread-Semaphore-2.120.0-r3.ebuild,v 1.1 2014/07/15 18:02:28 dilfridge Exp $
+
+EAPI=5
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="amd64 ppc 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-Tie-RefHash/perl-Tie-RefHash-1.390.0-r1.ebuild b/virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.390.0-r1.ebuild
deleted file mode 100644
index 8960fa35983d..000000000000
--- a/virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.390.0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.390.0-r1.ebuild,v 1.1 2013/08/14 05:30:46 patrick Exp $
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="|| ( =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-Tie-RefHash/perl-Tie-RefHash-1.390.0-r2.ebuild b/virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.390.0-r2.ebuild
new file mode 100644
index 000000000000..519a00e67b89
--- /dev/null
+++ b/virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.390.0-r2.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-Tie-RefHash/perl-Tie-RefHash-1.390.0-r2.ebuild,v 1.1 2014/07/15 18:04:59 dilfridge Exp $
+
+EAPI=5
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="amd64 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-Time-HiRes/perl-Time-HiRes-1.972.500-r1.ebuild b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.972.500-r2.ebuild
similarity index 63%
rename from virtual/perl-Time-HiRes/perl-Time-HiRes-1.972.500-r1.ebuild
rename to virtual/perl-Time-HiRes/perl-Time-HiRes-1.972.500-r2.ebuild
index 7833f97bca19..8a1e0a3ddf2a 100644
--- a/virtual/perl-Time-HiRes/perl-Time-HiRes-1.972.500-r1.ebuild
+++ b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.972.500-r2.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-Time-HiRes/perl-Time-HiRes-1.972.500-r1.ebuild,v 1.14 2014/01/20 20:47:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Time-HiRes/perl-Time-HiRes-1.972.500-r2.ebuild,v 1.3 2014/07/15 18:10:42 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.16* ~perl-core/${PN#perl-}-${PV} )"
+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-Time-HiRes/perl-Time-HiRes-1.972.600.ebuild b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.972.600-r1.ebuild
similarity index 66%
rename from virtual/perl-Time-HiRes/perl-Time-HiRes-1.972.600.ebuild
rename to virtual/perl-Time-HiRes/perl-Time-HiRes-1.972.600-r1.ebuild
index 34cd396b1778..91ab97bc8d70 100644
--- a/virtual/perl-Time-HiRes/perl-Time-HiRes-1.972.600.ebuild
+++ b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.972.600-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-Time-HiRes/perl-Time-HiRes-1.972.600.ebuild,v 1.3 2014/01/20 20:47:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Time-HiRes/perl-Time-HiRes-1.972.600-r1.ebuild,v 1.1 2014/07/15 18:10:42 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
-RDEPEND="|| ( =dev-lang/perl-5.18* =dev-lang/perl-5.16* ~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-Time-Local/perl-Time-Local-1.200.0-r2.ebuild b/virtual/perl-Time-Local/perl-Time-Local-1.200.0-r2.ebuild
deleted file mode 100644
index 705c97c5dc64..000000000000
--- a/virtual/perl-Time-Local/perl-Time-Local-1.200.0-r2.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-Time-Local/perl-Time-Local-1.200.0-r2.ebuild,v 1.3 2014/01/20 20:47:25 vapier Exp $
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="|| ( =dev-lang/perl-5.16* =dev-lang/perl-5.14* ~perl-core/${PN#perl-}-${PV} )"
diff --git a/virtual/perl-Time-Local/perl-Time-Local-1.220.0.ebuild b/virtual/perl-Time-Local/perl-Time-Local-1.220.0.ebuild
deleted file mode 100644
index eca2550b7331..000000000000
--- a/virtual/perl-Time-Local/perl-Time-Local-1.220.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-Time-Local/perl-Time-Local-1.220.0.ebuild,v 1.2 2014/01/20 20:47:25 vapier Exp $
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-Time-Local/perl-Time-Local-1.230.0.ebuild b/virtual/perl-Time-Local/perl-Time-Local-1.230.0-r1.ebuild
similarity index 68%
rename from virtual/perl-Time-Local/perl-Time-Local-1.230.0.ebuild
rename to virtual/perl-Time-Local/perl-Time-Local-1.230.0-r1.ebuild
index 70ffd9aef73e..ccd4f74913b5 100644
--- a/virtual/perl-Time-Local/perl-Time-Local-1.230.0.ebuild
+++ b/virtual/perl-Time-Local/perl-Time-Local-1.230.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-Time-Local/perl-Time-Local-1.230.0.ebuild,v 1.16 2014/01/20 20:47:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Time-Local/perl-Time-Local-1.230.0-r1.ebuild,v 1.1 2014/07/15 18:14:26 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 ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-RDEPEND="~perl-core/${PN#perl-}-${PV}"
+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/perl-Time-Piece/perl-Time-Piece-1.20.ebuild b/virtual/perl-Time-Piece/perl-Time-Piece-1.20-r1.ebuild
similarity index 51%
rename from virtual/perl-Time-Piece/perl-Time-Piece-1.20.ebuild
rename to virtual/perl-Time-Piece/perl-Time-Piece-1.20-r1.ebuild
index 669dbdb51772..c6fb7e314586 100644
--- a/virtual/perl-Time-Piece/perl-Time-Piece-1.20.ebuild
+++ b/virtual/perl-Time-Piece/perl-Time-Piece-1.20-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-Time-Piece/perl-Time-Piece-1.20.ebuild,v 1.8 2014/01/20 20:47:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Time-Piece/perl-Time-Piece-1.20-r1.ebuild,v 1.1 2014/07/15 18:19:54 dilfridge Exp $
-DESCRIPTION="Object Oriented time objects"
+EAPI=5
+
+DESCRIPTION="Virtual for ${PN#perl-}"
HOMEPAGE=""
SRC_URI=""
@@ -11,4 +13,8 @@ SLOT="0"
KEYWORDS="alpha amd64 arm64 ia64 ppc ppc64 sparc x86 ~x86-solaris"
IUSE=""
-RDEPEND="~perl-core/Time-Piece-${PV}"
+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-Time-Piece/perl-Time-Piece-1.22.ebuild b/virtual/perl-Time-Piece/perl-Time-Piece-1.22.ebuild
deleted file mode 100644
index 3f7a3f8df519..000000000000
--- a/virtual/perl-Time-Piece/perl-Time-Piece-1.22.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-Time-Piece/perl-Time-Piece-1.22.ebuild,v 1.2 2014/01/20 20:47:28 vapier Exp $
-
-DESCRIPTION="Object Oriented time objects"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
-IUSE=""
-
-RDEPEND="~perl-core/Time-Piece-${PV}"
diff --git a/virtual/perl-Time-Piece/perl-Time-Piece-1.230.0.ebuild b/virtual/perl-Time-Piece/perl-Time-Piece-1.270.0.ebuild
similarity index 54%
rename from virtual/perl-Time-Piece/perl-Time-Piece-1.230.0.ebuild
rename to virtual/perl-Time-Piece/perl-Time-Piece-1.270.0.ebuild
index 8b33ddc51b30..a684750e3a25 100644
--- a/virtual/perl-Time-Piece/perl-Time-Piece-1.230.0.ebuild
+++ b/virtual/perl-Time-Piece/perl-Time-Piece-1.270.0.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-Time-Piece/perl-Time-Piece-1.230.0.ebuild,v 1.2 2014/01/20 20:47:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Time-Piece/perl-Time-Piece-1.270.0.ebuild,v 1.1 2014/07/15 18:19:54 dilfridge Exp $
-DESCRIPTION="Object Oriented time objects"
+EAPI=5
+
+DESCRIPTION="Virtual for ${PN#perl-}"
HOMEPAGE=""
SRC_URI=""
@@ -11,4 +13,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
IUSE=""
-RDEPEND="~perl-core/Time-Piece-${PV}"
+RDEPEND="
+ || ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Version-Requirements/perl-Version-Requirements-0.101.21.ebuild b/virtual/perl-Version-Requirements/perl-Version-Requirements-0.101.21.ebuild
deleted file mode 100644
index 1e2ff9a85f03..000000000000
--- a/virtual/perl-Version-Requirements/perl-Version-Requirements-0.101.21.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-Version-Requirements/perl-Version-Requirements-0.101.21.ebuild,v 1.1 2012/01/08 17:13:08 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="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-Version-Requirements/perl-Version-Requirements-0.101.20-r2.ebuild b/virtual/perl-Version-Requirements/perl-Version-Requirements-0.101.22.ebuild
similarity index 64%
rename from virtual/perl-Version-Requirements/perl-Version-Requirements-0.101.20-r2.ebuild
rename to virtual/perl-Version-Requirements/perl-Version-Requirements-0.101.22.ebuild
index 726d4a8417aa..4a9eda089364 100644
--- a/virtual/perl-Version-Requirements/perl-Version-Requirements-0.101.20-r2.ebuild
+++ b/virtual/perl-Version-Requirements/perl-Version-Requirements-0.101.22.ebuild
@@ -1,6 +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/virtual/perl-Version-Requirements/perl-Version-Requirements-0.101.20-r2.ebuild,v 1.10 2012/05/15 19:14:18 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Version-Requirements/perl-Version-Requirements-0.101.22.ebuild,v 1.1 2014/07/15 18:26:29 dilfridge Exp $
+
+EAPI=5
DESCRIPTION="Virtual for ${PN#perl-}"
HOMEPAGE=""
@@ -11,4 +13,8 @@ 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.14* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.16* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-XSLoader/perl-XSLoader-0.160.0.ebuild b/virtual/perl-XSLoader/perl-XSLoader-0.160.0-r1.ebuild
similarity index 63%
rename from virtual/perl-XSLoader/perl-XSLoader-0.160.0.ebuild
rename to virtual/perl-XSLoader/perl-XSLoader-0.160.0-r1.ebuild
index 5835d2a1af09..42ac63469115 100644
--- a/virtual/perl-XSLoader/perl-XSLoader-0.160.0.ebuild
+++ b/virtual/perl-XSLoader/perl-XSLoader-0.160.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-XSLoader/perl-XSLoader-0.160.0.ebuild,v 1.13 2014/02/16 14:13:24 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-XSLoader/perl-XSLoader-0.160.0-r1.ebuild,v 1.1 2014/07/15 18:30:50 dilfridge Exp $
+
+EAPI=5
DESCRIPTION="Virtual for ${PN#perl-}"
HOMEPAGE=""
@@ -11,4 +13,8 @@ SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE=""
-RDEPEND="~perl-core/${PN#perl-}-${PV}"
+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-XSLoader/perl-XSLoader-0.170.0.ebuild b/virtual/perl-XSLoader/perl-XSLoader-0.170.0.ebuild
new file mode 100644
index 000000000000..ea3f60598e23
--- /dev/null
+++ b/virtual/perl-XSLoader/perl-XSLoader-0.170.0.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-XSLoader/perl-XSLoader-0.170.0.ebuild,v 1.1 2014/07/15 18:30:51 dilfridge Exp $
+
+EAPI=5
+
+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-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+ || ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-autodie/perl-autodie-2.160.0.ebuild b/virtual/perl-autodie/perl-autodie-2.160.0.ebuild
deleted file mode 100644
index 5af520c14b45..000000000000
--- a/virtual/perl-autodie/perl-autodie-2.160.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-autodie/perl-autodie-2.160.0.ebuild,v 1.1 2013/03/02 08:39:58 tove Exp $
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-autodie/perl-autodie-2.200.0.ebuild b/virtual/perl-autodie/perl-autodie-2.200.0.ebuild
deleted file mode 100644
index 98f29a1cfaf7..000000000000
--- a/virtual/perl-autodie/perl-autodie-2.200.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-autodie/perl-autodie-2.200.0.ebuild,v 1.1 2013/08/16 07:00:28 patrick Exp $
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-autodie/perl-autodie-2.210.0.ebuild b/virtual/perl-autodie/perl-autodie-2.210.0.ebuild
deleted file mode 100644
index 105474399afa..000000000000
--- a/virtual/perl-autodie/perl-autodie-2.210.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-autodie/perl-autodie-2.210.0.ebuild,v 1.1 2013/09/18 02:25:11 patrick Exp $
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-autodie/perl-autodie-2.230.0.ebuild b/virtual/perl-autodie/perl-autodie-2.230.0.ebuild
new file mode 100644
index 000000000000..b10aec63ddfe
--- /dev/null
+++ b/virtual/perl-autodie/perl-autodie-2.230.0.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-autodie/perl-autodie-2.230.0.ebuild,v 1.1 2014/07/15 19:20:41 dilfridge Exp $
+
+EAPI=5
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ || ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-i18n-langtags/perl-i18n-langtags-0.35.ebuild b/virtual/perl-i18n-langtags/perl-i18n-langtags-0.380.0.ebuild
similarity index 53%
rename from virtual/perl-i18n-langtags/perl-i18n-langtags-0.35.ebuild
rename to virtual/perl-i18n-langtags/perl-i18n-langtags-0.380.0.ebuild
index dbafb82524ba..b5c6688d9c03 100644
--- a/virtual/perl-i18n-langtags/perl-i18n-langtags-0.35.ebuild
+++ b/virtual/perl-i18n-langtags/perl-i18n-langtags-0.380.0.ebuild
@@ -1,6 +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/virtual/perl-i18n-langtags/perl-i18n-langtags-0.35.ebuild,v 1.8 2013/12/31 14:57:20 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-i18n-langtags/perl-i18n-langtags-0.380.0.ebuild,v 1.1 2014/07/15 19:43:49 dilfridge Exp $
+
+EAPI=5
DESCRIPTION="Virtual for I18N-LangTags"
HOMEPAGE=""
@@ -11,4 +13,8 @@ SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd"
IUSE=""
-RDEPEND="|| ( ~dev-lang/perl-5.12.4 ~dev-lang/perl-5.12.3 ~dev-lang/perl-5.12.2 ~perl-core/i18n-langtags-${PV} )"
+RDEPEND="
+ || ( =dev-lang/perl-5.16* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-i18n-langtags/perl-i18n-langtags-0.390.0.ebuild b/virtual/perl-i18n-langtags/perl-i18n-langtags-0.390.0.ebuild
new file mode 100644
index 000000000000..31c7020e356a
--- /dev/null
+++ b/virtual/perl-i18n-langtags/perl-i18n-langtags-0.390.0.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-i18n-langtags/perl-i18n-langtags-0.390.0.ebuild,v 1.1 2014/07/15 19:43:49 dilfridge Exp $
+
+EAPI=5
+
+DESCRIPTION="Virtual for I18N-LangTags"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND="
+ || ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-i18n-langtags/perl-i18n-langtags-0.400.0.ebuild b/virtual/perl-i18n-langtags/perl-i18n-langtags-0.400.0.ebuild
new file mode 100644
index 000000000000..cdccdadfabb5
--- /dev/null
+++ b/virtual/perl-i18n-langtags/perl-i18n-langtags-0.400.0.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-i18n-langtags/perl-i18n-langtags-0.400.0.ebuild,v 1.1 2014/07/15 19:43:49 dilfridge Exp $
+
+EAPI=5
+
+DESCRIPTION="Virtual for I18N-LangTags"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND="
+ || ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-if/perl-if-0.60.200-r1.ebuild b/virtual/perl-if/perl-if-0.60.200-r1.ebuild
new file mode 100644
index 000000000000..8d15fe2e8da3
--- /dev/null
+++ b/virtual/perl-if/perl-if-0.60.200-r1.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-if/perl-if-0.60.200-r1.ebuild,v 1.1 2014/07/15 20:53:49 dilfridge Exp $
+
+EAPI=5
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="x86 amd64"
+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-if/perl-if-0.60.200.ebuild b/virtual/perl-if/perl-if-0.60.200.ebuild
deleted file mode 100644
index 24dafb5f8de1..000000000000
--- a/virtual/perl-if/perl-if-0.60.200.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-if/perl-if-0.60.200.ebuild,v 1.1 2013/08/14 05:37:59 patrick Exp $
-
-DESCRIPTION="Virtual for perl-core/if"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="|| ( =dev-lang/perl-5.18* =dev-lang/perl-5.16* ~perl-core/if-${PV} )"
diff --git a/virtual/perl-if/perl-if-0.60.300.ebuild b/virtual/perl-if/perl-if-0.60.300.ebuild
new file mode 100644
index 000000000000..e20f1baee119
--- /dev/null
+++ b/virtual/perl-if/perl-if-0.60.300.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-if/perl-if-0.60.300.ebuild,v 1.1 2014/07/15 20:53:49 dilfridge Exp $
+
+EAPI=5
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+ || ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-libnet/perl-libnet-1.220.0-r1.ebuild b/virtual/perl-libnet/perl-libnet-1.220.0-r2.ebuild
similarity index 62%
rename from virtual/perl-libnet/perl-libnet-1.220.0-r1.ebuild
rename to virtual/perl-libnet/perl-libnet-1.220.0-r2.ebuild
index 939b52cd5904..33d4dd46e572 100644
--- a/virtual/perl-libnet/perl-libnet-1.220.0-r1.ebuild
+++ b/virtual/perl-libnet/perl-libnet-1.220.0-r2.ebuild
@@ -1,9 +1,11 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-libnet/perl-libnet-1.220.0-r1.ebuild,v 1.9 2014/02/15 08:56:55 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-libnet/perl-libnet-1.220.0-r2.ebuild,v 1.3 2014/07/15 21:20:09 dilfridge Exp $
-#Some important notes about detecting libnet version
-#http://dev.gentoo.org/~zlogene/perl-libnet-mantainer-notes
+# Some important notes about detecting libnet version
+# http://dev.gentoo.org/~zlogene/perl-libnet-mantainer-notes
+
+EAPI=5
DESCRIPTION="Virtual for ${PN#perl-}"
HOMEPAGE=""
@@ -14,4 +16,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.16* =dev-lang/perl-5.14* ~dev-lang/perl-5.12.4 ~dev-lang/perl-5.12.3 ~dev-lang/perl-5.12.2 ~perl-core/${PN#perl-}-${PV} )"
+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-libnet/perl-libnet-1.230.0-r1.ebuild b/virtual/perl-libnet/perl-libnet-1.230.0-r1.ebuild
new file mode 100644
index 000000000000..e403611134b8
--- /dev/null
+++ b/virtual/perl-libnet/perl-libnet-1.230.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-libnet/perl-libnet-1.230.0-r1.ebuild,v 1.1 2014/07/15 21:20:09 dilfridge Exp $
+
+# Some important notes about detecting libnet version
+# http://dev.gentoo.org/~zlogene/perl-libnet-mantainer-notes
+
+EAPI=5
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+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="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-libnet/perl-libnet-1.230.0.ebuild b/virtual/perl-libnet/perl-libnet-1.230.0.ebuild
deleted file mode 100644
index 6e408f91a5e1..000000000000
--- a/virtual/perl-libnet/perl-libnet-1.230.0.ebuild
+++ /dev/null
@@ -1,17 +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-libnet/perl-libnet-1.230.0.ebuild,v 1.5 2014/02/15 08:56:55 zlogene Exp $
-
-#Some important notes about detecting libnet version
-#http://dev.gentoo.org/~zlogene/perl-libnet-mantainer-notes
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-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* =dev-lang/perl-5.16* =dev-lang/perl-5.14* ~dev-lang/perl-5.12.4 ~dev-lang/perl-5.12.3 ~dev-lang/perl-5.12.2 ~perl-core/${PN#perl-}-${PV} )"
diff --git a/virtual/perl-libnet/perl-libnet-1.270.0.ebuild b/virtual/perl-libnet/perl-libnet-1.270.0.ebuild
new file mode 100644
index 000000000000..4ad5d7f8de46
--- /dev/null
+++ b/virtual/perl-libnet/perl-libnet-1.270.0.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-libnet/perl-libnet-1.270.0.ebuild,v 1.1 2014/07/15 21:20:09 dilfridge Exp $
+
+# Some important notes about detecting libnet version
+# http://dev.gentoo.org/~zlogene/perl-libnet-mantainer-notes
+
+# perl-5.20 probably was 1.260 (which is not on cpan anymore)
+
+EAPI=5
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+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="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-locale-maketext/perl-locale-maketext-1.230.0.ebuild b/virtual/perl-locale-maketext/perl-locale-maketext-1.230.0-r1.ebuild
similarity index 59%
rename from virtual/perl-locale-maketext/perl-locale-maketext-1.230.0.ebuild
rename to virtual/perl-locale-maketext/perl-locale-maketext-1.230.0-r1.ebuild
index 6c93d443231b..6f6449e0ffde 100644
--- a/virtual/perl-locale-maketext/perl-locale-maketext-1.230.0.ebuild
+++ b/virtual/perl-locale-maketext/perl-locale-maketext-1.230.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-locale-maketext/perl-locale-maketext-1.230.0.ebuild,v 1.10 2014/01/17 05:58:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-locale-maketext/perl-locale-maketext-1.230.0-r1.ebuild,v 1.1 2014/07/15 21:26:33 dilfridge Exp $
+
+EAPI=5
DESCRIPTION="Virtual for ${PN#perl-}"
HOMEPAGE=""
@@ -10,4 +12,8 @@ SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc s390 sh sparc x86 ~amd64-fbsd"
IUSE=""
-RDEPEND="~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-locale-maketext/perl-locale-maketext-1.250.0.ebuild b/virtual/perl-locale-maketext/perl-locale-maketext-1.250.0.ebuild
new file mode 100644
index 000000000000..f0e16f53a552
--- /dev/null
+++ b/virtual/perl-locale-maketext/perl-locale-maketext-1.250.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-locale-maketext/perl-locale-maketext-1.250.0.ebuild,v 1.1 2014/07/15 21:26:33 dilfridge Exp $
+
+EAPI=5
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+HOMEPAGE=""
+SRC_URI=""
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND="
+ || ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 6891ac4a7a66..7b83e7efacec 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,2 +1,2 @@
-DIST google-chrome-beta_36.0.1985.103-1_amd64.deb 48196212 SHA256 d15b0dbbda0e602f6667cdec08752d7b21f45346db4d1dbe715a1d6b994d00b7 SHA512 8ad9a5f1c625ff897eeee91fac114de9c343e9c3e466e62fd82b856a77664cc966c286bc82c99db6ec875a967bb5b598d0c56cd7d3440c9ca376aee0269149ff WHIRLPOOL 2b775be23d6fb5572a3fcfe93861a787b36af96551c22ebb04af4b5f875a305dfbff5084c156bf5e0e213fbc05fc8c1d1f546a55daf53a5322ac0494b541ba07
-DIST google-chrome-beta_36.0.1985.103-1_i386.deb 48773452 SHA256 8c943e69a40abbabff881882c56446eb8d3030cf8405a86039f21f387c2f7088 SHA512 29fbb682a05e04d79120f924cf04348f12570f93885e6d7b863c3170c095f651e9621b3d848196636e77d083b0a400a240b03aae4b809b677ade49b9d79f46a3 WHIRLPOOL 6e86fba8268ee9b033cb06043dc2db055f026ec24d033d258e1f8d54a2e0056e93c68c750a4145dc1a80c12c5c2adecfda6a87c8783d6c480dc0301b61f1e7c9
+DIST google-chrome-beta_36.0.1985.125-1_amd64.deb 48396230 SHA256 9953f6e24d7d3ff18088f2b442be4b9bdd68a6819541a992aef11d4e3853f671 SHA512 b351f2f6ad4a6e2d4f9dad0805fef3d5ea3d0f765772980faf6dbd5e5436c4bcb2ef68ad22e4275624f24a52e01fb0fb20b300f7b5d77ba716190c8c9a709d0b WHIRLPOOL 9f39caccbeb7d0ff7d2b03d0c344ac0d90ac66bb9e5a45419dbf1efdfaeb5aee8bc5e53836b41cd59ebf451c95c343326e2dd1abdbde555629eb67dc94588a01
+DIST google-chrome-beta_36.0.1985.125-1_i386.deb 48782928 SHA256 e2ee5d5e3136657ed40e86d66ea9737b46f63e7f558e7816e8bc20ff250112d5 SHA512 3ec121038a8b877fb25782d2c44bce33affb3d16b9c8a18fe863befe3971e739830fa6c4fe5519cedc9dc5675dd2ebb2b96df550febc1f5c4db806e57248c3fa WHIRLPOOL f13909af05de43576793fb852d0730e308cd8b68f6253c6650ad906839680c2051af113df7e091b2868df90e2ebda179bb432c9fef6a6bd8140485b33582081e
diff --git a/www-client/google-chrome-beta/google-chrome-beta-36.0.1985.103_p1.ebuild b/www-client/google-chrome-beta/google-chrome-beta-36.0.1985.125_p1.ebuild
similarity index 98%
rename from www-client/google-chrome-beta/google-chrome-beta-36.0.1985.103_p1.ebuild
rename to www-client/google-chrome-beta/google-chrome-beta-36.0.1985.125_p1.ebuild
index e3fd75dfaa8d..ebf71f9a9955 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-36.0.1985.103_p1.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-36.0.1985.125_p1.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/google-chrome-beta/google-chrome-beta-36.0.1985.103_p1.ebuild,v 1.1 2014/07/01 16:18:02 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome-beta/google-chrome-beta-36.0.1985.125_p1.ebuild,v 1.1 2014/07/15 23:59:41 floppym Exp $
EAPI="5"
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 9902b8f0a18d..e29e6656897a 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,2 +1,2 @@
-DIST google-chrome-unstable_37.0.2062.3-1_amd64.deb 49436368 SHA256 2cba7e8b18cc2d7af22c3dc1436eae9f2df760074614b112367d37f330e25386 SHA512 dcd454b2531b4b6949f57034669c9130c9daa9f57e7a8a87135b7223dbcec026b0f1748f83543eb881de6e04a52a8a3ceb8fa25e80b6f0112c06f7ac3f28eeee WHIRLPOOL decfc5c2a08b45c355ee2abd34effd701d6c150e928e42d2fdeaf8e1faa72653a6f771e7cb38a4a2ec8452ce741b358362b71726b762b35b49a6bbc21f954b62
-DIST google-chrome-unstable_37.0.2062.3-1_i386.deb 49758064 SHA256 c1a52e5d97203b38e696ead0e4428e3e6079edd6e934bd51e79ba2673d5067ac SHA512 4dd51654c540dbe1529d1bbe084c1f2af8fcee9849d52d6aba32d2a66dbf990d029a1a9cc7c30baf30ec142ba6f1a0412cd6909b3b10c3985aec7731c396b244 WHIRLPOOL 6eb16b19df13e5e2dad96931de7271f36a577bbd234c482e32bceb896cbe3376b1007614ccb2da03f44b8e806b7b6ca79e0520de91c49b413aac6f828ef5388d
+DIST google-chrome-unstable_37.0.2062.20-1_amd64.deb 49420848 SHA256 615c8410b2cddab0c0030826e5ae0dfc8514a1f7338aac0faa7267b10604976c SHA512 0804df8493978377e881d7cefd868f083239d341f5d03f13c4d7cd6ab20e7e044a2f01e29bda6b2b87c630b9f2a24c08efc2aa5ee9837f839d9b36e8f5f80b5d WHIRLPOOL 5afd39eeea18820d9559b208fb2c182b34fbaa60b01abec2e33fa47761cc745098423f1d7d4af4f59523bcac85ad3029df479112dab417744b0895736e29ea8a
+DIST google-chrome-unstable_37.0.2062.20-1_i386.deb 49906174 SHA256 d82374ff61712fd70bd53f8eb755f4a72cc7ad25f0abac4b1064219bafd5d85b SHA512 93f9406f388886b4e8807f0411446d7061d7420a9b76fed79235bab11cda5426b9b540ee1fe9fa9bf740ff9748eef3329564187b62710ad4a43101ca570e261b WHIRLPOOL d4867d31ce605a5db9d9ba20ef7812bb6df1f32a468d9ada27250f0fb4b9c1f1ecef06c10d0f55b9359b3289db2d24952b242c380b610cff51be3a5d57017dbc
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-37.0.2062.3_p1.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-37.0.2062.20_p1.ebuild
similarity index 97%
rename from www-client/google-chrome-unstable/google-chrome-unstable-37.0.2062.3_p1.ebuild
rename to www-client/google-chrome-unstable/google-chrome-unstable-37.0.2062.20_p1.ebuild
index 235b190aa245..be02229ce4b4 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-37.0.2062.3_p1.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-37.0.2062.20_p1.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/google-chrome-unstable/google-chrome-unstable-37.0.2062.3_p1.ebuild,v 1.1 2014/06/26 23:23:33 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome-unstable/google-chrome-unstable-37.0.2062.20_p1.ebuild,v 1.1 2014/07/16 00:01:05 floppym Exp $
EAPI="5"
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 3fd7c293c18c..5438b7941e6d 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,6 +1,6 @@
-DIST google-chrome-beta_36.0.1985.103-1_amd64.deb 48196212 SHA256 d15b0dbbda0e602f6667cdec08752d7b21f45346db4d1dbe715a1d6b994d00b7 SHA512 8ad9a5f1c625ff897eeee91fac114de9c343e9c3e466e62fd82b856a77664cc966c286bc82c99db6ec875a967bb5b598d0c56cd7d3440c9ca376aee0269149ff WHIRLPOOL 2b775be23d6fb5572a3fcfe93861a787b36af96551c22ebb04af4b5f875a305dfbff5084c156bf5e0e213fbc05fc8c1d1f546a55daf53a5322ac0494b541ba07
-DIST google-chrome-beta_36.0.1985.103-1_i386.deb 48773452 SHA256 8c943e69a40abbabff881882c56446eb8d3030cf8405a86039f21f387c2f7088 SHA512 29fbb682a05e04d79120f924cf04348f12570f93885e6d7b863c3170c095f651e9621b3d848196636e77d083b0a400a240b03aae4b809b677ade49b9d79f46a3 WHIRLPOOL 6e86fba8268ee9b033cb06043dc2db055f026ec24d033d258e1f8d54a2e0056e93c68c750a4145dc1a80c12c5c2adecfda6a87c8783d6c480dc0301b61f1e7c9
+DIST google-chrome-beta_36.0.1985.125-1_amd64.deb 48396230 SHA256 9953f6e24d7d3ff18088f2b442be4b9bdd68a6819541a992aef11d4e3853f671 SHA512 b351f2f6ad4a6e2d4f9dad0805fef3d5ea3d0f765772980faf6dbd5e5436c4bcb2ef68ad22e4275624f24a52e01fb0fb20b300f7b5d77ba716190c8c9a709d0b WHIRLPOOL 9f39caccbeb7d0ff7d2b03d0c344ac0d90ac66bb9e5a45419dbf1efdfaeb5aee8bc5e53836b41cd59ebf451c95c343326e2dd1abdbde555629eb67dc94588a01
+DIST google-chrome-beta_36.0.1985.125-1_i386.deb 48782928 SHA256 e2ee5d5e3136657ed40e86d66ea9737b46f63e7f558e7816e8bc20ff250112d5 SHA512 3ec121038a8b877fb25782d2c44bce33affb3d16b9c8a18fe863befe3971e739830fa6c4fe5519cedc9dc5675dd2ebb2b96df550febc1f5c4db806e57248c3fa WHIRLPOOL f13909af05de43576793fb852d0730e308cd8b68f6253c6650ad906839680c2051af113df7e091b2868df90e2ebda179bb432c9fef6a6bd8140485b33582081e
DIST google-chrome-stable_35.0.1916.153-1_amd64.deb 46537134 SHA256 2e723d825a3b4563232a1edfdfd4309bb23174b54a90650a4aa6a18d62a84cf4 SHA512 30dceb1ecaab00cf3743fcc192f561a024205786090c18e88cb840fa5a39b7dbdf578e2a436fd7cee047e84f7560ec9df5ec49fd920388d17d667ecca1861f23 WHIRLPOOL fa3cbe91ad229675260c799e4fc738f2cfb83be2eadb8902b2ca12865dee55a15eb2fb8bfd2745b8e00186acac239c0cedb6c3584e2af5d517638ae7041a8656
DIST google-chrome-stable_35.0.1916.153-1_i386.deb 46806400 SHA256 767a8dce8e06f74d5a1d42f9fd780647d31f0984ba153c97d11645d57827a376 SHA512 9b95bcb5e076f369127c8201f994d1357f9945417b4795121654bb992721267d02de10b4e3b87dfae8903145ac2cd2d6605aa7ff2ebefc2efcb55c3799d7ea65 WHIRLPOOL 6c707a7f537ea31e38408389b5cbc3f6e8571e17d7a1d794a2d12dde19a02dc2ff3710f770ee8f62c90c7fbeea6b965f773b706a68f8ea97f0bc14fc487e9590
-DIST google-chrome-unstable_37.0.2062.3-1_amd64.deb 49436368 SHA256 2cba7e8b18cc2d7af22c3dc1436eae9f2df760074614b112367d37f330e25386 SHA512 dcd454b2531b4b6949f57034669c9130c9daa9f57e7a8a87135b7223dbcec026b0f1748f83543eb881de6e04a52a8a3ceb8fa25e80b6f0112c06f7ac3f28eeee WHIRLPOOL decfc5c2a08b45c355ee2abd34effd701d6c150e928e42d2fdeaf8e1faa72653a6f771e7cb38a4a2ec8452ce741b358362b71726b762b35b49a6bbc21f954b62
-DIST google-chrome-unstable_37.0.2062.3-1_i386.deb 49758064 SHA256 c1a52e5d97203b38e696ead0e4428e3e6079edd6e934bd51e79ba2673d5067ac SHA512 4dd51654c540dbe1529d1bbe084c1f2af8fcee9849d52d6aba32d2a66dbf990d029a1a9cc7c30baf30ec142ba6f1a0412cd6909b3b10c3985aec7731c396b244 WHIRLPOOL 6eb16b19df13e5e2dad96931de7271f36a577bbd234c482e32bceb896cbe3376b1007614ccb2da03f44b8e806b7b6ca79e0520de91c49b413aac6f828ef5388d
+DIST google-chrome-unstable_37.0.2062.20-1_amd64.deb 49420848 SHA256 615c8410b2cddab0c0030826e5ae0dfc8514a1f7338aac0faa7267b10604976c SHA512 0804df8493978377e881d7cefd868f083239d341f5d03f13c4d7cd6ab20e7e044a2f01e29bda6b2b87c630b9f2a24c08efc2aa5ee9837f839d9b36e8f5f80b5d WHIRLPOOL 5afd39eeea18820d9559b208fb2c182b34fbaa60b01abec2e33fa47761cc745098423f1d7d4af4f59523bcac85ad3029df479112dab417744b0895736e29ea8a
+DIST google-chrome-unstable_37.0.2062.20-1_i386.deb 49906174 SHA256 d82374ff61712fd70bd53f8eb755f4a72cc7ad25f0abac4b1064219bafd5d85b SHA512 93f9406f388886b4e8807f0411446d7061d7420a9b76fed79235bab11cda5426b9b540ee1fe9fa9bf740ff9748eef3329564187b62710ad4a43101ca570e261b WHIRLPOOL d4867d31ce605a5db9d9ba20ef7812bb6df1f32a468d9ada27250f0fb4b9c1f1ecef06c10d0f55b9359b3289db2d24952b242c380b610cff51be3a5d57017dbc
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-36.0.1985.103_beta1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-36.0.1985.125_beta1.ebuild
similarity index 95%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-36.0.1985.103_beta1.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-36.0.1985.125_beta1.ebuild
index 39af9aa3d59a..fe2f68ccf605 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-36.0.1985.103_beta1.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-36.0.1985.125_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-36.0.1985.103_beta1.ebuild,v 1.1 2014/07/01 16:18:15 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-36.0.1985.125_beta1.ebuild,v 1.1 2014/07/16 00:00:48 floppym Exp $
EAPI=4
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.3_alpha1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.20_alpha1.ebuild
similarity index 95%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.3_alpha1.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.20_alpha1.ebuild
index 6060082729be..055d7460a31a 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.3_alpha1.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.20_alpha1.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.3_alpha1.ebuild,v 1.1 2014/06/26 23:23:46 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.20_alpha1.ebuild,v 1.1 2014/07/16 00:00:48 floppym Exp $
EAPI=4
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.3.0.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.3.0.ebuild
index bbda3e4f9a62..a75b4f99ed1a 100644
--- a/x11-libs/libva-intel-driver/libva-intel-driver-1.3.0.ebuild
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-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/x11-libs/libva-intel-driver/libva-intel-driver-1.3.0.ebuild,v 1.3 2014/06/18 21:02:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-1.3.0.ebuild,v 1.4 2014/07/15 15:47:47 pacho Exp $
EAPI=5
@@ -26,7 +26,7 @@ fi
LICENSE="MIT"
SLOT="0"
if [ "${PV%9999}" = "${PV}" ] ; then
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
else
KEYWORDS=""
fi
diff --git a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r1.ebuild b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r1.ebuild
index c26d08302cbd..6d66bc4c6dfd 100644
--- a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r1.ebuild
+++ b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.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/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r1.ebuild,v 1.3 2014/06/18 21:02:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r1.ebuild,v 1.4 2014/07/15 15:47:32 pacho Exp $
EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/$
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug opengl"
RDEPEND=">=x11-libs/libva-1.2.1-r1[X,opengl?,${MULTILIB_USEDEP}]
diff --git a/x11-libs/libva/libva-1.3.1.ebuild b/x11-libs/libva/libva-1.3.1.ebuild
index 06b3d6734242..16b1a66b4e8e 100644
--- a/x11-libs/libva/libva-1.3.1.ebuild
+++ b/x11-libs/libva/libva-1.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/x11-libs/libva/libva-1.3.1.ebuild,v 1.2 2014/06/18 21:02:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.3.1.ebuild,v 1.3 2014/07/15 15:47:47 pacho Exp $
EAPI=5
@@ -26,7 +26,7 @@ fi
LICENSE="MIT"
SLOT="0"
if [ "${PV%9999}" = "${PV}" ] ; then
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
else
KEYWORDS=""
fi
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index b055906cf86d..89b3113b6473 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,3 +1,2 @@
DIST muffin-1.8.2.tar.gz 2685117 SHA256 903c6ab5e228c8a1b8e05f460ba34c111e8a92ce9382ebd0b014416af4dd7049 SHA512 eb175e201e16c277cf3d3f69726249cc6ca992cafd5fa1c03b563a3a30705362874fc710eef5801cb42bf6692fd0e44723d2a261c757320ed687756a79287b92 WHIRLPOOL 20dcc04d64c0a7a5c594820f29dee9267d5ed2d818a2b8f23f913ec4d4c90a3ff11ae3a7d9d5804d9146798efef60a2eac8dccdb35367c55b5de08a9edfa6d6f
-DIST muffin-2.2.2.tar.gz 2704579 SHA256 1f39bb8d76ed0fa5704c5cb336ea86e6871396e92fca8a1ff0671be0b4d30739 SHA512 f059eec68328de7fa207aa2d6d75350844bd9c2b82e795d6ea47cfe94400c44aaed32e72f93166878f1ce264bbeb796e0fd903caa5596f5029c909dbef277854 WHIRLPOOL 095e0ecdcba8130c6f55cf4246084e4b197f3a7ea978e141268031f71299a255054c53b37b9fc1dce722ff71d55eed0a23ff70a26ec5a270947a9441bf6b81f4
-DIST muffin-2.2.3.tar.gz 2704806 SHA256 c34f02a67c96d3d0925988a87865f1dc590c84ba7ddd9d8e1872b5ad768f445c SHA512 a4d26a00ec5d6a0eebc4a270557f6ad057731df74e1a56a9b72a54415ca0f3f3f56e1564d4fb2f84ea41aafbe05dc44eb6a8d502b886ac77fd8697e484b36cf7 WHIRLPOOL 8737730ee480678b5d0caae1480a98108a27e2184f4d7196e8ef63760bb8f6258de0d17d487eb22fbeb689ef06040248577d65ed41ade0eed2a9d30aa73b2718
+DIST muffin-2.2.6.tar.gz 2705497 SHA256 5617504f5f8ecaf53268787728e6b7bf5da1514d9bc538dd0c047d467cca9ccf SHA512 d77d51c927216efbf2d833fbc2a6f1d6f1752316a35fdff75f5c25f4a148916757a33d1bb46fd89bdb678366fa17fd352282f084c350c35b561102bbf7f996cc WHIRLPOOL 34c314aab819c366857c23cf9babc9a2dda7e52b63fcb496237a80a31a780a60d054808a7dec1c3b0e945d869cdc2aa192bf76467a108a376c817e6b7a594326
diff --git a/x11-wm/muffin/muffin-2.2.3.ebuild b/x11-wm/muffin/muffin-2.2.3.ebuild
deleted file mode 100644
index 98287c5d7b4c..000000000000
--- a/x11-wm/muffin/muffin-2.2.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/muffin/muffin-2.2.3.ebuild,v 1.1 2014/05/16 02:03:55 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit autotools eutils gnome2 python-any-r1
-
-DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-
-SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection test xinerama"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
- >=x11-libs/pango-1.2[X,introspection?]
- >=x11-libs/cairo-1.10:=[X]
- x11-libs/gdk-pixbuf:2[introspection?]
- >=x11-libs/gtk+-3.3.7:3[X,introspection?]
- >=dev-libs/glib-2.25.10:2
- >=gnome-extra/cinnamon-desktop-1.0:0=[introspection?]
- >=media-libs/clutter-1.9.10:1.0=[introspection?]
- >=media-libs/cogl-1.9.6:1.0=[introspection?]
- >=media-libs/libcanberra-0.26[gtk3]
- >=x11-libs/startup-notification-0.7:=
- >=x11-libs/libXcomposite-0.2
- >=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
-
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/opengl
-
- gnome-extra/zenity
-
- introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
- xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${COMMON_DEPEND}
- ${PYTHON_DEPS}
- >=app-text/gnome-doc-utils-0.8
- sys-devel/gettext
- >=dev-util/intltool-0.35
- virtual/pkgconfig
- test? ( app-text/docbook-xml-dtd:4.5 )
- xinerama? ( x11-proto/xineramaproto )
- x11-proto/xextproto
- x11-proto/xproto
-"
-RDEPEND="${COMMON_DEPEND}
- !x11-misc/expocity
-"
-
-src_prepare() {
- epatch_user
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
- gnome2_src_configure \
- --disable-static \
- --enable-shape \
- --enable-sm \
- --enable-startup-notification \
- --enable-xsync \
- --enable-verbose-mode \
- --with-libcanberra \
- $(use_enable introspection) \
- $(use_enable xinerama)
-}
diff --git a/x11-wm/muffin/muffin-2.2.2.ebuild b/x11-wm/muffin/muffin-2.2.6.ebuild
similarity index 94%
rename from x11-wm/muffin/muffin-2.2.2.ebuild
rename to x11-wm/muffin/muffin-2.2.6.ebuild
index bf53735e9b24..9e029aec0adb 100644
--- a/x11-wm/muffin/muffin-2.2.2.ebuild
+++ b/x11-wm/muffin/muffin-2.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/x11-wm/muffin/muffin-2.2.2.ebuild,v 1.2 2014/05/07 02:16:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/muffin/muffin-2.2.6.ebuild,v 1.1 2014/07/15 12:33:09 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -10,7 +10,6 @@ inherit autotools eutils gnome2 python-any-r1
DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
HOMEPAGE="http://cinnamon.linuxmint.com/"
-
SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"