diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index 471391e19363..5368c8a864fa 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,24 +1,12 @@
-DIST amd64-debug-libreoffice-base-3.6.4.3.tar.xz 720487616 SHA256 2ad20d86299fc387e6e2032e2664416d59562f1d8e50302e1733007bd11a8573 SHA512 b1f5d159d92c3527c0a84cff668f6c7a4972977bbe308ae22c45ef71a035e4b0b11ce2eced2f14f6db7b37d88a73f2422af122091fda450a583c2d5502a4f8bb WHIRLPOOL ec77cb8ee384655539e1280d757214e33351f34973f6bbe69d496a2cca885f8db81f39cd47a932f063151516b76131dc1432a3df9bbd1a86ee5a99804f7a43d6
 DIST amd64-debug-libreoffice-base-3.6.6.2.tar.xz 798311800 SHA256 72d34f5afaec43ab6eb01aae8432b32de32aa587f714d6dedbd62fb02c10f82c SHA512 91ac988f43782287e8e9274f982d7f123293e38fffe0bc80227ce1d1d4115c5b831384f9b55aeb997d08ddb280ad7c3cde3e247461fc3586f186debdc8bd28c5 WHIRLPOOL 80b24e2b5dce5af3d3f6e7f9065edeab9dd78c13b834dbc8c482858446dfd2e136841f186b519b1690145970106cf19b65c198f006f76ee2f32fbd7918578d9b
-DIST amd64-debug-libreoffice-base-java-3.6.4.3.tar.xz 724983648 SHA256 cebcfa40a5e04f782d9db3097285019ddd0160f3c85b86341da4d54893e3cc4a SHA512 1017ed7a6416bf64f654d5e88f63c9771ce691841047aea7b0bb0ad526605541f26993ea99d60775da6bdcbd07ec641e86d0f2f179d5df99cdb77e9a94f138ae WHIRLPOOL f46f4e77c7a5b9f0016651d4b10b1be922072e2d0d6bf00549ef27707f872befa1104f93d8fb0b9df009aefd3c48613d849dd95c800badb29277b20cf234ee18
 DIST amd64-debug-libreoffice-base-java-3.6.6.2.tar.xz 803059688 SHA256 6f2388e09ea83b4f2655f67a668285b0d36f5826a6282ca324566b078e1abca4 SHA512 20687a17711ac75f605d15a8c21cd614af1bf6c2a33c4fe04f6d520251c71928af4837ee52d7c219bddcc7ef97500545df62878828dc59606f09ec5d3ffc141c WHIRLPOOL 2cb5c74a73897c7bf5bb4d013a32017a32ed31f79186b18e47bfe70a1b206f5cd5109a16f5b5e96accf19b90703f317285461213af353a48b28bfbdcd4fce0b5
-DIST amd64-debug-libreoffice-gnome-3.6.4.3.tar.xz 721973696 SHA256 294990497c22361c2c99fcd3d4f07e2e84806acdcb128daba2403e955cf8c471 SHA512 e11eb5b4c245f88a3341fefc617b2d2b91752ac9fd8f7652d8d892f5e82cf9a27cea2ebf2ec89fa0f02e5a722e41939f45ad52b467ea364212cb229fa3b85137 WHIRLPOOL 3655da5c1375706eb2a06fa291eb28d259125ee9b517ce029412146c69a14b1bd55d5794dd5e8ae1ef0a26a35e698fff6965f248bed260e70109585da8c689b3
 DIST amd64-debug-libreoffice-gnome-3.6.6.2.tar.xz 799922372 SHA256 dd1561ad5257d256ab642f394165704cbecaa3ad7cd40e1e355eab1ce9999521 SHA512 3d49228515de1cde8edc4ea2cc9591f03ab8129dc0d998064080040588d51d816dfe216e70e2d8a91f07398434cd8a85c1eb2cfb93217a78eecce32e7f7f95ed WHIRLPOOL 05131733ee8e91f39c4dae13974d4276f23c91cb4f4c42bf90d0769feffd654f604efaf382c69b3f9fed54c552c090049d87c170c7659c3648f82498483b8eb1
-DIST amd64-debug-libreoffice-gnome-java-3.6.4.3.tar.xz 726469020 SHA256 696d14d25db8c0f8bc39c437dc986f00f846c3075b2d42f0b79fd2a9538da697 SHA512 91b4fda1ce95aedb05d8fb27af46a1d137b1ceaf4a4dd58450ea45a9abc007bb26337f93365aa5ad044f0b5eddeefee920fb3e48f7cb345c285d547d9c7ad6dc WHIRLPOOL 552cd03208b227e12146074fb995a40bb9f9551dd4b6a80635db9bd87d7482f21d9a6db9ac94849a28698ac7a32bff6e32f22452c0ca72fd2cb2b9d87e8c65eb
 DIST amd64-debug-libreoffice-gnome-java-3.6.6.2.tar.xz 804665916 SHA256 d9dfd341bde6dec5ae08e411088b3ff287f82db877591907a740f4ea4978e21f SHA512 ba4a8443b029d2112998114be34b797065e14e76f4fd6675d558ceed4c15e0c4e295665a83932c702c48623c8d03ec28e7c952bc7895092977959357ec34c800 WHIRLPOOL 3695361ce050dd60eb6e3b8188ed2cc6ea10e892648f6e5dc8c5e8e3af4c4c59cb7bb9b21027d559eb1a4b5bc1dd2a513831ae56a02eb8edf9e713d5d49800f2
-DIST amd64-debug-libreoffice-kde-3.6.4.3.tar.xz 721561272 SHA256 5d8723eb01faefa3a0fe6cf15484a10ed12aa71f759d72e29ef8e19d1ba08292 SHA512 12435a630e77d8f80a22f412e4dace183c2f05ce15da419cef450eb1ed6c8974adda33fc7eed00a3d5ad2dfc12e2db0aeb8c35e428d3a6ed43bdee4034165b29 WHIRLPOOL f5c823af762cbb9919e7b53ff458729d756610f0eeb64cf469d6fe5daccb275a098ba94348e440357aa7ca63f54096b99deb621aeef847967e6a471bf01f39bf
 DIST amd64-debug-libreoffice-kde-3.6.6.2.tar.xz 799548168 SHA256 96c756dc8f8e57de33e54ed0f9ee9cc3f4b4add6bc7a4204f97f2fb6789d5ec6 SHA512 8a3ae41abb0027d96b58415e0010bc31c9b9b1e728cd0e10a078d691122ba7105d9c210753a4de32f698ac0b4e46d9ad841af6034a1b56e4f22cc43722e75114 WHIRLPOOL 3eb7988eaaabc41a7af2682d2ac952d72d777f83fd22866799eea4086850fa11b7cfcda6dde2d4f2f67060d823b220fddc59217eab13aad5529f6a60c4e93a23
-DIST amd64-debug-libreoffice-kde-java-3.6.4.3.tar.xz 726063732 SHA256 5450a1c4fef78b556a21cbd590e582537e60e66a81bc74b55c12e6b8003f28a0 SHA512 5f792c6a80c70822816d7f94dd224e4ac245dda9a2b236db3aa3d14bcdbd01c05ec9b22b7008586de64faa257e83426d15a24c4fcc9533de4213059ad562134a WHIRLPOOL 657dd7a5c3f5bc0a53662f7c59b258ec7dc63534258c7f7730f5a22897c4dfe9ce9abf301618736207f16f3d6b70599b7d7c314d22040e25dac216c7d4512359
 DIST amd64-debug-libreoffice-kde-java-3.6.6.2.tar.xz 804288792 SHA256 99fe3ecdacf4dab7eb39f688c85d5a8dcde798a7d2d40754dda2a5200f0f21e8 SHA512 8a48e49dc7778dc24c414907abdba1913d4665d245ac41d5e4e8128ceeb1426498ddc28398c4ae35fccd1a63661527eab6df7857ca8e7e4a03aa0a8c5db7a72c WHIRLPOOL 7914423b94c03c70526b7478037450cac760cc0cfcfc6a2d0ea90ef169d81e972dff90f98389e51b6a315def49a12442c11b7a5dac195b2cc79857ae38436ae8
-DIST x86-debug-libreoffice-base-3.6.4.3.tar.xz 698229452 SHA256 56a7855b299d3677ebad46b6837d42f4f74bad8f74569e78e722cfad8dfeb796 SHA512 15e33247f625ea155a79ff0f56e1de4687f44339c4861db68fdb832d10547787ec8ccd2f8ea69901a3a92c5fbcc0b8b3a8c295b18725cc0eb712001a8f4bf013 WHIRLPOOL 8bf467d9867044a4103e8498144e42413ee290f47e96c176c40f8e2b981665f6ddc73aef0d27405408652c20ac8672454c8ec2c8701bc2e3948778b417cba251
 DIST x86-debug-libreoffice-base-3.6.6.2.tar.xz 747064660 SHA256 38f5c4f38a4a6222726e21d66c28ee737d6a369ee45e689444ec73e368e04626 SHA512 8223cd602884de47c96e442e1a1da24582b8f17a8231aeaed3b842a789dc99e142137ec0c7f338d43f4d5a0e1794004eb7ad3ea5e1ebedf13d73516a9f4ca0a3 WHIRLPOOL 98890f40cdf7a82702a8be0c28cf019b4be5ba4ac89d3fe65e0f17423f126b7223309d6b776cff1e91621840bef2b13b2cbcadd2f0790ef99a5957729d6f7be7
-DIST x86-debug-libreoffice-base-java-3.6.4.3.tar.xz 702429940 SHA256 8f41f2e73f85322499a625b6155743f505cd2d2dfd4331f06183af82be3daefc SHA512 874759d0457361d4298948fa98c47587ce12264cb97bfa48dd182b79590108b7f547427b4a5f5deb66c3df2ff1b1710ded4129f4b579a18d934d669e687cc99c WHIRLPOOL 0ef779abd6e00ed9cab8c3f6d05eb4bee15700b243d06f3c61c0a81ec45b2426798ea0ff34f6b84df3c5fc8c4e16866226d091e2b065ec098147206740d796c8
 DIST x86-debug-libreoffice-base-java-3.6.6.2.tar.xz 751314052 SHA256 6001bd7cf53dd8662077a8218d409b0898149846090dcbe3a56a97d2b521a4dc SHA512 f70572bdfcc7e5c3019a1c401a0cbc6238d418839e62e60a08bf67f5525eef2a5748087282750f754b03b365cacd818920f49db9807a68fa01a6c48534dbaa9a WHIRLPOOL c4299812e22e9db20c9fea8c70703c24251f70b27e4d1c8ec7b8e0bc15a218c39682024477969d45c95b9f21a3b54541a46b0614afae2e3883f21094ed025eef
-DIST x86-debug-libreoffice-gnome-3.6.4.3.tar.xz 699631964 SHA256 ecd4c8e56513d6f6f2f044dfa4c96907165d255894653b0cf8c275a3bf294918 SHA512 3d0241d324e8aaf561539c74fd78f1d963e8729880010a6833a3970e88fc244b42b588e848c14cbcaffc7c37c7b956be98e0a56b31e6451edf3220e090ac3518 WHIRLPOOL 98ec5a9c706c4e14d8a7823904d8b3c6ff77d6b88e2c7af587d21708dab7060982315273b2e5d3f7f77e22ba7af847dd01ae79ca950e5c5b2651c026c06100f0
 DIST x86-debug-libreoffice-gnome-3.6.6.2.tar.xz 748563592 SHA256 5e4f9f7ce5f044f0c9fa7b81f711fa98f390898ee4cc5f3d23fa100de3d560d8 SHA512 4f64d8fc357ff214a75ff7615ef4e4db2e043df55c943d050db31dde8b95d7896e10599892492333a2434ddb108df81bb8baebbba8132ee4f4f59b85c34149f6 WHIRLPOOL 4013b8fd24d3bbba6675e3ce3bbd735649451a57ad8cc9863e94438111eae5335a821735498325d03531f90f389c8f4316e3644fc8a6278c63db1afe310887b5
-DIST x86-debug-libreoffice-gnome-java-3.6.4.3.tar.xz 703851096 SHA256 04404598fb58a1562561af87ab8be4477f727cbee80cac9a7cc4eb829d0cbb2e SHA512 65f70cfbd372605c32bcd0995b611fe0933201eb4102220a3eea99a062782cd99b5be9cecc34a59fd33145a2daf9339f0c32ab5eec3f218b7e434e7fd5b9e979 WHIRLPOOL a07e4f64cb35c2fa81ca8804b5adffc188a216be3d6cc1494c96c74d007529938989d5673626de60018b565dd5675ead7765007b1b5ec4fc34fa9dad794dc7db
 DIST x86-debug-libreoffice-gnome-java-3.6.6.2.tar.xz 752853660 SHA256 c9ff5cc8cbdd71b2a2104b9b50628a743ea8a34419dd1b57356f76c0082c25df SHA512 51d3cfacbcb8a83b850354336dc6d3d378fc8f6605957c572fc953c35bbf6612c976364af93d7fb6e5653fcb705bedb99232036eaa14a9202f9cae10822de6ba WHIRLPOOL 3a3e17e61d4df5e0e5efab59e34559dadd78cb75d974c92acc97f0dd77b799a18ff5cdf42e2b0af86852b5268e9b1d1a5e03f98b77fe78c748655d951b6be141
-DIST x86-debug-libreoffice-kde-3.6.4.3.tar.xz 699282620 SHA256 d71b04e4263bdfb3284aeaaebb01349410ff67d5ca2f1bcb95bea23963f0b9ec SHA512 aaf2a74c6721de9a9499b9fd7282977e841e8ec5eb35cee0811d20e799f96c06a7d01b0171bb7a9c12b1f72cd49b4d3933888b6927ebf1ad1dbc21eec296283d WHIRLPOOL ac9bc97ed81fa59013fa0af83f64f49df28206746741a7a9e58b51bedecc97e6daa85b13243a79d57f149880def3f83a06d9927a6cd97257362ca65d726208cb
 DIST x86-debug-libreoffice-kde-3.6.6.2.tar.xz 748216820 SHA256 5e254251a0b6f7fe33f38395396e852952e83a564788825085d301a4217009fe SHA512 fccec10848e754b3b66dc141bd102e1f32d5414206f14f3b33b36426ddeb9866c2e9e45c9f6b843d4185790ac37fd572469ab977b0d6241ae71af82ded892e94 WHIRLPOOL 0a33046110734fc6d767f4b03a3c4e5b83ab3698db3c2f45f108efea56b5b6ad829929a6e5dfc0f368c0605d46c82dc7ff0739ca498964e74bc1a7b9651942b7
-DIST x86-debug-libreoffice-kde-java-3.6.4.3.tar.xz 703519392 SHA256 2dd44f5bb7623aebf492d01a712d19615c958d9bc31ec852136889f36d436aee SHA512 8bccb21dbe086b65f470c2393e3a86933d0c33657b5662d5450732d9615dfbad18db2b5a684f38c27dc4bbc0d8a3345a9a2608b6ff379d62026182ea6ac5f9bd WHIRLPOOL 780b880c82afbf0f86c8b7ef3e7e7c63d10abc6e41579c06609b58fd8ecf0347336a77e07861ff8c9965c276c08dd8b9fba6115965045ba536dd141743ca3a40
 DIST x86-debug-libreoffice-kde-java-3.6.6.2.tar.xz 752537256 SHA256 d0a28307dd48fe8d095b2bfe39ed884f059a44a2feea592bf22c84f3f4eb9726 SHA512 25c81bc77a2d24e4dace2fc5a710336c3e5d489047e98bd4a9e6877f92ea7e31078cc167c0be4f1d2774a94455e6dde0cbdcd22344e6a3f3e90c0c9979bbd7f7 WHIRLPOOL 6f7cd49e09a84f0ef06359832df844985ba598c6698f6ed3d3d69137d2641da86097a7c4439f2ce980b07d09dd399411f8b20751771705a03af4afcc7d0b6ca5
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-3.6.4.3.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-3.6.4.3.ebuild
deleted file mode 100644
index 7bfe58c5a55c..000000000000
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-3.6.4.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin-debug/libreoffice-bin-debug-3.6.4.3.ebuild,v 1.3 2012/12/20 10:44:11 ago Exp $
-
-EAPI=5
-
-BASE_AMD64_URI="mirror://gentoo/amd64-debug-"
-BASE_X86_URI="mirror://gentoo/x86-debug-"
-
-DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info."
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI_AMD64="
-	kde? (
-		!java? ( ${BASE_AMD64_URI}${PN/-bin-debug}-kde-${PVR}.tar.xz )
-		java? ( ${BASE_AMD64_URI}${PN/-bin-debug}-kde-java-${PVR}.tar.xz )
-	)
-	gnome? (
-		!java? ( ${BASE_AMD64_URI}${PN/-bin-debug}-gnome-${PVR}.tar.xz )
-		java? ( ${BASE_AMD64_URI}${PN/-bin-debug}-gnome-java-${PVR}.tar.xz )
-	)
-	!kde? ( !gnome? (
-		!java? ( ${BASE_AMD64_URI}${PN/-bin-debug}-base-${PVR}.tar.xz )
-		java? ( ${BASE_AMD64_URI}${PN/-bin-debug}-base-java-${PVR}.tar.xz )
-	) )
-"
-SRC_URI_X86="
-	kde? (
-		!java? ( ${BASE_X86_URI}${PN/-bin-debug}-kde-${PVR}.tar.xz )
-		java? ( ${BASE_X86_URI}${PN/-bin-debug}-kde-java-${PVR}.tar.xz )
-	)
-	gnome? (
-		!java? ( ${BASE_X86_URI}${PN/-bin-debug}-gnome-${PVR}.tar.xz )
-		java? ( ${BASE_X86_URI}${PN/-bin-debug}-gnome-java-${PVR}.tar.xz )
-	)
-	!kde? ( !gnome? (
-		!java? ( ${BASE_X86_URI}${PN/-bin-debug}-base-${PVR}.tar.xz )
-		java? ( ${BASE_X86_URI}${PN/-bin-debug}-base-java-${PVR}.tar.xz )
-	) )
-"
-
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-IUSE="gnome java kde"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
-
-RESTRICT="test strip"
-
-S="${WORKDIR}"
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr
-	cp -aR "${S}"/usr/* "${ED}"/usr/ || die
-}
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-3.6.6.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-3.6.6.2.ebuild
index f0b09667a079..156201480cb8 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-3.6.6.2.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-3.6.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.6.6.2.ebuild,v 1.3 2013/05/03 20:10:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.6.6.2.ebuild,v 1.4 2013/05/31 02:10:15 patrick Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ BASE_SRC_URI="http://download.documentfoundation.org/${PN/-l10n/}/testing/${MY_P
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
 IUSE="offlinehelp"
 
 LANGUAGES_HELP="ast bg bn_IN bn bo bs ca_XV ca cs da de dz el en_GB en en_ZA eo
diff --git a/dev-lang/luajit/luajit-2.0.1_p1.ebuild b/dev-lang/luajit/luajit-2.0.1_p1-r1.ebuild
similarity index 88%
rename from dev-lang/luajit/luajit-2.0.1_p1.ebuild
rename to dev-lang/luajit/luajit-2.0.1_p1-r1.ebuild
index d086cd2c11df..eeff909bba8c 100644
--- a/dev-lang/luajit/luajit-2.0.1_p1.ebuild
+++ b/dev-lang/luajit/luajit-2.0.1_p1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/luajit/luajit-2.0.1_p1.ebuild,v 1.1 2013/05/28 00:59:37 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/luajit/luajit-2.0.1_p1-r1.ebuild,v 1.1 2013/05/31 02:03:09 rafaelmartins Exp $
 
 EAPI=5
 
@@ -31,6 +31,7 @@ src_prepare(){
 		epatch "${DISTDIR}/${HOTFIX}"
 	fi
 	sed -i 's,PREFIX= /usr/local,PREFIX= /usr,' Makefile || die 'sed failed.'
+	sed -i 's,/lib,/'$(get_libdir)',' etc/${PN}.pc || die 'sed2 failed.'
 }
 
 src_compile() {
@@ -44,8 +45,7 @@ src_compile() {
 		TARGET_LD="$(tc-getCC)" \
 		TARGET_AR="$(tc-getAR) rcus" \
 		TARGET_STRIP="true" \
-		LDCONFIG="true" \
-		LIBDIR="$(get_libdir)" \
+		INSTALL_LIB="${D%/}/usr/$(get_libdir)" \
 		XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")"
 }
 
@@ -58,8 +58,7 @@ src_install(){
 		TARGET_LD="$(tc-getCC)" \
 		TARGET_AR="$(tc-getAR) rcus" \
 		TARGET_STRIP="true" \
-		LDCONFIG="true" \
-		LIBDIR="$(get_libdir)"
+		INSTALL_LIB="${D%/}/usr/$(get_libdir)"
 
 	pax-mark m "${ED}usr/bin/luajit-${MY_PV}"
 
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index 904c84421264..49fa502ce4f0 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -3,3 +3,4 @@ DIST nqp-2013.02.1.tar.gz 1435679 SHA256 b787010886e9b0a4ae36d85aec56e9f1b4fa828
 DIST nqp-2013.02.tar.gz 1435599 SHA256 5ac65aaacccf56699bb4be5d03742086ecfcccb19c0cb457110a82eb0fbeaee0 SHA512 d1f22c2848bafa6c51f7c0c88f88cb931fedf9a87829107fa53af40c7d9959915f8d38448f3c696707bbaf1a4b8e786fe3ab19565d2d5c2d97c95cfa49fa0186 WHIRLPOOL d5ba849ff9b450f1d8898565a25d8b97c2e770b0875a48cb26f53e5e839e0fab811e061a4f292e90e15ade1e02c6663653f7b5b28f4925a7c4e7e6d891960655
 DIST nqp-2013.03.tar.gz 1357091 SHA256 2aeac62c503edb7f863f5a747ee5efba49a96f83f716b36dd06d2e7032df85de SHA512 e20396c734fb313a5c17304820550ccea0d003121c86839c472ae58bb3478231967ba616213ffdcb4f819a334b494720258bc20c7bf74fd015f7e433103b781c WHIRLPOOL 827d71e4b317da0725529f554b5e26efd455f4393f9a93c604481a4a4bcaa3d0937b6fb2facf20fc1e3e3ac9d9f686978c8f2b2e004a01630d5e7de47fa7cdcf
 DIST nqp-2013.04.tar.gz 1362412 SHA256 8c94ce1c64359206140fc90ece2cee2e20542ea62000b37309104f34d773dc35 SHA512 d0962342e0680fc88f4c22167695de0e52b532a8908d9d5caca4dd4440d14184c699d9831122fe3aeb13f3e5659777c3bb1e43607d1b315a5b035ec21dc083ce WHIRLPOOL 51f3870ea126c50945265b816af717efc74738fecd673b4a113a32776a91c1fb2f313a1980181a9417e7ce328a4620393eebaa2aa0a304083d55575b26d3e783
+DIST nqp-2013.05.tar.gz 2460055 SHA256 6e7cc712ea86958c400e143cf2c356b870855b44ebddc02d3bfa0e6a3bb4da76 SHA512 4ab6a166b1ead5e16b908d887e2a9122d463e5b84d8993aab0454b12ff38e16fd88507b460f78bed9cc8846ad706f1ff95f1f065908f99dea7a96287a2eb1f06 WHIRLPOOL bbcb38212ab884f0cc5a544ea8fee5f61c2138ba9c5941116076ba3d18a7cb08d48b9acd98fc6e9dfd98924edc3399cb37070edd43778c110eca84fb213fd328
diff --git a/dev-lang/nqp/nqp-2013.05.ebuild b/dev-lang/nqp/nqp-2013.05.ebuild
new file mode 100644
index 000000000000..8de67ff0293e
--- /dev/null
+++ b/dev-lang/nqp/nqp-2013.05.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqp/nqp-2013.05.ebuild,v 1.1 2013/05/31 04:52:22 patrick Exp $
+
+EAPI=3
+
+inherit eutils multilib
+
+PARROT_VERSION="4.4.0"
+
+DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
+HOMEPAGE="http://rakudo.org/"
+SRC_URI="http://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/parrot-${PARROT_VERSION}[unicode]"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+src_prepare() {
+	cd "${WORKDIR}"
+	ln -s * "${S}" || die
+	cd "${S}"
+	echo "${PV}" > VERSION
+}
+
+src_configure() {
+	perl Configure.pl || die
+}
+
+src_compile() {
+	emake -j1 || die
+}
+
+src_test() {
+	emake -j1 test || die
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install || die
+
+	dodoc CREDITS README.pod || die
+
+	if use doc; then
+		dodoc docs/* || die
+	fi
+}
diff --git a/dev-lang/parrot/Manifest b/dev-lang/parrot/Manifest
index 507a800e7f75..6bb4cf5c2daa 100644
--- a/dev-lang/parrot/Manifest
+++ b/dev-lang/parrot/Manifest
@@ -3,3 +3,4 @@ DIST parrot-4.11.0.tar.gz 4626678 SHA256 46de72022dfe521fb8c5d95453e1d091d4d20d8
 DIST parrot-5.0.0.tar.gz 4596149 SHA256 47faa48bbba9b644bcef4d712e0c66c06d61b23a047ad3a5db6f001590c273df SHA512 fff66777f47eacf6bfa75156a11db45447c4c77c2b12b3e08a83e35e750a9e788bc3739b2146463c4dff1ab7a5a60f84b89e398c576d89e3b09475e0733592ad WHIRLPOOL 3d176b758f63f875509361851b826507d74b4d4d687d0ff15af2321fc521af7f6d3aa72702beda669ddaab0cd3f79dbe108fef6c872540608ab35f54951acfd5
 DIST parrot-5.1.0.tar.gz 4601825 SHA256 2483963c1bec665be772cb40a71fd3d9d2621feca547932475017c81a2f7e49b SHA512 0c1adb4758c3b62509ef6ae98a91a1ade023a3e36bd066890dd50df527cf5faa7e2bbd09ad47f052fd7806f59c6bf060aa26262cf97cad3ed51f77bcbbbee20c WHIRLPOOL cd2c952436585c5a758ae277d86508643cd2be8c55a85f6a660c03433eb99a6e7c1949aa865e9d6c947bd89734eb35dde50dbef2a756f76b98b769d3e52b8072
 DIST parrot-5.3.0.tar.gz 4597727 SHA256 79d6f1fe20645b0afbc496cd0d7850a78b8940230e7637c5356d780f5aa1750b SHA512 b9fed444af833ac9a66ef2c5af6e6b589b6a64320d7699c29844b72edb885027a78a84cd68934ef416d86090c876b255e8106be7ac0d77969a3e0b0544d0632a WHIRLPOOL a4da457d7844f468baa3ea7c0dfb3b779d8d8a4f0645a7544b5c515f9631ef0bbd05eac240820bd4cc78cdd78e27d284a22548e530ce7595f9a1b0f992f5cbeb
+DIST parrot-5.4.0.tar.gz 4601122 SHA256 4e37686911b446f5e5f2c0aa62138988ba0c411d2c5e2ba231d1a3421a85ad10 SHA512 fecda8746ca561b93ea9c2d3ed18f30a4d86c9be1fd43edecd7adc9a3d2c8eb9290d2d1e3f98d2a54e3acb1141a87aa2433e2c21bc2399ef7cbb3f2c9ee10626 WHIRLPOOL 26de51dddbf147248e5871f6de42c3a4a41ef771404fb412eef632159a098dc5a8fae03e16b049d190b87e21e362a2fddd90176a06db7bda2b900ee45c928015
diff --git a/dev-lang/parrot/parrot-5.4.0.ebuild b/dev-lang/parrot/parrot-5.4.0.ebuild
new file mode 100644
index 000000000000..846f258086fd
--- /dev/null
+++ b/dev-lang/parrot/parrot-5.4.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-5.4.0.ebuild,v 1.1 2013/05/31 04:43:41 patrick Exp $
+
+EAPI=3
+
+inherit eutils multilib
+
+DESCRIPTION="Virtual machine designed to efficiently compile and execute bytecode for dynamic languages"
+HOMEPAGE="http://www.parrot.org/"
+SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/devel/${PV}/${P}.tar.gz"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="opengl nls doc examples gdbm gmp ssl +unicode pcre"
+
+RDEPEND="sys-libs/readline
+	opengl? ( media-libs/freeglut )
+	nls? ( sys-devel/gettext )
+	unicode? ( >=dev-libs/icu-2.6 )
+	gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
+	gmp? ( >=dev-libs/gmp-4.1.4 )
+	ssl? ( dev-libs/openssl )
+	pcre? ( dev-libs/libpcre )"
+
+DEPEND="dev-lang/perl[doc?]
+	${RDEPEND}"
+
+src_prepare() {
+	# Fix for #404195 - pcre detection is wonky
+	sed -i 's:libpcre.so.0:libpcre.so.1:' runtime/parrot/library/pcre.pir || die "Couldn't fix pcre location"
+}
+
+src_configure() {
+	myconf="--disable-rpath"
+	use unicode || myconf+=" --without-icu"
+	use ssl     || myconf+=" --without-crypto"
+	use gdbm    || myconf+=" --without-gdbm"
+	use nls     || myconf+=" --without-gettext"
+	use gmp     || myconf+=" --without-gmp"
+	use opengl  || myconf+=" --without-opengl"
+	use pcre    || myconf+=" --without-pcre"
+
+	perl Configure.pl \
+		--ccflags="${CFLAGS}" \
+		--linkflags="${LDFLAGS}" \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--sysconfdir="${EPREFIX}"/etc \
+		--sharedstatedir="${EPREFIX}"/var/lib/parrot \
+		$myconf || die
+}
+
+src_compile() {
+	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib
+	# occasionally dies in parallel make
+	emake -j1 || die
+	if use doc ; then
+		emake -j1 html || die
+	fi
+}
+
+src_test() {
+	emake -j1 test || die
+}
+
+src_install() {
+	emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die
+	dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die
+	if use examples; then
+		insinto "/usr/share/doc/${PF}/examples"
+		doins -r examples/* || die
+	fi
+	if use doc; then
+		insinto "/usr/share/doc/${PF}/editor"
+		doins -r editor || die
+		cd docs/html
+		dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \
+			pmc.html tools.html docs src tools || die
+	fi
+}
diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest
index feb2b92b1701..72d6ad75476c 100644
--- a/dev-lang/rakudo/Manifest
+++ b/dev-lang/rakudo/Manifest
@@ -3,3 +3,4 @@ DIST rakudo-2013.02.1.tar.gz 1145289 SHA256 915d368df12250d2a462abd3b3dc5885aea4
 DIST rakudo-2013.02.tar.gz 1146326 SHA256 c07275fcc003634366b4127ee7b1be73235e966496e03b367fcf281de95bf68d SHA512 9ce587b4a623b1bcbede4a62ad652fbdb68bf00444833ddf01818bd7e2a683cde967b9ff6dda062563b5ed1a57387062eb4a67bec450f068add9f5c751a2748f WHIRLPOOL 0ea3090ba43d65574e82365b612f3a5a69b9a47f030ac1f5c6aa44eeb1c35d8791f94d26aa3038aa7499d4bde30576ed855e1c8866aa5554358e3300d2d01ba7
 DIST rakudo-2013.03.tar.gz 1143869 SHA256 574ace060e6a599240c075df3e804d8d7f85dad0899f398707008d51920b9958 SHA512 dc80489c2eed8e2a605dbdd0e66534001003447b830ac587c1eeb879d878b87da98b7070f06b54c08ca38f4b2a289a9d414ef597f3eea76a0c0b2af48e1db014 WHIRLPOOL 50c552a521f8823f4bd22a9ab77386e35d08f5feb61f8a201f92f7c16da30754800a1879ccecac78819046e6fa4b3a639df5e47989011ea3232ed7413e1c3226
 DIST rakudo-2013.04.tar.gz 1155305 SHA256 504f7f88825a4b806fb6068919bf3f81c401605bb2054bf84cd05bc60983c86a SHA512 d2a73d2a74b115c9fb1ca388c22282a66302f5fc4226a5b386de55481c5e00864b890dd21249ea526e63f935288c4ccbcee0a09b02eb1e41f8491eea3b77886f WHIRLPOOL d57603137411c2fe18773b03eb5a038573a5e4bf34217460361aebcd6a1a72b1b326f3f8d04ca2c95d7f4cf43dbc53b71bb669d144f5de77fa8c625e6b47be28
+DIST rakudo-2013.05.tar.gz 1170331 SHA256 cd96457bc2c99f9a373420014b89438139895edca61cc825547ae82f5a653aa8 SHA512 b586421a1f25e247a4a6bedefc19b0b8db8d8aff387b24ceae19c4bdcf8e51bba0afbbe31a1b87005b7ca091fd2541a8fe3104ba5475cf3a80c0506820903b08 WHIRLPOOL 22c35b23039ddc3a2f11d650c498a42840a904df75ef87890ae5690a5d240e13501300fef9795431c4ecda84aaa29b01c4509225ed629df5919b966d88e096e0
diff --git a/dev-lang/rakudo/rakudo-2013.05.ebuild b/dev-lang/rakudo/rakudo-2013.05.ebuild
new file mode 100644
index 000000000000..3dcebc6bfa0b
--- /dev/null
+++ b/dev-lang/rakudo/rakudo-2013.05.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rakudo/rakudo-2013.05.ebuild,v 1.1 2013/05/31 04:53:35 patrick Exp $
+
+EAPI=3
+
+PARROT_VERSION="4.4.0"
+NQP_VERSION="${PV}"
+
+inherit eutils multilib
+
+DESCRIPTION="A Perl 6 implementation built on the Parrot virtual machine"
+HOMEPAGE="http://rakudo.org/"
+SRC_URI="http://rakudo.org/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/parrot-${PARROT_VERSION}[unicode]
+	>=dev-lang/nqp-${NQP_VERSION}"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+src_prepare() {
+	sed -i "s,\$(DOCDIR)/rakudo$,&-${PVR}," tools/build/Makefile.in || die
+}
+
+src_configure() {
+	perl Configure.pl || die
+}
+
+src_test() {
+	emake -j1 test || die
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install || die
+
+	dodoc CREDITS README docs/ChangeLog docs/ROADMAP || die
+
+	if use doc; then
+		dohtml -A svg docs/architecture.html docs/architecture.svg || die
+		dodoc docs/*.pod || die
+		docinto announce
+		dodoc docs/announce/* || die
+	fi
+}
diff --git a/dev-python/django-appconf/django-appconf-0.6.ebuild b/dev-python/django-appconf/django-appconf-0.6.ebuild
index f79df155535e..a24e10534adb 100644
--- a/dev-python/django-appconf/django-appconf-0.6.ebuild
+++ b/dev-python/django-appconf/django-appconf-0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-appconf/django-appconf-0.6.ebuild,v 1.2 2013/05/20 17:17:00 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-appconf/django-appconf-0.6.ebuild,v 1.3 2013/05/31 02:31:42 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -11,7 +11,7 @@ DESCRIPTION="A helper class for handling configuration defaults of packaged apps
 HOMEPAGE="http://pypi.python.org/pypi/django-appconf http://django-appconf.readthedocs.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc"
+IUSE="doc test"
 
 LICENSE="BSD"
 SLOT="0"
@@ -19,7 +19,9 @@ SLOT="0"
 RDEPEND=">=dev-python/django-1.4.1[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/django-discover-runner[${PYTHON_USEDEP}] )
+"
 
 PATCHES=( "${FILESDIR}"/docs.patch )
 
@@ -28,17 +30,9 @@ python_compile_all() {
 }
 
 python_test() {
-	export DJANGO_SETTINGS_MODULE="django.conf"
-	export SECRET_KEY="green"
-	pushd "${BUILD_DIR}"/lib > /dev/null
-	if ! "${PYTHON}" -c \
-		"from django.conf import global_settings;global_settings.SECRET_KEY='$SECRET_KEY'" \
-		-m appconf.tests.tests
-	then
-		die "test failed under ${EPYTHON}"
-	else
-		einfo "tests passed under ${EPYTHON}"
-	fi
+	set -- django-admin.py test appconf --settings=appconf.test_settings
+	echo "$@"
+	"$@" || die "Testing failed with ${EPYTHON}"
 }
 
 python_install_all() {
diff --git a/dev-python/django-auth-ldap/Manifest b/dev-python/django-auth-ldap/Manifest
index 64b2e5abbc99..ea29852ee6c5 100644
--- a/dev-python/django-auth-ldap/Manifest
+++ b/dev-python/django-auth-ldap/Manifest
@@ -1,3 +1,3 @@
 DIST django-auth-ldap-1.0.19.tar.gz 31549 SHA256 db9ba2d367f7a39e8e6474440cf4ef0290ea51c87116ba8d59191051a46fe462 SHA512 5440e47513b0e80a2a409efc88388866b98c387ec86dd94802679ee1d4310a2a55ca2cc9319b17f489db1479fb90e9e9d7e9740b1bd7b888c802e5408a54b6ce WHIRLPOOL dffcfb8c27657f8dd4da584fbeec35671a0e1b1980882c98263d358c8bb04f7f0aa0125f8c759e5ac303ceba408e9c7a56297bd5a5ce53d08e2eb75e8c399e5f
-DIST django-auth-ldap-1.1.4.tar.gz 39252 SHA256 54fab9a4d8a493edc124496fbfdb6b6723b45ddf7be53144b378c8e54fdf0185 SHA512 993b2e41a8fdb012228a721bf5915b1e3a29deaefb14f9954a7a75dfb99b4ca6e42125d07444347ec72f3ccd72e29d2e90f2509e43fd397d2bbbb20e2c633f8f WHIRLPOOL 0ad3b001af61a3ac759e6999c40612c211f9bae67217cd986dadd73480c972faadd5dacf5b7ce18565f716a5c582c11d7724003e4b7c832173f10d6a7349607e
+DIST django-auth-ldap-1.1.4.tar.gz 41140 SHA256 b87919df2211cf68556aa8dbeea01bb4217a0053e6a4eef7a7bc8f2ef07b28bb SHA512 cc97b424ded2916651e5ef65bb35f1aedcc5d51cf1a201d0e9e739b9171fb319b1226dab4791e9c7da867a0b9d5dccf0af79e263599b356f9075e80f1d4c8ba9 WHIRLPOOL d7244a0716b84aa63f42e0c2f36a7faa782340a241e3dd8369e58da49e81ac8c30f57f6b64a118778bcf943d0c93555affa9ccba1e2679a44922520d8f6c6bbe
 DIST django-auth-ldap-1.1.tar.gz 33022 SHA256 95f89b01c0d85a882ae3446af13e8f9804e0a2a816e9d2152ca44eaf8f2bf7a3 SHA512 422a40da476a6af185f787c7111578f3a7af81970fddf1b50faf6dad7dd51225c6063364b63e500c74fb433ee9c5cda9819ef52df86d0bb2a24f51f00878f89c WHIRLPOOL aca900ab3865e89a5db3bcc1fd5c5454f61e50ac449a1e6f455a2796bda5001cf40f5ba0384bc91331e1990a609e80c3acd0f984c5d6b3b66c43188993e51e17
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-1.1.4-r1.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-1.1.4-r1.ebuild
index d1ad34121c95..856f875b04ee 100644
--- a/dev-python/django-auth-ldap/django-auth-ldap-1.1.4-r1.ebuild
+++ b/dev-python/django-auth-ldap/django-auth-ldap-1.1.4-r1.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-auth-ldap/django-auth-ldap-1.1.4-r1.ebuild,v 1.1 2013/05/18 15:24:01 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-auth-ldap/django-auth-ldap-1.1.4-r1.ebuild,v 1.2 2013/05/31 02:43:35 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit distutils-r1
+inherit distutils-r1 vcs-snapshot
 
 DESCRIPTION="Django LDAP authentication backend"
 HOMEPAGE="http://pypi.python.org/pypi/django-auth-ldap http://bitbucket.org/psagers/django-auth-ldap/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://bitbucket.org/psagers/django-auth-ldap/get/${PV}.tar.gz -> ${P}.tar.gz"
+
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
@@ -29,14 +30,11 @@ python_compile_all() {
 }
 
 python_test() {
-	export DJANGO_SETTINGS_MODULE="django.conf"
-	if ! "${PYTHON}" -c \
-		"from django.conf import global_settings;global_settings.SECRET_KEY='green'" -m django_auth_ldap.tests
-	then
-		die "tests failed under ${EPYTHON}"
-	else
-		einfo "tests passed under ${EPYTHON}"
-	fi
+	pushd test > /dev/null || die
+	set -- django-admin.py test django_auth_ldap --settings=test.settings
+	echo "$@"
+	"$@" || die "Tests failed with ${EPYTHON}"
+	popd > /dev/null || die
 }
 
 python_install_all() {
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-1.1.4.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-1.1.4.ebuild
deleted file mode 100644
index e835f1fe13e0..000000000000
--- a/dev-python/django-auth-ldap/django-auth-ldap-1.1.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-auth-ldap/django-auth-ldap-1.1.4.ebuild,v 1.1 2013/05/05 15:09:34 tampakrap Exp $
-
-EAPI=4
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="Django LDAP authentication backend"
-HOMEPAGE="http://pypi.python.org/pypi/django-auth-ldap http://bitbucket.org/psagers/django-auth-ldap/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-LICENSE="BSD"
-SLOT="0"
-PYTHON_MODNAME="django_auth_ldap"
-
-RDEPEND=">=dev-python/django-1.0"
-DEPEND="${RDEPEND}
-	dev-python/python-ldap
-	doc? ( dev-python/sphinx )"
-
-src_compile() {
-	distutils_src_compile
-
-	use doc && emake -C docs html
-}
-
-src_test() {
-	export DJANGO_SETTINGS_MODULE="django.conf"
-
-	# Python.[56] trigger a harmless deprecation warning
-	testing() {
-		"$(PYTHON)" -m django_auth_ldap.tests
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r docs/_build/html/
-	fi
-}
diff --git a/dev-python/django-compressor/Manifest b/dev-python/django-compressor/Manifest
index 08bc16d3473a..6b8218701e51 100644
--- a/dev-python/django-compressor/Manifest
+++ b/dev-python/django-compressor/Manifest
@@ -1 +1 @@
-DIST django-compressor-1.3.tar.gz 91190 SHA256 66ff1a845a6c1b16c4cf552ee3d746033979e46cd9bd5d999d4b5dae93327a52 SHA512 73d7ed68c9050945968324eb061e8bf605c3758d4df924c8e12b326cd823b1ec92aef7b984fd282cb491ef3025a3ae5733f03063036361fdd0f1e0a23e875ea2 WHIRLPOOL aea5f2cd38f54a25b7b2f5053d7ce5d7fdead1a4d7e98a15a555cd56089641103f47bf5ba65a1e493f198c9a26f9b0086107ea8270f635954a420845a53f66f5
+DIST django-compressor-1.3.tar.gz 89931 SHA256 1282b78d44d23eb282f65bced84b3d3554ba4125d07773af908303de3b6bde3d SHA512 04bdbee0c3218ff8151d7ac2a54ccb9d7813d9a23773b215ba9d94fb1428844d23b9c6085395964e42e23641f012f58e411cf4371de68a4510e26c1ad711e275 WHIRLPOOL 8985c17730cbecceeb13edf5eee6aacf32a5e6558fc3d308851a8ba107f8ce4bb471704d3cd7b293d3f19b13ee8a7dd3efd2e0d4ebf6768f6e90e82884faaa95
diff --git a/dev-python/django-compressor/django-compressor-1.3.ebuild b/dev-python/django-compressor/django-compressor-1.3.ebuild
index a0459bf9261c..62f85e204998 100644
--- a/dev-python/django-compressor/django-compressor-1.3.ebuild
+++ b/dev-python/django-compressor/django-compressor-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-compressor/django-compressor-1.3.ebuild,v 1.1 2013/05/29 11:54:23 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-compressor/django-compressor-1.3.ebuild,v 1.2 2013/05/31 03:04:44 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -10,7 +10,7 @@ inherit distutils-r1
 MY_PN="${PN/-/_}"
 DESCRIPTION="Allows to define regrouped/postcompiled content 'on the fly' inside of django template"
 HOMEPAGE="http://pypi.python.org/pypi/django_compressor/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/jezdez/django_compressor/archive/${PV}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
@@ -21,28 +21,28 @@ S=${WORKDIR}/${MY_PN}-${PV}
 
 RDEPEND=">=dev-python/django-1.1.4[${PYTHON_USEDEP}]
 	>=dev-python/django-appconf-0.4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/versiontools[${PYTHON_USEDEP}]
-	test? ( dev-python/twill[${PYTHON_USEDEP}] )"
+	test? (
+		dev-python/django-discover-runner[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+"
 
 python_compile_all() {
 	use doc && emake -C docs html
 }
 
 python_test() {
-	export DJANGO_SETTINGS_MODULE="django.conf"
-	export SECRET_KEY="green"
-	local test
-	for test in compressor/tests/test_*.py
-	do
-		if "${PYTHON}" -c \
-			"from django.conf import global_settings;global_settings.SECRET_KEY='$SECRET_KEY'" ${test}
-		then
-			einfo "Test ${test} completed under ${EPYTHON}"
-		else
-			die "${test} failed with Python ${EPYTHON}"
-		fi
-	done
+	set -- django-admin.py test compressor --settings=compressor.test_settings
+	echo "$@"
+	"$@" || die "Tests failed with ${EPYTHON}"
 }
 
 python_install_all() {
diff --git a/dev-python/django-debug-toolbar/Manifest b/dev-python/django-debug-toolbar/Manifest
index 637adb888814..c03933e740cf 100644
--- a/dev-python/django-debug-toolbar/Manifest
+++ b/dev-python/django-debug-toolbar/Manifest
@@ -1 +1 @@
-DIST django-debug-toolbar-0.9.4.tar.gz 150062 SHA256 d6bc217b672ddf0e729f76da2df1d4a50d45f1c934239851f7f7ae6a51201f4b SHA512 340d481bc57c77eb04f7058f39fa4d3b42186582e750ace11ef492e7e658d3dca08029343b6172cb07c935b4cd0e74e410d5eca92e9a0970d5bea9658e62a390 WHIRLPOOL f0e5753bed013b5c0b20b271c99838fed24783d86253bc12a056a48567e7ea5abd4066e292b8bb123b519224837094b2cf8331361338e1d689c6e13d7c0b37c0
+DIST django-debug-toolbar-0.9.4.tar.gz 254395 SHA256 695b9b62fc00cda2cf89ed9ba584e1f1eb6826c07342bee31bd2acdaff5f031b SHA512 efd8b0068ee978559a4c53036b209e62be8294f0d42516bf2536458c5c8d94bc083be21565fd3b6cbce81882d37f712d4dc3896e0105922771b3c43618e337ef WHIRLPOOL 400c165ad6dd011262af9c8cd828adabd0470fd56e19fc6ed02c0974d7a7220c65aa9ad4197b6504c71ab1e64ca036be3ee5262f7a40f718917f0debe5344e94
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-0.9.4-r1.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-0.9.4-r1.ebuild
index 55be975d8ae2..bdf67e2ea5ce 100644
--- a/dev-python/django-debug-toolbar/django-debug-toolbar-0.9.4-r1.ebuild
+++ b/dev-python/django-debug-toolbar/django-debug-toolbar-0.9.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-debug-toolbar/django-debug-toolbar-0.9.4-r1.ebuild,v 1.1 2013/05/21 14:40:24 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-debug-toolbar/django-debug-toolbar-0.9.4-r1.ebuild,v 1.2 2013/05/31 03:22:29 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -8,8 +8,9 @@ PYTHON_COMPAT=( python{2_6,2_7} )
 inherit distutils-r1
 
 DESCRIPTION="A configurable set of panels that display debug information"
-HOMEPAGE="http://pypi.python.org/pypi/django-debug-toolbar/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://pypi.python.org/pypi/django-debug-toolbar/
+	https://github.com/django-debug-toolbar/django-debug-toolbar/"
+SRC_URI="https://github.com/django-debug-toolbar/django-debug-toolbar/archive/${PV}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
@@ -23,15 +24,7 @@ DEPEND="${RDEPEND}
 	test? (	dev-python/dingus[${PYTHON_USEDEP}] )"
 
 python_test() {
-	# To verify tests are run, simply add -v before -c
-	export DJANGO_SETTINGS_MODULE="django.conf"
-	export SECRET_KEY='green'
-	if "${PYTHON}" -c \
-		"from django.conf import global_settings;global_settings.SECRET_KEY='$SECRET_KEY'" -m tests.tests; then
-		einfo "Tests completed for ${EPYTHON}"
-	else
-		die "Tests failed for ${EPYTHON}"
-	fi
+	"${PYTHON}" runtests.py || die "Tests failed with ${EPYTHON}"
 }
 
 python_install() {
diff --git a/dev-python/django-discover-runner/Manifest b/dev-python/django-discover-runner/Manifest
new file mode 100644
index 000000000000..25a5f3e832b4
--- /dev/null
+++ b/dev-python/django-discover-runner/Manifest
@@ -0,0 +1 @@
+DIST django-discover-runner-0.4.tar.gz 6764 SHA256 c802a9f19ee9cf55f478c3b664ee6f5ea8973b58248d24aa8c9e2dc65b9fa885 SHA512 594b06915f373b77da3cdbe3e91e989fa6b4befea55381dff63e457f6c5dba9d9b7e4ebd77b88f97b51176e002915bdc8d11bc8e95908cdb4089da2cf997897b WHIRLPOOL 77e127c1b90fb7d1115734a2852d0edfbce56ee3a60e55dbd2a948402819ba694bac1ba4631460b796080a7b4e1e1f84cc41b99dcc2986e1acce5ad2f9a61db4
diff --git a/dev-python/django-discover-runner/django-discover-runner-0.4.ebuild b/dev-python/django-discover-runner/django-discover-runner-0.4.ebuild
new file mode 100644
index 000000000000..d594cf1e61ac
--- /dev/null
+++ b/dev-python/django-discover-runner/django-discover-runner-0.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-discover-runner/django-discover-runner-0.4.ebuild,v 1.1 2013/05/31 02:28:10 floppym Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Django test runner based on unittest2's test discovery"
+HOMEPAGE="https://github.com/jezdez/django-discover-runner
+	https://pypi.python.org/pypi/django-discover-runner"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/django[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/django-discover-runner/metadata.xml b/dev-python/django-discover-runner/metadata.xml
new file mode 100644
index 000000000000..69620babebc7
--- /dev/null
+++ b/dev-python/django-discover-runner/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<upstream>
+		<remote-id type="pypi">django-discover-runner</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/django-endless-pagination/Manifest b/dev-python/django-endless-pagination/Manifest
index 4fc8ea7ada7b..ed07e60365a6 100644
--- a/dev-python/django-endless-pagination/Manifest
+++ b/dev-python/django-endless-pagination/Manifest
@@ -1 +1 @@
-DIST django-endless-pagination-1.1.tar.gz 31499 SHA256 9b9ed6f93313ea1d6b3af650383fc4788b3151265e3841e41681e24e66abb72e SHA512 5526e565988e8af436936ffb949c826c20b6f3af4628e34a29f735a4e7fad97f0d953d53141b34dc268be185a25a2cd236b0b3a1e5946c52e8f6b8e6a0a4f9d7 WHIRLPOOL bfb569d657b4598a47d5cd1ba9ebdd1fd62b1310b65f53a026187b519cc8d70baa763bacef9e9f54e4eeee379cb06531c5c3ce396c15af102fd4615553c9ca72
+DIST django-endless-pagination-2.0.tar.gz 61514 SHA256 a719f9d4e4fcd312774dcc3f260e85e9f5a4ad9a21c96d243b7cc048c3329c85 SHA512 d413c3e4f46c73c47e98eeb073bdbedaea3c03931c7147190594bc170489ae09325b43edae9c1eabe56f606b62bf93777f7444b0b174ff6303a5e30453578ac3 WHIRLPOOL 65929e5500e954ec9f8eaafc1c3519f2623148c1949b6ed39b00d172a3c4470e106e9fcea10925c9f21a254bf50be90e2c48281283e7235d00ed3e2bab0c7bfd
diff --git a/dev-python/django-endless-pagination/django-endless-pagination-1.1-r1.ebuild b/dev-python/django-endless-pagination/django-endless-pagination-2.0.ebuild
similarity index 56%
rename from dev-python/django-endless-pagination/django-endless-pagination-1.1-r1.ebuild
rename to dev-python/django-endless-pagination/django-endless-pagination-2.0.ebuild
index 6838d10ff7d8..171c7003db49 100644
--- a/dev-python/django-endless-pagination/django-endless-pagination-1.1-r1.ebuild
+++ b/dev-python/django-endless-pagination/django-endless-pagination-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-endless-pagination/django-endless-pagination-1.1-r1.ebuild,v 1.1 2013/05/21 15:51:10 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-endless-pagination/django-endless-pagination-2.0.ebuild,v 1.1 2013/05/31 04:27:29 floppym Exp $
 
 EAPI=5
 
@@ -9,8 +9,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Tools supporting ajax, multiple and lazy pagination, Twitter-style and Digg-style pagination"
-HOMEPAGE="http://code.google.com/p/django-endless-pagination/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+HOMEPAGE="https://github.com/frankban/django-endless-pagination"
+SRC_URI="https://github.com/frankban/django-endless-pagination/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -20,21 +20,24 @@ IUSE="doc test"
 RDEPEND=">=dev-python/django-1.3[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/django-nose[${PYTHON_USEDEP}]
+		dev-python/ipdb
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xvfbwrapper[${PYTHON_USEDEP}]
+	)
+"
 
 python_compile_all() {
 	use doc && emake -C doc html
 }
 
 python_test() {
-	export SECRET_KEY='green'
-	if ! "${PYTHON}" -c \
-		"from django.conf import global_settings;global_settings.SECRET_KEY='$SECRET_KEY'" \
-		-d tests/runtests.py; then
-		die "Tests failed under python2.7"
-	else
-		einfo "Tests passed under python2.7"
-	fi
+	unset PYTHONPATH
+	"${PYTHON}" tests/manage.py test || die "Testing failed with ${EPYTHON}"
 }
 
 python_install_all() {
diff --git a/dev-python/imaging/metadata.xml b/dev-python/imaging/metadata.xml
index 338413c17e70..301d2207cc29 100644
--- a/dev-python/imaging/metadata.xml
+++ b/dev-python/imaging/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
-	<use>
-		<flag name='webp'>Enable support for webp image format.</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-python/xvfbwrapper/Manifest b/dev-python/xvfbwrapper/Manifest
new file mode 100644
index 000000000000..eb81c2b8b651
--- /dev/null
+++ b/dev-python/xvfbwrapper/Manifest
@@ -0,0 +1 @@
+DIST xvfbwrapper-0.2.2.tar.gz 3421 SHA256 58934508285c43aafac4179f26c34735b46c0bcb96b66198a4dbc68468e3cbb4 SHA512 ac71ec9a08189456c40e493f57802e872c03c0c5caf84493d77bf2e379853afe79099bcf5e5c7c0eb66ff1bf64e44bf37687a82b49864bc63a237f767752eed4 WHIRLPOOL cf3d39ff9eb68b3665c84c87cd7306134ca6d98734111855a777fe53a0528b5a212f3f082fe4d7734a460325875039511fa832e0ff9983c02c9dfc6b2bb54d90
diff --git a/dev-python/xvfbwrapper/metadata.xml b/dev-python/xvfbwrapper/metadata.xml
new file mode 100644
index 000000000000..8de041ce7cb4
--- /dev/null
+++ b/dev-python/xvfbwrapper/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<upstream>
+		<remote-id type="pypi">xvfbwrapper</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/xvfbwrapper/xvfbwrapper-0.2.2.ebuild b/dev-python/xvfbwrapper/xvfbwrapper-0.2.2.ebuild
new file mode 100644
index 000000000000..13990897274b
--- /dev/null
+++ b/dev-python/xvfbwrapper/xvfbwrapper-0.2.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/xvfbwrapper/xvfbwrapper-0.2.2.ebuild,v 1.1 2013/05/31 04:17:24 floppym Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_2,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for running a display inside X virtual framebuffer"
+HOMEPAGE="https://github.com/cgoldberg/xvfbwrapper
+	http://pypi.python.org/pypi/xvfbwrapper"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="x11-base/xorg-server[xvfb]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pep8[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	unset DISPLAY
+	"${PYTHON}" -m unittest discover || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-ruby/redcarpet/Manifest b/dev-ruby/redcarpet/Manifest
index 79a959b213e1..3ab1d6ea3c26 100644
--- a/dev-ruby/redcarpet/Manifest
+++ b/dev-ruby/redcarpet/Manifest
@@ -1,2 +1 @@
-DIST redcarpet-2.1.1.gem 45568 SHA256 d212b5f22784b9f406dc85f2dd7084a9fc15bf9c610031819ff84199d2e3fdce SHA512 e2df0ff578f06a1ea8051e8ad30dd0ea89fbc624df96bed74c69515047bdf2490c88c92c43ebf2388e26274a579033742214177d8d4fbb109f0179a1bca24a4c WHIRLPOOL aeb867fc28f7c0a7e2cb7a56b80ca86a4a7d1876ab51331e0fda50b8bb93b03cb80b72f266de43fbe21908b41cfcc19201198cc5203178e448e56df50372e2b0
 DIST redcarpet-2.2.2.gem 47104 SHA256 edad703ca4b3c1f744cad14a82f286e61fea7155757e1c59e87727a3b88f61b8 SHA512 646056077e8b667d1e1b55af770387165fcc24de8f699e030f64383f473ae1c57e0342032da2db2ba8a1f6f71be33a195866ae28331bcb1624555a0c11f27613 WHIRLPOOL 4d397daa5ad6653940596c87946ef1f18609519a5efd5466a747d7d73c5728d976616c10874468aa30eb9262f6827049cff489f0e50f98c9c521e35f6e3309ec
diff --git a/dev-ruby/redcarpet/redcarpet-2.1.1.ebuild b/dev-ruby/redcarpet/redcarpet-2.1.1.ebuild
deleted file mode 100644
index e169224ae779..000000000000
--- a/dev-ruby/redcarpet/redcarpet-2.1.1.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/dev-ruby/redcarpet/redcarpet-2.1.1.ebuild,v 1.2 2012/12/10 07:10:34 pinkbyte Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ree18 ruby19"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-# There are also conformance tests but these files are not shipped in
-# the gem.
-RUBY_FAKEGEM_TASK_TEST="test:unit"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A Ruby wrapper for Upskirt."
-HOMEPAGE="https://github.com/vmg/redcarpet"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	# Remove test depending on compile, since we handle compilation
-	# directly.
-	sed -i -e 's/:compile//' Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/redcarpet extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/redcarpet
-	cp ext/redcarpet/*$(get_modname) lib/ || die
-}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 05404a68f8d4..1f87571b90ee 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 30 May 2013 21:36:55 +0000
+Fri, 31 May 2013 06:06:54 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 05404a68f8d4..063641fef4a3 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 30 May 2013 21:36:55 +0000
+Fri, 31 May 2013 06:06:55 +0000
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-debug-3.6.4.3 b/metadata/md5-cache/app-office/libreoffice-bin-debug-3.6.4.3
deleted file mode 100644
index 99a02dccc91d..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-bin-debug-3.6.4.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DESCRIPTION=LibreOffice, a full office productivity suite. Binary package, debug info.
-EAPI=5
-HOMEPAGE=http://www.libreoffice.org
-IUSE=gnome java kde
-KEYWORDS=-* amd64 x86
-LICENSE=LGPL-3
-RDEPEND==app-office/libreoffice-bin-3.6.4.3[gnome=,java=,kde=]
-RESTRICT=test strip
-SLOT=0
-SRC_URI=amd64? ( kde? ( !java? ( mirror://gentoo/amd64-debug-libreoffice-kde-3.6.4.3.tar.xz ) java? ( mirror://gentoo/amd64-debug-libreoffice-kde-java-3.6.4.3.tar.xz ) ) gnome? ( !java? ( mirror://gentoo/amd64-debug-libreoffice-gnome-3.6.4.3.tar.xz ) java? ( mirror://gentoo/amd64-debug-libreoffice-gnome-java-3.6.4.3.tar.xz ) ) !kde? ( !gnome? ( !java? ( mirror://gentoo/amd64-debug-libreoffice-base-3.6.4.3.tar.xz ) java? ( mirror://gentoo/amd64-debug-libreoffice-base-java-3.6.4.3.tar.xz ) ) ) ) x86? ( kde? ( !java? ( mirror://gentoo/x86-debug-libreoffice-kde-3.6.4.3.tar.xz ) java? ( mirror://gentoo/x86-debug-libreoffice-kde-java-3.6.4.3.tar.xz ) ) gnome? ( !java? ( mirror://gentoo/x86-debug-libreoffice-gnome-3.6.4.3.tar.xz ) java? ( mirror://gentoo/x86-debug-libreoffice-gnome-java-3.6.4.3.tar.xz ) ) !kde? ( !gnome? ( !java? ( mirror://gentoo/x86-debug-libreoffice-base-3.6.4.3.tar.xz ) java? ( mirror://gentoo/x86-debug-libreoffice-base-java-3.6.4.3.tar.xz ) ) ) )
-_md5_=6af3155052ba654328eb6dc21e241a1e
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-3.6.6.2 b/metadata/md5-cache/app-office/libreoffice-l10n-3.6.6.2
index 0808ba21cb9d..d56be9889c5c 100644
--- a/metadata/md5-cache/app-office/libreoffice-l10n-3.6.6.2
+++ b/metadata/md5-cache/app-office/libreoffice-l10n-3.6.6.2
@@ -4,11 +4,11 @@ DESCRIPTION=Translations for the Libreoffice suite.
 EAPI=4
 HOMEPAGE=http://www.libreoffice.org
 IUSE=offlinehelp linguas_ast linguas_bg linguas_bn_IN linguas_bn linguas_bo linguas_bs linguas_ca_XV linguas_ca linguas_cs linguas_da linguas_de linguas_dz linguas_el linguas_en_GB linguas_en linguas_en_ZA linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_km linguas_ko linguas_lb linguas_mk linguas_nb linguas_ne linguas_nl linguas_nn linguas_om linguas_pl linguas_pt_BR linguas_pt linguas_ru linguas_si linguas_sk linguas_sl linguas_sq linguas_sv linguas_tg linguas_tr linguas_ug linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW linguas_af linguas_am linguas_ar linguas_as linguas_be linguas_br linguas_brx linguas_cy linguas_dgo linguas_fa linguas_ga linguas_gd linguas_kk linguas_kn linguas_kok linguas_ks linguas_ku linguas_lo linguas_lt linguas_lv linguas_mai linguas_ml linguas_mn linguas_mni linguas_mr linguas_my linguas_nr linguas_nso linguas_oc linguas_or linguas_pa_IN linguas_ro linguas_rw linguas_sa_IN linguas_sat linguas_sd linguas_sh linguas_sr linguas_ss linguas_st linguas_sw_TZ linguas_ta linguas_te linguas_th linguas_tn linguas_ts linguas_tt linguas_uz linguas_ve linguas_xh linguas_zu
-KEYWORDS=amd64 ~arm ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 RDEPEND=app-text/hunspell !<app-office/libreoffice-3.6 !<app-office/libreoffice-bin-3.6
 RESTRICT=strip
 SLOT=0
 SRC_URI=linguas_ast? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_ast.tar.gz ) ) linguas_bg? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_bg.tar.gz ) ) linguas_bn_IN? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_bn-IN.tar.gz ) ) linguas_bn? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_bn.tar.gz ) ) linguas_bo? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_bo.tar.gz ) ) linguas_bs? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_bs.tar.gz ) ) linguas_ca_XV? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_ca-XV.tar.gz ) ) linguas_ca? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_ca.tar.gz ) ) linguas_cs? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_cs.tar.gz ) ) linguas_da? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_da.tar.gz ) ) linguas_de? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_de.tar.gz ) ) linguas_dz? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_dz.tar.gz ) ) linguas_el? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_el.tar.gz ) ) linguas_en_GB? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_en-GB.tar.gz ) ) linguas_en? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_en-US.tar.gz ) ) linguas_en_ZA? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_en-ZA.tar.gz ) ) linguas_eo? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_eo.tar.gz ) ) linguas_es? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_es.tar.gz ) ) linguas_et? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_et.tar.gz ) ) linguas_eu? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_eu.tar.gz ) ) linguas_fi? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_fi.tar.gz ) ) linguas_fr? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_fr.tar.gz ) ) linguas_gl? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_gl.tar.gz ) ) linguas_gu? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_gu.tar.gz ) ) linguas_he? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_he.tar.gz ) ) linguas_hi? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_hi.tar.gz ) ) linguas_hr? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_hr.tar.gz ) ) linguas_hu? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_hu.tar.gz ) ) linguas_id? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_id.tar.gz ) ) linguas_is? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_is.tar.gz ) ) linguas_it? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_it.tar.gz ) ) linguas_ja? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_ja.tar.gz ) ) linguas_ka? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_ka.tar.gz ) ) linguas_km? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_km.tar.gz ) ) linguas_ko? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_ko.tar.gz ) ) linguas_lb? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_lb.tar.gz ) ) linguas_mk? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_mk.tar.gz ) ) linguas_nb? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_nb.tar.gz ) ) linguas_ne? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_ne.tar.gz ) ) linguas_nl? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_nl.tar.gz ) ) linguas_nn? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_nn.tar.gz ) ) linguas_om? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_om.tar.gz ) ) linguas_pl? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_pl.tar.gz ) ) linguas_pt_BR? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_pt-BR.tar.gz ) ) linguas_pt? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_pt.tar.gz ) ) linguas_ru? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_ru.tar.gz ) ) linguas_si? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_si.tar.gz ) ) linguas_sk? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_sk.tar.gz ) ) linguas_sl? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_sl.tar.gz ) ) linguas_sq? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_sq.tar.gz ) ) linguas_sv? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_sv.tar.gz ) ) linguas_tg? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_tg.tar.gz ) ) linguas_tr? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_tr.tar.gz ) ) linguas_ug? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_ug.tar.gz ) ) linguas_uk? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_uk.tar.gz ) ) linguas_vi? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_vi.tar.gz ) ) linguas_zh_CN? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_zh-CN.tar.gz ) ) linguas_zh_TW? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_helppack-rpm_zh-TW.tar.gz ) ) linguas_ast? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_ast.tar.gz ) linguas_bg? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_bg.tar.gz ) linguas_bn_IN? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_bn-IN.tar.gz ) linguas_bn? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_bn.tar.gz ) linguas_bo? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_bo.tar.gz ) linguas_bs? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_bs.tar.gz ) linguas_ca_XV? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_ca-XV.tar.gz ) linguas_ca? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_ca.tar.gz ) linguas_cs? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_cs.tar.gz ) linguas_da? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_da.tar.gz ) linguas_de? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_de.tar.gz ) linguas_dz? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_dz.tar.gz ) linguas_el? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_el.tar.gz ) linguas_en_GB? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_en-GB.tar.gz ) linguas_en_ZA? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_en-ZA.tar.gz ) linguas_eo? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_eo.tar.gz ) linguas_es? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_es.tar.gz ) linguas_et? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_et.tar.gz ) linguas_eu? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_eu.tar.gz ) linguas_fi? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_fi.tar.gz ) linguas_fr? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_fr.tar.gz ) linguas_gl? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_gl.tar.gz ) linguas_gu? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_gu.tar.gz ) linguas_he? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_he.tar.gz ) linguas_hi? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_hi.tar.gz ) linguas_hr? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_hr.tar.gz ) linguas_hu? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_hu.tar.gz ) linguas_id? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_id.tar.gz ) linguas_is? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_is.tar.gz ) linguas_it? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_it.tar.gz ) linguas_ja? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_ja.tar.gz ) linguas_ka? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_ka.tar.gz ) linguas_km? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_km.tar.gz ) linguas_ko? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_ko.tar.gz ) linguas_lb? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_lb.tar.gz ) linguas_mk? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_mk.tar.gz ) linguas_nb? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_nb.tar.gz ) linguas_ne? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_ne.tar.gz ) linguas_nl? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_nl.tar.gz ) linguas_nn? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_nn.tar.gz ) linguas_om? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_om.tar.gz ) linguas_pl? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_pl.tar.gz ) linguas_pt_BR? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_pt-BR.tar.gz ) linguas_pt? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_pt.tar.gz ) linguas_ru? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_ru.tar.gz ) linguas_si? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_si.tar.gz ) linguas_sk? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_sk.tar.gz ) linguas_sl? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_sl.tar.gz ) linguas_sq? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_sq.tar.gz ) linguas_sv? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_sv.tar.gz ) linguas_tg? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_tg.tar.gz ) linguas_tr? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_tr.tar.gz ) linguas_ug? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_ug.tar.gz ) linguas_uk? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_uk.tar.gz ) linguas_vi? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_vi.tar.gz ) linguas_zh_CN? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_zh-CN.tar.gz ) linguas_zh_TW? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_zh-TW.tar.gz ) linguas_af? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_af.tar.gz ) linguas_am? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_am.tar.gz ) linguas_ar? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_ar.tar.gz ) linguas_as? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_as.tar.gz ) linguas_be? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_be.tar.gz ) linguas_br? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_br.tar.gz ) linguas_brx? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_brx.tar.gz ) linguas_cy? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_cy.tar.gz ) linguas_dgo? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_dgo.tar.gz ) linguas_fa? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_fa.tar.gz ) linguas_ga? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_ga.tar.gz ) linguas_gd? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_gd.tar.gz ) linguas_kk? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_kk.tar.gz ) linguas_kn? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_kn.tar.gz ) linguas_kok? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_kok.tar.gz ) linguas_ks? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_ks.tar.gz ) linguas_ku? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_ku.tar.gz ) linguas_lo? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_lo.tar.gz ) linguas_lt? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_lt.tar.gz ) linguas_lv? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_lv.tar.gz ) linguas_mai? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_mai.tar.gz ) linguas_ml? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_ml.tar.gz ) linguas_mn? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_mn.tar.gz ) linguas_mni? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_mni.tar.gz ) linguas_mr? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_mr.tar.gz ) linguas_my? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_my.tar.gz ) linguas_nr? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_nr.tar.gz ) linguas_nso? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_nso.tar.gz ) linguas_oc? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_oc.tar.gz ) linguas_or? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_or.tar.gz ) linguas_pa_IN? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_pa-IN.tar.gz ) linguas_ro? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_ro.tar.gz ) linguas_rw? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_rw.tar.gz ) linguas_sa_IN? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_sa-IN.tar.gz ) linguas_sat? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_sat.tar.gz ) linguas_sd? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_sd.tar.gz ) linguas_sh? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_sh.tar.gz ) linguas_sr? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_sr.tar.gz ) linguas_ss? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_ss.tar.gz ) linguas_st? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_st.tar.gz ) linguas_sw_TZ? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_sw-TZ.tar.gz ) linguas_ta? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_ta.tar.gz ) linguas_te? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_te.tar.gz ) linguas_th? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_th.tar.gz ) linguas_tn? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_tn.tar.gz ) linguas_ts? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_ts.tar.gz ) linguas_tt? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_tt.tar.gz ) linguas_uz? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_uz.tar.gz ) linguas_ve? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_ve.tar.gz ) linguas_xh? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_xh.tar.gz ) linguas_zu? ( http://download.documentfoundation.org/libreoffice/testing/3.6.6/rpm/x86/LibO_3.6.6.2_Linux_x86_langpack-rpm_zu.tar.gz )
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	multilib	892e597faee02a5b94eb02ab512e7622	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0416679caea21a776f60e14ac9fdfd38
+_md5_=b8768dd9bf8c719f0d019218f502fdd1
diff --git a/metadata/md5-cache/dev-lang/luajit-2.0.1_p1 b/metadata/md5-cache/dev-lang/luajit-2.0.1_p1-r1
similarity index 93%
rename from metadata/md5-cache/dev-lang/luajit-2.0.1_p1
rename to metadata/md5-cache/dev-lang/luajit-2.0.1_p1-r1
index 8c6345e8bfdf..db3f05825368 100644
--- a/metadata/md5-cache/dev-lang/luajit-2.0.1_p1
+++ b/metadata/md5-cache/dev-lang/luajit-2.0.1_p1-r1
@@ -8,4 +8,4 @@ LICENSE=MIT
 SLOT=2
 SRC_URI=http://luajit.org/download/LuaJIT-2.0.1.tar.gz http://luajit.org/download/v2.0.1_hotfix1.patch
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=daa8b31813252678dae72437d5942e3c
+_md5_=de399ed4861dcabbd38b3865471c8070
diff --git a/metadata/md5-cache/dev-lang/nqp-2013.05 b/metadata/md5-cache/dev-lang/nqp-2013.05
new file mode 100644
index 000000000000..5d0cd647a43d
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/nqp-2013.05
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-lang/parrot-4.4.0[unicode] dev-lang/perl
+DESCRIPTION=Not Quite Perl, a Perl 6 bootstrapping compiler
+EAPI=3
+HOMEPAGE=http://rakudo.org/
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=>=dev-lang/parrot-4.4.0[unicode]
+SLOT=0
+SRC_URI=http://github.com/perl6/nqp/tarball/2013.05 -> nqp-2013.05.tar.gz
+_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=2f2781a5b8c757a47b39775acc2a7219
diff --git a/metadata/md5-cache/dev-lang/parrot-5.4.0 b/metadata/md5-cache/dev-lang/parrot-5.4.0
new file mode 100644
index 000000000000..68d58acc5b92
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/parrot-5.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl[doc?] sys-libs/readline opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6 ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl ) pcre? ( dev-libs/libpcre )
+DESCRIPTION=Virtual machine designed to efficiently compile and execute bytecode for dynamic languages
+EAPI=3
+HOMEPAGE=http://www.parrot.org/
+IUSE=opengl nls doc examples gdbm gmp ssl +unicode pcre
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=Artistic-2
+RDEPEND=sys-libs/readline opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6 ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl ) pcre? ( dev-libs/libpcre )
+SLOT=0
+SRC_URI=ftp://ftp.parrot.org/pub/parrot/releases/devel/5.4.0/parrot-5.4.0.tar.gz
+_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=27f444c0556cfaabfcec2032b6539323
diff --git a/metadata/md5-cache/dev-lang/rakudo-2013.05 b/metadata/md5-cache/dev-lang/rakudo-2013.05
new file mode 100644
index 000000000000..42eaed864ecc
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rakudo-2013.05
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=>=dev-lang/parrot-4.4.0[unicode] >=dev-lang/nqp-2013.05 dev-lang/perl
+DESCRIPTION=A Perl 6 implementation built on the Parrot virtual machine
+EAPI=3
+HOMEPAGE=http://rakudo.org/
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=>=dev-lang/parrot-4.4.0[unicode] >=dev-lang/nqp-2013.05
+SLOT=0
+SRC_URI=http://rakudo.org/downloads/rakudo/rakudo-2013.05.tar.gz
+_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=2e978cff2bc9b66996a61648ffd47061
diff --git a/metadata/md5-cache/dev-python/django-appconf-0.6 b/metadata/md5-cache/dev-python/django-appconf-0.6
index 2a78594f9f63..f401e6f30e36 100644
--- a/metadata/md5-cache/dev-python/django-appconf-0.6
+++ b/metadata/md5-cache/dev-python/django-appconf-0.6
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/django-1.4.1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DEPEND=>=dev-python/django-1.4.1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) test? ( dev-python/django-discover-runner[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 DESCRIPTION=A helper class for handling configuration defaults of packaged apps gracefully
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/django-appconf http://django-appconf.readthedocs.org/
-IUSE=doc python_targets_python2_6 python_targets_python2_7
+IUSE=doc test python_targets_python2_6 python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/django-1.4.1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-appconf/django-appconf-0.6.tar.gz
 _eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	f31a0ec0d081047cbf9c0bbb4822d831	multibuild	4f797e941786b6313d84053ae3e0ec96	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=da43905ec3386c155efb179760bd0626
+_md5_=0e003ffa8c08cd41e60a4349e1aa8cc9
diff --git a/metadata/md5-cache/dev-python/django-auth-ldap-1.1.4 b/metadata/md5-cache/dev-python/django-auth-ldap-1.1.4
deleted file mode 100644
index a1b4b259d60c..000000000000
--- a/metadata/md5-cache/dev-python/django-auth-ldap-1.1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=>=dev-python/django-1.0 dev-python/python-ldap doc? ( dev-python/sphinx ) =dev-lang/python-2*
-DESCRIPTION=Django LDAP authentication backend
-EAPI=4
-HOMEPAGE=http://pypi.python.org/pypi/django-auth-ldap http://bitbucket.org/psagers/django-auth-ldap/
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/django-1.0 =dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://pypi/d/django-auth-ldap/django-auth-ldap-1.1.4.tar.gz
-_eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=c785ce7c262f558c3366fbbd4ba167f6
diff --git a/metadata/md5-cache/dev-python/django-auth-ldap-1.1.4-r1 b/metadata/md5-cache/dev-python/django-auth-ldap-1.1.4-r1
index 162761639fed..6fc6d3fe6532 100644
--- a/metadata/md5-cache/dev-python/django-auth-ldap-1.1.4-r1
+++ b/metadata/md5-cache/dev-python/django-auth-ldap-1.1.4-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install prepare test
+DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=>=dev-python/django-1.3.2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/python-ldap[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 DESCRIPTION=Django LDAP authentication backend
 EAPI=5
@@ -9,6 +9,6 @@ LICENSE=BSD
 RDEPEND=>=dev-python/django-1.3.2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
-SRC_URI=mirror://pypi/d/django-auth-ldap/django-auth-ldap-1.1.4.tar.gz
-_eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	f31a0ec0d081047cbf9c0bbb4822d831	multibuild	4f797e941786b6313d84053ae3e0ec96	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=58a3678961c9c51e43243a395fc6206f
+SRC_URI=https://bitbucket.org/psagers/django-auth-ldap/get/1.1.4.tar.gz -> django-auth-ldap-1.1.4.tar.gz
+_eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	f31a0ec0d081047cbf9c0bbb4822d831	multibuild	4f797e941786b6313d84053ae3e0ec96	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129
+_md5_=8e89a6b2cee7721fd4abc6eb92bb3efb
diff --git a/metadata/md5-cache/dev-python/django-compressor-1.3 b/metadata/md5-cache/dev-python/django-compressor-1.3
index 3b230c0b1e1b..ed53359b28c7 100644
--- a/metadata/md5-cache/dev-python/django-compressor-1.3
+++ b/metadata/md5-cache/dev-python/django-compressor-1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/django-1.1.4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/django-appconf-0.4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/versiontools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] test? ( dev-python/twill[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DEPEND=>=dev-python/django-1.1.4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/django-appconf-0.4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/versiontools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] test? ( dev-python/django-discover-runner[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/unittest2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/beautifulsoup:python-2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/html5lib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/lxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 DESCRIPTION=Allows to define regrouped/postcompiled content 'on the fly' inside of django template
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/django_compressor/
@@ -9,6 +9,6 @@ LICENSE=MIT
 RDEPEND=>=dev-python/django-1.1.4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/django-appconf-0.4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
-SRC_URI=mirror://pypi/d/django_compressor/django_compressor-1.3.tar.gz -> django-compressor-1.3.tar.gz
+SRC_URI=https://github.com/jezdez/django_compressor/archive/1.3.tar.gz -> django-compressor-1.3.tar.gz
 _eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	f31a0ec0d081047cbf9c0bbb4822d831	multibuild	4f797e941786b6313d84053ae3e0ec96	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6fbc70148604e611deb99a126f8a36e2
+_md5_=8e605ea25e140722f29905ca32eabfdd
diff --git a/metadata/md5-cache/dev-python/django-debug-toolbar-0.9.4-r1 b/metadata/md5-cache/dev-python/django-debug-toolbar-0.9.4-r1
index 81ed3bbd6160..939cc953a402 100644
--- a/metadata/md5-cache/dev-python/django-debug-toolbar-0.9.4-r1
+++ b/metadata/md5-cache/dev-python/django-debug-toolbar-0.9.4-r1
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/django[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] test? ( dev-python/dingus[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 DESCRIPTION=A configurable set of panels that display debug information
 EAPI=5
-HOMEPAGE=http://pypi.python.org/pypi/django-debug-toolbar/
+HOMEPAGE=http://pypi.python.org/pypi/django-debug-toolbar/ https://github.com/django-debug-toolbar/django-debug-toolbar/
 IUSE=test python_targets_python2_6 python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/django[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
-SRC_URI=mirror://pypi/d/django-debug-toolbar/django-debug-toolbar-0.9.4.tar.gz
+SRC_URI=https://github.com/django-debug-toolbar/django-debug-toolbar/archive/0.9.4.tar.gz -> django-debug-toolbar-0.9.4.tar.gz
 _eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	f31a0ec0d081047cbf9c0bbb4822d831	multibuild	4f797e941786b6313d84053ae3e0ec96	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5192a5de151c4fa305248fa13106c679
+_md5_=7b1545b04fad4a8a247521d69f2c24cf
diff --git a/metadata/md5-cache/dev-python/django-discover-runner-0.4 b/metadata/md5-cache/dev-python/django-discover-runner-0.4
new file mode 100644
index 000000000000..b86926bff435
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-discover-runner-0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/django[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+DESCRIPTION=A Django test runner based on unittest2's test discovery
+EAPI=5
+HOMEPAGE=https://github.com/jezdez/django-discover-runner https://pypi.python.org/pypi/django-discover-runner
+IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/django[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
+SLOT=0
+SRC_URI=mirror://pypi/d/django-discover-runner/django-discover-runner-0.4.tar.gz
+_eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	f31a0ec0d081047cbf9c0bbb4822d831	multibuild	4f797e941786b6313d84053ae3e0ec96	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=57367b620f0e3220ae3f072a352050d5
diff --git a/metadata/md5-cache/dev-python/django-endless-pagination-1.1-r1 b/metadata/md5-cache/dev-python/django-endless-pagination-2.0
similarity index 58%
rename from metadata/md5-cache/dev-python/django-endless-pagination-1.1-r1
rename to metadata/md5-cache/dev-python/django-endless-pagination-2.0
index 17aa7a85a87e..61cb14af44ed 100644
--- a/metadata/md5-cache/dev-python/django-endless-pagination-1.1-r1
+++ b/metadata/md5-cache/dev-python/django-endless-pagination-2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/django-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=>=dev-python/django-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/django-nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ipdb dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/selenium[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/xvfbwrapper[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tools supporting ajax, multiple and lazy pagination, Twitter-style and Digg-style pagination
 EAPI=5
-HOMEPAGE=http://code.google.com/p/django-endless-pagination/
+HOMEPAGE=https://github.com/frankban/django-endless-pagination
 IUSE=doc test python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/django-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=http://django-endless-pagination.googlecode.com/files/django-endless-pagination-1.1.tar.gz
+SRC_URI=https://github.com/frankban/django-endless-pagination/archive/v2.0.tar.gz -> django-endless-pagination-2.0.tar.gz
 _eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	f31a0ec0d081047cbf9c0bbb4822d831	multibuild	4f797e941786b6313d84053ae3e0ec96	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=13b38c96abc9a625b78820bca3e4476a
+_md5_=be18c4c8f4c2b0b932ad6f1e4ca150e5
diff --git a/metadata/md5-cache/dev-python/xvfbwrapper-0.2.2 b/metadata/md5-cache/dev-python/xvfbwrapper-0.2.2
new file mode 100644
index 000000000000..89a03fa10a08
--- /dev/null
+++ b/metadata/md5-cache/dev-python/xvfbwrapper-0.2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=x11-base/xorg-server[xvfb] test? ( dev-python/pep8[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/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(-)]
+DESCRIPTION=Python wrapper for running a display inside X virtual framebuffer
+EAPI=5
+HOMEPAGE=https://github.com/cgoldberg/xvfbwrapper http://pypi.python.org/pypi/xvfbwrapper
+IUSE=test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=x11-base/xorg-server[xvfb] python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
+SLOT=0
+SRC_URI=mirror://pypi/x/xvfbwrapper/xvfbwrapper-0.2.2.tar.gz
+_eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	f31a0ec0d081047cbf9c0bbb4822d831	multibuild	4f797e941786b6313d84053ae3e0ec96	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=15f30f5f13a58011408006af26e40e24
diff --git a/metadata/md5-cache/dev-ruby/redcarpet-2.1.1 b/metadata/md5-cache/dev-ruby/redcarpet-2.1.1
deleted file mode 100644
index 92e690091fe4..000000000000
--- a/metadata/md5-cache/dev-ruby/redcarpet-2.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-DESCRIPTION=A Ruby wrapper for Upskirt.
-EAPI=4
-HOMEPAGE=https://github.com/vmg/redcarpet
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 )
-SLOT=0
-SRC_URI=mirror://rubygems/redcarpet-2.1.1.gem
-_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	d2a1d4e0903b29b09c892b21b79fcf46	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=44c3836a18355c2d4246b80d27a18d0c
diff --git a/metadata/md5-cache/net-analyzer/snort-2.9.0.5 b/metadata/md5-cache/net-analyzer/snort-2.9.0.5
deleted file mode 100644
index 196cff520227..000000000000
--- a/metadata/md5-cache/net-analyzer/snort-2.9.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=net-libs/libpcap-1.0.0 >=net-libs/daq-0.5 >=dev-libs/libpcre-6.0 dev-libs/libdnet postgres? ( dev-db/postgresql-base ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) prelude? ( >=dev-libs/libprelude-0.9.0 ) zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=The de facto standard for intrusion detection/prevention
-EAPI=2
-HOMEPAGE=http://www.snort.org/
-IUSE=static +dynamicplugin +ipv6 +zlib gre mpls targetbased +decoder-preprocessor-rules ppm perfprofiling linux-smp-stats inline-init-failopen prelude +threads debug active-response normalizer reload-error-restart react flexresp3 aruba mysql odbc postgres selinux
-KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~mips
-LICENSE=GPL-2
-RDEPEND=>=net-libs/libpcap-1.0.0 >=net-libs/daq-0.5 >=dev-libs/libpcre-6.0 dev-libs/libdnet postgres? ( dev-db/postgresql-base ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) prelude? ( >=dev-libs/libprelude-0.9.0 ) zlib? ( sys-libs/zlib ) selinux? ( sec-policy/selinux-snort )
-SLOT=0
-SRC_URI=http://www.snort.org/dl/snort-current/snort-2.9.0.5.tar.gz
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d428c9be87da7f9b1881b2b52a794e36
diff --git a/metadata/md5-cache/net-analyzer/snort-2.9.1 b/metadata/md5-cache/net-analyzer/snort-2.9.1
deleted file mode 100644
index 2d5ce7fb8d07..000000000000
--- a/metadata/md5-cache/net-analyzer/snort-2.9.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=net-libs/libpcap-1.0.0 >=net-libs/daq-0.6 >=dev-libs/libpcre-6.0 dev-libs/libdnet postgres? ( dev-db/postgresql-base ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=The de facto standard for intrusion detection/prevention
-EAPI=2
-HOMEPAGE=http://www.snort.org/
-IUSE=static +dynamicplugin +zlib +gre +mpls +targetbased +decoder-preprocessor-rules +ppm +perfprofiling linux-smp-stats inline-init-failopen +threads debug +active-response +normalizer reload-error-restart +react +flexresp3 +paf large-pcap-64bit aruba mysql odbc postgres selinux
-KEYWORDS=amd64 ~mips ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=net-libs/libpcap-1.0.0 >=net-libs/daq-0.6 >=dev-libs/libpcre-6.0 dev-libs/libdnet postgres? ( dev-db/postgresql-base ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) zlib? ( sys-libs/zlib ) selinux? ( sec-policy/selinux-snort )
-SLOT=0
-SRC_URI=http://www.snort.org/dl/snort-current/snort-2.9.1.tar.gz
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ecfb4859185d49b620b8b6a214d28b93
diff --git a/metadata/md5-cache/net-analyzer/snort-2.9.2.1 b/metadata/md5-cache/net-analyzer/snort-2.9.2.1
deleted file mode 100644
index 71979d0a600d..000000000000
--- a/metadata/md5-cache/net-analyzer/snort-2.9.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=net-libs/libpcap-1.0.0 >=net-libs/daq-0.6 >=dev-libs/libpcre-6.0 dev-libs/libdnet postgres? ( dev-db/postgresql-base ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=The de facto standard for intrusion detection/prevention
-EAPI=2
-HOMEPAGE=http://www.snort.org/
-IUSE=static +dynamicplugin +zlib +gre +mpls +targetbased +decoder-preprocessor-rules +ppm +perfprofiling linux-smp-stats inline-init-failopen +threads debug +active-response +normalizer reload-error-restart +react +flexresp3 +paf large-pcap-64bit aruba mysql odbc postgres selinux
-KEYWORDS=~amd64 ~mips ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=net-libs/libpcap-1.0.0 >=net-libs/daq-0.6 >=dev-libs/libpcre-6.0 dev-libs/libdnet postgres? ( dev-db/postgresql-base ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) zlib? ( sys-libs/zlib ) selinux? ( sec-policy/selinux-snort )
-SLOT=0
-SRC_URI=http://www.snort.org/dl/snort-current/snort-2.9.2.1.tar.gz
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=bddeb0967f2b1423af8e38e7fb643248
diff --git a/metadata/md5-cache/net-analyzer/snort-2.9.2.2 b/metadata/md5-cache/net-analyzer/snort-2.9.2.2
deleted file mode 100644
index dac182daa9b7..000000000000
--- a/metadata/md5-cache/net-analyzer/snort-2.9.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=net-libs/libpcap-1.0.0 >=net-libs/daq-0.6 >=dev-libs/libpcre-6.0 dev-libs/libdnet postgres? ( dev-db/postgresql-base ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=The de facto standard for intrusion detection/prevention
-EAPI=2
-HOMEPAGE=http://www.snort.org/
-IUSE=static +dynamicplugin +zlib +gre +mpls +targetbased +decoder-preprocessor-rules +ppm +perfprofiling linux-smp-stats inline-init-failopen +threads debug +active-response +normalizer reload-error-restart +react +flexresp3 +paf large-pcap-64bit aruba mysql odbc postgres selinux
-KEYWORDS=~amd64 ~mips ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=net-libs/libpcap-1.0.0 >=net-libs/daq-0.6 >=dev-libs/libpcre-6.0 dev-libs/libdnet postgres? ( dev-db/postgresql-base ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) zlib? ( sys-libs/zlib ) selinux? ( sec-policy/selinux-snort )
-SLOT=0
-SRC_URI=http://www.snort.org/dl/snort-current/snort-2.9.2.2.tar.gz
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=771c889518129268e5223f6d13f4238b
diff --git a/metadata/md5-cache/net-analyzer/snort-2.9.2.3 b/metadata/md5-cache/net-analyzer/snort-2.9.4.6
similarity index 90%
rename from metadata/md5-cache/net-analyzer/snort-2.9.2.3
rename to metadata/md5-cache/net-analyzer/snort-2.9.4.6
index 169976dfb47f..0fa80e3085c6 100644
--- a/metadata/md5-cache/net-analyzer/snort-2.9.2.3
+++ b/metadata/md5-cache/net-analyzer/snort-2.9.4.6
@@ -1,13 +1,14 @@
 DEFINED_PHASES=configure install postinst prepare setup
 DEPEND=>=net-libs/libpcap-1.0.0 >=net-libs/daq-0.6 >=dev-libs/libpcre-6.0 dev-libs/libdnet postgres? ( dev-db/postgresql-base ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The de facto standard for intrusion detection/prevention
-EAPI=2
+EAPI=5
 HOMEPAGE=http://www.snort.org/
 IUSE=static +dynamicplugin +zlib +gre +mpls +targetbased +decoder-preprocessor-rules +ppm +perfprofiling linux-smp-stats inline-init-failopen +threads debug +active-response +normalizer reload-error-restart +react +flexresp3 +paf large-pcap-64bit aruba mysql odbc postgres selinux
 KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libpcap-1.0.0 >=net-libs/daq-0.6 >=dev-libs/libpcre-6.0 dev-libs/libdnet postgres? ( dev-db/postgresql-base ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) zlib? ( sys-libs/zlib ) selinux? ( sec-policy/selinux-snort )
+REQUIRED_USE=zlib? ( dynamicplugin )
 SLOT=0
-SRC_URI=http://www.snort.org/dl/snort-current/snort-2.9.2.3.tar.gz
+SRC_URI=http://snort.org/downloads/2320 -> snort-2.9.4.6.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=772330d00bdf08a128ff3c45f5c62e79
+_md5_=292999e6b50f0849408eb5e5c45564af
diff --git a/metadata/md5-cache/net-libs/daq-2.0.0 b/metadata/md5-cache/net-libs/daq-2.0.0
new file mode 100644
index 000000000000..5015c581a44b
--- /dev/null
+++ b/metadata/md5-cache/net-libs/daq-2.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=pcap? ( >=net-libs/libpcap-1.0.0 ) dump? ( >=net-libs/libpcap-1.0.0 ) nfq? ( dev-libs/libdnet >=net-firewall/iptables-1.4.10 net-libs/libnetfilter_queue ) ipq? ( dev-libs/libdnet >=net-firewall/iptables-1.4.10 net-libs/libnetfilter_queue )
+DESCRIPTION=Data Acquisition library, for packet I/O
+EAPI=2
+HOMEPAGE=http://www.snort.org/
+IUSE=ipv6 +afpacket +dump +pcap nfq ipq static-libs
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=pcap? ( >=net-libs/libpcap-1.0.0 ) dump? ( >=net-libs/libpcap-1.0.0 ) nfq? ( dev-libs/libdnet >=net-firewall/iptables-1.4.10 net-libs/libnetfilter_queue ) ipq? ( dev-libs/libdnet >=net-firewall/iptables-1.4.10 net-libs/libnetfilter_queue )
+SLOT=0
+SRC_URI=http://www.snort.org/downloads/2311 -> daq-2.0.0.tar.gz
+_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=1c9bd41994f41d34961b3233f717be65
diff --git a/metadata/md5-cache/net-libs/nodejs-0.10.8 b/metadata/md5-cache/net-libs/nodejs-0.10.9
similarity index 84%
rename from metadata/md5-cache/net-libs/nodejs-0.10.8
rename to metadata/md5-cache/net-libs/nodejs-0.10.9
index 2140de28c434..c14342f0fe74 100644
--- a/metadata/md5-cache/net-libs/nodejs-0.10.8
+++ b/metadata/md5-cache/net-libs/nodejs-0.10.9
@@ -8,6 +8,6 @@ LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=dev-libs/openssl
 RESTRICT=test
 SLOT=0
-SRC_URI=http://nodejs.org/dist/v0.10.8/node-v0.10.8.tar.gz
+SRC_URI=http://nodejs.org/dist/v0.10.9/node-v0.10.9.tar.gz
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	python-any-r1	7ed4a8181d62a098eaa6c8eeacf190c9	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=15c14a224fdb4bd1a813404938a67b77
+_md5_=78afefd6dec47cab0bf5d9c90f4edc7a
diff --git a/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1 b/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1
new file mode 100644
index 000000000000..b54c15452f05
--- /dev/null
+++ b/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prerm setup unpack
+DEPEND=virtual/qmail >=net-mail/vpopmail-5.4.33 net-mail/autorespond maildrop? ( >=mail-filter/maildrop-2.0.1 ) >=sys-apps/sed-4 >=app-admin/webapp-config-1.50.15 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=A web interface for managing a qmail system with virtual domains
+HOMEPAGE=http://www.inter7.com/qmailadmin.html
+IUSE=maildrop vhosts
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/qmail >=net-mail/vpopmail-5.4.33 net-mail/autorespond maildrop? ( >=mail-filter/maildrop-2.0.1 ) >=app-admin/webapp-config-1.50.15
+RESTRICT=userpriv
+SLOT=0
+SRC_URI=mirror://sourceforge/qmailadmin/qmailadmin-1.2.15.tar.gz
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	f31a0ec0d081047cbf9c0bbb4822d831	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qmail	ab89520a61b98d32800cf7cfcbd78a25	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_md5_=4c0903f4d264f5a3f5480f1515cb6036
diff --git a/metadata/md5-cache/net-mail/qmailadmin-1.2.16 b/metadata/md5-cache/net-mail/qmailadmin-1.2.16
new file mode 100644
index 000000000000..d93e8005c8b8
--- /dev/null
+++ b/metadata/md5-cache/net-mail/qmailadmin-1.2.16
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prerm setup unpack
+DEPEND=virtual/qmail >=net-mail/vpopmail-5.4.33 net-mail/autorespond maildrop? ( >=mail-filter/maildrop-2.0.1 ) >=sys-apps/sed-4 >=app-admin/webapp-config-1.50.15 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=A web interface for managing a qmail system with virtual domains
+HOMEPAGE=http://www.inter7.com/qmailadmin.html
+IUSE=maildrop vhosts
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/qmail >=net-mail/vpopmail-5.4.33 net-mail/autorespond maildrop? ( >=mail-filter/maildrop-2.0.1 ) >=app-admin/webapp-config-1.50.15
+RESTRICT=userpriv
+SLOT=0
+SRC_URI=mirror://sourceforge/qmailadmin/qmailadmin-1.2.16.tar.gz
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	f31a0ec0d081047cbf9c0bbb4822d831	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qmail	ab89520a61b98d32800cf7cfcbd78a25	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_md5_=f4ce0817934393615deb2479395d292d
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.16 b/metadata/md5-cache/net-mail/vpopmail-5.4.16
index 34623619d6fc..e9d9c941b4b9 100644
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.16
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.16
@@ -10,4 +10,4 @@ RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.16.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	f31a0ec0d081047cbf9c0bbb4822d831	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=106a42b7e298d35e6db1f987303da1fd
+_md5_=f3096308797f2963482218ff8a75c1f3
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.30-r1 b/metadata/md5-cache/net-mail/vpopmail-5.4.30-r1
index 170df4e173cf..8afc569cb73f 100644
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.30-r1
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.30-r1
@@ -10,4 +10,4 @@ RDEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql
 SLOT=0
 SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.30.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	f31a0ec0d081047cbf9c0bbb4822d831	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qmail	ab89520a61b98d32800cf7cfcbd78a25	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=50119a4a33553a1afca2a9de2f63f778
+_md5_=6d304e5d16b568840d5e58c0d19c5fbc
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.30-r2 b/metadata/md5-cache/net-mail/vpopmail-5.4.30-r2
index 0aeee1545622..16011a29b444 100644
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.30-r2
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.30-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A collection of programs to manage virtual email domains and account
 EAPI=2
 HOMEPAGE=http://www.inter7.com/index.php?page=vpopmail
 IUSE=clearpasswd ipalias maildrop mysql spamassassin
-KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) spamassassin? ( mail-filter/spamassassin )
 SLOT=0
 SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.30.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	f31a0ec0d081047cbf9c0bbb4822d831	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qmail	ab89520a61b98d32800cf7cfcbd78a25	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f3750cf3755a719c3811513a88d8851e
+_md5_=dc94759d3503c48e5f604f2f2e975ca2
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33 b/metadata/md5-cache/net-mail/vpopmail-5.4.33
index 6bfc3218eb0f..2a2c3cd32841 100644
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.33
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.33
@@ -4,10 +4,10 @@ DESCRIPTION=A collection of programs to manage virtual email domains and account
 EAPI=4
 HOMEPAGE=http://www.inter7.com/index.php?page=vpopmail
 IUSE=clearpasswd ipalias maildrop mysql spamassassin
-KEYWORDS=~amd64 hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) spamassassin? ( mail-filter/spamassassin )
 SLOT=0
 SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	f31a0ec0d081047cbf9c0bbb4822d831	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qmail	ab89520a61b98d32800cf7cfcbd78a25	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8e3b2ae76b27a0bdd06b0fc37839da8c
+_md5_=d680e77478de12cf0ef56e75ef87f985
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r1 b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r1
new file mode 100644
index 000000000000..ad5ad8304a09
--- /dev/null
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) spamassassin? ( mail-filter/spamassassin ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 >=sys-apps/sed-4
+DESCRIPTION=A collection of programs to manage virtual email domains and accounts on your Qmail mail servers.
+EAPI=5
+HOMEPAGE=http://www.inter7.com/index.php?page=vpopmail
+IUSE=clearpasswd ipalias maildrop mysql postgres spamassassin
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) spamassassin? ( mail-filter/spamassassin )
+REQUIRED_USE=mysql? ( !postgres )
+SLOT=0
+SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	f31a0ec0d081047cbf9c0bbb4822d831	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qmail	ab89520a61b98d32800cf7cfcbd78a25	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=07c6d6aaa69fc74295d840d5fa715e2a
diff --git a/metadata/md5-cache/net-wireless/gr-osmosdr-0.0.1 b/metadata/md5-cache/net-wireless/gr-osmosdr-0.0.1
new file mode 100644
index 000000000000..2a3e0d4434f6
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gr-osmosdr-0.0.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/boost <net-wireless/gnuradio-3.7:0= net-wireless/rtl-sdr dev-python/cheetah sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) =dev-lang/python-2*
+DESCRIPTION=GNU Radio source block for OsmoSDR and rtlsdr
+EAPI=5
+HOMEPAGE=http://sdr.osmocom.org/
+LICENSE=GPL-3
+RDEPEND=dev-libs/boost <net-wireless/gnuradio-3.7:0= net-wireless/rtl-sdr =dev-lang/python-2*
+SLOT=0
+SRC_URI=mirror://gentoo/gr-osmosdr-0.0.1.tar.xz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	bc8bbf26de246f74e2901a3696ad96d6	eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a4fa0dbeedb1970deb300cfd0bc2554d
diff --git a/metadata/md5-cache/net-wireless/gr-osmosdr-9999 b/metadata/md5-cache/net-wireless/gr-osmosdr-9999
index 3f497e49282a..efc1adfc664e 100644
--- a/metadata/md5-cache/net-wireless/gr-osmosdr-9999
+++ b/metadata/md5-cache/net-wireless/gr-osmosdr-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost net-wireless/gnuradio net-wireless/rtl-sdr dev-python/cheetah sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-vcs/git =dev-lang/python-2*
+DEPEND=dev-libs/boost >=net-wireless/gnuradio-3.7:0= net-wireless/rtl-sdr dev-python/cheetah sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) =dev-lang/python-2* dev-vcs/git
 DESCRIPTION=GNU Radio source block for OsmoSDR and rtlsdr
-EAPI=4
+EAPI=5
 HOMEPAGE=http://sdr.osmocom.org/
 LICENSE=GPL-3
-RDEPEND=dev-libs/boost net-wireless/gnuradio net-wireless/rtl-sdr =dev-lang/python-2*
+RDEPEND=dev-libs/boost >=net-wireless/gnuradio-3.7:0= net-wireless/rtl-sdr =dev-lang/python-2*
 SLOT=0
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	bc8bbf26de246f74e2901a3696ad96d6	eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8c955d5a410810c44222b39fa9495950
+_md5_=11304f0fab567bafc82d0df87d68930a
diff --git a/metadata/md5-cache/sys-apps/smartmontools-6.1 b/metadata/md5-cache/sys-apps/smartmontools-6.1
new file mode 100644
index 000000000000..a7c3702c12e5
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/smartmontools-6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=caps? ( sys-libs/libcap-ng ) selinux? ( sys-libs/libselinux ) virtual/pkgconfig
+DESCRIPTION=Self-Monitoring, Analysis and Reporting Technology System (S.M.A.R.T.) monitoring tools
+EAPI=4
+HOMEPAGE=http://smartmontools.sourceforge.net/
+IUSE=caps minimal selinux static
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~x64-macos
+LICENSE=GPL-2
+RDEPEND=caps? ( sys-libs/libcap-ng ) selinux? ( sys-libs/libselinux ) !minimal? ( virtual/mailx )
+SLOT=0
+SRC_URI=mirror://sourceforge/smartmontools/smartmontools-6.1.tar.gz
+_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=2cdcdbdde5eb836b583ee24eec1c0898
diff --git a/metadata/md5-cache/sys-apps/smartmontools-9999 b/metadata/md5-cache/sys-apps/smartmontools-9999
index 10247ded3f40..1e4d986ea3c3 100644
--- a/metadata/md5-cache/sys-apps/smartmontools-9999
+++ b/metadata/md5-cache/sys-apps/smartmontools-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure install preinst prepare unpack
 DEPEND=caps? ( sys-libs/libcap-ng ) selinux? ( sys-libs/libselinux ) virtual/pkgconfig || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Self-Monitoring, Analysis and Reporting Technology System (S.M.A.R.T.) monitoring tools
-EAPI=3
+EAPI=4
 HOMEPAGE=http://smartmontools.sourceforge.net/
 IUSE=caps minimal selinux static
 LICENSE=GPL-2
 RDEPEND=caps? ( sys-libs/libcap-ng ) selinux? ( sys-libs/libselinux ) !minimal? ( virtual/mailx )
 SLOT=0
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	869118194bbbecaa8f935e185befcdb7	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b137aca21406c3eb75012a26fe29a921
+_md5_=65141b07402721effb1c31f2468398fa
diff --git a/metadata/md5-cache/sys-libs/libcxx-0.0_p20121105 b/metadata/md5-cache/sys-libs/libcxx-0.0_p20121105
deleted file mode 100644
index 2b59a6719376..000000000000
--- a/metadata/md5-cache/sys-libs/libcxx-0.0_p20121105
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=sys-libs/libcxxrt sys-devel/clang app-arch/xz-utils sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=New implementation of the C++ standard library, targeting C++11
-EAPI=4
-HOMEPAGE=http://libcxx.llvm.org/
-KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
-LICENSE=|| ( UoI-NCSA MIT )
-RDEPEND=sys-libs/libcxxrt
-SLOT=0
-SRC_URI=mirror://gentoo/libcxx-0.0_p20121105.tar.xz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	bc8bbf26de246f74e2901a3696ad96d6	eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d655dad3eec6eab4094a4d4dcf6f24f1
diff --git a/metadata/md5-cache/sys-libs/libcxx-9999 b/metadata/md5-cache/sys-libs/libcxx-9999
index 2f538925ba4e..5407b140a882 100644
--- a/metadata/md5-cache/sys-libs/libcxx-9999
+++ b/metadata/md5-cache/sys-libs/libcxx-9999
@@ -1,10 +1,11 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
-DEPEND=sys-libs/libcxxrt sys-devel/clang app-arch/xz-utils sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DEPEND=libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130530[static-libs?] ) !libcxxrt? ( sys-devel/gcc[cxx] ) sys-devel/clang app-arch/xz-utils sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=New implementation of the C++ standard library, targeting C++11
-EAPI=4
+EAPI=5
 HOMEPAGE=http://libcxx.llvm.org/
+IUSE=+libcxxrt static-libs
 LICENSE=|| ( UoI-NCSA MIT )
-RDEPEND=sys-libs/libcxxrt
+RDEPEND=libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130530[static-libs?] ) !libcxxrt? ( sys-devel/gcc[cxx] )
 SLOT=0
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	bc8bbf26de246f74e2901a3696ad96d6	eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	subversion	869118194bbbecaa8f935e185befcdb7	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b1a4e2a3b2c94f6af998c942f59128b7
+_md5_=3a9ef3ca754bcf2d23df62b4d5f49485
diff --git a/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20120911 b/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20120911
deleted file mode 100644
index 1387c90ec3c6..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20120911
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=sys-libs/libunwind-1.0.1-r1 app-arch/xz-utils
-DESCRIPTION=C++ Runtime from PathScale, FreeBSD and NetBSD.
-EAPI=4
-HOMEPAGE=https://github.com/pathscale/libcxxrt http://www.pathscale.com/node/265
-IUSE=static-libs
-KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-RDEPEND=>=sys-libs/libunwind-1.0.1-r1
-SLOT=0
-SRC_URI=mirror://gentoo/libcxxrt-0.0_p20120911.tar.xz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6651c2a07908e1ad681f5daf0db5179c
diff --git a/metadata/md5-cache/sys-libs/libcxxrt-9999 b/metadata/md5-cache/sys-libs/libcxxrt-9999
index 61cd4fc24cc4..463edd01d4d8 100644
--- a/metadata/md5-cache/sys-libs/libcxxrt-9999
+++ b/metadata/md5-cache/sys-libs/libcxxrt-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=sys-libs/libunwind-1.0.1-r1 dev-vcs/git
+DEPEND=>=sys-libs/libunwind-1.0.1-r1[static-libs?] dev-vcs/git
 DESCRIPTION=C++ Runtime from PathScale, FreeBSD and NetBSD.
 EAPI=4
 HOMEPAGE=https://github.com/pathscale/libcxxrt http://www.pathscale.com/node/265
 IUSE=static-libs
 LICENSE=BSD-2
-RDEPEND=>=sys-libs/libunwind-1.0.1-r1
+RDEPEND=>=sys-libs/libunwind-1.0.1-r1[static-libs?]
 SLOT=0
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1c5d574c666dff466d1ef6529a2097a7
+_md5_=21efe9a1d015a5d28c388d448796a631
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 4b2661bd5291..ce9517369b30 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 30 May 2013 21:36:57 +0000
+Fri, 31 May 2013 06:06:57 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 43dd0265a4c8..9f93a6bb9054 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu May 30 21:36:55 UTC 2013
+Fri May 31 06:06:54 UTC 2013
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 924e61af2df3..9882fd96d18c 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 30 May 2013 22:00:01 +0000
+Fri, 31 May 2013 06:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 948d21c40ad3..0a46f145d9c0 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1369949701 Thu May 30 21:35:01 2013 UTC
+1369980301 Fri May 31 06:05:01 2013 UTC
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index 1cd8630123bb..e1c03bedf2d7 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -1,5 +1,2 @@
-DIST snort-2.9.0.5.tar.gz 5867934 SHA256 f997fddbbd1a5f7ccdd4153610b0916fcbe105ea3316d4ed3487fd0054287e94
-DIST snort-2.9.1.tar.gz 6217639 SHA256 1e69de95c8956191b26d19138a2fb7b6f2faf519f601aa3c7d779593c48830c2
-DIST snort-2.9.2.1.tar.gz 6522229 SHA256 4ec549fc2b0df5e89b2dc0453eabf3499f7da2fa88cd004a084ffa1109cbffa5
-DIST snort-2.9.2.2.tar.gz 6529966 SHA256 63f4eeee24d79e4a4e4b573e085d0d2fd78fcf3b7ea730c37eab7b47fcd9b954
 DIST snort-2.9.2.3.tar.gz 6532878 SHA256 ccdb5cdaffdb82ee6277a9d861a7fe762b131037fbe2bf17837332ccdb220c02 SHA512 75a444fe44448a6d4f3b3c3d492c901dbdc097a3545b79384b4a2a49301dfd103a5fb09a6e21c49ecec93d0e160b23c6edde27d3cad8db53868f6932ad856884 WHIRLPOOL 3ee0c1f2e039bd84e9cbaa498e24fe73ee8ea735beecd0265a18e0774b52ab7ca0409b4ade0f1a831776f5ba8bee9eae9d4ddc418d04f0d54fdca828902f54b5
+DIST snort-2.9.4.6.tar.gz 5338762 SHA256 cfaa5390b1840aaaa68a6c05a7077dd92cb916e6186a014baa451d43cdb0b3bc SHA512 e35e22cab3b98bbd42ffb4b88c4c4cc9b1c11e35952a9f3f4f684c02c81ca8604b45d16f42b3d0a6c792eeab86a8e319d8ebdd7b1a5215f93ec0e70b6ef53f98 WHIRLPOOL d029b7519e4ea2d9039fba289bf3785f60edaa22da643196b44772a99c1c9833431840845c51c627d7fce3c77758ea68f205df1a2e32a779440c3a651d2f06a3
diff --git a/net-analyzer/snort/snort-2.9.0.5.ebuild b/net-analyzer/snort/snort-2.9.0.5.ebuild
deleted file mode 100644
index 2a0b12ba0ca9..000000000000
--- a/net-analyzer/snort/snort-2.9.0.5.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.9.0.5.ebuild,v 1.6 2012/06/12 03:23:21 zmedico Exp $
-
-EAPI="2"
-inherit autotools multilib user
-
-DESCRIPTION="The de facto standard for intrusion detection/prevention"
-HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/dl/snort-current/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~mips"
-IUSE="static +dynamicplugin +ipv6 +zlib gre mpls targetbased +decoder-preprocessor-rules
-ppm perfprofiling linux-smp-stats inline-init-failopen prelude +threads debug
-active-response normalizer reload-error-restart react flexresp3
-aruba mysql odbc postgres selinux"
-
-DEPEND=">=net-libs/libpcap-1.0.0
-	>=net-libs/daq-0.5
-	>=dev-libs/libpcre-6.0
-	dev-libs/libdnet
-	postgres? ( dev-db/postgresql-base )
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	prelude? ( >=dev-libs/libprelude-0.9.0 )
-	zlib? ( sys-libs/zlib )"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-snort )"
-
-pkg_setup() {
-
-	if use zlib && ! use dynamicplugin; then
-		eerror "You have enabled the 'zlib' USE flag but not the 'dynamicplugin' USE flag."
-		eerror "'zlib' requires 'dynamicplugin' be enabled."
-		die
-	fi
-
-	# pre_inst() is a better place to put this
-	# but we need it here for the 'fowners' statements in src_install()
-	enewgroup snort
-	enewuser snort -1 -1 /dev/null snort
-
-}
-
-src_prepare() {
-
-	# Fix to ensure that the package builds if USE flag -dynamicplugin is used.
-#	epatch "${FILESDIR}/disabledynamic.patch"
-
-	#Multilib fix for the sf_engine
-	einfo "Applying multilib fix."
-	sed -i -e 's:${exec_prefix}/lib:${exec_prefix}/'$(get_libdir)':g' \
-		"${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
-		|| die "sed for sf_engine failed"
-
-	#Multilib fix for the curent set of dynamic-preprocessors
-	for i in ftptelnet smtp ssh dns ssl dcerpc2 sdf; do
-		sed -i -e 's:${exec_prefix}/lib:${exec_prefix}/'$(get_libdir)':g' \
-			"${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
-			|| die "sed for $i failed."
-	done
-
-	if use prelude; then
-		einfo "Applying prelude fix."
-		sed -i -e "s:AC_PROG_RANLIB:AC_PROG_LIBTOOL:" configure.in \
-			|| die "sed	for perlude failed"
-	fi
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable static) \
-		$(use_enable dynamicplugin) \
-		$(use_enable ipv6) \
-		$(use_enable zlib) \
-		$(use_enable gre) \
-		$(use_enable mpls) \
-		$(use_enable targetbased) \
-		$(use_enable decoder-preprocessor-rules) \
-		$(use_enable ppm) \
-		$(use_enable perfprofiling) \
-		$(use_enable linux-smp-stats) \
-		$(use_enable inline-init-failopen) \
-		$(use_enable prelude) \
-		$(use_enable threads pthread) \
-		$(use_enable debug) \
-		$(use_enable debug debug-msgs) \
-		$(use_enable debug corefiles) \
-		$(use_enable !debug dlclose) \
-		$(use_enable active-response) \
-		$(use_enable normalizer) \
-		$(use_enable reload-error-restart) \
-		$(use_enable react) \
-		$(use_enable flexresp3) \
-		$(use_enable aruba) \
-		$(use_with mysql) \
-		$(use_with odbc) \
-		$(use_with postgres postgresql) \
-		--enable-reload \
-		--disable-build-dynamic-examples \
-		--disable-profile \
-		--disable-ppm-test \
-		--disable-intel-soft-cpm \
-		--disable-static-daq \
-		--disable-rzb-saac \
-		--without-oracle
-
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die "emake failed"
-
-	dodir /var/log/snort \
-		/var/run/snort \
-		/etc/snort/rules \
-		/usr/$(get_libdir)/snort_dynamicrules \
-			|| die "Failed to create core directories"
-
-	# config.log and build.log are needed by Sourcefire
-	# to trouble shoot build problems and bug reports so we are
-	# perserving them incase the user needs upstream support.
-	dodoc RELEASE.NOTES ChangeLog \
-		doc/* \
-		tools/u2boat/README.u2boat \
-		schemas/* || die "Failed to install snort docs"
-
-	insinto /etc/snort
-	doins etc/attribute_table.dtd \
-		etc/classification.config \
-		etc/gen-msg.map \
-		etc/reference.config \
-		etc/threshold.conf \
-		etc/unicode.map || die "Failed to install docs in etc"
-
-	# We use snort.conf.distrib because the config file is complicated
-	# and the one shipped with snort can change drastically between versions.
-	# Users should migrate setting by hand and not with etc-update.
-	newins etc/snort.conf snort.conf.distrib \
-		|| die "Failed to add snort.conf.distrib"
-
-	insinto /etc/snort/preproc_rules
-	doins preproc_rules/decoder.rules \
-		preproc_rules/preprocessor.rules \
-		preproc_rules/sensitive-data.rules || die "Failed to install preproc rule files"
-
-	chown -R snort:snort \
-		"${D}"/var/log/snort \
-		"${D}"/var/run/snort \
-		"${D}"/etc/snort \
-		"${D}"/etc/snort/preproc_rules || die "Failed to set ownership of dirs"
-
-	newinitd "${FILESDIR}/snort.rc10" snort || die "Failed to install snort init script"
-	newconfd "${FILESDIR}/snort.confd" snort || die "Failed to install snort confd file"
-
-	# Sourcefire uses Makefiles to install docs causing Bug #297190.
-	# This removes the unwanted doc directory and rogue Makefiles.
-	rm -rf "${D}"usr/share/doc/snort || die "Failed to remove SF doc directories"
-	rm "${D}"usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
-
-	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
-	sed -i -e 's:/usr/local/lib:/usr/'$(get_libdir)':g' \
-		"${D}etc/snort/snort.conf.distrib" \
-		|| die "Failed to update snort.conf.distrib lib paths"
-
-	# Set the correct rule location in the config
-	sed -i -e 's:RULE_PATH ../rules:RULE_PATH /etc/snort/rules:g' \
-		"${D}etc/snort/snort.conf.distrib" \
-		|| die "Failed to update snort.conf.distrib rule path"
-
-	# Set the correct preprocessor/decoder rule location in the config
-	sed -i -e 's:PREPROC_RULE_PATH ../preproc_rules:PREPROC_RULE_PATH /etc/snort/preproc_rules:g' \
-		"${D}etc/snort/snort.conf.distrib" \
-		|| die "Failed to update snort.conf.distrib preproc rule path"
-
-	# Enable the preprocessor/decoder rules
-	sed -i -e 's:^# include $PREPROC_RULE_PATH:include $PREPROC_RULE_PATH:g' \
-		"${D}etc/snort/snort.conf.distrib" \
-		|| die "Failed to uncomment snort.conf.distrib preproc rule path"
-
-	sed -i -e 's:^# dynamicdetection directory:dynamicdetection directory:g' \
-		"${D}etc/snort/snort.conf.distrib" \
-		|| die "Failed to uncomment snort.conf.distrib dynamicdetection directory"
-
-	# Just some clean up of trailing /'s in the config
-	sed -i -e 's:snort_dynamicpreprocessor/$:snort_dynamicpreprocessor:g' \
-		"${D}etc/snort/snort.conf.distrib" \
-		|| die "Failed to clean up snort.conf.distrib trailing slashes"
-
-	# Make it clear in the config where these are...
-	sed -i -e 's:^include classification.config:include /etc/snort/classification.config:g' \
-		"${D}etc/snort/snort.conf.distrib" \
-		|| die "Failed to update snort.conf.distrib classification.config path"
-
-	sed -i -e 's:^include reference.config:include /etc/snort/reference.config:g' \
-		"${D}etc/snort/snort.conf.distrib" \
-		|| die "Failed to update snort.conf.distrib /etc/snort/reference.config path"
-
-	# Disable all rule files by default. Users need to choose what they want enabled.
-	sed -i -e 's:^include $RULE_PATH:# include $RULE_PATH:g' \
-		"${D}etc/snort/snort.conf.distrib" \
-		|| die "Failed to disable rules in snort.conf.distrib"
-
-	# Disable preproc rule files by default.
-	sed -i -e 's:^include $PREPROC_RULE_PATH:# include $PREPROC_RULE_PATH:g' \
-		"${D}etc/snort/snort.conf.distrib" \
-		|| die "Failed to disable rules in snort.conf.distrib"
-
-	# Disable normalizer preprocessor config if normalizer USE flag not set.
-	if ! use normalizer; then
-		sed -i -e 's:^preprocessor normalize:#preprocessor normalize:g' \
-			"${D}etc/snort/snort.conf.distrib" \
-			|| die "Failed to disable normalizer config in snort.conf.distrib"
-	fi
-
-}
-
-pkg_postinst() {
-	elog
-	elog "Snort-2.9 introduces the DAQ, or Data Acquisition library, for"
-	elog "packet I/O. The DAQ replaces direct calls to PCAP functions with"
-	elog "an abstraction layer that	facilitates operation on a variety of"
-	elog "hardware and software interfaces without requiring changes to Snort."
-	elog
-	elog "The only DAQ modules supported with this ebuild are AFpacket, PCAP,"
-	elog "and Dump. IPQ nad NFQ will be supported in future versions of this"
-	elog "package."
-	elog
-	elog "For passive (non-inline) Snort deployments you will want to use"
-	elog "either PCAP or AFpacket. For inline deployments you will need"
-	elog "to use AFpacket. The Dump DAQ is used for testing the various inline"
-	elog "features available in ${P}."
-	elog
-	elog "The core DQA libraries are installed in /usr/$(get_libdir)/. The libraries"
-	elog "for the individual DAQ modules (afpacket,pcap,dump) are installed in"
-	elog "/usr/$(get_libdir)/daq. To use these you will need to add the following"
-	elog "lines to your snort.conf:"
-	elog
-	elog "config daq: <DAQ module>"
-	elog "config daq_mode: <mode>"
-	elog "config daq_dir: /usr/$(get_libdir)/daq"
-	elog
-	elog "Please see the README file for DAQ for information about specific"
-	elog "DAQ modules and README.daq from the Snort 2.9 documentation"
-	elog "reguarding Snort and DAQ configuration information."
-	elog
-	elog "See /usr/share/doc/${PF} and /etc/snort/snort.conf.distrib for"
-	elog "information on configuring snort."
-	elog
-
-	if [[ $(date +%Y%m%d) < 20110507 ]]; then
-		ewarn
-		ewarn "Please note, you can not use ${P} with the SO rules from"
-		ewarn "previous versions of Snort!"
-		ewarn
-		ewarn "If you do not have a subscription to the VRT rule set and you"
-		ewarn "wish to continue using the shared object (SO) rules, you will"
-		ewarn "need to downgrade Snort. The SO rules will be made available"
-		ewarn "to registered (non-subscription) users on May 7, 2011"
-		ewarn "(30 days after being released to subscription users)."
-		ewarn
-		ewarn "Please see http://www.snort.org/snort-rules/#rules for more"
-		ewarn "details."
-		ewarn
-	fi
-
-	if use debug; then
-		elog "You have the 'debug' USE flag enabled. If this has been done to"
-		elog "troubleshoot an issue by producing a core dump or a back trace,"
-		elog "then you need to also ensure the FEATURES variable in make.conf"
-		elog "contains the 'nostrip' option."
-	fi
-}
diff --git a/net-analyzer/snort/snort-2.9.1.ebuild b/net-analyzer/snort/snort-2.9.1.ebuild
deleted file mode 100644
index d6e9bd683fab..000000000000
--- a/net-analyzer/snort/snort-2.9.1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.9.1.ebuild,v 1.7 2012/06/14 19:48:43 xmw Exp $
-
-EAPI="2"
-inherit autotools multilib user
-
-DESCRIPTION="The de facto standard for intrusion detection/prevention"
-HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/dl/snort-current/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc x86"
-IUSE="static +dynamicplugin +zlib +gre +mpls +targetbased +decoder-preprocessor-rules
-+ppm +perfprofiling linux-smp-stats inline-init-failopen +threads debug +active-response
-+normalizer reload-error-restart +react +flexresp3 +paf large-pcap-64bit
-aruba mysql odbc postgres selinux"
-
-DEPEND=">=net-libs/libpcap-1.0.0
-	>=net-libs/daq-0.6
-	>=dev-libs/libpcre-6.0
-	dev-libs/libdnet
-	postgres? ( dev-db/postgresql-base )
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	zlib? ( sys-libs/zlib )"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-snort )"
-
-pkg_setup() {
-
-	if use zlib && ! use dynamicplugin; then
-		eerror "You have enabled the 'zlib' USE flag but not the 'dynamicplugin' USE flag."
-		eerror "'zlib' requires 'dynamicplugin' be enabled."
-		die
-	fi
-
-	# pre_inst() is a better place to put this
-	# but we need it here for the 'fowners' statements in src_install()
-	enewgroup snort
-	enewuser snort -1 -1 /dev/null snort
-
-}
-
-src_prepare() {
-
-	#Multilib fix for the sf_engine
-	einfo "Applying multilib fix."
-	sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
-		"${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
-		|| die "sed for sf_engine failed"
-
-	#Multilib fix for the curent set of dynamic-preprocessors
-	for i in ftptelnet smtp ssh dns ssl dcerpc2 sdf imap pop rzb_saac sip reputation; do
-		sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
-			"${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
-			|| die "sed for $i failed."
-	done
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable static) \
-		$(use_enable static so-with-static-lib) \
-		$(use_enable dynamicplugin) \
-		$(use_enable zlib) \
-		$(use_enable gre) \
-		$(use_enable mpls) \
-		$(use_enable targetbased) \
-		$(use_enable decoder-preprocessor-rules) \
-		$(use_enable ppm) \
-		$(use_enable perfprofiling) \
-		$(use_enable linux-smp-stats) \
-		$(use_enable inline-init-failopen) \
-		$(use_enable threads pthread) \
-		$(use_enable debug) \
-		$(use_enable debug debug-msgs) \
-		$(use_enable debug corefiles) \
-		$(use_enable !debug dlclose) \
-		$(use_enable active-response) \
-		$(use_enable normalizer) \
-		$(use_enable reload-error-restart) \
-		$(use_enable react) \
-		$(use_enable flexresp3) \
-		$(use_enable paf) \
-		$(use_enable large-pcap-64bit large-pcap) \
-		$(use_enable aruba) \
-		$(use_with mysql) \
-		$(use_with odbc) \
-		$(use_with postgres postgresql) \
-		--enable-ipv6 \
-		--enable-reload \
-		--disable-prelude \
-		--disable-build-dynamic-examples \
-		--disable-profile \
-		--disable-ppm-test \
-		--disable-intel-soft-cpm \
-		--disable-static-daq \
-		--disable-rzb-saac \
-		--without-oracle
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die "emake failed"
-
-	dodir /var/log/snort \
-		/var/run/snort \
-		/etc/snort/rules \
-		/etc/snort/so_rules \
-		/usr/$(get_libdir)/snort_dynamicrules \
-			|| die "Failed to create core directories"
-
-	# config.log and build.log are needed by Sourcefire
-	# to trouble shoot build problems and bug reports so we are
-	# perserving them incase the user needs upstream support.
-	dodoc RELEASE.NOTES ChangeLog \
-		doc/* \
-		tools/u2boat/README.u2boat \
-		schemas/* || die "Failed to install snort docs"
-
-	insinto /etc/snort
-	doins etc/attribute_table.dtd \
-		etc/classification.config \
-		etc/gen-msg.map \
-		etc/reference.config \
-		etc/threshold.conf \
-		etc/unicode.map || die "Failed to install docs in etc"
-
-	# We use snort.conf.distrib because the config file is complicated
-	# and the one shipped with snort can change drastically between versions.
-	# Users should migrate setting by hand and not with etc-update.
-	newins etc/snort.conf snort.conf.distrib \
-		|| die "Failed to add snort.conf.distrib"
-
-	# config.log and build.log are needed by Sourcefire
-	# to troubleshoot build problems and bug reports so we are
-	# perserving them incase the user needs upstream support.
-	# 'die' was intentionally not added here.
-	if [ -f "${WORKDIR}/${PF}/config.log" ]; then
-		dodoc "${WORKDIR}/${PF}/config.log"
-	fi
-	if [ -f "${T}/build.log" ]; then
-		dodoc "${T}/build.log"
-	fi
-
-	insinto /etc/snort/preproc_rules
-	doins preproc_rules/decoder.rules \
-		preproc_rules/preprocessor.rules \
-		preproc_rules/sensitive-data.rules || die "Failed to install preproc rule files"
-
-	fowners -R snort:snort \
-		/var/log/snort \
-		/var/run/snort \
-		/etc/snort || die
-
-	newinitd "${FILESDIR}/snort.rc11" snort || die "Failed to install snort init script"
-	newconfd "${FILESDIR}/snort.confd.2" snort || die "Failed to install snort confd file"
-
-	# Sourcefire uses Makefiles to install docs causing Bug #297190.
-	# This removes the unwanted doc directory and rogue Makefiles.
-	rm -rf "${D}"usr/share/doc/snort || die "Failed to remove SF doc directories"
-	rm "${D}"usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
-
-	#Remove unneeded .la files (Bug #382863)
-	rm "${D}"usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
-	rm "${D}"usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
-
-	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
-	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set the correct rule location in the config
-	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set the correct preprocessor/decoder rule location in the config
-	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Enable the preprocessor/decoder rules
-	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Just some clean up of trailing /'s in the config
-	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Make it clear in the config where these are...
-	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Disable all rule files by default.
-	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Disable normalizer preprocessor config if normalizer USE flag not set.
-	if ! use normalizer; then
-		sed -i -e 's|^preprocessor normalize|#preprocessor normalize|g' \
-			"${D}etc/snort/snort.conf.distrib" || die
-	fi
-
-	# Set the configured DAQ to afpacket
-	sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set the location of the DAQ modules
-	sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set the DAQ mode to passive
-	sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set snort to run as snort:snort
-	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set the default log dir
-	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set the correct so_rule location in the config
-	 sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
-		 "${D}etc/snort/snort.conf.distrib" || die
-}
-
-pkg_postinst() {
-
-	einfo "There have been a number of improvements and new features"
-	einfo "added to ${P}. Please review the RELEASE.NOTES and"
-	einfo "ChangLog located in /usr/share/doc/${PF}."
-	einfo
-	elog "The Sourcefire Vulnerability Research Team (VRT) recommends that"
-	elog "users migrate their snort.conf customizations to the latest config"
-	elog "file released by the VRT. You can find the latest version of the"
-	elog "Snort config file in /etc/snort/snort.conf.distrib."
-	elog
-	elog "!! It is important that you migrate to this new snort.conf file !!"
-	elog
-	elog "This version of the ebuild includes an updated init.d file and"
-	elog "conf.d file that rely on options found in the latest Snort"
-	elog "config file provided by the VRT."
-
-	if use debug; then
-		elog "You have the 'debug' USE flag enabled. If this has been done to"
-		elog "troubleshoot an issue by producing a core dump or a back trace,"
-		elog "then you need to also ensure the FEATURES variable in make.conf"
-		elog "contains the 'nostrip' option."
-	fi
-}
diff --git a/net-analyzer/snort/snort-2.9.2.1.ebuild b/net-analyzer/snort/snort-2.9.2.1.ebuild
deleted file mode 100644
index 08a3762be0c3..000000000000
--- a/net-analyzer/snort/snort-2.9.2.1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.9.2.1.ebuild,v 1.4 2012/06/15 06:11:29 xmw Exp $
-
-EAPI="2"
-inherit autotools multilib user
-
-DESCRIPTION="The de facto standard for intrusion detection/prevention"
-HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/dl/snort-current/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
-IUSE="static +dynamicplugin +zlib +gre +mpls +targetbased +decoder-preprocessor-rules
-+ppm +perfprofiling linux-smp-stats inline-init-failopen +threads debug +active-response
-+normalizer reload-error-restart +react +flexresp3 +paf large-pcap-64bit
-aruba mysql odbc postgres selinux"
-
-DEPEND=">=net-libs/libpcap-1.0.0
-	>=net-libs/daq-0.6
-	>=dev-libs/libpcre-6.0
-	dev-libs/libdnet
-	postgres? ( dev-db/postgresql-base )
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	zlib? ( sys-libs/zlib )"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-snort )"
-
-pkg_setup() {
-
-	if use zlib && ! use dynamicplugin; then
-		eerror "You have enabled the 'zlib' USE flag but not the 'dynamicplugin' USE flag."
-		eerror "'zlib' requires 'dynamicplugin' be enabled."
-		die
-	fi
-
-	# pre_inst() is a better place to put this
-	# but we need it here for the 'fowners' statements in src_install()
-	enewgroup snort
-	enewuser snort -1 -1 /dev/null snort
-
-}
-
-src_prepare() {
-
-	#Multilib fix for the sf_engine
-	einfo "Applying multilib fix."
-	sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
-		"${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
-		|| die "sed for sf_engine failed"
-
-	#Multilib fix for the curent set of dynamic-preprocessors
-	for i in ftptelnet smtp ssh dns ssl dcerpc2 sdf imap pop rzb_saac sip reputation gtp modbus dnp3; do
-		sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
-			"${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
-			|| die "sed for $i failed."
-	done
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable static) \
-		$(use_enable static so-with-static-lib) \
-		$(use_enable dynamicplugin) \
-		$(use_enable zlib) \
-		$(use_enable gre) \
-		$(use_enable mpls) \
-		$(use_enable targetbased) \
-		$(use_enable decoder-preprocessor-rules) \
-		$(use_enable ppm) \
-		$(use_enable perfprofiling) \
-		$(use_enable linux-smp-stats) \
-		$(use_enable inline-init-failopen) \
-		$(use_enable threads pthread) \
-		$(use_enable debug) \
-		$(use_enable debug debug-msgs) \
-		$(use_enable debug corefiles) \
-		$(use_enable !debug dlclose) \
-		$(use_enable active-response) \
-		$(use_enable normalizer) \
-		$(use_enable reload-error-restart) \
-		$(use_enable react) \
-		$(use_enable flexresp3) \
-		$(use_enable paf) \
-		$(use_enable large-pcap-64bit large-pcap) \
-		$(use_enable aruba) \
-		$(use_with mysql) \
-		$(use_with odbc) \
-		$(use_with postgres postgresql) \
-		--enable-ipv6 \
-		--enable-reload \
-		--disable-prelude \
-		--disable-build-dynamic-examples \
-		--disable-profile \
-		--disable-ppm-test \
-		--disable-intel-soft-cpm \
-		--disable-static-daq \
-		--disable-rzb-saac \
-		--without-oracle
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die "emake failed"
-
-	dodir /var/log/snort \
-		/var/run/snort \
-		/etc/snort/rules \
-		/etc/snort/so_rules \
-		/usr/$(get_libdir)/snort_dynamicrules \
-			|| die "Failed to create core directories"
-
-	# config.log and build.log are needed by Sourcefire
-	# to trouble shoot build problems and bug reports so we are
-	# perserving them incase the user needs upstream support.
-	dodoc RELEASE.NOTES ChangeLog \
-		doc/* \
-		tools/u2boat/README.u2boat \
-		schemas/* || die "Failed to install snort docs"
-
-	insinto /etc/snort
-	doins etc/attribute_table.dtd \
-		etc/classification.config \
-		etc/gen-msg.map \
-		etc/reference.config \
-		etc/threshold.conf \
-		etc/unicode.map || die "Failed to install docs in etc"
-
-	# We use snort.conf.distrib because the config file is complicated
-	# and the one shipped with snort can change drastically between versions.
-	# Users should migrate setting by hand and not with etc-update.
-	newins etc/snort.conf snort.conf.distrib \
-		|| die "Failed to add snort.conf.distrib"
-
-	# config.log and build.log are needed by Sourcefire
-	# to troubleshoot build problems and bug reports so we are
-	# perserving them incase the user needs upstream support.
-	# 'die' was intentionally not added here.
-	if [ -f "${WORKDIR}/${PF}/config.log" ]; then
-		dodoc "${WORKDIR}/${PF}/config.log"
-	fi
-	if [ -f "${T}/build.log" ]; then
-		dodoc "${T}/build.log"
-	fi
-
-	insinto /etc/snort/preproc_rules
-	doins preproc_rules/decoder.rules \
-		preproc_rules/preprocessor.rules \
-		preproc_rules/sensitive-data.rules || die "Failed to install preproc rule files"
-
-	fowners -R snort:snort \
-		/var/log/snort \
-		/var/run/snort \
-		/etc/snort || die
-
-	newinitd "${FILESDIR}/snort.rc11" snort || die "Failed to install snort init script"
-	newconfd "${FILESDIR}/snort.confd.2" snort || die "Failed to install snort confd file"
-
-	# Sourcefire uses Makefiles to install docs causing Bug #297190.
-	# This removes the unwanted doc directory and rogue Makefiles.
-	rm -rf "${D}"usr/share/doc/snort || die "Failed to remove SF doc directories"
-	rm "${D}"usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
-
-	#Remove unneeded .la files (Bug #382863)
-	rm "${D}"usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
-	rm "${D}"usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
-
-	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
-	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set the correct rule location in the config
-	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set the correct preprocessor/decoder rule location in the config
-	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Enable the preprocessor/decoder rules
-	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Just some clean up of trailing /'s in the config
-	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Make it clear in the config where these are...
-	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Disable all rule files by default.
-	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Disable normalizer preprocessor config if normalizer USE flag not set.
-	if ! use normalizer; then
-		sed -i -e 's|^preprocessor normalize|#preprocessor normalize|g' \
-			"${D}etc/snort/snort.conf.distrib" || die
-	fi
-
-	# Set the configured DAQ to afpacket
-	sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set the location of the DAQ modules
-	sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set the DAQ mode to passive
-	sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set snort to run as snort:snort
-	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set the default log dir
-	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set the correct so_rule location in the config
-	 sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
-		 "${D}etc/snort/snort.conf.distrib" || die
-}
-
-pkg_postinst() {
-
-	einfo "There have been a number of improvements and new features"
-	einfo "added to ${P}. Please review the RELEASE.NOTES and"
-	einfo "ChangLog located in /usr/share/doc/${PF}."
-	einfo
-	elog "The Sourcefire Vulnerability Research Team (VRT) recommends that"
-	elog "users migrate their snort.conf customizations to the latest config"
-	elog "file released by the VRT. You can find the latest version of the"
-	elog "Snort config file in /etc/snort/snort.conf.distrib."
-	elog
-	elog "!! It is important that you migrate to this new snort.conf file !!"
-	elog
-	elog "This version of the ebuild includes an updated init.d file and"
-	elog "conf.d file that rely on options found in the latest Snort"
-	elog "config file provided by the VRT."
-
-	if use debug; then
-		elog "You have the 'debug' USE flag enabled. If this has been done to"
-		elog "troubleshoot an issue by producing a core dump or a back trace,"
-		elog "then you need to also ensure the FEATURES variable in make.conf"
-		elog "contains the 'nostrip' option."
-	fi
-}
diff --git a/net-analyzer/snort/snort-2.9.2.2.ebuild b/net-analyzer/snort/snort-2.9.2.2.ebuild
deleted file mode 100644
index 2e5d07a54c3b..000000000000
--- a/net-analyzer/snort/snort-2.9.2.2.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.9.2.2.ebuild,v 1.3 2012/06/15 06:11:29 xmw Exp $
-
-EAPI="2"
-inherit autotools multilib user
-
-DESCRIPTION="The de facto standard for intrusion detection/prevention"
-HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/dl/snort-current/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
-IUSE="static +dynamicplugin +zlib +gre +mpls +targetbased +decoder-preprocessor-rules
-+ppm +perfprofiling linux-smp-stats inline-init-failopen +threads debug +active-response
-+normalizer reload-error-restart +react +flexresp3 +paf large-pcap-64bit
-aruba mysql odbc postgres selinux"
-
-DEPEND=">=net-libs/libpcap-1.0.0
-	>=net-libs/daq-0.6
-	>=dev-libs/libpcre-6.0
-	dev-libs/libdnet
-	postgres? ( dev-db/postgresql-base )
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	zlib? ( sys-libs/zlib )"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-snort )"
-
-pkg_setup() {
-
-	if use zlib && ! use dynamicplugin; then
-		eerror "You have enabled the 'zlib' USE flag but not the 'dynamicplugin' USE flag."
-		eerror "'zlib' requires 'dynamicplugin' be enabled."
-		die
-	fi
-
-	# pre_inst() is a better place to put this
-	# but we need it here for the 'fowners' statements in src_install()
-	enewgroup snort
-	enewuser snort -1 -1 /dev/null snort
-
-}
-
-src_prepare() {
-
-	#Multilib fix for the sf_engine
-	einfo "Applying multilib fix."
-	sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
-		"${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
-		|| die "sed for sf_engine failed"
-
-	#Multilib fix for the curent set of dynamic-preprocessors
-	for i in ftptelnet smtp ssh dns ssl dcerpc2 sdf imap pop rzb_saac sip reputation gtp modbus dnp3; do
-		sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
-			"${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
-			|| die "sed for $i failed."
-	done
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable static) \
-		$(use_enable static so-with-static-lib) \
-		$(use_enable dynamicplugin) \
-		$(use_enable zlib) \
-		$(use_enable gre) \
-		$(use_enable mpls) \
-		$(use_enable targetbased) \
-		$(use_enable decoder-preprocessor-rules) \
-		$(use_enable ppm) \
-		$(use_enable perfprofiling) \
-		$(use_enable linux-smp-stats) \
-		$(use_enable inline-init-failopen) \
-		$(use_enable threads pthread) \
-		$(use_enable debug) \
-		$(use_enable debug debug-msgs) \
-		$(use_enable debug corefiles) \
-		$(use_enable !debug dlclose) \
-		$(use_enable active-response) \
-		$(use_enable normalizer) \
-		$(use_enable reload-error-restart) \
-		$(use_enable react) \
-		$(use_enable flexresp3) \
-		$(use_enable paf) \
-		$(use_enable large-pcap-64bit large-pcap) \
-		$(use_enable aruba) \
-		$(use_with mysql) \
-		$(use_with odbc) \
-		$(use_with postgres postgresql) \
-		--enable-ipv6 \
-		--enable-reload \
-		--disable-prelude \
-		--disable-build-dynamic-examples \
-		--disable-profile \
-		--disable-ppm-test \
-		--disable-intel-soft-cpm \
-		--disable-static-daq \
-		--disable-rzb-saac \
-		--without-oracle
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die "emake failed"
-
-	dodir /var/log/snort \
-		/var/run/snort \
-		/etc/snort/rules \
-		/etc/snort/so_rules \
-		/usr/$(get_libdir)/snort_dynamicrules \
-			|| die "Failed to create core directories"
-
-	# config.log and build.log are needed by Sourcefire
-	# to trouble shoot build problems and bug reports so we are
-	# perserving them incase the user needs upstream support.
-	dodoc RELEASE.NOTES ChangeLog \
-		doc/* \
-		tools/u2boat/README.u2boat \
-		schemas/* || die "Failed to install snort docs"
-
-	insinto /etc/snort
-	doins etc/attribute_table.dtd \
-		etc/classification.config \
-		etc/gen-msg.map \
-		etc/reference.config \
-		etc/threshold.conf \
-		etc/unicode.map || die "Failed to install docs in etc"
-
-	# We use snort.conf.distrib because the config file is complicated
-	# and the one shipped with snort can change drastically between versions.
-	# Users should migrate setting by hand and not with etc-update.
-	newins etc/snort.conf snort.conf.distrib \
-		|| die "Failed to add snort.conf.distrib"
-
-	# config.log and build.log are needed by Sourcefire
-	# to troubleshoot build problems and bug reports so we are
-	# perserving them incase the user needs upstream support.
-	# 'die' was intentionally not added here.
-	if [ -f "${WORKDIR}/${PF}/config.log" ]; then
-		dodoc "${WORKDIR}/${PF}/config.log"
-	fi
-	if [ -f "${T}/build.log" ]; then
-		dodoc "${T}/build.log"
-	fi
-
-	insinto /etc/snort/preproc_rules
-	doins preproc_rules/decoder.rules \
-		preproc_rules/preprocessor.rules \
-		preproc_rules/sensitive-data.rules || die "Failed to install preproc rule files"
-
-	fowners -R snort:snort \
-		/var/log/snort \
-		/var/run/snort \
-		/etc/snort || die
-
-	newinitd "${FILESDIR}/snort.rc11" snort || die "Failed to install snort init script"
-	newconfd "${FILESDIR}/snort.confd.2" snort || die "Failed to install snort confd file"
-
-	# Sourcefire uses Makefiles to install docs causing Bug #297190.
-	# This removes the unwanted doc directory and rogue Makefiles.
-	rm -rf "${D}"usr/share/doc/snort || die "Failed to remove SF doc directories"
-	rm "${D}"usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
-
-	#Remove unneeded .la files (Bug #382863)
-	rm "${D}"usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
-	rm "${D}"usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
-
-	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
-	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set the correct rule location in the config
-	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set the correct preprocessor/decoder rule location in the config
-	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Enable the preprocessor/decoder rules
-	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Just some clean up of trailing /'s in the config
-	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Make it clear in the config where these are...
-	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Disable all rule files by default.
-	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Disable normalizer preprocessor config if normalizer USE flag not set.
-	if ! use normalizer; then
-		sed -i -e 's|^preprocessor normalize|#preprocessor normalize|g' \
-			"${D}etc/snort/snort.conf.distrib" || die
-	fi
-
-	# Set the configured DAQ to afpacket
-	sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set the location of the DAQ modules
-	sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set the DAQ mode to passive
-	sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set snort to run as snort:snort
-	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set the default log dir
-	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
-		"${D}etc/snort/snort.conf.distrib" || die
-
-	# Set the correct so_rule location in the config
-	 sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
-		 "${D}etc/snort/snort.conf.distrib" || die
-}
-
-pkg_postinst() {
-
-	einfo "There have been a number of improvements and new features"
-	einfo "added to ${P}. Please review the RELEASE.NOTES and"
-	einfo "ChangLog located in /usr/share/doc/${PF}."
-	einfo
-	elog "The Sourcefire Vulnerability Research Team (VRT) recommends that"
-	elog "users migrate their snort.conf customizations to the latest config"
-	elog "file released by the VRT. You can find the latest version of the"
-	elog "Snort config file in /etc/snort/snort.conf.distrib."
-	elog
-	elog "!! It is important that you migrate to this new snort.conf file !!"
-	elog
-	elog "This version of the ebuild includes an updated init.d file and"
-	elog "conf.d file that rely on options found in the latest Snort"
-	elog "config file provided by the VRT."
-
-	if use debug; then
-		elog "You have the 'debug' USE flag enabled. If this has been done to"
-		elog "troubleshoot an issue by producing a core dump or a back trace,"
-		elog "then you need to also ensure the FEATURES variable in make.conf"
-		elog "contains the 'nostrip' option."
-	fi
-}
diff --git a/net-analyzer/snort/snort-2.9.2.3.ebuild b/net-analyzer/snort/snort-2.9.4.6.ebuild
similarity index 88%
rename from net-analyzer/snort/snort-2.9.2.3.ebuild
rename to net-analyzer/snort/snort-2.9.4.6.ebuild
index e8127c32105f..c2fa25ef4c9d 100644
--- a/net-analyzer/snort/snort-2.9.2.3.ebuild
+++ b/net-analyzer/snort/snort-2.9.4.6.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.9.2.3.ebuild,v 1.6 2012/12/30 21:16:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.9.4.6.ebuild,v 1.1 2013/05/31 03:09:06 patrick Exp $
 
-EAPI="2"
+EAPI="5"
 inherit autotools multilib user
 
 DESCRIPTION="The de facto standard for intrusion detection/prevention"
 HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/dl/snort-current/${P}.tar.gz"
+SRC_URI="http://snort.org/downloads/2320 -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
@@ -28,13 +28,9 @@ DEPEND=">=net-libs/libpcap-1.0.0
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-snort )"
 
-pkg_setup() {
+REQUIRED_USE="zlib? ( dynamicplugin )"
 
-	if use zlib && ! use dynamicplugin; then
-		eerror "You have enabled the 'zlib' USE flag but not the 'dynamicplugin' USE flag."
-		eerror "'zlib' requires 'dynamicplugin' be enabled."
-		die
-	fi
+pkg_setup() {
 
 	# pre_inst() is a better place to put this
 	# but we need it here for the 'fowners' statements in src_install()
@@ -46,7 +42,7 @@ pkg_setup() {
 src_prepare() {
 
 	#Multilib fix for the sf_engine
-	einfo "Applying multilib fix."
+	ebegin "Applying multilib fix"
 	sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
 		"${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
 		|| die "sed for sf_engine failed"
@@ -57,6 +53,7 @@ src_prepare() {
 			"${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
 			|| die "sed for $i failed."
 	done
+	eend
 
 	AT_M4DIR=m4 eautoreconf
 }
@@ -107,14 +104,13 @@ src_configure() {
 
 src_install() {
 
-	emake DESTDIR="${D}" install || die "emake failed"
+	emake DESTDIR="${D}" install
 
 	dodir /var/log/snort \
 		/var/run/snort \
 		/etc/snort/rules \
 		/etc/snort/so_rules \
-		/usr/$(get_libdir)/snort_dynamicrules \
-			|| die "Failed to create core directories"
+		/usr/$(get_libdir)/snort_dynamicrules
 
 	# config.log and build.log are needed by Sourcefire
 	# to trouble shoot build problems and bug reports so we are
@@ -122,7 +118,6 @@ src_install() {
 	dodoc RELEASE.NOTES ChangeLog \
 		doc/* \
 		tools/u2boat/README.u2boat \
-		schemas/* || die "Failed to install snort docs"
 
 	insinto /etc/snort
 	doins etc/attribute_table.dtd \
@@ -130,18 +125,16 @@ src_install() {
 		etc/gen-msg.map \
 		etc/reference.config \
 		etc/threshold.conf \
-		etc/unicode.map || die "Failed to install docs in etc"
+		etc/unicode.map
 
 	# We use snort.conf.distrib because the config file is complicated
 	# and the one shipped with snort can change drastically between versions.
 	# Users should migrate setting by hand and not with etc-update.
-	newins etc/snort.conf snort.conf.distrib \
-		|| die "Failed to add snort.conf.distrib"
+	newins etc/snort.conf snort.conf.distrib
 
 	# config.log and build.log are needed by Sourcefire
 	# to troubleshoot build problems and bug reports so we are
-	# perserving them incase the user needs upstream support.
-	# 'die' was intentionally not added here.
+	# preserving them incase the user needs upstream support.
 	if [ -f "${WORKDIR}/${PF}/config.log" ]; then
 		dodoc "${WORKDIR}/${PF}/config.log"
 	fi
@@ -152,15 +145,15 @@ src_install() {
 	insinto /etc/snort/preproc_rules
 	doins preproc_rules/decoder.rules \
 		preproc_rules/preprocessor.rules \
-		preproc_rules/sensitive-data.rules || die "Failed to install preproc rule files"
+		preproc_rules/sensitive-data.rules
 
 	fowners -R snort:snort \
 		/var/log/snort \
 		/var/run/snort \
-		/etc/snort || die
+		/etc/snort
 
-	newinitd "${FILESDIR}/snort.rc11" snort || die "Failed to install snort init script"
-	newconfd "${FILESDIR}/snort.confd.2" snort || die "Failed to install snort confd file"
+	newinitd "${FILESDIR}/snort.rc12" snort
+	newconfd "${FILESDIR}/snort.confd.2" snort
 
 	# Sourcefire uses Makefiles to install docs causing Bug #297190.
 	# This removes the unwanted doc directory and rogue Makefiles.
diff --git a/net-libs/daq/Manifest b/net-libs/daq/Manifest
index e05c52d3626f..c1b5b148da1c 100644
--- a/net-libs/daq/Manifest
+++ b/net-libs/daq/Manifest
@@ -1,2 +1,3 @@
 DIST daq-0.5.tar.gz 449703 SHA256 36f2954a5994e0047c43a6e48e033712a4f2dbabb63556aa07d6344f3f834eec SHA512 2c83d383550f75fd961b514681122ac5493ca99095820e4b701776a53a1d7b6f7edb839c9082b87a1902d0f4e6c6c6507fbcb6164215e1b2a4e2df860f6ddad1 WHIRLPOOL 0e900d8b7922326715fd054e311247ed78a7342c57186566dd26dd74a43cd428af6fe220335f30c8f34c61685fb307646c9a90510c693e2d96e1eaf83c39adba
 DIST daq-0.6.2.tar.gz 451581 SHA256 0159865b5dc127ed2faf8d6732d781939f27e38b7c7deabcd369a22ea9e42f26 SHA512 da19034f210d9c202f5e3ba7ddf60645498ed8bdaf28410811922ebb1338b56c55c8e992e46e1c7b9b89de6148b471129826a02ab2a45c7232bc4091a4e53125 WHIRLPOOL 01e7b47e27b71d11648936911bb9bd2657b387fd15eb41f5939b23b3e2da9753d66165eddd0831ba4e827ab67ee2f61ee963cb98788ad4a7ca9d03f921031ff6
+DIST daq-2.0.0.tar.gz 480030 SHA256 fbafc8e362a96fcadc69731f91203ef90845507aae0a4774d5c2825e9d2c1c38 SHA512 aa79e06473592c0ee57a3a2da60f01f35e6268a126fcb3a992ee7c6da48a079cf359db7439be3778997e774c340630d768712c9efea10c570feb4961f9a00b3c WHIRLPOOL c1eb41df6718a7ece0da95599f78f080a32337a3522181ad31db46a0285d584dfd46e2fffce5e73ef3ba0409bd033b59ac0b272df1d7ee104f6160edc69bc8be
diff --git a/net-libs/daq/daq-2.0.0.ebuild b/net-libs/daq/daq-2.0.0.ebuild
new file mode 100644
index 000000000000..9c88032a78a7
--- /dev/null
+++ b/net-libs/daq/daq-2.0.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/daq-2.0.0.ebuild,v 1.1 2013/05/31 02:48:40 patrick Exp $
+
+EAPI="2"
+
+inherit eutils multilib
+
+DESCRIPTION="Data Acquisition library, for packet I/O"
+HOMEPAGE="http://www.snort.org/"
+SRC_URI="http://www.snort.org/downloads/2311 -> ${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 +afpacket +dump +pcap nfq ipq static-libs"
+
+DEPEND="pcap? ( >=net-libs/libpcap-1.0.0 )
+		dump? ( >=net-libs/libpcap-1.0.0 )
+		nfq? ( dev-libs/libdnet
+			>=net-firewall/iptables-1.4.10
+			net-libs/libnetfilter_queue )
+		ipq? ( dev-libs/libdnet
+			>=net-firewall/iptables-1.4.10
+			net-libs/libnetfilter_queue )"
+
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf \
+		$(use_enable ipv6) \
+		$(use_enable pcap pcap-module) \
+		$(use_enable afpacket afpacket-module) \
+		$(use_enable dump dump-module) \
+		$(use_enable nfq nfq-module) \
+		$(use_enable ipq ipq-module) \
+		$(use_enable static-libs static) \
+		--disable-ipfw-module \
+		--disable-bundled-modules
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc ChangeLog README
+
+	# Remove unneeded .la files
+	rm \
+		"${D}"usr/$(get_libdir)/daq/*.la \
+		"${D}"usr/$(get_libdir)/libdaq*.la \
+		"${D}"usr/$(get_libdir)/libsfbpf.la \
+		|| die
+
+	# If not using static-libs don't install the static libraries
+	# This has been bugged upstream
+	if ! use static-libs; then
+		for z in libdaq_static libdaq_static_modules; do
+			rm "${D}"usr/$(get_libdir)/${z}.a
+		done
+	fi
+}
+
+pkg_postinst() {
+	einfo "The Data Acquisition library (DAQ) for packet I/O replaces direct"
+	einfo "calls to PCAP functions with an abstraction layer that facilitates"
+	einfo "operation on a variety of hardware and software interfaces without"
+	einfo "requiring changes to application such as Snort."
+	einfo
+	einfo "Please see the README file for DAQ for information about specific"
+	einfo "DAQ modules."
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 46ab1b681648..433a5a3b85de 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,6 +1,6 @@
 DIST node-v0.10.6.tar.gz 13260795 SHA256 7e2079394efe82f62798178f617888c9d6a39150c76122c432ae9ea73ce28e79 SHA512 08e196948448fce089c583419f3e9c08cb666305fcb0dd929c41d25a6342892cf82c670449cd1b245d6aee689e8f7a5ce7515dd7f132d7ee1470e4513b6fb5cf WHIRLPOOL 18e13d2719fce63f589c82d3b95bb72d84659ec5d7a3a63d71db867e1d8213ff0be4f128fb563b29cdc65e89ef01fe2e073b105fe05f4951ac3eedcf127217f1
 DIST node-v0.10.7.tar.gz 13367694 SHA256 22d1d211f5260dfa5b842cebdb04633f28df180843105ff3eb792ca35ed425e0 SHA512 72772419417cb9d49838374117ea723e2b2efbafc9bcb4cad5217c8df9545eff59d3a3338d50af7daac61566774db069fea43ae3b7a320b0fb23344c9bd9da6f WHIRLPOOL 992efde0b7a0e92f56a5891e1c9a37e018d752bda9a2bf7894b5e725e59dfdf3577aa073be755f1f1212f7a5534844128d2aa26a36af1929c10c354edff026c3
-DIST node-v0.10.8.tar.gz 13372909 SHA256 edf6f766c8ccc7ef5b02a50c94567343eb1ffae479db93684ba89976e3f18354 SHA512 0c5fb2865a813c7cfc68f47a9901d6e46303955ef520b6c9629be895e30b830b6a186688ec9e52a2e828a191f8001c7df45e755310dee27c2facff9a786cca1e WHIRLPOOL b9fe8118bb23479d3a3798fd5e8779f7224ab1e2bedc3712572f356c3d68965a0acb6036b3ba7b13960f3a49567e87f84bc997fc603039626411d5d97acc7b28
+DIST node-v0.10.9.tar.gz 13678037 SHA256 25fb276ac6765ebb19f44d3e3775ed1c0275f874c896755d0d619226caee9c30 SHA512 34feca9d8a2a6580f4715e89533a9c3290ac60c9028864539bc7dc904d5bdd30f1c8d9fb6e61c909e33f5ff81c3078f80aa745ca420a153b2d14e21728de4d36 WHIRLPOOL 9a3a2e2d10b3459e4dd6474dfc2055b1f926b7387d82fd3abdd80b721d60a2fee6cbe73bf55dbc6af64c7b8771ffe97537531db06460592257d76d32856a4e3c
 DIST node-v0.11.0.tar.gz 12956118 SHA256 a1887957fd6f0091379d1317f1daeb791bbf4301e58d693d17ad1d0fdbfa7898 SHA512 1c3d3445edf8600a1bf60b7be69e22bbfc74c3c076b92bcd71168c0f830aa42ba0ef7a0a63d9663b35e480d2da9694b8620e3db11be1c1f7e78a24a90bf3f20e WHIRLPOOL 7378e8b0d695425b475c5711b7f4ba2b8bbe72e4317c5a18f8ccf6386d51f61718c6b3ee68d64c2e95552dccd5ca86a8b8ca96c279e9cae2899c9cbf8e18eac7
 DIST node-v0.11.2.tar.gz 13564314 SHA256 d115f01fea0b2c5a4c4ca489d0cc8cec70300f0212f08905d881ac55f642554a SHA512 67c834eb7509428d3ecb3cf808a66153941e4f484c879eae5b271b6b010dcf0cd3338f06e241b2ed423e5ba5062ae23be37c2e67bc1379b4b5f0823df3697dcc WHIRLPOOL 79634567de2d730f23b16ec2d3b4488b2423227d92fc522abf72359923d01e6180620f87eb46c8bb666defa63f87b4cdba2be9109f4042c512b81b2d3e0b0fd8
 DIST node-v0.8.21.tar.gz 12191813 SHA256 e526f56d22bb2ebee5a607bd1e7a16dcc8530b916e3a372192e6cd5fa97d08e6 SHA512 10a305d5d798703144a4d4a29878b261be516f29a0bfe349e73879b81e16db89a6fabfce43a6b1abef2f085aa2cf884bde310b9feeb377083c43f674492f5d99 WHIRLPOOL f44085bb6710289adc85653f39073d17527bbe2bd27d9a998376a3eeab9fea462fb8f9d0f3baab4bda28d3046d3920a58ab14cfaa9eb1d20bb66cfdc1c71cc72
diff --git a/net-libs/nodejs/nodejs-0.10.8.ebuild b/net-libs/nodejs/nodejs-0.10.9.ebuild
similarity index 93%
rename from net-libs/nodejs/nodejs-0.10.8.ebuild
rename to net-libs/nodejs/nodejs-0.10.9.ebuild
index 54bd54bd0236..cb80124ad939 100644
--- a/net-libs/nodejs/nodejs-0.10.8.ebuild
+++ b/net-libs/nodejs/nodejs-0.10.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.10.8.ebuild,v 1.1 2013/05/26 07:24:38 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.10.9.ebuild,v 1.1 2013/05/31 03:19:19 patrick Exp $
 
 EAPI=5
 
diff --git a/net-mail/qmailadmin/Manifest b/net-mail/qmailadmin/Manifest
index b2fda1094b8b..86ec63b9f713 100644
--- a/net-mail/qmailadmin/Manifest
+++ b/net-mail/qmailadmin/Manifest
@@ -1,3 +1,4 @@
-DIST qmailadmin-1.2.10.tar.gz 390150 RMD160 1220d99d2f228011760ce670fea94f3e5a019506 SHA1 80ec9159535e08ae10a7690ff403d77ea33c17d0 SHA256 24f27697c268a0031145d1fe3b597f0e3e55af41a09f5c6d499b6c2409ce771b
-DIST qmailadmin-1.2.12.tar.gz 400144 RMD160 6aa50a9075c97ecfb7db1e1cf6eed31ea9ec0e11 SHA1 89f87e1a3b25e7fcee74296721347454b838e32c SHA256 926c6dd91540aed9b011e0c3623ed108acdb5ecc3d6cff8f08731c2f2bba42c4
-DIST qmailadmin-1.2.15.tar.gz 385529 RMD160 b42907514dc19551434256a4d505064baa098a4d SHA1 33aaa3328a50d64396ad157724e87c84f1bcb3cd SHA256 3b8bb55a5e567497434c7cf9cbaf8cd73f85b8fa5c56b4bebdf7aef8b2c70db7
+DIST qmailadmin-1.2.10.tar.gz 390150 SHA256 24f27697c268a0031145d1fe3b597f0e3e55af41a09f5c6d499b6c2409ce771b SHA512 43dcd55b9b3458896398eada9a7d0b513cce5bde6edecb8ae54b6519509361dfab18c7600a3f94ff141b4a3b824e93b4a88a5db3e5a8980ddabf2e6dda8cfb47 WHIRLPOOL 7ab4afacb84b210507916b19ea35ab3280a5ea8289b10dcf8a3ba9e2c23467f2bc1f14cd5d5cda7d1ebf5d9fcceebd12a85877961580743d650826801221ada6
+DIST qmailadmin-1.2.12.tar.gz 400144 SHA256 926c6dd91540aed9b011e0c3623ed108acdb5ecc3d6cff8f08731c2f2bba42c4 SHA512 9fea49c3cab31606b37b9b827cd21ee852267e8c5555d96c48d52fc8388d7a3a862384cf18211c89c34525b84f866fa371a70a88386309e32dde1d7d8bb5b3ed WHIRLPOOL f681e817bc9eb96a25e2c73af3535ece35308472870d1a2348eec1c3c4c3b4a2462c791bb443319f10aad8795014c90eae291854cb9affac8cd9ebc8576db901
+DIST qmailadmin-1.2.15.tar.gz 385529 SHA256 3b8bb55a5e567497434c7cf9cbaf8cd73f85b8fa5c56b4bebdf7aef8b2c70db7 SHA512 0cf32916bd6ef47fce091d4a92203fb8b80e0c3349cf8af826c047ba778e7992bcb98002023219648c7aa1ab60fbb052d4726f12f44d68647e657fb3760b8347 WHIRLPOOL 4555e2ee3581f89a1fbcb2777546461cbbbd47ace7577579d5a5c6cb41cb20265e7a31c89d571ed5258e503937f9d5a8f56f34de2adfe59962f33c3ddf23fc5f
+DIST qmailadmin-1.2.16.tar.gz 388689 SHA256 89b72184e31bf2c88a169950a0804dc32389106735f0ab09800996c7be06260f SHA512 4afa18461d8bb91e7075f08f00f3e1ef030a01381d049e122d4c234f2b6db9884d4426e9f4c61d5257e55786228741a3b8ded1fbfb925611f536cedb9d61de91 WHIRLPOOL 397bf6a1158fa015bfe3348fafa063693e0558f8037c24ed93083b8a34cc3fc1425c34c7227ab8e193d5df05763ce19007b9490bfb8bca1ff80b218a11eec3a0
diff --git a/net-mail/qmailadmin/files/qmailadmin-1.2.15-quota-security.patch b/net-mail/qmailadmin/files/qmailadmin-1.2.15-quota-security.patch
new file mode 100644
index 000000000000..bf8ca4785dfd
--- /dev/null
+++ b/net-mail/qmailadmin/files/qmailadmin-1.2.15-quota-security.patch
@@ -0,0 +1,41 @@
+Previous patch did not fix the 32-bit overflow properly.
+This goes with the vpopmail 5.4.33 matching quota fix (in upstream).
+
+X-Gentoo-Bug: 269129
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar qmailadmin-1.2.15.orig/qmailadmin.h qmailadmin-1.2.15/qmailadmin.h
+--- qmailadmin-1.2.15.orig/qmailadmin.h	2013-05-30 23:42:27.689759997 +0000
++++ qmailadmin-1.2.15/qmailadmin.h	2013-05-30 23:44:33.870866242 +0000
+@@ -63,4 +63,4 @@
+ /* copied from maildirquota.c in vpopmail
+  * it really needs to get into vpopmail.h somehow
+  */
+-int readuserquota(const char* dir, long *sizep, int *cntp);
++//int readuserquota(const char* dir, storage_t *sizep, storage_t *cntp);
+diff -Nuar qmailadmin-1.2.15.orig/template.c qmailadmin-1.2.15/template.c
+--- qmailadmin-1.2.15.orig/template.c	2009-02-06 05:30:05.000000000 +0000
++++ qmailadmin-1.2.15/template.c	2013-05-30 23:45:47.319571080 +0000
+@@ -426,7 +426,7 @@
+           case 'Q':
+             vpw = vauth_getpw(ActionUser, Domain);
+             if (strncmp(vpw->pw_shell, "NOQUOTA", 2) != 0) {
+-              long diskquota = 0;
+-              int maxmsg = 0;
++              uint64_t diskquota = 0;
++              uint64_t maxmsg = 0;
+               char path[256];
+ 
+diff -Nuar qmailadmin-1.2.15.orig/user.c qmailadmin-1.2.15/user.c
+--- qmailadmin-1.2.15.orig/user.c	2009-05-02 19:13:29.000000000 +0000
++++ qmailadmin-1.2.15/user.c	2013-05-30 23:45:26.039946212 +0000
+@@ -170,7 +170,7 @@
+               (AdminType==USER_ADMIN && strcmp(pw->pw_name,Username)==0)))) {
+         if (AdminType==DOMAIN_ADMIN || 
+             (AdminType==USER_ADMIN && strcmp(pw->pw_name,Username)==0)) {
+-          long diskquota = 0;
+-          int maxmsg = 0;
++          uint64_t diskquota = 0;
++          uint64_t maxmsg = 0;
+ 
+           /* display account name and user name */
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
new file mode 100644
index 000000000000..9f1688b9500c
--- /dev/null
+++ b/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild,v 1.2 2013/05/31 00:47:07 robbat2 Exp $
+
+inherit qmail eutils webapp autotools
+
+# the RESTRICT is because the vpopmail lib directory is locked down
+# and non-root can't access them.
+RESTRICT="userpriv"
+
+MY_P=${P/_rc/-rc}
+
+DESCRIPTION="A web interface for managing a qmail system with virtual domains"
+HOMEPAGE="http://www.inter7.com/qmailadmin.html"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE="maildrop"
+
+DEPEND="virtual/qmail
+	>=net-mail/vpopmail-5.4.33
+	net-mail/autorespond
+	maildrop? ( >=mail-filter/maildrop-2.0.1 )"
+
+S="${WORKDIR}"/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.2.9-maildir.patch
+	epatch "${FILESDIR}"/${PN}-1.2.12-quota-overflow.patch
+	epatch "${FILESDIR}"/${PN}-1.2.15-quota-security.patch
+	eautoreconf
+}
+
+src_compile() {
+	# Pass spam stuff through $@ so we get the quoting right
+	if use maildrop ; then
+		set -- --enable-modify-spam \
+			--enable-spam-command='|preline maildrop /etc/maildroprc'
+	else
+		set --
+	fi
+
+	econf \
+		--enable-valias \
+		--enable-vpopmaildir=/var/vpopmail \
+		--enable-htmldir="${MY_HTDOCSDIR}" \
+		--enable-imagedir="${MY_HTDOCSDIR}"/images \
+		--enable-imageurl=/${PN}/images \
+		--enable-htmllibdir=/usr/share/${PN}/htmllib \
+		--enable-cgibindir="${MY_CGIBINDIR}" \
+		--enable-cgipath=/cgi-bin/${PN} \
+		--enable-qmaildir="${QMAIL_HOME}" \
+		--enable-autoresponder-path="${QMAIL_HOME}"/bin \
+		--enable-true-path=/bin \
+		--enable-ezmlmdir=/usr/bin \
+		--enable-domain-autofill \
+		--enable-modify-quota \
+		--enable-no-cache \
+		--enable-trivial-password \
+		--enable-catchall \
+		--enable-maxusersperpage=50 \
+		--enable-maxaliasesperpage=50 \
+		--enable-vpopuser=vpopmail \
+		--enable-vpopgroup=vpopmail \
+		"$@" \
+		|| die "econf failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS INSTALL README.hooks BUGS TODO ChangeLog \
+		TRANSLATORS NEWS FAQ README contrib/*
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	einfo "If you would like support for ezmlm mailing lists inside qmailadmin,"
+	einfo "please emerge some variant of ezmlm-idx."
+	webapp_pkg_postinst
+}
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
new file mode 100644
index 000000000000..1f871041909c
--- /dev/null
+++ b/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild,v 1.1 2013/05/31 00:47:07 robbat2 Exp $
+
+inherit qmail eutils webapp autotools
+
+# the RESTRICT is because the vpopmail lib directory is locked down
+# and non-root can't access them.
+RESTRICT="userpriv"
+
+MY_P=${P/_rc/-rc}
+
+DESCRIPTION="A web interface for managing a qmail system with virtual domains"
+HOMEPAGE="http://www.inter7.com/qmailadmin.html"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE="maildrop"
+
+DEPEND="virtual/qmail
+	>=net-mail/vpopmail-5.4.33
+	net-mail/autorespond
+	maildrop? ( >=mail-filter/maildrop-2.0.1 )"
+
+S="${WORKDIR}"/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.2.9-maildir.patch
+	eautoreconf
+}
+
+src_compile() {
+	# Pass spam stuff through $@ so we get the quoting right
+	if use maildrop ; then
+		set -- --enable-modify-spam \
+			--enable-spam-command='|preline maildrop /etc/maildroprc'
+	else
+		set --
+	fi
+
+	econf \
+		--enable-valias \
+		--enable-vpopmaildir=/var/vpopmail \
+		--enable-htmldir="${MY_HTDOCSDIR}" \
+		--enable-imagedir="${MY_HTDOCSDIR}"/images \
+		--enable-imageurl=/${PN}/images \
+		--enable-htmllibdir=/usr/share/${PN}/htmllib \
+		--enable-cgibindir="${MY_CGIBINDIR}" \
+		--enable-cgipath=/cgi-bin/${PN} \
+		--enable-qmaildir="${QMAIL_HOME}" \
+		--enable-autoresponder-path="${QMAIL_HOME}"/bin \
+		--enable-true-path=/bin \
+		--enable-ezmlmdir=/usr/bin \
+		--enable-domain-autofill \
+		--enable-modify-quota \
+		--enable-no-cache \
+		--enable-trivial-password \
+		--enable-catchall \
+		--enable-maxusersperpage=50 \
+		--enable-maxaliasesperpage=50 \
+		--enable-vpopuser=vpopmail \
+		--enable-vpopgroup=vpopmail \
+		"$@" \
+		|| die "econf failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS INSTALL README.hooks BUGS TODO ChangeLog \
+		TRANSLATORS NEWS FAQ README contrib/*
+
+	webapp_src_install
+
+	# CGI needs to be able to read /etc/vpopmail.conf
+	# Which is 0640 root:vpopmail, as it contains passwords
+	cgi=/usr/share/webapps/${PN}/${PV}/hostroot/cgi-bin/qmailadmin
+	fowners root:vpopmail $cgi
+	fperms g+s $cgi
+}
+
+pkg_postinst() {
+	einfo "If you would like support for ezmlm mailing lists inside qmailadmin,"
+	einfo "please emerge some variant of ezmlm-idx."
+	webapp_pkg_postinst
+	einfo "For complete webapp-config support:"
+	einfo "1. Add this for the Apache cgi-bin dir: Options +ExecCGI -MultiViews +FollowSymLinks"
+	einfo "2. Run: webapp-config -I -h localhost -d qmailadmin $PN $PV"
+	einfo "3. Symlink: ln -s {/usr/share/webapps/${PN}/${PV}/hostroot,/var/www/localhost}/cgi-bin/${PN}"
+}
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index 7bebd0a5dd5c..80fd5b44ad67 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -1,3 +1,3 @@
-DIST vpopmail-5.4.16.tar.gz 453019 RMD160 de385ee6dbe0edf7ccb2e88c5b967669711d1e2b SHA1 59d158f0e6b9516f242085101a144597fc8bf296 SHA256 c1ea76e404082a116795dc3c49933b26f79cdbb49bca5ebc4fa170403a5e3c7a
-DIST vpopmail-5.4.30.tar.gz 609358 RMD160 83fa5b43e146719953fb16da5b7d0a3780f8f94b SHA1 419f4dc8cc6577a43aa42f67a68f418e5b415adb SHA256 38239ca6f9dda25f70cc46106f3ffe8b9d3b95907ced54c15eb942c2ff387acc
-DIST vpopmail-5.4.33.tar.gz 612271 RMD160 d064f1a53e7cbe41c87af790ab2dee2d406df7b2 SHA1 1fd185321c5460458683ab7acfc104420b213e2d SHA256 383c7436dfb18e773336f608f1771fc08559143c4f3938a5807a0cc5994c44f4
+DIST vpopmail-5.4.16.tar.gz 453019 SHA256 c1ea76e404082a116795dc3c49933b26f79cdbb49bca5ebc4fa170403a5e3c7a SHA512 a7ce5640a59ee7f216869d08cb681eb323910f4fd7dcc9f644fe9bcb842c6703745edbbd5bb95ab44dc59b4684a8e29b115a3aeb893ef7514fdc28eab46328d0 WHIRLPOOL 10bc8c4f05b11cabaaf69e49f42006bd8b46d671f189c4e5d8258e3fb88bffb76e086398792dc655b3a02d6f59efcb48727602b50273138a3b35940725faeba3
+DIST vpopmail-5.4.30.tar.gz 609358 SHA256 38239ca6f9dda25f70cc46106f3ffe8b9d3b95907ced54c15eb942c2ff387acc SHA512 62bb677cb2f928d37fff1346a7aa7a6f9f7900159d1edcf0f471bf252c59f19e2b8605c27033e9123339a75dc4058b4fd21ea5e05684590e50c94a1431d91c7b WHIRLPOOL 0a4caafe23dd649e6c5917bac6fa414dd702b8631231c94385a2afc24e977b3ea07e6cdf71261935e4a7df2e7508edad40124c15cfab2e02308c060c5d50e44a
+DIST vpopmail-5.4.33.tar.gz 612271 SHA256 383c7436dfb18e773336f608f1771fc08559143c4f3938a5807a0cc5994c44f4 SHA512 abd5060d709c661d95ca442c6f77c4c27cf30a3c6790fc36d76ccf379ed2e08c1f0af697b2bcc57176a2cdb2cb67f6c27236d7b3fa69a135fa87f45a5df208ab WHIRLPOOL 9b49635984e541880528e56da9932a74e1a0988ef0b82f0f15538b6f9744c3bf1e86da45dd5de0c55af714669547c48d1f13830c8480e6760bc548b5047520f3
diff --git a/net-mail/vpopmail/files/vpopmail-vpgsql.patch b/net-mail/vpopmail/files/vpopmail-vpgsql.patch
new file mode 100644
index 000000000000..1d387e43f59d
--- /dev/null
+++ b/net-mail/vpopmail/files/vpopmail-vpgsql.patch
@@ -0,0 +1,94 @@
+--- vpgsql.c.2	2011-02-28 18:00:45.000000000 +0100
++++ vpgsql.c	2011-08-06 05:46:49.959717911 +0200
+@@ -392,10 +392,10 @@
+ #endif
+ 
+ #ifdef ENABLE_SQL_LOGGING
+-    qnprintf( sqlBufUpdate, SQL_BUF_SIZE,
++    qnprintf( SqlBufUpdate, SQL_BUF_SIZE,
+        "delete from vlog where domain = '%s'", domain );
+     pgres=PQexec(pgc, SqlBufUpdate);
+-    if( !pgres || PGresultStatus(pgres)!=PGRES_COMMAND_OK) {
++    if( !pgres || PQresultStatus(pgres)!=PGRES_COMMAND_OK) {
+       return(-1);
+     }
+ #endif
+@@ -445,11 +445,11 @@
+ #endif
+ 
+ #ifdef ENABLE_SQL_LOGGING
+-    qnprintf( sqlBufUpdate, SQL_BUF_SIZE,
++    qnprintf( SqlBufUpdate, SQL_BUF_SIZE,
+         "delete from vlog where domain = '%s' and user='%s'", 
+        domain, user );
+     pgres=PQexec(pgc, SqlBufUpdate);
+-    if( !pgres || PGresultStatus(pgres)!=PGRES_COMMAND_OK) {
++    if( !pgres || PQresultStatus(pgres)!=PGRES_COMMAND_OK) {
+       err = -1;
+     }
+ #endif
+@@ -1555,6 +1555,64 @@
+     return valias_current->data; 
+   }
+ }
++
++char *valias_select_names( char *alias, char *domain )
++{
++	PGresult *pgres;
++	int err;
++	unsigned ntuples, ctuple;
++	struct linklist *temp_entry = NULL;
++
++	/* remove old entries as necessary */
++	while (valias_current != NULL)
++		valias_current = linklist_del (valias_current);
++
++	if ( (err =vauth_open(0)) != 0 ) return (NULL);
++
++	qnprintf( SqlBufRead, SQL_BUF_SIZE,
++		"select distinct alias from valias where domain = '%s' order by alias", domain);
++	if ( ! (pgres=PQexec(pgc, SqlBufRead))
++		|| PQresultStatus(pgres) != PGRES_TUPLES_OK ) {
++		if(pgres) PQclear(pgres);
++		vcreate_valias_table();
++		if ( ! (pgres=PQexec(pgc, SqlBufRead))
++			|| PQresultStatus(pgres) != PGRES_TUPLES_OK ) {
++				fprintf(stderr,"vpgsql: sql error[o]: %s\n",
++				PQerrorMessage(pgc));
++				if (pgres) PQclear (pgres);
++				return(NULL);
++		}
++	}
++	ntuples = PQntuples (pgres);
++	for (ctuple = 0; ctuple < ntuples; ctuple++) {
++		temp_entry = linklist_add (temp_entry, PQgetvalue (pgres, ctuple, 1), PQgetvalue (pgres, ctuple, 0));
++		if (valias_current == NULL) valias_current = temp_entry;
++	}
++	PQclear (pgres);
++	pgres = NULL; 
++
++	if (valias_current == NULL) return NULL; /* no results */
++	else {
++		strcpy (alias, valias_current->d2);
++		return(valias_current->data);
++	}
++}
++
++char *valias_select_names_next(char *alias)
++{
++	if (valias_current == NULL) return NULL;
++	valias_current = linklist_del (valias_current);
++
++	if (valias_current == NULL) return NULL; /* no results */
++	else {
++		strcpy(alias, valias_current->d2);
++		return(valias_current->data);
++	}
++}
++
++void valias_select_names_end() {
++	// not needed with PostgreSQL
++}
+ #endif
+ 
+ #ifdef ENABLE_SQL_LOGGING
diff --git a/net-mail/vpopmail/vpopmail-5.4.16.ebuild b/net-mail/vpopmail/vpopmail-5.4.16.ebuild
index fe0b0b1c438f..fde422e2d215 100644
--- a/net-mail/vpopmail/vpopmail-5.4.16.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.16.ebuild,v 1.17 2011/11/03 00:30:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.16.ebuild,v 1.18 2013/05/31 00:46:46 robbat2 Exp $
 
 inherit eutils fixheadtails autotools user
 
diff --git a/net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild b/net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild
index 6f7298b39243..c84fb560bbce 100644
--- a/net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild,v 1.10 2011/11/03 00:30:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild,v 1.11 2013/05/31 00:46:46 robbat2 Exp $
 
 EAPI="2"
 
diff --git a/net-mail/vpopmail/vpopmail-5.4.30-r2.ebuild b/net-mail/vpopmail/vpopmail-5.4.30-r2.ebuild
index a4f96e825c49..0e9e9d43b69e 100644
--- a/net-mail/vpopmail/vpopmail-5.4.30-r2.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.30-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.30-r2.ebuild,v 1.5 2011/11/03 00:30:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.30-r2.ebuild,v 1.6 2013/05/31 00:46:46 robbat2 Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="clearpasswd ipalias maildrop mysql spamassassin"
 
 DEPEND="virtual/qmail
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild
new file mode 100644
index 000000000000..68116f5ed14f
--- /dev/null
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild,v 1.2 2013/05/31 00:46:46 robbat2 Exp $
+
+EAPI=5
+
+inherit autotools eutils fixheadtails qmail user
+
+HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
+DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail mail servers."
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
+REQUIRED_USE="mysql? ( !postgres )"
+
+DEPEND="virtual/qmail
+	maildrop? ( mail-filter/maildrop )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-server )
+	spamassassin? ( mail-filter/spamassassin )"
+RDEPEND="${DEPEND}"
+
+# This makes sure the variable is set, and that it isn't null.
+VPOP_DEFAULT_HOME="/var/vpopmail"
+
+vpopmail_set_homedir() {
+	VPOP_HOME=$(egethome vpopmail)
+	if [[ -z "${VPOP_HOME}" ]]; then
+		ebeep
+		eerror "vpopmail's home directory is null in passwd data!"
+		eerror "You probably want to check that out."
+		eerror "Continuing with default."
+		VPOP_HOME="${VPOP_DEFAULT_HOME}"
+	else
+		einfo "Setting VPOP_HOME to: $VPOP_HOME"
+	fi
+}
+
+pkg_setup() {
+	enewgroup vpopmail 89
+	enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
+	upgradewarning
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.4.9-access.violation.patch
+	epatch "${FILESDIR}"/${PN}-lazy.patch
+	epatch "${FILESDIR}"/${PN}-double-free.patch
+	epatch "${FILESDIR}"/${PN}-vpgsql.patch
+
+	echo 'install-recursive: install-exec-am' \
+		>>"${S}"/Makefile.am
+
+	# fix maildir paths
+	sed -i -e 's|Maildir|.maildir|g' \
+		vchkpw.c vconvert.c vdelivermail.c \
+		vpopbull.c vpopmail.c vqmaillocal.c \
+		vuserinfo.c maildirquota.c || die
+
+	# remove vpopmail advertisement
+	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
+		vdelivermail.c vpopbull.c vqmaillocal.c || die
+
+	# automake/autoconf
+	mv -f "${S}"/configure.{in,ac} || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' \
+	        configure.ac || die
+
+	# _FORTIFY_SOURCE
+	sed -i \
+		-e 's/\(snprintf(\s*\(LI->[a-zA-Z_]\+\),\s*\)[a-zA-Z_]\+,/\1 sizeof(\2),/' \
+		vlistlib.c || die
+
+	eautoreconf
+	ht_fix_file cdb/Makefile
+}
+
+src_configure() {
+	vpopmail_set_homedir
+
+	local authopts
+	if use mysql; then
+		mysqlinc=$(mysql_config --include)
+		authopts="--enable-incdir=${mysqlinc#-I}"
+		authopts+=" --enable-auth-module=mysql"
+		authopts+="	--enable-libdir=/usr/$(get_libdir)/mysql"
+		authopts+="	--enable-sql-logging"
+		authopts+=" --enable-valias"
+		authopts+="	--disable-mysql-replication"
+		authopts+="	--enable-mysql-limits"
+	elif use postgres; then
+		pglibdir=$(pg_config --libdir)
+		authopts+=" --enable-auth-module=pgsql"
+		authopts+=" --enable-libdir=${pglibdir}"
+		authopts+=" --enable-sql-logging"
+		authopts+=" --enable-valias"
+	else
+		authopts+=" --enable-auth-module=cdb"
+	fi
+
+	econf ${authopts} \
+		--sysconfdir=${VPOP_HOME}/etc \
+		--enable-non-root-build \
+		--enable-qmaildir=${QMAIL_HOME} \
+		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
+		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
+		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
+		--enable-vpopuser=vpopmail \
+		--enable-vpopgroup=vpopmail \
+		--enable-many-domains \
+		--enable-file-locking \
+		--enable-file-sync \
+		--enable-md5-passwords \
+		--enable-logging \
+		--enable-auth-logging \
+		--enable-log-name=vpopmail \
+		--enable-qmail-ext \
+		--disable-tcpserver-file \
+		--disable-roaming-users \
+		$(use_enable ipalias ip-alias-domains) \
+		$(use_enable clearpasswd clear-passwd) \
+		$(use_enable maildrop) \
+		$(use_enable maildrop maildrop-prog /usr/bin/maildrop) \
+		$(use_enable spamassassin)
+}
+
+src_install() {
+	vpopmail_set_homedir
+
+	emake DESTDIR="${D}" install
+	keepdir "${VPOP_HOME}"/domains
+
+	# install helper script for maildir conversion
+	into "${VPOP_HOME}"
+	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
+	into /usr
+
+	dodoc doc/AUTHORS ChangeLog doc/FAQ doc/INSTALL doc/README*
+	dohtml doc/doc_html/* doc/man_html/*
+	rm -rf "${D}/${VPOP_HOME}"/doc
+	dosym /usr/share/doc/${PF}/ "${VPOP_HOME}"/doc
+
+	# create /etc/vpopmail.conf
+	if use mysql; then
+		dodir /etc
+		mv "${D}${VPOP_HOME}"/etc/vpopmail.mysql "${D}"/etc/vpopmail.conf
+		dosym /etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql
+
+		sed -e '12d' -i "${D}"/etc/vpopmail.conf
+		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
+		echo '# Write DB' >> "${D}"/etc/vpopmail.conf
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
+
+		# lock down perms
+		fperms 640 /etc/vpopmail.conf
+		fowners root:vpopmail /etc/vpopmail.conf
+	fi
+
+	insinto "${VPOP_HOME}"/etc
+	doins vusagec.conf
+	dosym "${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
+	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf
+
+	einfo "Installing env.d entry"
+	dodir /etc/env.d
+	doenvd "${FILESDIR}"/99vpopmail
+
+	einfo "Locking down vpopmail permissions"
+	fowners -R root:0 "${VPOP_HOME}"/{bin,etc,include}
+	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
+	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
+}
+
+pkg_postinst() {
+	if use mysql ; then
+		elog
+		elog "You have 'mysql' turned on in your USE"
+		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
+		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
+		elog
+		elog "First log into mysql as your mysql root user and pass. Then:"
+		elog "> create database vpopmail;"
+		elog "> use mysql;"
+		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
+		elog "  vpopmail@localhost identified by 'your password';"
+		elog "> flush privileges;"
+		elog
+		elog "If you have problems with vpopmail not accepting mail properly,"
+		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
+		elog "owned by root:vpopmail"
+		elog
+	fi
+
+	# do this for good measure
+	if [[ -e /etc/vpopmail.conf ]]; then
+		chmod 640 /etc/vpopmail.conf
+		chown root:vpopmail /etc/vpopmail.conf
+	fi
+
+	upgradewarning
+}
+
+pkg_postrm() {
+	vpopmail_set_homedir
+
+	elog "The vpopmail DATA will NOT be removed automatically."
+	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
+}
+
+upgradewarning() {
+	ewarn
+	ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
+	ewarn "The internal structure of the mail storage has changed for"
+	ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
+	ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh"
+	ewarn "to upgrade your system! (It can do conversions both ways)."
+	ewarn "You should be able to run it right away without any changes."
+	ewarn
+
+	elog
+	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
+	elog "using net-mail/relay-ctrl instead."
+	elog
+
+	if use mysql; then
+		elog
+		elog "If you are upgrading from 5.4.17 or older, you have to fix your"
+		elog "MySQL tables:"
+		elog
+		elog 'ALTER TABLE `dir_control` CHANGE `domain` `domain` CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `ip_alias_map` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `lastauth` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `valias` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `vlog` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `vpopmail` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `limits` CHANGE domain domain CHAR(96) NOT NULL,'
+		elog '    ADD `disable_spamassassin` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_smtp`,'
+		elog '    ADD `delete_spam` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_spamassassin`;'
+		elog
+	fi
+
+	ewarn
+	ewarn "Newer versions of vpopmail contain a quota daemon called vusaged."
+	ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled"
+	ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!"
+	ewarn "Otherwise mail delivery WILL BREAK"
+	ewarn
+}
diff --git a/net-mail/vpopmail/vpopmail-5.4.33.ebuild b/net-mail/vpopmail/vpopmail-5.4.33.ebuild
index afac37b8d7fd..bea58c67e605 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.33.ebuild,v 1.7 2012/02/09 03:50:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.33.ebuild,v 1.9 2013/05/31 00:46:46 robbat2 Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="clearpasswd ipalias maildrop mysql spamassassin"
 
 DEPEND="virtual/qmail
@@ -58,6 +58,16 @@ src_prepare() {
 	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
 		vdelivermail.c vpopbull.c vqmaillocal.c || die
 
+	# automake/autoconf
+	mv -f "${S}"/configure.{in,ac} || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' \
+	        configure.ac || die
+
+	# _FORTIFY_SOURCE
+	sed -i \
+		-e 's/\(snprintf(\s*\(LI->[a-zA-Z_]\+\),\s*\)[a-zA-Z_]\+,/\1 sizeof(\2),/' \
+		vlistlib.c || die
+
 	eautoreconf
 	ht_fix_file cdb/Makefile
 }
diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index e69de29bb2d1..6579bb1d557d 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -0,0 +1 @@
+DIST gr-osmosdr-0.0.1.tar.xz 119808 SHA256 d682436f34e09b72a41eba2b2f478171329fbc28c92cfa183e77effe05699fd3 SHA512 c1640e05d22ebe72bba18f5eaea464402d965a3a61ef6784477e6867577041cd629329f862afd9545c95ed2a2966eefcbbf8834d1121f1b494e6b5a3e268f4fc WHIRLPOOL 6db8dd7e196721853a312f9e45b17ade0cf2a16821cb6c9c5c9f866aea4abc727c90a165139fe3c66b351f227ac47c4ee3c72d75430777ffe84c3b9135fc3e6b
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.0.1.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.0.1.ebuild
new file mode 100644
index 000000000000..8dee3fd58f13
--- /dev/null
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.0.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gr-osmosdr/gr-osmosdr-0.0.1.ebuild,v 1.1 2013/05/30 22:13:39 chithanh Exp $
+
+EAPI=5
+PYTHON_DEPEND="2"
+
+inherit cmake-utils python
+
+DESCRIPTION="GNU Radio source block for OsmoSDR and rtlsdr"
+HOMEPAGE="http://sdr.osmocom.org/"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-2
+	SRC_URI=""
+	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="dev-libs/boost
+	<net-wireless/gnuradio-3.7:0=
+	net-wireless/rtl-sdr"
+DEPEND="${RDEPEND}
+	dev-python/cheetah"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	python_convert_shebangs -q -r 2 "${S}"
+}
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
index 8a2d0157036e..9870bc386c70 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
@@ -1,16 +1,22 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild,v 1.4 2012/06/11 23:59:41 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild,v 1.5 2013/05/30 22:13:39 chithanh Exp $
 
-EAPI=4
+EAPI=5
 PYTHON_DEPEND="2"
 
-inherit cmake-utils git-2 python
+inherit cmake-utils python
 
 DESCRIPTION="GNU Radio source block for OsmoSDR and rtlsdr"
 HOMEPAGE="http://sdr.osmocom.org/"
-SRC_URI=""
-EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-2
+	SRC_URI=""
+	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz"
+fi
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -18,7 +24,7 @@ KEYWORDS=""
 IUSE=""
 
 RDEPEND="dev-libs/boost
-	net-wireless/gnuradio
+	>=net-wireless/gnuradio-3.7:0=
 	net-wireless/rtl-sdr"
 DEPEND="${RDEPEND}
 	dev-python/cheetah"
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 2e359160235c..eecd1fb99f92 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.use.mask,v 1.147 2013/05/28 13:53:41 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.use.mask,v 1.148 2013/05/31 02:32:09 patrick Exp $
+
+# Patrick Lauer <patrick@gentoo.org> (31 May 2013)
+# no stable jdk+java-config
+net-misc/tightvnc java
 
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (28 May 2013)
 # depends on sys-devel/llvm[video_cards_radeon]
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 7c7e41cdb2c8..0a013ef3e7aa 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1731,7 +1731,6 @@ dev-python/django-tastypie:yaml - An optional serialiser dev-python/yaml
 dev-python/docutils:glep - Install support for GLEPs
 dev-python/falcon:cython - Build cython-based python modules
 dev-python/icalendar:doc - Generate examples and other extra documentation
-dev-python/imaging:webp - Enable support for webp image format.
 dev-python/ipython:matplotlib - Add support for dev-python/matplotlib
 dev-python/ipython:mongodb - Enable support for MongoDB via dev-python/pymongo
 dev-python/ipython:notebook - Install requirements for the web notebook based on www-servers/tornado
@@ -6041,6 +6040,7 @@ sys-libs/glibc:nscd - Build, and enable support for, the Name Service Cache Daem
 sys-libs/glibc:suid - Make internal pt_chown helper setuid -- not needed if using Linux and have /dev/pts mounted with gid=5
 sys-libs/glibc:systemtap - enable systemtap static probe points
 sys-libs/gwenhywfar:fox - Use x11-libs/fox graphical toolkit
+sys-libs/libcxx:libcxxrt - Build on top of sys-libs/libcxxrt instead of gcc's libsupc++ (avoids depending on gcc).
 sys-libs/libosinfo:introspection - Use dev-libs/gobject-introspection for introspection
 sys-libs/libosinfo:vala - Enable bindings for dev-lang/vala
 sys-libs/libseccomp:tools - enable debugging tools
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index 3e3302ba0f0e..2251e33c03f8 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -5,3 +5,4 @@ DIST smartmontools-5.41.tar.gz 740661 SHA256 173eb14e3253a30230f38c7e684085bcae7
 DIST smartmontools-5.42.tar.gz 742138 SHA256 b664d11e814e114ce3a32a4fa918c9e649c684e2897c007b2a8b92574decc374 SHA512 0c3dc9fe41a874ef72152b94fe46bd367961012096529cfaea4e48a2c849770a6f2b5e92437359ad9cc7bc0b5c654093310bfaa2ee8726421c2a22386fc1278c WHIRLPOOL 62e778c6b8c2e12d8f2f37669efd583f8c23ad21c6b91c0f413f736edabc1c52f12a7ce3ffabda789703c2dcad23b92d8e8957e190c00fc73fb72a2e1818c86b
 DIST smartmontools-5.43.tar.gz 767978 SHA256 d845187d1500b87ef8d2c43772bd0218a59114fe58474a903c56777c9175351e SHA512 dab8ccaaa5d98e6c908c76ca137253bf89ddfbc14fdca40fe7cefe933a2a4eb7bb68a0467dcc2f0f8a589a5cf7d8ab60dcf8498af3155137101a89586b063c9d WHIRLPOOL 275068f62d6c4f01b9800d76f879bfed0c91d95dfa56fe71a6a939cb348797381cc7166a23a5cffb19c228938b28c852f8a2021f914f106639ec6d0dd6d3cfc0
 DIST smartmontools-6.0.tar.gz 771540 SHA256 9fe4ff2b7bcd00fde19db82bba168f5462ed6e857d3ef439495e304e3231d3a6 SHA512 85ff4ae574be5ef386754e33856154d56ff4f97ef1a88e80d037cefc1a58e5afec93a8769003f0b98bd655579503b217f48bea8483e287a4c2a74ebfb371f064 WHIRLPOOL f6d5435c055d29eabed864b14df7c0391817b0bc10ee8bcc10b6c307091f33c6b00723560084edb74339c383472109359f7c242eb0658cf9b87f0d07e92f3d32
+DIST smartmontools-6.1.tar.gz 787091 SHA256 a9003b8bccc82682f658ce76d70edb1842411e51dc56d4cd6b56618da1d9ce07 SHA512 38aca4b02c0acb4c1c641737a6b651c2110238e9696bef89adada650ab1314e3ab2f4a8bde538b959b341e3ec84348eecc075f1d709363b83b1fdb894a893295 WHIRLPOOL e94e3569c68ba57a012415f5aa9969a06d711f742e56fced0e32bb5d30f3d132f323e89e68a5d6aa7ea41ccc620eb23ea51cda4146e9d348cc444dd147d0e5dd
diff --git a/sys-apps/smartmontools/smartmontools-6.1.ebuild b/sys-apps/smartmontools/smartmontools-6.1.ebuild
new file mode 100644
index 000000000000..07f203735664
--- /dev/null
+++ b/sys-apps/smartmontools/smartmontools-6.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-6.1.ebuild,v 1.1 2013/05/31 05:48:50 radhermit Exp $
+
+EAPI="4"
+
+inherit flag-o-matic systemd
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk/smartmontools"
+	ESVN_PROJECT="smartmontools"
+	inherit subversion autotools
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Self-Monitoring, Analysis and Reporting Technology System (S.M.A.R.T.) monitoring tools"
+HOMEPAGE="http://smartmontools.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps minimal selinux static"
+
+DEPEND="caps? ( sys-libs/libcap-ng )
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND}
+	!minimal? ( virtual/mailx )"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		#./autogen.sh
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	use minimal && einfo "Skipping the monitoring daemon for minimal build."
+	use static && append-ldflags -static
+	# The build installs /etc/init.d/smartd, but we clobber it
+	# in our src_install, so no need to manually delete it.
+	econf \
+		--with-docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--with-initscriptdir="${EPREFIX}/etc/init.d" \
+		$(use_with caps libcap-ng) \
+		$(use_with selinux) \
+		$(systemd_with_unitdir)
+}
+
+src_install() {
+	if use minimal ; then
+		dosbin smartctl
+		doman smartctl.8
+	else
+		default
+		newinitd "${FILESDIR}"/smartd.rc smartd
+		newconfd "${FILESDIR}"/smartd.confd smartd
+	fi
+}
diff --git a/sys-apps/smartmontools/smartmontools-9999.ebuild b/sys-apps/smartmontools/smartmontools-9999.ebuild
index 3127b649afcc..8b48646cb2ab 100644
--- a/sys-apps/smartmontools/smartmontools-9999.ebuild
+++ b/sys-apps/smartmontools/smartmontools-9999.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-9999.ebuild,v 1.13 2013/02/21 02:17:07 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-9999.ebuild,v 1.14 2013/05/31 05:48:50 radhermit Exp $
 
-EAPI="3"
+EAPI="4"
 
 inherit flag-o-matic systemd
 if [[ ${PV} == "9999" ]] ; then
 	ESVN_REPO_URI="https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk/smartmontools"
 	ESVN_PROJECT="smartmontools"
 	inherit subversion autotools
-	SRC_URI=""
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-freebsd ~x86-linux ~x64-macos"
@@ -49,10 +48,10 @@ src_configure() {
 
 src_install() {
 	if use minimal ; then
-		dosbin smartctl || die
+		dosbin smartctl
 		doman smartctl.8
 	else
-		emake install DESTDIR="${D}" || die
+		default
 		newinitd "${FILESDIR}"/smartd.rc smartd
 		newconfd "${FILESDIR}"/smartd.confd smartd
 	fi
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 3b901d11269a..4ae8affdd2c1 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -1,2 +1 @@
-DIST libcxx-0.0_p20121105.tar.xz 824596 SHA256 68d33fa94e02c94014f8ddbed2d818085b5b54ea8eb13e20339f0749f61a59aa SHA512 619aa05bd0273f3f03f0016e5cb5431fc548354a876eea6d95a556c6ce1b23877acf3ff18eabea6c4930946b4cc60a92553c3f2b22c31c436be9b093ace77608 WHIRLPOOL d27f9040d12f0b699388bf103c30447a45810fb7bfd5046c99588696f2f92c9c461769751676be4952805ed768fc7dcc27185f3d1466c4703d1b7e93cf4c96ba
 DIST libcxx-0.0_p20130218.tar.xz 795520 SHA256 18bb8e4670e97e4e270c153ae7ba5d9861e0b28088db447e124694aee89f800c SHA512 1d3a5a4615e9b2070f1d2f47b4738a59e35aa5ea99bba92761094e90fc8ac382fcb9c2181db201e88cdc5c3c15661ce67314494747e95aba6830d2d94769381e WHIRLPOOL eef2d8ebe21a2f52457f5cf9385df75b9c2f689bbc991e7f82d97b15f0b933ba2bc311f4c0d4ea396ce34e4e971f3480a77fa534f75cce0f19c3a9a7196e83bf
diff --git a/sys-libs/libcxx/libcxx-0.0_p20121105.ebuild b/sys-libs/libcxx/libcxx-0.0_p20121105.ebuild
deleted file mode 100644
index 0da9ac0df586..000000000000
--- a/sys-libs/libcxx/libcxx-0.0_p20121105.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-0.0_p20121105.ebuild,v 1.2 2013/01/31 17:56:57 bicatali Exp $
-
-EAPI=4
-
-ESVN_REPO_URI="http://llvm.org/svn/llvm-project/libcxx/trunk"
-
-[ "${PV%9999}" != "${PV}" ] && SCM="subversion" || SCM=""
-
-inherit cmake-utils ${SCM} base flag-o-matic
-
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
-HOMEPAGE="http://libcxx.llvm.org/"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-else
-	SRC_URI=""
-fi
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE=""
-
-RDEPEND="sys-libs/libcxxrt"
-DEPEND="${RDEPEND}
-	sys-devel/clang
-	app-arch/xz-utils"
-
-PATCHES=( "${FILESDIR}/multilib.patch"
-		  "${FILESDIR}/cxxrt.patch" )
-DOCS=( "CREDITS.TXT" )
-
-src_prepare() {
-	base_src_prepare
-}
-
-src_configure() {
-	append-cppflags "-I/usr/include/libcxxrt -DLIBCXXRT"
-	# Needs to be built with clang. gcc-4.6.3 fails at least.
-	# TODO: cross-compile ?
-	export CC=clang
-	export CXX=clang++
-	cmake-utils_src_configure
-}
-
-# Tests fail for now, if anybody is able to fix them, help is very welcome.
-src_test() {
-	cd "${S}/test"
-	LD_LIBRARY_PATH="${CMAKE_BUILD_DIR}/lib:${LD_LIBRARY_PATH}" \
-		CC="clang++" \
-		HEADER_INCLUDE="-I${S}/include" \
-		SOURCE_LIB="-L${CMAKE_BUILD_DIR}/lib" \
-		./testit || die
-}
-
-pkg_postinst() {
-	elog "This package (${PN}) is mainly intended as a replacement for the C++"
-	elog "standard library when using clang."
-	elog "To use it, instead of libstdc++, use:"
-	elog "    clang++ -stdlib=libc++"
-	elog "to compile your C++ programs."
-}
diff --git a/sys-libs/libcxx/libcxx-9999.ebuild b/sys-libs/libcxx/libcxx-9999.ebuild
index 7c89c34bb818..b6e69d2a4005 100644
--- a/sys-libs/libcxx/libcxx-9999.ebuild
+++ b/sys-libs/libcxx/libcxx-9999.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.5 2013/01/31 17:56:57 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.9 2013/05/31 01:16:29 aballier Exp $
 
-EAPI=4
+EAPI=5
 
 ESVN_REPO_URI="http://llvm.org/svn/llvm-project/libcxx/trunk"
 
 [ "${PV%9999}" != "${PV}" ] && SCM="subversion" || SCM=""
 
-inherit cmake-utils ${SCM} base flag-o-matic
+inherit cmake-utils ${SCM} base flag-o-matic toolchain-funcs
 
 DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
 HOMEPAGE="http://libcxx.llvm.org/"
@@ -25,40 +25,73 @@ if [ "${PV%9999}" = "${PV}" ] ; then
 else
 	KEYWORDS=""
 fi
-IUSE=""
+IUSE="+libcxxrt static-libs"
 
-RDEPEND="sys-libs/libcxxrt"
+RDEPEND="libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130530[static-libs?] )
+	!libcxxrt? ( sys-devel/gcc[cxx] )"
 DEPEND="${RDEPEND}
 	sys-devel/clang
 	app-arch/xz-utils"
 
-PATCHES=( "${FILESDIR}/multilib.patch"
-		  "${FILESDIR}/cxxrt.patch" )
+PATCHES=( "${FILESDIR}/multilib.patch" )
 DOCS=( "CREDITS.TXT" )
 
 src_prepare() {
+	use libcxxrt && PATCHES+=( "${FILESDIR}/cxxrt.patch" )
 	base_src_prepare
 }
 
 src_configure() {
-	append-cppflags "-I/usr/include/libcxxrt -DLIBCXXRT"
+	local mycmakeargs_base=( )
+	if use libcxxrt ; then
+		mycmakeargs_base=(
+			-DLIBCXX_CXX_ABI=libcxxrt
+			-DLIBCXX_LIBCXXRT_INCLUDE_PATHS="/usr/include/libcxxrt/"
+		 )
+	else
+		# Very hackish, see $HOMEPAGE
+		# If someone has a clever idea, please share it!
+		local includes="$(echo | "$(tc-getCXX)" -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | tr '\n' ';' | tr -d ' ')"
+		mycmakeargs_base=(
+			 -DLIBCXX_CXX_ABI=libsupc++
+			 -DLIBCXX_LIBSUPCXX_INCLUDE_PATHS="${includes}"
+		)
+	fi
+
 	# Needs to be built with clang. gcc-4.6.3 fails at least.
 	# TODO: cross-compile ?
 	export CC=clang
 	export CXX=clang++
-	cmake-utils_src_configure
+
+	if use static-libs ; then
+		local mycmakeargs=( "${mycmakeargs_base[@]}" "-DLIBCXX_ENABLE_SHARED=OFF" )
+		BUILD_DIR="${S}_static"	cmake-utils_src_configure
+	fi
+	local mycmakeargs=( "${mycmakeargs_base[@]}" )
+	BUILD_DIR="${S}_shared" cmake-utils_src_configure
+}
+
+src_compile() {
+	use static-libs && BUILD_DIR="${S}_static" cmake-utils_src_compile
+	BUILD_DIR="${S}_shared" cmake-utils_src_compile
 }
 
 # Tests fail for now, if anybody is able to fix them, help is very welcome.
 src_test() {
 	cd "${S}/test"
-	LD_LIBRARY_PATH="${CMAKE_BUILD_DIR}/lib:${LD_LIBRARY_PATH}" \
+	LD_LIBRARY_PATH="${S}_shared/lib:${LD_LIBRARY_PATH}" \
 		CC="clang++" \
 		HEADER_INCLUDE="-I${S}/include" \
-		SOURCE_LIB="-L${CMAKE_BUILD_DIR}/lib" \
+		SOURCE_LIB="-L${S}_shared/lib" \
+		LIBS="-lm" \
 		./testit || die
 }
 
+src_install() {
+	use static-libs && BUILD_DIR="${S}_static" cmake-utils_src_install
+	BUILD_DIR="${S}_shared" cmake-utils_src_install
+}
+
 pkg_postinst() {
 	elog "This package (${PN}) is mainly intended as a replacement for the C++"
 	elog "standard library when using clang."
diff --git a/sys-libs/libcxx/metadata.xml b/sys-libs/libcxx/metadata.xml
index a460f7c4b962..578f810d9f7a 100644
--- a/sys-libs/libcxx/metadata.xml
+++ b/sys-libs/libcxx/metadata.xml
@@ -8,5 +8,8 @@
     <email>aballier@gentoo.org</email>
     <name>Alexis Ballier</name>
   </maintainer>
+  <use>
+	  <flag name="libcxxrt">Build on top of <pkg>sys-libs/libcxxrt</pkg> instead of gcc's libsupc++ (avoids depending on gcc).</flag>
+  </use>
 </pkgmetadata>
 
diff --git a/sys-libs/libcxxrt/Manifest b/sys-libs/libcxxrt/Manifest
index dcffb25efb57..e10d173f7091 100644
--- a/sys-libs/libcxxrt/Manifest
+++ b/sys-libs/libcxxrt/Manifest
@@ -1,2 +1 @@
-DIST libcxxrt-0.0_p20120911.tar.xz 57004 SHA256 4faf3279b439a3232ae5ca9da04c7b3298a4cfac6ea4602fc43f350ac72a9805 SHA512 0d64931afb1a282b3f4ecb9ead1d891cb2cae2b321a09b5f015ef1888ba3d8bd323832e85fef4356df083a03c0486512f21224866a9e50e01e4fac89ddaf2f1a WHIRLPOOL 856486898b38ce122fbc132eaf7e535290c191afec540e50d37cca2a8ad0d7b33635572864610a4a30b6dcec61d9c154bc773487896cb8aa0402f2c6f9c43f7d
 DIST libcxxrt-0.0_p20130218.tar.xz 57444 SHA256 27e4c7dcec3603631fb2ff8d0bf8f1c6dfc32d1c5f460512b630578b90255f77 SHA512 982d7840ecfb31b98ca8b71329bda8ce42396ae19fcd63a2f0fefb78e2a028f31207af0be2c7fbb26cf3f46c040dacdf27bc55bd1a05c7a240db9cee17f2f03a WHIRLPOOL a3eb3a0b5ec672c01d8a06aceceebefa221c20459f9c48f199f0bd0bdff3cdbab1e672673c80e9ca67d4ad757cfd2c6a300d1bc80193c0016eddcdc946e9766f
diff --git a/sys-libs/libcxxrt/libcxxrt-0.0_p20120911.ebuild b/sys-libs/libcxxrt/libcxxrt-0.0_p20120911.ebuild
deleted file mode 100644
index 2cd5f8bd2acf..000000000000
--- a/sys-libs/libcxxrt/libcxxrt-0.0_p20120911.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/libcxxrt-0.0_p20120911.ebuild,v 1.3 2013/01/31 17:48:20 bicatali Exp $
-
-EAPI=4
-
-EGIT_REPO_URI="git://github.com/pathscale/libcxxrt.git"
-
-[ "${PV%9999}" != "${PV}" ] && SCM="git-2" || SCM=""
-
-inherit base flag-o-matic toolchain-funcs portability ${SCM}
-
-DESCRIPTION="C++ Runtime from PathScale, FreeBSD and NetBSD."
-HOMEPAGE="https://github.com/pathscale/libcxxrt http://www.pathscale.com/node/265"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	DEPEND="app-arch/xz-utils"
-else
-	SRC_URI=""
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="static-libs"
-
-RDEPEND=">=sys-libs/libunwind-1.0.1-r1"
-DEPEND="${RDEPEND}
-	${DEPEND}"
-
-src_prepare() {
-	base_src_prepare
-	cp "${FILESDIR}/Makefile" src/ || die
-	cp "${FILESDIR}/Makefile.test" test/Makefile || die
-	rm -f src/unwind* || die
-	cp -f "${FILESDIR}/unwind.h" src/ || die
-}
-
-src_compile() {
-	# Notes: we build -nodefaultlibs to avoid linking to gcc libs.
-	# libcxxrt needs: dladdr (dlopen_lib), libunwind (or libgcc_s but we build
-	# over libunwind) and the libc.
-	tc-export CC CXX AR
-	append-ldflags "-Wl,-z,defs" # make sure we are not underlinked
-	cd "${S}/src"
-	LIBS="$(dlopen_lib) -lunwind -lc" emake shared
-	use static-libs && emake static
-}
-
-src_test() {
-	cd "${S}/test"
-	LD_LIBRARY_PATH="${S}/src:${LD_LIBRARY_PATH}" LIBS="-L${S}/src -lcxxrt -lc" emake check
-}
-
-src_install() {
-	# TODO: See README. Maybe hide it in a subdir and let only libcxx know about
-	# it. FreeBSD head installs it in /lib
-	dolib.so src/${PN}.so*
-	use static-libs && dolib.a src/${PN}.a
-
-	insinto /usr/include/libcxxrt/
-	doins src/cxxabi.h
-
-	dodoc AUTHORS COPYRIGHT README
-}
diff --git a/sys-libs/libcxxrt/libcxxrt-9999.ebuild b/sys-libs/libcxxrt/libcxxrt-9999.ebuild
index b196af32c436..c605dce95434 100644
--- a/sys-libs/libcxxrt/libcxxrt-9999.ebuild
+++ b/sys-libs/libcxxrt/libcxxrt-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/libcxxrt-9999.ebuild,v 1.4 2013/01/31 17:48:20 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/libcxxrt-9999.ebuild,v 1.6 2013/05/30 23:33:32 aballier Exp $
 
 EAPI=4
 
@@ -28,7 +28,7 @@ else
 fi
 IUSE="static-libs"
 
-RDEPEND=">=sys-libs/libunwind-1.0.1-r1"
+RDEPEND=">=sys-libs/libunwind-1.0.1-r1[static-libs?]"
 DEPEND="${RDEPEND}
 	${DEPEND}"
 
@@ -36,8 +36,6 @@ src_prepare() {
 	base_src_prepare
 	cp "${FILESDIR}/Makefile" src/ || die
 	cp "${FILESDIR}/Makefile.test" test/Makefile || die
-	rm -f src/unwind* || die
-	cp -f "${FILESDIR}/unwind.h" src/ || die
 }
 
 src_compile() {
@@ -63,7 +61,7 @@ src_install() {
 	use static-libs && dolib.a src/${PN}.a
 
 	insinto /usr/include/libcxxrt/
-	doins src/cxxabi.h
+	doins src/cxxabi.h src/unwind*.h
 
 	dodoc AUTHORS COPYRIGHT README
 }