diff --git a/app-backup/bareos/ChangeLog b/app-backup/bareos/ChangeLog
index fa55050cd781..b72b954d4ca5 100644
--- a/app-backup/bareos/ChangeLog
+++ b/app-backup/bareos/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-backup/bareos
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/ChangeLog,v 1.6 2014/03/07 22:27:07 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/ChangeLog,v 1.9 2014/05/04 22:37:54 mschiff Exp $
+
+*bareos-13.2.3 (04 May 2014)
+
+  04 May 2014; Marc Schiffbauer <mschiff@gentoo.org> +bareos-13.2.3.ebuild:
+  Bump version.
+
+  04 May 2014; Marc Schiffbauer <mschiff@gentoo.org> files/bareos-dir.initd,
+  files/bareos-fd.initd, files/bareos-sd.initd:
+  Fix pid path in init scripts
+
+  04 May 2014; Marc Schiffbauer <mschiff@gentoo.org> bareos-13.2.2.ebuild,
+  files/bareos-dir.initd, files/bareos-fd.initd, files/bareos-sd.initd:
+  Change location of pidfiles from /run to /run/bareos for better non-root
+  support
 
   07 Mar 2014; Marc Schiffbauer <mschiff@gentoo.org> bareos-13.2.2.ebuild:
   Remove examples USE flag.
diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 8424c22b8407..498aecb1af17 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -4,21 +4,23 @@ Hash: SHA256
 AUX bareos-12.4.5-Makefile.patch 924 SHA256 0b2428d3ee7ea5ceae4e02d3c315cc6f6b59d21d44749967dd121e29c060942d SHA512 f1b5da39d01f6b00851810c6a0cbcda9ac0561fb165054f6f2c4540943b41af9d524a6a8aca1ae87d55fa8624aecf44c3c0db03c2d7c22690a84c16994289eed WHIRLPOOL 0aeddbe01415260fce862dfa0b387bb5a443b29ed1367ea0fb0c2350c2af24f4f1934497d1590612fa3a3e62e929e5811caa9591e99e5a76fcfc6d73769baa1a
 AUX bareos-12.4.5-bat-ldflags.patch 389 SHA256 b4b569fecdecbef0b5e0c1bcafddd61a48893ee1e33b52289a455a4773adc9ca SHA512 811fd6ffc2a1c4aeef3afd9001fd2bf01c70ef3f75ed6949ec6b064a9e6ce7a4893ffe464e5c9c67e33fdf92e00b0601500930165891b70d403d31a2ee347434 WHIRLPOOL 488a764b303c3ed077d55bf04ae91e33d24c69c71476d8ad3416608f60a8071471a96f2a539266509b20133d5cf0e0f66ac284aee99f5378030b7a6c394a1987
 AUX bareos-dir.confd 788 SHA256 9cd4ac430bfc29e9b6c71c24b94fc4d4baa6febaec062b3fc90eb3db86ff8a83 SHA512 85307268abd1bc15e7e1b7ab4d519aa579349f7c61e242aba6cf9d7613a25ad67034b7e8cc12be20d7b0b4ec73100fc859847fe676641f7d36e7b61a6988a7d0 WHIRLPOOL 18d0b42a01c77493d5867a5a17fd7cd5081937da22e0ff027814176398a2bbb5a246a81cfc3a9db3ea405a846e619d36f88063ed8b5b4e7822d71102200e4a21
-AUX bareos-dir.initd 548 SHA256 340a8f7ec78678882a01e2bcc0b90bde95aed980bc6838df2f6d47ed82a32326 SHA512 c28c9a960075b67fc5d204dec0f275e651882c4110038da0cbc80330916738eb7f12a0316f44259d6ac6616d0823fe4cdd71c71d6aeca1ac4c4504ec5897db22 WHIRLPOOL 0649dbbf2f17e8309b2d56fffe0009fc731178302c902fe0eb07b007a2b5fb5695d2ea26c85c857b76f4f1382f9e84c724ad8e0a6411f0fa5883a9b4689c00f5
+AUX bareos-dir.initd 606 SHA256 c8486c7b97ab77a3bbb857ab6a6183f4cc1877198224115aa824fd65af903f59 SHA512 9393044770b69018702e512a282152aded93f4ade9dc3de73590d69102b81f131f49c12d6d309609758ec6e29276ea7bf730cef86cc30f6f7b3de12405459d92 WHIRLPOOL bca82ad24f660683e75324f3a36be87917faf26369039a644c316b57e2e584c585decd5dfa73f8b981397d73b6d4dc7a52b360254c34c17964eeb494ab3754dd
 AUX bareos-fd.confd 357 SHA256 f1ecfc6945d1563aec0330943f7e887c99066de3350d84f994f4f5f42fa2e0f4 SHA512 59c4e304f4934c08dc99cbe43f8d989a7bf66d5c8177ce958bd76e4a5b6ef697db21bb79c3c586a1af18f2f3f1e1f350ea2afb7237f7ce86914b20169b7f5612 WHIRLPOOL 41708ac2ee0f90b82ddfbb74cfd41c0c7801fd096caeac32a312b80e6bd48744e23e422a04c3704f40ea717f9e9f70c98dc9885d266f19bb5e470a509236125b
-AUX bareos-fd.initd 530 SHA256 5d3cde8ea6279226090d61009f432edf390b8e54d6e2d3cf93242fa5ce49301c SHA512 79f28c0f6b184a67273f566b1935d8147e50b7e225ba8fa16f0e554b9dc4aee0d2ea8851db2e9e6cbc5ad73c465de5b61b5e57ee90ef48e6901616c0a2361d1c WHIRLPOOL 24736aecc9204b3b869cc918a93d0060612f4035c42388b6dc233416dbf62e3075e8e69c7b6d759963b574d1beb61cfc3bdb148b2022fac50ff1474e947d0fef
+AUX bareos-fd.initd 588 SHA256 9a7d3879875ca119f70fa5a7d05b48b18d0d88dfcf8061ec35b8939f9f1802b7 SHA512 88e7a1a68313bbf0c47fe7222a1d89f7a9eac5ace31304849e41746d775f44b7e50ec652ed1e07239f5b7683fdc01b6ff9c534f71bf535947293b1286eb80743 WHIRLPOOL 22a3c90b2359a1cf7a8a4a9a582f7d9f8dbc0c001f5b7c58319ad1d33c350961baea143a88ef8130e58b8b2c6f7739522725a459d1cc64d9c472cc3d96a50793
 AUX bareos-sd.confd 506 SHA256 9842116be1e53c0a592db79cb01d67c36482171bfffba6459c5bfa93a58564b1 SHA512 33e26f6582b08d56936bd75994444fb79a7ee1940ef6e6a1e0ff2194a10e42611404b175330ff77f81ca52215ec8f0a97e05b39e27667560a861cf6b30055f18 WHIRLPOOL bb254d806e40d6e29c5ae284cadcbc7e5cbce0818035ba7c7fb9918970f0d90d85d5bba108d986569e62e7600281faf018253285012b8ee8f5ed0e682f9aff7a
-AUX bareos-sd.initd 537 SHA256 b11b8c6ce593bacf393307084c52e6c7af4649bce467d3a18df11d76ea3c086d SHA512 418d5637f4a79e0f96231669376af1d794f3a04a1b4e5f998857e84ee39a607512852e5d08c14cfabd2524b757266490302ddfb71021408491acca5b79e3101f WHIRLPOOL 3a5c78f9104c536f85cc7638749cd63e9df34d958abc2de187e340eefd9eed3c846b0e1bdf2c60f1ced89b19957e34203ac33a5c1870c6f99e2b8f1efae072fc
+AUX bareos-sd.initd 595 SHA256 60317066caec54c6e4b30255affaec7f741e8a88e4fb5fc8346fb018d5dc82ad SHA512 576a1af894bb28ab49eac580dbfb610372da162d69fb091f30b903735c3274c3420604c2628fd121b642385bcc144c3bac1555de9fab34c709fc30b49c8a8e69 WHIRLPOOL 34098ad67131caf4fdd3bea371869bb093cb9765dd5a1a53d1d746aacad57f2c88b523abd5bb8ba391bf07c422a87de7f9320d11dc65981348620e136cb09ccc
 DIST bareos-12.4.5.tar.gz 3496879 SHA256 2defc15ed4fb6483e1d45ea63bb9cb8ba009e2b31c7755544984f1813bf4e017 SHA512 a59e95bc9b4a5147d8254e6b802c411956d324571ac084f5cb11629ddad59d605cdad2ab7b86f001af8c32faf15070833f233a44cbefaf71d13cad05faaba5cf WHIRLPOOL c95492acb57729e45a6ff5d2ae1894de4ebdb9e416d9f8a5beeef89ccf563a12ea8d5cdb943c2b6ec5681fb2bf0d348fb5e089ecac571256a835b4fd1a4459c8
 DIST bareos-13.2.2.tar.gz 3429649 SHA256 389204b1307da76c08d0a332ed41d5c64f0cc496c83a5ae0931f4571217976f6 SHA512 56a516bec4f5205f02d84939a71e9bf2278570c8296aab7c99c714e90910b8bac9137e5ad24da1a3c8f4e3d1b2e4dcaeebee1bbabe9d83ae74b9021ef82472b9 WHIRLPOOL bb6de279c69667a4900fa0b6f5b2694c284965090e21b79cc50e97d5d955b2f526535d6f8a4d7290e4af3212472e47c7e368c18fdde0d8510951756e8cbb9a2c
+DIST bareos-13.2.3.tar.gz 3451591 SHA256 5245333699caaa48a5234e34c379e9994274b1002b7be4801f84a9e7bf78437e SHA512 2d0b14509d6ff9668151f6f6ff18513cf1ecfe91d24fd5d646c25f3d307ce6c24a1aacfaa824a85e4a1d5aba8157e854bf629234e4302c32f3f5de841842c819 WHIRLPOOL 849f89362e392ecb4061e1c2623f158e02a16b0e0fb8e78f993c8ea206d01dfc8d2209234e40dd6f7edd700ec8a321fb6020d3aaed389c631bf3e43028b9e679
 EBUILD bareos-12.4.5-r1.ebuild 11293 SHA256 954a85184c1c16bbe51d504ca51b6b1eb8f2f2e76eba186c473bd222af3eeedc SHA512 b069ccceb1eee8c8c4c9acdfd016648c2658485d45f1534e0903b4a1ff7b5f38eff069f7578e39d31f49cdb10762fa323f6e2c9587a927a3f3f8bec589479f68 WHIRLPOOL 8369ee6fca419c2f670f2a6847e6403abd519983840cf312c3844204dbd736fab35b487ca29e7062c2bad2989c9f078980cd1cb72e34abd39e2db0e39ab0293d
-EBUILD bareos-13.2.2.ebuild 11163 SHA256 4bb45480cbc224d9a57622711523ae9a2af534cc9f041547d774cac17fa1587b SHA512 216b6fb90fd161c9e3af5b6c704c65adeb47fc3beb9181227d7dc527bddd5a6591e7e2521fb90bc8ceccf661659dc3571e0f2356149d27a1d2292288ebd680a0 WHIRLPOOL 28b03e52f40748090fbf5ea2c0712121352747708edd4ba84a5ecb2aadced547ba6feba4827f8fdc68b598c7564fd7edd825a3a01e298d4d456ebcc0b0ef383f
-MISC ChangeLog 1402 SHA256 f5be9ee5165feaaf854758358585d888cf2a7eabe7a410eb3a7ee86c0039aa8d SHA512 fc564b499d1f0239847f4015fd772b237445390efedbda1f0810c2e5aa23858638f85a273918301ae02db55f1628d52e62dd4c57ffc3ab0b73bf04ee0e724043 WHIRLPOOL c14e661d76ed00bf03a63617902a6f9482e74819d69a9ebeac09d1eb1e66d1554d99c09ccfbdccb265ee2dbdb8e20a4135fc4b5cc5ab859e7eae2aa9806f45be
+EBUILD bareos-13.2.2.ebuild 11170 SHA256 83a84f7640581820ab86782174c04ec2a1c7c1b8d99c77e9b628482e896ed8a9 SHA512 38e68b8e44eb5a466fa6fa701f5831340a3f3ea905694d4dcd38556ea497b2bbc04a29389e24f6e4b03f43dd1a9925c56a644872c8b7b2649dafc79207456b7b WHIRLPOOL cad0763ade0335820f81572c91195e7cb96b85e332274a773cb9c9a80ada6f608610585830dc3b3bb19472c52e0f12041cc65b5200fa2dbd64165765f5e51be5
+EBUILD bareos-13.2.3.ebuild 11170 SHA256 b559ab97c6a53d92d5cefe2f854d4922cadacca348f1faa5092de7d4976d9889 SHA512 5c0c931bafbd8ff84abbe2b876c0e503051a03aef0473d22a6d89c1efe6cfae3e888658a12fb781cecda67e47e8ae29fbd91e59939a490107dc3af5aa07de10e WHIRLPOOL 7f9659524ea53f0fa427e3cf8875015bbc36630bbe5fd2a182db6d07708db71c37e20219ff5e55e3471321c6229e678c5d0d3ae7ad1424e00bf54b2fbad6c8fb
+MISC ChangeLog 1915 SHA256 f2f45670262871aae476ffde2dbbfb6533c4595d4488aad76f95a83b42c3244e SHA512 9b5a48c6bf01b4c8dc62bf2a8757c1a4951811d72285aa4fc2255978dee6ffc5b4e3eddd295b445f43429f34beea2e50b8ed74f3cbd9bba23ac9c314807b0426 WHIRLPOOL ff3e4af7b7d3b5737c69baf6e021f7e292eac5d93051cebf36f7a659889ce867fb1504b4d2ecc60c0b089e4481a93b2927887dffd0d8a89bb3c365fe3a116f82
 MISC metadata.xml 722 SHA256 805245709ddd3e39e78cadb5b8a05ada22f547e66a89742bbb0cbd127205a3a7 SHA512 11f66c555f15c0a03a358a0de24b45ba02d9aebfb8760f6161ab8157d0d2bb22fd97ff101170be2f55cdbf25f23fe342070a1857eeb475e87827477b4592a6ad WHIRLPOOL 20246a4528d065ac1b6d3c3abaac7db1ff51553c7a7689f0d05c66069d67b9b9e465d5f0b252ecd416bc090d6d6d1e143e80f0df14cfbd7736e8a36b494c1fdc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iD8DBQFTGkfBKWxsyjWmQTQRCAqqAJ9blV53jWE805vOzNbq4ibmD8iH/gCfbFaM
-rY8iGdKJLYZV5VxbfBHaC08=
-=9fLm
+iD8DBQFTZsFGKWxsyjWmQTQRCGaeAJ40CX540jVoOAKcPpJlTWOLagwvsACfVbIf
+MClf7KcP1lzb2JjtlHirNfc=
+=ZfD4
 -----END PGP SIGNATURE-----
diff --git a/app-backup/bareos/bareos-13.2.2.ebuild b/app-backup/bareos/bareos-13.2.2.ebuild
index 0bd61d827877..be147ef205fa 100644
--- a/app-backup/bareos/bareos-13.2.2.ebuild
+++ b/app-backup/bareos/bareos-13.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/bareos-13.2.2.ebuild,v 1.3 2014/03/07 22:27:07 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/bareos-13.2.2.ebuild,v 1.4 2014/05/04 16:49:53 mschiff Exp $
 
 EAPI="5"
 
@@ -169,7 +169,7 @@ src_configure() {
 		--libdir=/usr/$(get_libdir) \
 		--docdir=/usr/share/doc/${PF} \
 		--htmldir=/usr/share/doc/${PF}/html \
-		--with-pid-dir=/run \
+		--with-pid-dir=/run/bareos \
 		--sysconfdir=/etc/bareos \
 		--with-subsys-dir=/run/lock/subsys \
 		--with-working-dir=/var/lib/bareos \
diff --git a/app-backup/bareos/bareos-13.2.3.ebuild b/app-backup/bareos/bareos-13.2.3.ebuild
new file mode 100644
index 000000000000..7bcb68901d43
--- /dev/null
+++ b/app-backup/bareos/bareos-13.2.3.ebuild
@@ -0,0 +1,396 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/bareos-13.2.3.ebuild,v 1.1 2014/05/04 22:37:54 mschiff Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_REQ_USE="threads"
+
+inherit eutils multilib python-single-r1 qt4-r2 user
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="http://www.bareos.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="acl clientonly +director ipv6 logwatch mysql ndmp postgres python qt4
+		readline scsi-crypto sql-pooling +sqlite3 ssl static +storage-daemon tcpd
+		vim-syntax X"
+
+DEPEND="
+	!app-backup/bacula
+	dev-libs/gmp
+	!clientonly? (
+		postgres? ( dev-db/postgresql-base[threads] )
+		mysql? ( virtual/mysql )
+		sqlite3? ( dev-db/sqlite:3 )
+		director? ( virtual/mta )
+	)
+	qt4? (
+		dev-qt/qtsvg:4
+		x11-libs/qwt:5
+	)
+	logwatch? ( sys-apps/logwatch )
+	tcpd? ( sys-apps/tcp-wrappers )
+	readline? ( sys-libs/readline )
+	static? (
+		acl? ( virtual/acl[static-libs] )
+		sys-libs/zlib[static-libs]
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses[static-libs]
+		ssl? ( dev-libs/openssl[static-libs] )
+	)
+	!static? (
+		acl? ( virtual/acl )
+		sys-libs/zlib
+		dev-libs/lzo
+		sys-libs/ncurses
+		ssl? ( dev-libs/openssl )
+	)
+	python? ( ${PYTHON_DEPS} )
+	"
+RDEPEND="${DEPEND}
+	!clientonly? (
+		storage-daemon? (
+			sys-block/mtx
+			app-arch/mt-st
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+
+REQUIRED_USE="static? ( clientonly )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+S=${WORKDIR}/${PN}-Release-${PV}
+
+pkg_setup() {
+	use mysql && export mydbtypes+="mysql"
+	use postgres && export mydbtypes+=" postgresql"
+	use sqlite3 && export mydbtypes+=" sqlite3"
+
+	# create the daemon group and user
+	if [ -z "$(egetent group bareos 2>/dev/null)" ]; then
+		enewgroup bareos
+		einfo
+		einfo "The group 'bareos' has been created. Any users you add to this"
+		einfo "group have access to files created by the daemons."
+		einfo
+	fi
+
+	if use clientonly && use static && use qt4; then
+		ewarn
+		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt4' useflag."
+		ewarn
+	fi
+
+	if ! use clientonly; then
+		if [ -z "$(egetent passwd bareos 2>/dev/null)" ]; then
+			enewuser bareos -1 -1 /var/lib/bareos bareos,disk,tape,cdrom,cdrw
+			einfo
+			einfo "The user 'bareos' has been created.  Please see the bareos manual"
+			einfo "for information about running bareos as a non-root user."
+			einfo
+		fi
+	fi
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bareos/<config> instead of ./<config>
+	pushd src >&/dev/null || die
+	for f in console/console.c dird/dird.c filed/filed.c \
+		stored/bcopy.c stored/bextract.c stored/bls.c \
+		stored/bscan.c stored/btape.c stored/stored.c \
+		qt-console/main.cpp; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bareos/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# bug 466690 Use CXXFLAGS instead of CFLAGS
+	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
+	# stop build for errors in subdirs
+	epatch "${FILESDIR}"/${PN}-12.4.5-Makefile.patch
+
+	# bat needs to respect LDFLAGS
+	epatch "${FILESDIR}"/${PN}-12.4.5-bat-ldflags.patch
+
+	# do not strip binaries
+	for d in filed console dird stored; do
+		sed -i -e "s/strip /# strip /" src/$d/Makefile.in || die
+	done
+}
+
+src_configure() {
+	local myconf=''
+
+	if use clientonly; then
+		myconf="${myconf} \
+			$(use_enable clientonly client-only) \
+			$(use_enable !static libtool) \
+			$(use_enable static static-cons) \
+			$(use_enable static static-fd)"
+	fi
+
+	# do not build bat and traymonitor if 'static' clientonly
+	if ! use clientonly || ! use static; then
+		myconf="${myconf} \
+			$(use_enable qt4 bat) \
+			$(use_enable qt4 traymonitor)"
+	fi
+
+	myconf="${myconf} \
+		$(use_with X x) \
+		$(use_enable acl) \
+		$(use_enable ipv6) \
+		$(use_enable ndmp) \
+		$(use_enable readline) \
+		$(use_enable !readline conio) \
+		$(use_enable scsi-crypto) \
+		$(use_enable sql-pooling) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with sqlite3) \
+		$(use sqlite3 || echo "--without-sqlite3") \
+		$(use_with ssl openssl) \
+		$(use_with tcpd tcp-wrappers) \
+		"
+
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--with-pid-dir=/run/bareos \
+		--sysconfdir=/etc/bareos \
+		--with-subsys-dir=/run/lock/subsys \
+		--with-working-dir=/var/lib/bareos \
+		--with-logdir=/var/log/bareos \
+		--with-scriptdir=/usr/libexec/bareos \
+		--with-plugindir=/usr/$(get_libdir)/${PN}/plugin \
+		--with-dir-user=bareos \
+		--with-dir-group=bareos \
+		--with-sd-user=root \
+		--with-sd-group=bareos \
+		--with-fd-user=root \
+		--with-fd-group=bareos \
+		--with-sbin-perm=0755 \
+		--enable-smartalloc \
+		--enable-dynamic-cats-backends \
+		--enable-batch-insert \
+		--disable-afs \
+		--host=${CHOST} \
+		${myconf}
+	# correct configuration for QT based bat
+	if use qt4 ; then
+		pushd src/qt-console
+		eqmake4
+		popd
+		pushd src/qt-tray-monitor
+		eqmake4
+		popd
+	fi
+}
+
+src_compile() {
+	# workaround for build failing with high -j values
+	# if ndmp is enabled
+	use ndmp && MAKEOPTS="$MAKEOPTS -j1"
+
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doicon scripts/bareos.png
+
+	# install bat icon and desktop file when enabled
+	# (for some reason ./configure doesn't pick this up)
+	if use qt4 && ! use static ; then
+		doicon src/images/bat.png
+		domenu scripts/bat.desktop
+	fi
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd,startmysql,stopmysql}
+	rm -f "${D}"/usr/sbin/bareos
+
+	# remove upstream init scripts
+	rm -f "${D}"/etc/init.d/bareos-*
+
+	# rename statically linked apps
+	if use clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bareos-fd bareos-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use clientonly; then
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bareos
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /etc/log.d/scripts/services
+			dodir /etc/log.d/scripts/shared
+			dodir /etc/log.d/conf/logfiles
+			dodir /etc/log.d/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1*
+	if ! use qt4; then
+		rm -vf "${D}"/usr/share/man/man1/bat.1*
+	fi
+	if use clientonly || ! use director; then
+		rm -vf "${D}"/usr/share/man/man8/bareos-dir.8*
+		rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8*
+		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
+		rm -vf "${D}"/usr/share/man/man8/bwild.8*
+		rm -vf "${D}"/usr/share/man/man8/bregex.8*
+		rm -vf "${D}"/usr/share/man/man8/bpluginfo.8*
+		rm -vf "${D}"/usr/libexec/bareos/create_*_database
+		rm -vf "${D}"/usr/libexec/bareos/drop_*_database
+		rm -vf "${D}"/usr/libexec/bareos/make_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/update_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup
+	fi
+	if use clientonly || ! use storage-daemon; then
+		rm -vf "${D}"/usr/share/man/man8/bareos-sd.8*
+		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
+		rm -vf "${D}"/usr/share/man/man8/bextract.8*
+		rm -vf "${D}"/usr/share/man/man8/bls.8*
+		rm -vf "${D}"/usr/share/man/man8/bscan.8*
+		rm -vf "${D}"/usr/share/man/man8/btape.8*
+		rm -vf "${D}"/usr/libexec/bareos/disk-changer
+		rm -vf "${D}"/usr/libexec/bareos/mtx-changer
+		rm -vf "${D}"/usr/libexec/bareos/dvd-handler
+		rm -vf "${D}"/etc/bareos/mtx-changer.conf
+	fi
+	if ! use scsi-crypto; then
+		rm -vf "${D}"/usr/share/man/man8/bscrypto.8*
+	fi
+	if ! use qt4; then
+		rm -vf "${D}"/usr/share/man/man1/bareos-tray-monitor.1*
+	fi
+
+	# documentation
+	dodoc README.md
+	use ndmp && dodoc README.NDMP
+	use scsi-crypto && dodoc README.scsicrypto
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/bareos.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins scripts/filetype.vim bareos_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bareos-fd"
+	if ! use clientonly; then
+		if use director; then
+			myscripts="${myscripts} bareos-dir"
+		fi
+		if use storage-daemon; then
+			myscripts="${myscripts} bareos-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependency for the director init script
+		case "${script}" in
+			bareos-dir)
+				sed -i -e "s:%databasetypes%:${mydbtypes}:" "${T}/${script}".confd || die
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bareos
+
+	# make sure bareos group can execute bareos libexec scripts
+	fowners -R root:bareos /usr/libexec/bareos
+}
+
+pkg_postinst() {
+	if use clientonly; then
+		fowners root:bareos /var/lib/bareos
+	else
+		fowners bareos:bareos /var/lib/bareos
+	fi
+
+	if ! use clientonly && use director; then
+		einfo
+		einfo "If this is a new install, you must create the databases with:"
+		if use postgres; then
+			einfo
+			einfo "For postgresql:"
+			einfo "  su postgres -c '/usr/libexec/bareos/create_bareos_database postgresql'"
+			einfo "  su postgres -c '/usr/libexec/bareos/make_bareos_tables postgresql'"
+			einfo "  su postgres -c '/usr/libexec/bareos/grant_bareos_privileges postgresql'"
+		fi
+		if use mysql; then
+			einfo
+			einfo "For mysql:"
+			einfo
+			einfo "  Make sure root has direct access to your mysql server. You may want to"
+			einfo "  create a /root/.my.cnf file with"
+			einfo "    [client]"
+			einfo "    user=root"
+			einfo "    password=YourPasswordForAccessingMysqlAsRoot"
+			einfo "  before running:"
+			einfo "  /usr/libexec/bareos/create_bareos_database mysql"
+			einfo "  /usr/libexec/bareos/make_bareos_tables mysql"
+			einfo "  /usr/libexec/bareos/grant_bareos_privileges mysql"
+		fi
+		einfo
+	fi
+
+	if use sqlite3; then
+		einfo
+		einfo "Be aware that Bareos does not officially support SQLite database."
+		einfo "Best use it only for a client-only installation. See Bug #445540."
+		einfo
+		einfo "It is strongly recommended to use either postgresql or mysql as"
+		einfo "catalog database backend."
+		einfo
+	fi
+
+	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
+	einfo "you have to enable 'USE=qt4'."
+	einfo
+}
diff --git a/app-backup/bareos/files/bareos-dir.initd b/app-backup/bareos/files/bareos-dir.initd
index 073f13e3bf6d..4d0f5f1eb797 100644
--- a/app-backup/bareos/files/bareos-dir.initd
+++ b/app-backup/bareos/files/bareos-dir.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/files/bareos-dir.initd,v 1.2 2013/11/12 09:19:10 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/files/bareos-dir.initd,v 1.4 2014/05/04 17:03:59 mschiff Exp $
 
 depend() {
 	use dns bareos-fd bareos-sd
@@ -9,6 +9,7 @@ depend() {
 
 start() {
 	ebegin "Starting bareos director"
+	checkpath -d -m 0750 -o bareos:bareos /run/bareos
 	start-stop-daemon --start --quiet --exec /usr/sbin/bareos-dir \
 		-- ${DIR_OPTIONS}
 	eend $?
@@ -16,6 +17,6 @@ start() {
 
 stop() {
 	ebegin "Stopping bareos director"
-	start-stop-daemon --stop --quiet --pidfile /run/bareos-dir.*.pid
+	start-stop-daemon --stop --quiet --pidfile /run/bareos/bareos-dir.*.pid
 	eend $?
 }
diff --git a/app-backup/bareos/files/bareos-fd.initd b/app-backup/bareos/files/bareos-fd.initd
index 37b47cd27ee8..e399d1e971dc 100644
--- a/app-backup/bareos/files/bareos-fd.initd
+++ b/app-backup/bareos/files/bareos-fd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/files/bareos-fd.initd,v 1.2 2013/11/12 09:19:10 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/files/bareos-fd.initd,v 1.4 2014/05/04 17:03:59 mschiff Exp $
 
 depend() {
 	use dns
@@ -9,6 +9,7 @@ depend() {
 
 start() {
 	ebegin "Starting bareos file daemon"
+	checkpath -d -m 0750 -o bareos:bareos /run/bareos
 	start-stop-daemon --start --quiet --exec /usr/sbin/bareos-fd \
 		-- ${FD_OPTIONS}
 	eend $?
@@ -16,6 +17,6 @@ start() {
 
 stop() {
 	ebegin "Stopping bareos file daemon"
-	start-stop-daemon --stop --quiet --pidfile /run/bareos-fd.*.pid
+	start-stop-daemon --stop --quiet --pidfile /run/bareos/bareos-fd.*.pid
 	eend $?
 }
diff --git a/app-backup/bareos/files/bareos-sd.initd b/app-backup/bareos/files/bareos-sd.initd
index 16374a04edae..ef33942ea148 100644
--- a/app-backup/bareos/files/bareos-sd.initd
+++ b/app-backup/bareos/files/bareos-sd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/files/bareos-sd.initd,v 1.2 2013/11/12 09:19:10 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/files/bareos-sd.initd,v 1.4 2014/05/04 17:03:59 mschiff Exp $
 
 depend() {
 	use dns
@@ -9,6 +9,7 @@ depend() {
 
 start() {
 	ebegin "Starting bareos storage daemon"
+	checkpath -d -m 0750 -o bareos:bareos /run/bareos
 	start-stop-daemon --start --quiet --exec /usr/sbin/bareos-sd \
 		-- ${SD_OPTIONS}
 	eend $?
@@ -16,6 +17,6 @@ start() {
 
 stop() {
 	ebegin "Stopping bareos storage daemon"
-	start-stop-daemon --stop --quiet --pidfile /run/bareos-sd.*.pid 
+	start-stop-daemon --stop --quiet --pidfile /run/bareos/bareos-sd.*.pid 
 	eend $?
 }
diff --git a/app-misc/emelfm2/ChangeLog b/app-misc/emelfm2/ChangeLog
index 250c41fe391f..327810caa2d3 100644
--- a/app-misc/emelfm2/ChangeLog
+++ b/app-misc/emelfm2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/emelfm2
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/ChangeLog,v 1.56 2013/09/23 09:47:35 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/ChangeLog,v 1.57 2014/05/05 00:20:44 jer Exp $
+
+*emelfm2-0.9.1 (05 May 2014)
+
+  05 May 2014; Jeroen Roovers <jer@gentoo.org> +emelfm2-0.9.1.ebuild:
+  Version bump.
 
   23 Sep 2013; Samuli Suominen <ssuominen@gentoo.org> emelfm2-0.8.1.ebuild,
   emelfm2-0.8.2.ebuild, emelfm2-0.9.0.ebuild:
diff --git a/app-misc/emelfm2/Manifest b/app-misc/emelfm2/Manifest
index 89eaefc12870..a8a91dd3e249 100644
--- a/app-misc/emelfm2/Manifest
+++ b/app-misc/emelfm2/Manifest
@@ -4,19 +4,17 @@ Hash: SHA256
 DIST emelfm2-0.8.1.tar.bz2 1098199 SHA256 d38355628360e6bcdb69ef4affff03dd9f7cc9bd25c999b18b648a23c6f8bba7 SHA512 0f371459b8e4ca96beb45a8ed04ea2b757356c938cbd6927244abadc01f4c89f39ca50b8a86c4ff97e5c2d068405c1969c1d028a2fba650ec9326c39bb39a65f WHIRLPOOL 1dbe7848c44a79afb40a1c663503ad57a257d1b55b4e24e1cc0c7efd3bbe0be94e3a5ba9228bc1ee1933ad967b42492ecba7e2849a33a00d188592b6b3f26a72
 DIST emelfm2-0.8.2.tar.bz2 1117651 SHA256 230bf59f2bbf22d56f434bb9b5e7a2eb9bb7c608fc0b6749dd462a8b6f5fe881 SHA512 231875baa83ae6279ed6ff9a62b14a67456336009317b644c251610891cac43e7901f5afb5e654309ccb61173d908d2cc5f6a1706304d29ba66d7255bb304e2a WHIRLPOOL dc3d1e9b9306b3b8818837fb0cafee3806f39e84b1f3beea1f9e719962d3fede9cd23018cc57f746c2805b79f5f126f0b10e935edfefb3c4d0da481f58b3dc8b
 DIST emelfm2-0.9.0.tar.bz2 1135533 SHA256 0f50b859e82ec26bd71eb23a5de9f1223b3af2d05744afa6eb395cdbb28f5fdb SHA512 4a6f17b3511a41041f26d0cf88fe8ebdc888cb37caa8dbfffa7ab2682e56930a8c32fc0796bbd79e25a3f78f51e3e97800bf9dcd540ca2eb65581a3ace7bc9e6 WHIRLPOOL ffced79307565c73ee1d1b0731aef4e970690481b983c9427cd9d1c0664f93174e6068c6781f2bb1a6207718b53217d8b645674fd51a9b80a23216925df01797
+DIST emelfm2-0.9.1.tar.bz2 1217126 SHA256 bfb94ff4e40c0a9c0d2a6aeb0efa22e177accbf6abd3096226d93daecd23642f SHA512 bd3a1ad2338c80d6824a2a84736470ecfa7e93f455cc8e3243944833807fe9b3544e2fea6bd6ccbddaf0188ad89ce616ed146271f6ffabec80f5dfb2f1ad6f57 WHIRLPOOL 4eaa1d95396a23c5f00ef66784f9f124f8c79e5dfe820f8bc556037109d799f5b1d30ef25a51183116ba955c931c0ec161d0e8aa3d92b79f33f0baaba7edf21d
 EBUILD emelfm2-0.8.1.ebuild 1693 SHA256 89c53733c75a13724e64e9f6aef445fe86e6e66e5da996e0f6e613e6e14d2f4a SHA512 5bef95903d8f618be8afe04e756d908adbc1e7241627601e96366c59b838c540cfbb57bd375bfeccd46535a52263e4868982f8508f74560c40701015a4063e07 WHIRLPOOL b48a0af2c8270dd91b5bca61b6c1c430e823aef820416a707e7c87c60830b7eabf0c740cb0f46fbb359d643a15d8bb3c4b56cbd2102464d1048c43829c83f8bb
 EBUILD emelfm2-0.8.2.ebuild 1969 SHA256 a4f8ca685553511740a7336719f58b50c994895849e623449cd063ff4e7f3149 SHA512 de4a36a23a1e9c2b2360168baaa0e88439b77a49c87d6e9ed9e01d32e4cfffe128af678fd2c3e02772cddf131a3cfd1f7d6c1594c1428e008b723f8c605e2741 WHIRLPOOL 82a1f0b376f7b88074a4eece870c8d04383f6dfb8e684e70264ec561eb20f7d424110f38bacf60cb3390f1afb5a0fe5cae20efed71caef4e2a905c60a809e54a
 EBUILD emelfm2-0.9.0.ebuild 2082 SHA256 45a15796cb10385bcb0ef3408f92de4502ee71643d5b1e7203e7ea98519e05d0 SHA512 439a72a2ae7036ba38cfda4a1b5ae3ee1006845bb72e973ae313bc7543c20170c6f46aa4b925e1b14ef6d108cfa17ac5079f537494ae2d7fdcf591c96fca8288 WHIRLPOOL fa6d2a8bfea833b89303e03ca0cfd1160b2eae2927e17c1c6f5a73a1dc84cf3fcbdeb1abd2c692f4e377e0a17febe80782e8556a0aac67d647513bf4ac0c25d8
-MISC ChangeLog 6119 SHA256 aa68d824d38af66177c972b7683243ed6636540ce5edef779aa20ee3a69fcc25 SHA512 c834405ad99abfbc8b90b16441a111ef8c944e1735c5b7858e5412ad7efe4ce7f463930839500493d70fc9205205f5c9c06f48b10eec6a60a19e0974349d8a5e WHIRLPOOL 641f396c0a9beb1250bab123224cfd00136e63255b0a7c7dbd553ac61bbd047f035b252eeb5a746b3fe8591ffdce7e117393416251ed1671aee35c3b5a014089
+EBUILD emelfm2-0.9.1.ebuild 2076 SHA256 036c5c6d9e23dcc6b3d6067840106c523b30aadf4507674e46924c52bdbbccea SHA512 0c46fbf8b1d26b25fc6da433b50816526f215694412aa34afa6d75740bc66ec74fb9469d178387222b1338454376bf15be6d8438fc36c25bc97c91feaddd7865 WHIRLPOOL 5d2f74a03ed4dd049f76144d9fd44c84b0b302deaa2282012b389703598feb9c8fce9857fc21b184202799fbbe761d49490bfa47f288ac53475886efd20fa5b5
+MISC ChangeLog 6230 SHA256 b5ce3369a500bad9d34a09258586a23182204a77b3a2413e60fb26f3e567882a SHA512 16b8c9ee8030d97d5bd1ce188e936cfe59a969d9cd83f2adb9223f91b66523cbe58527e1eec20e108e909926827512a8c0e86ddf1becae0937f4f45956670525 WHIRLPOOL 0772b33eb07a5609a7f9d05dc0046b9c59eb8b48374141a18d767e6259cf174e5b2943cbbfd4b26b855712a3b0b60e504427fccab6ec15b845ac41d6992ea982
 MISC metadata.xml 348 SHA256 3ff39d269d88bdb961058163bff26327b4ca0bb272c540c1b8f75e8f01ff05b2 SHA512 9bb6d4cd981edde1955e28c69ad7b9e92877d27dd147d4577cb17498d169e2aadb59ac8275a54e4d883b2a1558ab2bf9c9f2b85b2b2b91589a53e2408d033615 WHIRLPOOL e08ec3c69af5bdd1e814a2ef1a57e7b04bd1051aac67de205c94462514cf2a24ae9964229883c819afd59f5f4f09eda585cf760df77b4a6331f97e5f34aa55ad
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSQA33AAoJEEdUh39IaPFNV+oH/jSEzCBkC3SgnLwDrjwhkgb2
-fv8sduqLIz7+UHHul4knhW+Sa1Ei7xAVF3uAsE/pL/4iDgaO/kTm8gj3BtBve8Lt
-gctfciqhPnuN0uYfAz5OB8o6i7cB71EZtu0G600YLNlwbeHpnO+uYDbwLTiEinz0
-i+JvWPxEZrEo0l9ygNNQqpKQQzfPSiN6ma/9XS39hlBcboWymU4BxPCaem50prNZ
-aSkL8gX133WJtO0ZTLBckqyQBnNcLociqfN/nS2DOUxr9e4skNLOtJ7TpwSgpAIJ
-DOVb9N4LzJ94i9Bcz/+5U5m28v/GfB7kHpRpWOuxDqw8NoDoXo9YfbUlTq5B/Xc=
-=nrlJ
+iEYEAREIAAYFAlNm2V4ACgkQVWmRsqeSphPcjgCfRdaxA2XtBQkjz9i+YWgL7vV8
+O3EAn0sFa+Y8YT/uffOt21ZbvWdnl0hu
+=SWH5
 -----END PGP SIGNATURE-----
diff --git a/app-misc/emelfm2/emelfm2-0.9.1.ebuild b/app-misc/emelfm2/emelfm2-0.9.1.ebuild
new file mode 100644
index 000000000000..4acaf05593b4
--- /dev/null
+++ b/app-misc/emelfm2/emelfm2-0.9.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/emelfm2-0.9.1.ebuild,v 1.1 2014/05/05 00:20:44 jer Exp $
+
+EAPI=5
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A file manager that implements the popular two-pane design"
+HOMEPAGE="http://emelfm2.net/"
+SRC_URI="http://emelfm2.net/rel/${P}.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl ansi gimp gtk3 kernel_linux nls policykit spell udev"
+
+EMELFM2_LINGUAS=( de fr ja pl ru zh_CN )
+IUSE+=" ${EMELFM2_LINGUAS[@]/#/linguas_}"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.26:2
+	!gtk3? ( >=x11-libs/gtk+-2.12:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	acl? ( sys-apps/acl )
+	gimp? ( media-gfx/gimp )
+	policykit? ( sys-auth/polkit )
+	spell? ( >=app-text/gtkspell-2.0.14:2 )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	udev? ( sys-fs/udisks:0 )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+RESTRICT="test"
+
+src_prepare() {
+	sed -i \
+		-e 's:@$(BIN_MSGFMT):$(BIN_MSGFMT):g' \
+		-e 's:@$(CC):$(CC):g' \
+		-e 's:dbus-glib-1::' \
+		Makefile || die
+
+	local lingua
+	for lingua in ${EMELFM2_LINGUAS[@]}; do
+		use linguas_${lingua} || mv po/${lingua}.po{,.unwanted}
+	done
+}
+
+src_configure() {
+	myemelconf=(
+		$(usex acl WITH_ACL=1 WITH_ACL=0)
+		$(usex ansi WITH_OUTPUTSTYLES=1 WITH_OUTPUTSTYLES=0)
+		$(usex gimp WITH_THUMBS=1 WITH_THUMBS=0)
+		$(usex gtk3 'GTK3=1 GTK2=0' 'GTK3=0 GTK2=1')
+		$(usex kernel_linux WITH_KERNELFAM=1 WITH_KERNELFAM=0)
+		$(usex nls I18N=1 I18N=0)
+		$(usex policykit WITH_POLKIT=1 WITH_POLKIT=0)
+		$(usex spell EDITOR_SPELLCHECK=1 EDITOR_SPELLCHECK=0)
+		$(usex udev WITH_DEVKIT=1 WITH_DEVKIT=0)
+		DOCS_VERSION=1
+		STRIP=0
+		WITH_TRANSPARENCY=1
+	)
+}
+
+src_compile() {
+	tc-export CC
+	emake \
+		LIB_DIR="/usr/$(get_libdir)" \
+		PREFIX="/usr" \
+		${myemelconf[@]}
+}
+
+src_install() {
+	emake \
+		LIB_DIR="${D}/usr/$(get_libdir)" \
+		PREFIX="${D}/usr" \
+		${myemelconf[@]} \
+		install \
+		$(usex nls install_i18n '')
+
+	newicon icons/${PN}_48.png ${PN}.png
+}
diff --git a/app-portage/mirrorselect/ChangeLog b/app-portage/mirrorselect/ChangeLog
index 16c406a57a6c..cc8859c755d6 100644
--- a/app-portage/mirrorselect/ChangeLog
+++ b/app-portage/mirrorselect/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-portage/mirrorselect
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/ChangeLog,v 1.132 2014/05/03 20:59:25 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/ChangeLog,v 1.133 2014/05/05 04:32:29 dolsen Exp $
+
+*mirrorselect-2.2.1 (05 May 2014)
+
+  05 May 2014; Brian Dolbec <dolsen@gentoo.org> +mirrorselect-2.2.1.ebuild,
+  mirrorselect-9999.ebuild, -files/0001-Fix-rsync-mirror-selection.patch,
+  -files/0002-Check-for-a-valid-mirrorselect-test-file.patch,
+  -files/2.2.0-Fix-setup.py-PVR.patch,
+  -files/2.2.0-Ignore-inaccessible-fsmirrors.patch:
+  Version bump. Remove old versions. Update homepage link.
 
   03 May 2014; Mike Gilbert <floppym@gentoo.org> mirrorselect-2.2.0.1.ebuild,
   mirrorselect-9999.ebuild:
diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
index 1b4e754ac55a..b02dcd3ef508 100644
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@@ -1,23 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 0001-Fix-rsync-mirror-selection.patch 927 SHA256 e49678f6a94698959b3739e44b8dd83146964a6b52b1451b8776bc7c52dd963a SHA512 0b0dee2cd3dd764b32c164ad361a6ffd3fbd61515b772c6e5fbdea4c9cd6baa95d1c0dffbef41acb320ddb41ef1aba92ab7fd7909a28037a2d9dbc7378b97242 WHIRLPOOL 5cfb55dd4569c9147c301157350ae46c9911f489f42898f5578292788a12ebf6a0cca8bf4af6635d59a2e3d843ef003868379fef123c8a579fed1d1e4a3b4a6c
-AUX 0002-Check-for-a-valid-mirrorselect-test-file.patch 2167 SHA256 ab5ed31f6e6a8f314ecac032e4a4fd152e4b60717079ee0e424575a82c8426e4 SHA512 bc1bf7a797fc364997e60222813dd813bd4d0d2c184545519da6529fb2f7d961dba1060ea9e3dd3848f8076aa61364ae864bedba009703f73bd0aa44a16f7439 WHIRLPOOL 87789b43c31cf1b52e4e18883fbcf5dd04adc1a7eaa64154959801f9a20cec4d069bec420edda906f91a7e1eeeccadbcfa5caf7ae014a4969103b5ae92b9ce76
-AUX 2.2.0-Fix-setup.py-PVR.patch 648 SHA256 8c249ea37175f71629ce898ae7be1a903fcf538122390e06a167b443c7770231 SHA512 6bc48cf6c54b7a4af8529ef6c8b0427890ee7f5af5a0b654db8ca8ed3ba43620c78e7bb4a176962d0b116bb6a5f74c1c0f06c90c92e59e37ae9f01017be53aac WHIRLPOOL 7e6558135a900d1d1596dc14c0fe083239edd4213032cedb7ec3f8f42b9562f3badaa6438e406d87ddd62460cdb675fd77e49b1c3aa1183200f3081f15285b01
-AUX 2.2.0-Ignore-inaccessible-fsmirrors.patch 2995 SHA256 d3d8863db7fc20af71725944a32025739708742b882b4299d69024a60244066c SHA512 166ceb16665a777b10dd04d882f5aeea01409ea29b51957d83b17ae53926e26d1594f317ce950d49c4e597684ce0fb9d9db791522a831f884500bc36b82d3442 WHIRLPOOL c25a8a8e20c8df3ce22f14f5396d7f99523c93bfef6cdab4db2be6182e2c350436beccb3a718ef29e7d8abfdf683dcbda468fed92e423a91e0b3631434f11923
 DIST mirrorselect-2.1.0.tar.bz2 9282 SHA256 cbff801e561aa1466feaf27a6182f90012afba9590fb91d87289629d54207816 SHA512 e026604534994fe256e27c221b5ace5de9e4fa36a9e631cd01ba6124870372b31d28352dd28ba5af4164f7c0a86942bd3410523f01555ff79a8a823717e8a6c0 WHIRLPOOL 73cb0813e48f667e939df8eafc329d4e2776359a9d885ee976d9d9f98d8d461d92327726b353ec4e4fe94ae31aea8af00e604b2f917fc0e17b844f3a2d70eff4
 DIST mirrorselect-2.2.0.1.tar.gz 13138 SHA256 029a09073d6a4363f060912d257f8f118bb3a061c05db532bde1c05816affab1 SHA512 08216c381b70856dd56e903a208bc0ed202826b89136dd0b1cf69bd7cf2afa2df608ac2a0aed5161a56f51cf4bcb51f3826ad55b3a26e671ba2c68490c9cffad WHIRLPOOL 6925c4dc514fdd5f7c50427627b1ef6babba99c4e98d00d7144489ba16c3740ba967461847d99cd080805e6aebd44ca51ca85bd117ffdb52ba3cdf511fac0c69
 DIST mirrorselect-2.2.0.tar.gz 12977 SHA256 e3e00db9733618c9801b03e9d60c0f7b34dea15b69adff5c8d11782d40528fbe SHA512 d5c90d10fe81e2f4ada4b0db04c75d9211c0654807a07423753d451127835ab55929288d9ee61e41090824961f86ef8b82db629c3803f896c3a519eeb2e3bd2e WHIRLPOOL 3c48917494c07ef9c6fcfabb18ebb1598fb6fbd2a11625a5773e7cfc6ed43a7cf24f39d14a05f236ec282e4a2ff85d361826ad8c0130a232d23cbceb79fd1a76
+DIST mirrorselect-2.2.1.tar.gz 15869 SHA256 df86d7565f69a3d5e1ec18c5b4f007504eb091a4b5b49d2b866a6098b3868079 SHA512 1e9040d28c801d576ae3fcb1f8d0f1c4db69e15b85fbd945dfa25e72d0b510f837f3a2357afc10119956da0885a01ae7c9b03671984511b98210d75a72ffee14 WHIRLPOOL 0430eec65cf016519abc1d46728d872b2f031a582ca6c29d96d799d1fc9ffaeb3746990e219104f0e0e94eb31533bc9ba1ba019e80663e2887efcc8403a0e14a
+DIST mirrorselect-test 102403 SHA256 add93012c44824626a7e05eed2186dcfb60e0b696d4ad7910fdb9eb31c93d3b5 SHA512 f43d92e9bf7e77c8f04449a786cb659bdfc07257892caca842ab4a63eb9c5351fa48130c2e163857f3233a595cea7b83f5ea9fa879b782e15b73beb62f0e5e27 WHIRLPOOL ca9be67338986403d87db7de04d3d1b3ecd483f2a104668a7c23e8e2ef1141a31394d12d3cd4121ec25436c967aac960f3652c20f20d2c89fdde6dd547cd9f8a
 EBUILD mirrorselect-2.1.0-r3.ebuild 1189 SHA256 55c7527192d5e661b5b4ac1f6ddc5d201a8d898e96b864bc09f2dd4642636920 SHA512 a9029487c883f516b4d2e17914d04a901a65524a5d6d627f9d7b2b1d1a42541e0ebdc2005a7a9a36532ce572303a79bbaaa60db478270e3a372ffa0b1289d8ff WHIRLPOOL 11aade1d282bdd03117056dbed677cc8cd9ad0cfc8a7cb01ca6f0938989c5f26b81f392db58f2bad4a11c2c527d7e68250b5b396ea269adf35d78ba1e1a1a5b0
 EBUILD mirrorselect-2.2.0-r1.ebuild 1662 SHA256 2cc7ca3b2347610dccb7e9403afbac6f28e225542db1ad264d0f479968db44a9 SHA512 2d59dde8b5ca1836e02fe0a240436b17f939cc9a29b9acf6b50ce19308e713832143335515ca282974306d2095dab1d7ca2c7a3ea155439ac9346b1c3edae949 WHIRLPOOL 16e8a0a8258354df17af2a15bd0467a43992d08f769ad5f58f50f7b2b5081a0787d1d9add5684c099338f50682a0a5d644cb21b7713be6339347bcd8a4e8e67f
 EBUILD mirrorselect-2.2.0.1.ebuild 1019 SHA256 b61ff6368cf7cd6179c51d401a7934865ffba5996c8afa3184e9c44fa108c0de SHA512 dca3a92927467ecf87df42909c50db4b1de601f121dc43964b54d7adac0625203bcc00e6fcefd2897acfc9bc3d8df553f9f7a6d03606d8d09cf510f07513f166 WHIRLPOOL 8860ab999f1f7e9ac2a02d43d1d1fdd0d96c33a2c008c2b43509ec84f7e963a4dfa7858ca41d2ec9b51317dfc6dddef51004b19623f4d55123a6f4bdfa06a7c0
-EBUILD mirrorselect-9999.ebuild 1197 SHA256 731bde056d77ed4e8e786b4e277510a0aa8dad2d0d395c8bd14a87a0d6b1b2a2 SHA512 e1551a23f5e044e81dc046b93851be3220b7a939a0f8a64bcc33921cf29c9ebc3023bd2f0fcb2a4a294f1c8fce75edb591836b388d8e40cd9b7492e54bf1c7b9 WHIRLPOOL 80630ff46fc31a0c4a662572567a778ebe1c3777bffe762a8e33d10b8a1d8c1273a1dae0200bc4e551f5b7a331e9b1db0046907450f3ded51bf3e36fc77ed2c7
-MISC ChangeLog 22864 SHA256 3b2d0dedb6b720d05bc32c4708a9120ba0380a87f55cb4ff1a6d08105354ac96 SHA512 a55861bde5b1b405dd4b016c635d718ded5d7058fff6367585637f1c9d50fdcf82a1cb64f1faa077d9270951de6c3ab16c42c9ebdacef501dc1c7a0c67766b22 WHIRLPOOL 3c380647c042d27290437141c325a78782c966db7a276f6d941c793cbbe2b6d90d18ff4c3810b38a22bb88cb53fa20ed3651236c9d8d1aa00c6c174adc143e1c
+EBUILD mirrorselect-2.2.1.ebuild 1042 SHA256 ed430646dcd37fc6c1dab97ac7c27d738b87b0576ddeffbe54484abfa8b3f621 SHA512 01546fbcc831e42d64c10e9772843baad6b8d65b6ff4524b27b99181788d281aca33041851e3cefc23ffe6df675d172909271f336d03b9551628051e3fbdb94d WHIRLPOOL da1aa9cb1f7d2ee00568150031ce67900220b7cf52c196938c0aa5991d8981eb3800fe5e5dc5c01706ceb34ce2ddfd2ec75a6bc03117859634dc05259c682f11
+EBUILD mirrorselect-9999.ebuild 1196 SHA256 788562e57742d9a3d18b24cd68baaf8ccd7c3dcf510a6ce3698f9b0c2f88bb7c SHA512 f0e330c8b1714d49a0912f9ef5a202ef1cf91dced636698d80c13eb2a4aa1a1d0c5af8761f85bb247a29bbd4cd6afd6ef6d4ade0095dbda9f11f080123b741ef WHIRLPOOL eb604aaab6484f9176cf2f0f7e24bffad9735ad237a4c8529fb1b667efd9283986e8faa75662fd4c9a2c1c6ba97be813dd64dbc57e3b03344c141f3de6bfb9e7
+MISC ChangeLog 23261 SHA256 85190048a335de706fca4bf15c69706ac9df9d7877ec4a02d96f804485a37f73 SHA512 7906ff28c6eea1730a33a56e19a701f6788f4247cf1c5fdb544be1634403fd1f76ec35fedd306b17a2aa8c167e3759a4554ce71465ad5f17cd6cbfdb647a9cb8 WHIRLPOOL 7010c880a443be784e834688e59411d4de6c2e7dd5c9311e392b3645169b45dcce4cc9cfec1a7875435e4848d10f709dd3b2a3b11c47802b9764dd75a2318b9f
 MISC metadata.xml 371 SHA256 17394aa4850b9c997c49e9f18969992d65f5ec1a03e47a743230395fbc2a2595 SHA512 db398de272e260ca7a588bb45e5670c731eb8273f27acbee0569beae1169ca639941a082e467e2c3bd9da372a4c5f939e3480199ab79a4d37d7caf735a6d07a7 WHIRLPOOL 2d2b21732f795f01dacb5325891d6d2e90211bf96fb947668b8f3e8067c55fdc4ae699efea5ca0e2463be48ee5025b9769eed407235341b224b2e4057d56967d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlNlWK4ACgkQC77qH+pIQ6RWLQEApskAvBzhpsU5OeTROUDTqJYD
-e2e0MysJknuN9PrpY1YA/Ak1PyjcoziO6BTUiXWkK/ucdACkvFAZ/2O9STlBKoh+
-=JNjq
+iQF8BAEBCABmBQJTZxRNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4Njg4RkQxQ0M3MUMxQzA0RUFFQTQyMzcy
+MjE0RDkwQTAxNEYxN0NCAAoJECIU2QoBTxfLdkYIAJghhKQmUjL9h361/p6bu3gK
+tFH5jzf2ROI/1kxuUThgvu04ugdY9XtIfjQBGChii2CyvWDVJMj31g84NJItaSkh
+T09E3Akmke+pUdwpXKkn3NHF0c971WcJ7yGaiQ/X8JmjnCEsirGQhE6fysKLPNcn
+iKjBuNW+2ewA3VeWCesnNEez7kDoIPEei+FIyC9xmCcZVzFFTqPQzYaP6sX8uPbg
+OJQ/6EwqnLRqtUbTAFEmhIeD7t5jQiprg+ljcD0i7EJLEqNpgDVio4krckVDVfUa
+jjdIQ7emVEW8lB0CmE6zZ/iWuUaI0A3Seg1u5cGtcuOokbewUyPB/9dbO/CvRak=
+=STk0
 -----END PGP SIGNATURE-----
diff --git a/app-portage/mirrorselect/files/0001-Fix-rsync-mirror-selection.patch b/app-portage/mirrorselect/files/0001-Fix-rsync-mirror-selection.patch
deleted file mode 100644
index a612ffe81ba7..000000000000
--- a/app-portage/mirrorselect/files/0001-Fix-rsync-mirror-selection.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From daad8a5e5ea2dac503513f6ab114184dd427db01 Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Fri, 2 Apr 2010 16:44:14 +0200
-Subject: [PATCH] Fix rsync mirror selectection
-
-Append /gentoo-portage to the rsync mirror url if necessary, bug 312753,
-	   thanks to Donald Wallace Rouse II <gentoo-user-0d329vjsd8@dwr2.org>
----
- main.py |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/main.py b/main.py
-index 367e8d4..dd3386e 100755
---- a/main.py
-+++ b/main.py
-@@ -608,6 +608,8 @@ class Interactive(object):
- 
- 		for (url, args) in sorted(hosts, key = lambda x: (x[1]['country'].lower(), x[1]['name'].lower()) ):
- 			marker = ""
-+			if options.rsync and not url.endswith("/gentoo-portage"):
-+				url+="/gentoo-portage"
- 			if (not options.ipv6 and not options.ipv4) and args['ipv6'] == 'y':
- 				marker = "* "
- 			if options.ipv6 and ( args['ipv6'] == 'n' ): continue
--- 
-1.7.0.4
-
diff --git a/app-portage/mirrorselect/files/0002-Check-for-a-valid-mirrorselect-test-file.patch b/app-portage/mirrorselect/files/0002-Check-for-a-valid-mirrorselect-test-file.patch
deleted file mode 100644
index 864aaa7aa03d..000000000000
--- a/app-portage/mirrorselect/files/0002-Check-for-a-valid-mirrorselect-test-file.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 88521c86907819486e0e18bffcb1674ae180341e Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Sun, 1 Aug 2010 21:35:11 +0200
-Subject: [PATCH] Check for a valid mirrorselect-test file, fixes bug 330611, thanks to Soren Harward <stharward@gmail.com>.
-
----
- main.py |   17 +++++++----------
- 1 files changed, 7 insertions(+), 10 deletions(-)
-
-diff --git a/main.py b/main.py
-index dd3386e..f5f35be 100755
---- a/main.py
-+++ b/main.py
-@@ -36,6 +36,7 @@ import sys
- import time
- import urllib
- import urlparse
-+import hashlib
- from optparse import IndentedHelpFormatter, OptionParser
- from mirrorselect.mirrorparser3 import MirrorParser3, MIRRORS_3_XML, MIRRORS_RSYNC_DATA
- import codecs
-@@ -336,8 +337,6 @@ class Shallow(object):
- class Deep(object):
- 	"""handles deep mode mirror selection."""
- 
--	_bufsize = 4096
--
- 	def __init__(self, hosts, options):
- 		self.urls = []
- 		self._hosts = hosts
-@@ -457,10 +456,9 @@ class Deep(object):
- 
- 		for ip in ips:
- 			try:
--				ip_url = url.replace(url_parts.hostname, ip, 1)
- 				try:
- 					signal.alarm(self._connect_timeout)
--					f = urllib.urlopen(ip_url)
-+					f = urllib.urlopen(url)
- 					break
- 				finally:
- 					signal.alarm(0)
-@@ -480,14 +478,12 @@ class Deep(object):
- 			return (None, True)
- 
- 		try:
--
- 			# Close the initial "wake up" connection.
- 			try:
- 				signal.alarm(self._connect_timeout)
- 				f.close()
- 			finally:
- 				signal.alarm(0)
--
- 		except EnvironmentError, e:
- 			output.write(('deeptime(): close connection to host %s ' + \
- 				'failed for ip %s: %s\n') % \
-@@ -498,16 +494,17 @@ class Deep(object):
- 				(url_parts.hostname, ip), 2)
- 
- 		try:
--
- 			# The first connection serves to "wake up" the route between
- 			# the local and remote machines. A second connection is used
- 			# for the timed run.
- 			try:
- 				signal.alarm(int(math.ceil(maxtime)))
- 				stime = time.time()
--				f = urllib.urlopen(ip_url)
--				while f.read(self._bufsize):
--					pass
-+				f = urllib.urlopen(url)
-+
-+				if hashlib.md5(f.read()).hexdigest() != "bdf077b2e683c506bf9e8f2494eeb044":
-+					return (None, True)
-+
- 				delta = time.time() - stime
- 				f.close()
- 			finally:
--- 
-1.7.1
-
diff --git a/app-portage/mirrorselect/files/2.2.0-Fix-setup.py-PVR.patch b/app-portage/mirrorselect/files/2.2.0-Fix-setup.py-PVR.patch
deleted file mode 100644
index 86268109b7ea..000000000000
--- a/app-portage/mirrorselect/files/2.2.0-Fix-setup.py-PVR.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From bc0efc857b5708ea572e3a4c57c9689cf48c50ad Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Sat, 15 Dec 2012 20:48:17 -0800
-Subject: [PATCH] Fix setup.py to use PVR instead of VERSION from the
- environment so that egg-info is set correctly during the
- merge.
-
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 8a9f980..7a53076 100755
---- a/setup.py
-+++ b/setup.py
-@@ -12,7 +12,7 @@ import os
- import io
-
-
--__version__ = os.getenv('VERSION', default='9999')
-+__version__ = os.getenv('VERSION', default=os.getenv('PVR', default='9999'))
-
- cwd = os.getcwd()
-
---
-1.8.0
-
diff --git a/app-portage/mirrorselect/files/2.2.0-Ignore-inaccessible-fsmirrors.patch b/app-portage/mirrorselect/files/2.2.0-Ignore-inaccessible-fsmirrors.patch
deleted file mode 100644
index 01c97886d48f..000000000000
--- a/app-portage/mirrorselect/files/2.2.0-Ignore-inaccessible-fsmirrors.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 362ba4585a48273289f382c16947e858ff3818cf Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Sat, 15 Dec 2012 18:37:50 -0800
-Subject: [PATCH] Add aditional debug info, fix bug 373195, removing garbage
- or otherwise inaccessible file system mirrors from existing
- SYNC or GENTOO_MIRRORS make.conf values.
-
----
- mirrorselect/main.py      | 14 +++++++++++---
- mirrorselect/selectors.py |  4 +++-
- 2 files changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/mirrorselect/main.py b/mirrorselect/main.py
-index cbff890..48d74a7 100755
---- a/mirrorselect/main.py
-+++ b/mirrorselect/main.py
-@@ -154,8 +154,7 @@ class MirrorSelect(object):
- 		sys.exit(0)
-
-
--	@staticmethod
--	def get_filesystem_mirrors(config_path, sync=False):
-+	def get_filesystem_mirrors(self, config_path, sync=False):
- 		"""Read the current mirrors and retain mounted filesystems mirrors
-
- 		@param config_path: string
-@@ -170,6 +169,7 @@ class MirrorSelect(object):
- 		else:
- 			var = 'GENTOO_MIRRORS'
-
-+		self.output.write('get_filesystem_mirrors(): config_path = %s\n' % config_path, 2)
- 		try:
- 			f = open(config_path,'r')
- 		except IOError:
-@@ -182,6 +182,8 @@ class MirrorSelect(object):
- 			lex.quotes = "\"'"
- 			while 1:
- 				key = lex.get_token()
-+				#self.output.write('get_filesystem_mirrors(): processing key = %s\n' % key, 2)
-+
- 				if key == var:
- 					equ = lex.get_token()
-
-@@ -196,16 +198,22 @@ class MirrorSelect(object):
-
- 					""" Look for mounted filesystem in value """
- 					mirrorlist = val.rsplit()
-+					self.output.write('get_filesystem_mirrors(): mirrorlist = %s\n' % mirrorlist, 2)
- 					p = re.compile('rsync://|http://|ftp://', re.IGNORECASE)
- 					for mirror in mirrorlist:
- 						if (p.match(mirror) == None):
--							fsmirrors.append(mirror)
-+							if os.access(mirror, os.F_OK):
-+								self.output.write('get_filesystem_mirrors(): found file system mirror = %s\n' % mirror, 2)
-+								fsmirrors.append(mirror)
-+							else:
-+								self.output.write('get_filesystem_mirrors(): ignoring non-accessible mirror = %s\n' % mirror, 2)
- 					break
- 				elif key is None:
- 					break
- 		except Exception:
- 			fsmirrors = []
-
-+		self.output.write('get_filesystem_mirrors(): fsmirrors = %s\n' % fsmirrors, 2)
- 		return fsmirrors
-
-
-diff --git a/mirrorselect/selectors.py b/mirrorselect/selectors.py
-index b2a5fc7..38ca07a 100644
---- a/mirrorselect/selectors.py
-+++ b/mirrorselect/selectors.py
-@@ -303,14 +303,16 @@ class Deep(object):
-
- 		self.output.write('\n')	#this just makes output nicer
-
--		#can't just return the dict.valuse, because we want the fastest mirror first...
-+		#can't just return the dict.values, because we want the fastest mirror first...
- 		keys = list(top_hosts.keys())
- 		keys.sort()
-
- 		rethosts = []
- 		for key in keys:
-+			#self.output.write('deeptest(): adding rethost %s, %s' % (key, top_hosts[key]), 2)
- 			rethosts.append(top_hosts[key])
-
-+		self.output.write('deeptest(): final rethost %s' % (rethosts), 2)
- 		self.urls = rethosts
-
-
---
-1.8.0
-
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.1.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.1.ebuild
new file mode 100644
index 000000000000..498e785d7184
--- /dev/null
+++ b/app-portage/mirrorselect/mirrorselect-2.2.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/mirrorselect-2.2.1.ebuild,v 1.1 2014/05/05 04:32:29 dolsen Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils distutils-r1 prefix
+
+DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Mirrorselect"
+SRC_URI="http://dev.gentoo.org/~dolsen/releases/mirrorselect/${P}.tar.gz
+	http://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
+	"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-util/dialog
+	net-analyzer/netselect
+	dev-python/ssl-fetch
+	"
+
+python_prepare_all()  {
+	python_export_best
+	eprefixify setup.py mirrorselect/main.py
+	echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
+	distutils-r1_python_prepare_all
+}
diff --git a/app-portage/mirrorselect/mirrorselect-9999.ebuild b/app-portage/mirrorselect/mirrorselect-9999.ebuild
index 486dd13fda92..f8f09d006a3e 100644
--- a/app-portage/mirrorselect/mirrorselect-9999.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/mirrorselect-9999.ebuild,v 1.7 2014/05/03 20:59:25 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/mirrorselect-9999.ebuild,v 1.8 2014/05/05 04:32:29 dolsen Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mirrorselect.git"
 EGIT_MASTER="master"
 
 DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Mirrorselect"
 SRC_URI=""
 
 LICENSE="GPL-2"
@@ -40,6 +40,6 @@ pkg_postinst() {
 	distutils-r1_pkg_postinst
 
 	einfo "This is a development version."
-	einfo "Please report any bugs you encounter."
-	einfo "http://bugs.gentoo.org/"
+	einfo "Please report any bugs you encounter to:"
+	einfo "https://bugs.gentoo.org/"
 }
diff --git a/dev-cpp/gmock/ChangeLog b/dev-cpp/gmock/ChangeLog
index 34c28d6cfde2..3a0612050228 100644
--- a/dev-cpp/gmock/ChangeLog
+++ b/dev-cpp/gmock/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-cpp/gmock
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/ChangeLog,v 1.20 2014/03/27 02:35:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/ChangeLog,v 1.21 2014/05/04 15:27:38 vapier Exp $
+
+  04 May 2014; Mike Frysinger <vapier@gentoo.org> gmock-1.7.0-r1.ebuild:
+  Force python-2.x when running tests #455276 by Markus Oehme.
 
 *gmock-1.7.0-r1 (27 Mar 2014)
 
diff --git a/dev-cpp/gmock/Manifest b/dev-cpp/gmock/Manifest
index 140745a6c686..ee2507779406 100644
--- a/dev-cpp/gmock/Manifest
+++ b/dev-cpp/gmock/Manifest
@@ -10,24 +10,24 @@ DIST gmock-1.7.0.zip 2167746 SHA256 26fcbb5925b74ad5fc8c26b0495dfc96353f4d553492
 EBUILD gmock-1.4.0.ebuild 900 SHA256 ac6459b47610fabc4a1976a27b813a5d60bc2ed94b053e0f0f95eaa9317f2919 SHA512 dc4bd30c218906d7a43798dc4393d6b9201328185d6dc5e5fa591ec44419b71814d759e9061b2b7125d1efb41e670e9680c6ccd50be1835e7ae496020a5b6d33 WHIRLPOOL ebec651a934b28ecc628f6abfb3ebea8442b2eb572b5cd4cfafd86f1286454afff51de5260f0d5afe75253a52788b08253af08d7274283df52a7e9bef0b0b89c
 EBUILD gmock-1.5.0.ebuild 801 SHA256 da8e3eb98f7fc07b8909373b612700c8a861c5c92bb48ee27c5addf787848657 SHA512 d1813c15ecc635418c859f69ba49c4ff401daf56bef042d9d8e8abc1f072421af04579f0aea4e4ad6c650b60aaa2f1ccea65bd295a298f0cce5c3cfd5f9ddd52 WHIRLPOOL 47ed5fafcb25a3414bb06c8eb27688c571b42e7b52f84089414e82ac8944b736a66698023b9dd81d3201316af07fe5056c6741e925f185c85efaaa0bccf4dcaf
 EBUILD gmock-1.6.0.ebuild 995 SHA256 6258ae401f441e5d97a7e7fafa3af8e118ce8d673e9f91c30aae25ed95151836 SHA512 22188348514a7d0ab35f8befd290476ba188625b5d0e8adccd4859f6c912a719df47edcc0179e710efb8c8e8fc6a167af993991eec65dae8d06bbfa4827a2094 WHIRLPOOL 01e07ca21977d66958d932b33b36bc00aacd523d985db338f14388de00a0181b98f9f49715474ba67bf6de1fe238e2e8089f5a4397f57dd4b4def7e8edc3ba79
-EBUILD gmock-1.7.0-r1.ebuild 1109 SHA256 e18cbcf2d84a847611a089dfa8dd1192443261cc4b6fe43f08dab55f3d68b2b1 SHA512 4c34f3f94e4f57c1c2eaf0a4ad2ad3bff670b9c9d62f36edeed791a7385be37039549ec245bdbdd4289a3c04462e602bd511592ee4475b7753ea7f52348f32de WHIRLPOOL 4da87ca35558737ffb5ad4ae2312e52ebab4aa8c7e70106c63010e1a6c0cf834df937b0924aee8298dbbe4e825a84de82720173bf2dc441051acad98aa8b6814
+EBUILD gmock-1.7.0-r1.ebuild 1353 SHA256 0295ea2465f6dca51f4da2dc89b07d683f986aa90ecdc4197d7c91ad14cdad3a SHA512 58e50499bed039a1981d28d637d4271e18a26458edf4b35efaf4a379bc8a64dabf542775981174f73920ed0e498c5673cce669b0bbd2f50265f8955c9d72962b WHIRLPOOL 56e7e2ead53a6b0d2554abba54197bcf5480f9836426d733741501f584996e26b7b7f3a2ddb37bdf5fcd63fdbe6508fc37a25d631f03b11a26ab207897da5005
 EBUILD gmock-1.7.0.ebuild 1003 SHA256 1544f2c85385de37a6a5494f67c38652eba49e67f494ef563143413f237b5fd8 SHA512 d7f4d52ec8280e7e2a4eefc33cdaacd1dd6bd18fdc8d7f4c9ba4ae3b9c49060ac303e486a59e0ab0adfaf5cb4e54f386a1df2f0465a85c7fefc461c419e16ba5 WHIRLPOOL f0b7b913e5ef102c7af733200db686d8bf0cbf4c07121369a1a72a5d9c8825f69b9ada3079bf76fa4754f76adebc96635fa9bb9e7074d89bcb4c6a85fef8675b
-MISC ChangeLog 2757 SHA256 4dbceb17f800ff608f692b0bcea3001578ad0e28a09410fc29984c55a2ce8b32 SHA512 d38e2601b4dc8a6fe331fceda71c53f1dd633ee047c57171df9f88adbef92da8860f2dccfa611d0269a6a695c6466c594bb27eda46bfa93fb11709ab0ba04e6d WHIRLPOOL 97383164bdf4306ec206baa0655973191a37a98c8067cec272cb47bba02073599d19a7a497bbfa1c4fad0c9e89827e65bf70da0d3d38c75e73cc21c951d62853
+MISC ChangeLog 2894 SHA256 20a79f5bc55c380190294e3f8518516ed17b88534c171afb23668a66c06394f7 SHA512 a94fd20eff0981295a1ef0e4dfa55e765022d8910a28f7b37fae3503c527614674f8475b1d8302d258a83fde27d4f08efa4d86e434400816f79f23cbd2f8730a WHIRLPOOL 20e8d7ad3e106efe8cd676e0b157c00eab141fe6d62138bd4be95dedcbe9e240c5b71728a5390812ff96805eda34010e9d4a6f9d4d5e9ba503c21f9e2734b14b
 MISC metadata.xml 283 SHA256 c34e015327f31293e860e8b2366e59e1d361c67f47d1c2cb010e16f43521a0f2 SHA512 e85ed05e67750a75476066754448e724ab3e65c91af152befff80c7f66423254311243fa213ba282bcc6456499964d4c969103cad829d8386ab3ef50138b5b81 WHIRLPOOL 3c504418a30332c69ad4282d204ff0ffeef35bc0aff4071d0c7f51704e7a1e091ce7e72826de354f8d1ded20920d61fa60bee4fafd3db8bd43acb9cdce9717bf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTM45vAAoJEPGu1DbS6WIAO3sP/AzeKd61wiAyJB4V0XGqz7z9
-vevN79smtf3xVMHyivQDD1ncR9rYXnVBZlR0rvyxRbkyByQeykpTBrkVSX1sgdes
-hG0uWUPqi/jcfsrm2rhLTnUFY1pih7WTtTcWzEfTUe5xHBg91xfD59dF9N3izBa8
-v7GX0FCBOougBAp4dKxEsE3E9ifS36T+U/UdDDcLSWVvRu0mFq+TFRkTLRTAvv5+
-Yelz6uEPb9vnvrHoOx1eviWU8MvHEAU2+My8G+IxfeUNYb/9H3LtNu/Mq5DZRB26
-4Ohl66kflZWbVyWo5KqvyUG7K+KympAlHPot7MFj2RDXPPAdz1hByE5HJQ504Y7f
-Legwp9czv5Sqt3gkdO3Joqumj0PIdqG/yz8huBIriMZcIzTuZGgQAkENpihYAsd5
-jbp0nTRwAIN76CIEq2gn78vTqHeOg0aDp+8WqGH38+KpHRm5h3myxqHm4Wy/rqYD
-tKYcOtZ5UOrXJMUBJ2G6/00YXYLKt5jPPxNLGotRcn4Zplvhzd0VHw2edFCRmQdv
-W2sVJ3ajXYprnIjbCAXOBYwLsQ00TaY1RU+TPZYRO5MDAbAnn6THIx4EAW3KqN3k
-B1qon38XMnnUhaXGU2TJF7xuJdpSg5SLN8TA+VxW11w713e+xrr1srWBLPeYK74u
-yLNRG+jpYFYI9BIOAsOI
-=iTmD
+iQIcBAEBCAAGBQJTZlxtAAoJEPGu1DbS6WIAjUAP/1/F5hpQRokdw9TidxKLlRQx
+IvwDXH3cbDY5kiZenaIdHQ1HU1ognfEER9xGjxGFS9r1E2IkU5/RcAu5N2ro8Wfd
+hPefa/pom31MwjT1v86o/fpO+3lxA9o2Q2BkBnCF17PONifBWsB2p0QcOjTcQm15
+/zUi/2ZKcW1Z+byFnh+NhtqjP7L5BrTfxwZ0i2iXjgI2s3XpEDdfaBNgua8n0BWO
+I6KFVoQRz/nAnCcNNYJhuFH1gin/CIKVjYa+nC42ahEFCJg6Q1gyi677pLZSYH3Y
+6CyAzdQ+OZz3vwGIFZbbsdkN91JtpplDEZdrTG1rcutcfmmbrK5QK3F5pwhWAU/2
+SkyV4xmLiGvO21B/S5CfwoiJjG9ERKjw/jOGMtWIzzkAm+HhcSickZFJ46f1iUhc
+hVuFDJL0KZLBN5IYymcThkkEJ8Y1Vd4EWHFHrpMP5FxWV2FeEZfIbFBLQGqYo82k
+vqNEBzhsqjjvFnGgy3HiO6QsLNUN5pQL2ntnGmeOsLOkXoEuAFBFUv0LxFm09JUC
+aIZdHilVPV8o2ATuiW9VdplAWi70x4polpgl0Rg8u52P00CXP1bU1aPEFoJjXOnl
+0KydqThs1yb2ISIaWpaF1uS4+/n4Ebkhm/d+pf5lRJDvarsTl5CnAVxReuUUt3qh
+pqLoDjRkGX9OpM90K1OP
+=Ob4s
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/gmock/gmock-1.7.0-r1.ebuild b/dev-cpp/gmock/gmock-1.7.0-r1.ebuild
index f968d5f82b69..9a118336ae86 100644
--- a/dev-cpp/gmock/gmock-1.7.0-r1.ebuild
+++ b/dev-cpp/gmock/gmock-1.7.0-r1.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.7.0-r1.ebuild,v 1.1 2014/03/27 02:35:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.7.0-r1.ebuild,v 1.2 2014/05/04 15:27:38 vapier Exp $
 
 EAPI="4"
 
-inherit libtool multilib-minimal
+PYTHON_COMPAT=( python2_7 )
+
+inherit libtool multilib-minimal python-any-r1
 
 DESCRIPTION="Google's C++ mocking framework"
 HOMEPAGE="http://code.google.com/p/googlemock/"
@@ -17,8 +19,15 @@ IUSE="static-libs"
 
 RDEPEND="=dev-cpp/gtest-${PV}*[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
+	test? ( ${PYTHON_DEPS} )
 	app-arch/unzip"
 
+pkg_setup() {
+	# Stub to disable python_setup running when USE=-test.
+	# We'll handle it down in src_test ourselves.
+	:
+}
+
 src_unpack() {
 	default
 	# make sure we always use the system one
@@ -36,6 +45,11 @@ multilib_src_configure() {
 	ECONF_SOURCE=${S} econf $(use_enable static-libs static)
 }
 
+multilib_src_test() {
+	python_setup
+	emake check
+}
+
 multilib_src_install() {
 	default
 	dobin scripts/gmock-config
diff --git a/dev-db/myodbc/ChangeLog b/dev-db/myodbc/ChangeLog
index 5fd9f8c91b19..e1a6e5660d53 100644
--- a/dev-db/myodbc/ChangeLog
+++ b/dev-db/myodbc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/myodbc
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/ChangeLog,v 1.33 2013/05/10 08:17:39 patrick Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/ChangeLog,v 1.35 2014/05/05 03:03:50 grknight Exp $
+
+*myodbc-5.2.6 (04 May 2014)
+
+  04 May 2014; Brian Evans <grknight@gentoo.org> +files/cmake-doc-path.patch,
+  +myodbc-5.2.6.ebuild:
+  Version bump to 5.2.6. Fixes bugs #380141, #442322, #462432, #474088
 
   10 May 2013; Patrick Lauer <patrick@gentoo.org> myodbc-5.1.6.ebuild:
   Fix src_prepare
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index ab3808d9ef78..a69b7de5e65f 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1,7 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX cmake-doc-path.patch 1498 SHA256 75477998ba483fb1f6a5dde6cbd4719ac2e98e32540e7eb46bd334a0b354abe2 SHA512 2e48af11efb55a1508402d5d1d717a3dfc9897bf0ccce5aa190792fb673ac78b27a9480e951a6347a2c8d0e2fe08a28c11fd08c55dbea835a93f525decaaf09e WHIRLPOOL 0631c7cef81bb8541ca0af96afcf9ed8118aef87702d89d5237a8744bc6d9324b6cb148f3c32e4d225df038d15ad5c8583d0a6a49e33e9fc7b9cd44b319982be
 AUX myodbc-5.1.6-qt4-includedir.patch 580 SHA256 ba1ccd551f87b6d19ddfdb6cfb6f88f61b23c7718a3ed415ef5d94db225373d2 SHA512 79fb5a47f43555b14de8186c0afde91917fa647a000211f1a999cdcfe4aefc374d85e5e950c97260d682ec3498474c25200b27bda63cc31ec5612e08189f317a WHIRLPOOL ecd8eaaac7dc5ea1a294c1f3560c5a8ceb770b4d7abb4a754e71313b5976f82f6df2f8695734470a7988cdc1b01cf0c868ec6a268193dab9179d6043e909d9ba
 AUX odbc.ini.m4 517 SHA256 0f14bd8815aac8c75ff3b2b6e86b2883fbe4e2e6e3de153e772091c7a5c124e5 SHA512 60883bced4be275f9496910ecbf11d92e9d550e28c12eca8549546f3b5f5fd12322fabb81611bb4d951bab6d203ddd82aafe8ec8bdf0b6aa61a94eac6770fb3b WHIRLPOOL 2c12b3565efe6f92f8f43f9de84e667b066f6b82e17590b1c918540becc9554b1224c14f40dfa7c263818089208b7851b2ca6a6f881d77196564b57db49634fe
 AUX odbcinst.ini.m4 233 SHA256 893011ec62a2631cf41521717cbebfddf48ae3a633c8ca1e7774f11930fe2537 SHA512 d6a27b1915133e23ab4f16930446e6c623e3636490c1a772a531805d6abbaf8470fa59924f68f01faabf496be7b5f17294fe51a9f940dfa45f03a9abc120f953 WHIRLPOOL e8a10ae834eb97e63ed3dc637f534e556c9e13d11dc71ac0f9e3a0f16054d9e8a23be7bf6f68319817a9bdde7ae735b55be86728f80b7ec4d5ffe00d403c6536
 DIST mysql-connector-odbc-5.1.6.tar.gz 1041247 SHA256 1d53c3a20cf68b089535278d3e69c0e49f367a457640c5f8af25c1cbf4ffb02e SHA512 74fe41c09a6261e31475c17a6b96d3161737c792fec6b2774f51fa58adae592143e44d6a2bf5dc2ec445b5e19653aa6abc9e6d0d37cc478bb26137f2658766f9 WHIRLPOOL 573f942682581514adb94183c633eb38a0ab1c990ead1f7da1e90aedcff18da392480bfaa1216d3e9b0c8b261f963bd81c0ed5f7192c74a8294028783e6f85e9
+DIST mysql-connector-odbc-5.2.6-src.tar.gz 595963 SHA256 005bba26358819bb5db48d23e8eb4a94cc234dfa103dd47a6c2602e7e70ad17b SHA512 9732b3034bdeb24700d0369d066fb43ca6f0327c2d3a3f1fff77d51ab37a83139536a7caae377791d979132c9640d67fddb4040095478924f4c8139ec6f404a5 WHIRLPOOL d8f0fc2cc7ec0b7602a2e6434d2680174dd50fe1d16dd03e0370ba1ec7807b09a83411e62aca3d68d540c1a564c759cbfea63c2d3adb6b642286a49d4dfc1330
 EBUILD myodbc-5.1.6.ebuild 3351 SHA256 d4e3d271c2d8de85797fd497a9cebcbfbc66c6e511d3a7cd47d3b275f8257c42 SHA512 83bff8d93e2167db4a1f9b51fcd83ffcb91b5993962d99b1e894e7187db01275d8cd3dffc769b67a462b50b520714ae97e66d47792f0f7ac9c8dc5c1cd3a6fa2 WHIRLPOOL 53faa9b1ada3f2f8f57670952891995733cc7fc7d4f7174231f55b03294bb7e2e2edc8baed2e2e7a0cefc97b1cb681fda1951e430fd2f82863059c55ed70a5b6
-MISC ChangeLog 4702 SHA256 b5e0111a2ebffee360acb079082ecf1735077eab0dfddb778898c4c2626613b2 SHA512 0571b3f0a5b4fb1ebfd9cc709d9f67e292a1c57cc178a5b2888e3b29185d682438323f9d5fcbb8cd2462a81c253dac3a3663b94d513ab3b9c735e85f267f0fe6 WHIRLPOOL 97be078eaf3a9a112fe41ed6ac5b0b0e1979de39d9d386e3ce86412e1df8afa7451ce0e1e9c3f253ef3e8860427c15af8c26f5cde3044281ef0180ce05096751
+EBUILD myodbc-5.2.6.ebuild 2877 SHA256 6eb746376d879b47e3a2ff16c382903ee326c0f447b397b4a084fcbdb50f2627 SHA512 afcf587d62800daa1b8453c14f14ca8df5a3891d7ec4a512382a4943f07d1b5454728f51a7db8c3eb84825fb684aaa8fb9e334c9da91bfa256e37dda542d59f0 WHIRLPOOL 04187435de5574c341363e4d1bc9723c9916189cd5626dcb0a02ab0c5dfab1127068dc91821fd6a1e279700d6417f10940bb53fc7f55beaae80804953d5afc6a
+MISC ChangeLog 4906 SHA256 457771779d0761041eb61548ab50c3b73b05293e01ad2d1a982790b1b8268ff6 SHA512 8dd2765c683c42f0ea0372d860cd5817ebb248b8eb62c97426069d1d41de2bb95f75d5a7c7b4b233e2f8180a017c6c828ee9cde69f95e3281737088e300790ee WHIRLPOOL f79ed9ee3ea9ce4d7b70f1a2633533f3c4a4cb4edb767d6779fc0673f842957a1db161e07fdb0aa3e63680a9290f630a4fb0901cbfb37370588bef02d8f6be78
 MISC metadata.xml 158 SHA256 a212959a64142f5508788a3d336b55cdb97645b6e54d8a887e7308c67791d569 SHA512 538b01075e7bf3f429546654620fa773f3926594d7747d778ce6250263a7ba32fd7e63e14232fd89d503780b783fb7ab401ff2a0040a8d36c99c5c232609ca56 WHIRLPOOL 1739fa77f8bf21977b25d7c05d8da902f0a30335da5fcaca2b35200e504199c645d4115b8d2b4790ccdb692d7010c7a2cc09b27994679af8be6164f1c007e964
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJTZv+XAAoJEE4V4vFnx44dZg4IAK3Rn43ivLvMlVtxkTZOgvc0
+PbXAfum/NAGe+kSppdC8/wnsOlKAxX+2tYW4kUt+O1CmDi7VIryTIPFg4TDkk0fh
+3hJXTXbOn56ZcBGnnIC8fYswVm9Ml9ErnzChDxOHeBiVPsTftMCOKVEKTTx9ho5d
+JyDvm0pZxjDJWYFugxGAniqpvlNVdDnv6h+80Okjj/oD+QXowKtFUIxMbUXLF1o6
+ViDNxezc6UEN5b6AEXqdTLDxcQbYvWyypTz5Wfq7L3IX17Zjm0TYPp2IDIQy7taN
+f1dkI0OHjyaGRqBp6mJgBiDIjMvNn1QOoNSIQKATeIYCqp83pK2zB2+PhQMa6Gw=
+=/bRw
+-----END PGP SIGNATURE-----
diff --git a/dev-db/myodbc/files/cmake-doc-path.patch b/dev-db/myodbc/files/cmake-doc-path.patch
new file mode 100644
index 000000000000..c7f7d9d37ce7
--- /dev/null
+++ b/dev-db/myodbc/files/cmake-doc-path.patch
@@ -0,0 +1,43 @@
+=== modified file 'CMakeLists.txt'
+--- CMakeLists.txt	2013-03-09 09:51:06 +0000
++++ CMakeLists.txt	2013-03-09 11:05:27 +0000
+@@ -33,6 +33,12 @@
+ SET(CONNECTOR_MAJOR "5")
+ SET(CONNECTOR_MINOR "2")
+ 
++IF(WITH_DOCUMENTATION_INSTALL_PATH)
++	set(DOCUMENTATION_INSTALL_PATH ${WITH_DOCUMENTATION_INSTALL_PATH})
++ELSE(WITH_DOCUMENTATION_INSTALL_PATH)
++	set(DOCUMENTATION_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/doc/myodbc-${CONNECTOR_MAJOR}.${CONNECTOR_MINOR})
++ENDIF(WITH_DOCUMENTATION_INSTALL_PATH)
++
+ IF(CONNECTOR_MINOR LESS 10)
+ 	SET(CONNECTOR_MINOR_PADDED "0${CONNECTOR_MINOR}")
+ ELSE(CONNECTOR_MINOR LESS 10)
+@@ -329,19 +335,17 @@
+ 
+ ELSE(WIN32)
+ 
+-  INSTALL(FILES ChangeLog    DESTINATION .)
+-  INSTALL(FILES README       DESTINATION .)
+-  INSTALL(FILES README.debug DESTINATION .)
+-  INSTALL(FILES INSTALL      DESTINATION .)
++    INSTALL(FILES ChangeLog    DESTINATION ${DOCUMENTATION_INSTALL_PATH})
++    INSTALL(FILES README       DESTINATION ${DOCUMENTATION_INSTALL_PATH})
++    INSTALL(FILES README.debug DESTINATION ${DOCUMENTATION_INSTALL_PATH})
++    INSTALL(FILES INSTALL      DESTINATION ${DOCUMENTATION_INSTALL_PATH})
+   IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING")
+-    INSTALL(FILES COPYING       DESTINATION .)
+   ELSE()
+-    INSTALL(FILES LICENSE.mysql DESTINATION .)
+   ENDIF()
+ 
+ ENDIF(WIN32)
+ 
+-INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION .)
++INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION ${DOCUMENTATION_INSTALL_PATH})
+ 
+ INCLUDE(CPack)
+ 
+
+
diff --git a/dev-db/myodbc/myodbc-5.2.6.ebuild b/dev-db/myodbc/myodbc-5.2.6.ebuild
new file mode 100644
index 000000000000..b279c58cd85a
--- /dev/null
+++ b/dev-db/myodbc/myodbc-5.2.6.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/myodbc-5.2.6.ebuild,v 1.1 2014/05/04 19:37:13 grknight Exp $
+
+EAPI=5
+inherit cmake-utils eutils flag-o-matic versionator
+
+MAJOR="$(get_version_component_range 1-2 $PV)"
+MY_PN="mysql-connector-odbc"
+MY_P="${MY_PN}-${PV/_p/r}-src"
+
+DESCRIPTION="ODBC driver for MySQL"
+HOMEPAGE="http://www.mysql.com/products/myodbc/"
+SRC_URI="mirror://mysql/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
+RESTRICT="primaryuri"
+
+LICENSE="GPL-2"
+SLOT="${MAJOR}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-db/unixODBC
+	>=virtual/mysql-4.1
+"
+DEPEND="${DEPEND} ${RDEPEND}"
+S=${WORKDIR}/${MY_P}
+
+# Careful!
+DRIVER_NAME="${PN}-${SLOT}"
+
+src_prepare() {
+	# Remove Tests
+	sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
+		"${S}/CMakeLists.txt"
+
+	# Fix as-needed on the installer binary
+	echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt"
+
+	# Patch document path so it doesn't install files to /usr
+	epatch "${FILESDIR}/cmake-doc-path.patch"
+}
+
+src_configure() {
+	# The RPM_BUILD flag does nothing except install to /usr/lib64 when "x86_64"
+	# MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't exist on MariaDB
+	mycmakeargs+=(
+		-DMYSQL_CXX_LINKAGE=0
+		-DWITH_UNIXODBC=1
+		-DRPM_BUILD=1
+		-DMYSQL_LIB="$(mysql_config --variable=pkglibdir)/libmysqlclient_r.so"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	dodir /usr/share/${PN}-${SLOT}
+	for i in odbc.ini odbcinst.ini; do
+		einfo "Building $i"
+			sed \
+			-e "s,__PN__,${DRIVER_NAME},g" \
+			-e "s,__PF__,${PF},g" \
+			-e "s,libmyodbc3.so,libmyodbc${SLOT:0:1}.so,g" \
+			>"${D}"/usr/share/${PN}-${SLOT}/${i} \
+			<"${FILESDIR}"/${i}.m4 \
+			|| die "Failed to build $i"
+	done;
+}
+
+pkg_config() {
+
+	[ "${ROOT}" != "/" ] && \
+		die 'Sorry, non-standard ROOT setting is not supported :-('
+
+	local msg='MySQL ODBC driver'
+	local drivers=$(/usr/bin/odbcinst -q -d)
+
+	if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then
+		ebegin "Installing ${msg}"
+		/usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini
+		rc=$?
+		eend $rc
+		[ $rc -ne 0 ] && die
+	else
+		einfo "Skipping already installed ${msg}"
+	fi
+
+	local sources=$(/usr/bin/odbcinst -q -s)
+	msg='sample MySQL ODBC DSN'
+	if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then
+		ebegin "Installing ${msg}"
+		/usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini
+		rc=$?
+		eend $rc
+		[ $rc -ne 0 ] && die
+	else
+		einfo "Skipping already installed ${msg}"
+	fi
+}
+
+pkg_postinst() {
+
+	elog "If this is a new install, please run the following command"
+	elog "to configure the MySQL ODBC drivers and sources:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "Please note that the driver name used to form the DSN now includes the SLOT."
+}
diff --git a/dev-db/mysql-connector-c++/ChangeLog b/dev-db/mysql-connector-c++/ChangeLog
index f10f4dbdf1e8..21f075183f79 100644
--- a/dev-db/mysql-connector-c++/ChangeLog
+++ b/dev-db/mysql-connector-c++/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/mysql-connector-c++
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-connector-c++/ChangeLog,v 1.16 2013/03/17 15:19:29 hwoarang Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-connector-c++/ChangeLog,v 1.18 2014/05/05 03:04:51 grknight Exp $
+
+*mysql-connector-c++-1.1.3 (05 May 2014)
+
+  05 May 2014; Brian Evans <grknight@gentoo.org>
+  +files/mysql-connector-c++-1.1.3-fix-cmake.patch,
+  +mysql-connector-c++-1.1.3.ebuild:
+  Version bump.  Fix bugs #442662 and #445122.
 
   17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Add proxy-maintainers to metadata.xml
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
index 83fb5c2017b6..e2ba27fbf516 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -3,26 +3,21 @@ Hash: SHA256
 
 AUX mysql-connector-c++-1.1.0-disable-tests.patch 602 SHA256 c2c117c621172e93c6c52bdb9c684aa3bbbb39c1a808d709511308382ae9a1a6 SHA512 e051583d286797c4307aeaab8c719b1ee3588358e669258d49e559b96be38ed6d07bb4c8e1368b7568d489c21a020f14a3e2b99fb4407223f7c9241001f5f579 WHIRLPOOL 15fe13c64fdfae5286b6f21c2a8442f71a60e7c52c693cabd1bd6ef50401c8c19df2d76ae1d2fd9d1e82e7b43d991fc9361735ab16250eb4c229a405d7c8ee38
 AUX mysql-connector-c++-1.1.0-fix-cmake.patch 3713 SHA256 272b7807f4b17293d39a6161075abc4d6c220cc5873c297254d0049d8c65d44d SHA512 12ad034d8ebaef2a1dfbce10bf9d7b20566fb466ca5be832a4513e78379cd1206a188d25d6b90b6c4a5ae11edb8d4f23a101b82d6ee450371bf352e8e515c617 WHIRLPOOL 0b1d03e6f66f6b129a0edc19b38d908cbc4befa8f47fd954e623684119aea14f0ee1e79e7dad4827e5a3cd5ff25823602d305041d13ab7200ba803ae6bbaedad
+AUX mysql-connector-c++-1.1.3-fix-cmake.patch 4949 SHA256 78c442e7d2518bf5d40d48a2a408c9540d4dbb0281c6875ee1b4f4eef6de271d SHA512 985e5dd9f9f4aaae3b34ff05e32cb0d9ddb108aa20be32e14786b5b2664263149907b46828cb01d491ef07934b73b18ee715185c59bce940370955a544325f3f WHIRLPOOL 13955fc649b370bf630b5975ee8363ff7d0b21b8251e140a927ddc82d7920258df4ff7e46d641cbede0d4b00fe1cea8a5310a7ca752a09a88e877a7299059362
 DIST mysql-connector-c++-1.1.1.tar.gz 492659 SHA256 31c3e4f637153bd270812dffc6a50708dfc686a8afa7ea1c88a9dfda0d8af52e SHA512 d6b34fd4aeaf1032870d6de4f57ae92230790a3661c24af4ffed30f715f9a1941d0d063abbc0d703c15697c054731af6e39240d6dd70459371f25435595ec903 WHIRLPOOL f9fddb59df913a728769824aa7cc39b9ba55b1d3de56048148bf5ca37a366772f34a85bae58f0d5efead4010b0aac7ab5b897bd4a0db113e99fdf4898a31d26c
+DIST mysql-connector-c++-1.1.3.tar.gz 496226 SHA256 4b1516f183f29c011c1677d5a9b174d0f5c3b761d2e8056e79690c55c01ea690 SHA512 c03a4ae25e9d189a5114ab630bef6edaefd1aee809dbb1ec26b765f5e84b93fbe17e5f7357a4fe2a95c179cd2028b676151df4baf4e3da7515543ecc0834afd7 WHIRLPOOL 5f04231cec63de16c2a076143b2e0409544ebdf600d7423f63c8c2db45f1b63048e1da108a9f374dda6b6ff0d4c13b509190390e797f4674e14284acbaa9e2e5
 EBUILD mysql-connector-c++-1.1.1.ebuild 1644 SHA256 b7f47474fcd487d99ee7729859b2745763087be00554f1f48ef530319f0d1f94 SHA512 fc6aae7f987c40410536f448aed39f2a1a2f0d82de2c050ae061c1912c0d150e49fafad3fade04442bfa2ca36e3d0a876aedabac28b5b481aa190a8ec4189be0 WHIRLPOOL a6c8e82b2642c98944990cecb10575c79d3c703cf06c1996b7bd27b102a23960c4428f0fc09aef2eb5d06ad072c94198880b8dc24f7fe2dc938134aee30a0fa4
-MISC ChangeLog 3043 SHA256 313421247e036dbe5fa08440d897fe2cf8004114339d710b8c7f35cf6dac9d69 SHA512 369814f6635e436cdd5ebe6a5e12b62001345b33143545dbe016084aa80f90b015e33ee140a3c57a572513279d3b014aae5f6daf1bbc9e7a91a89b46466b40e0 WHIRLPOOL 6f95753e25209198a93bb1116c0225c4374735781aeba89fee2a91ee524134ede26284f063310a642a32256faa88c2cca6d951c5245bc38280ea06f7269538f4
+EBUILD mysql-connector-c++-1.1.3.ebuild 1534 SHA256 199b5716ddb48d97764b53af2f353a8d3034f8c4a1738655bde23bd2b8102af5 SHA512 90fdaf3a63199600026da577152b3b2b3596281a5c4d336fca4829124ad18ed3614aff5d0115f40331fb98b2a609fd8acefd76958b6063efaca80a9160d307c7 WHIRLPOOL 8a35954ec7e9b4f7b1d091709e00fb52609d371d16778a1e1f7451353ff2ccc1ea3aae4d1b7b9ec9b1fb2b8ee3c9606b7486473d38395ff5fd4ee264c9a0252d
+MISC ChangeLog 3271 SHA256 9c1d8c8d253529135addb86c7c71eff9c83e6ffe321efe10fcc8b00ec4f54423 SHA512 bae82351540cdea25e39e0d5ab3d798f916a68121260cce9d36861c2e62247a232723b3f210609961edf2a03f39d75b176068a98983c509ebc03b82920cde0a0 WHIRLPOOL 9496903584422c88e605dd5f1cbc036217f0f5c14bd65270ded4ec1e2cf666d7a3009123feca45400075a39532ee304149f8c384cc8925e11d463fc9e97f772b
 MISC metadata.xml 410 SHA256 cb306fe38a285ffd35a2a881d94e3b0239bca4f37568a90f49feaca22aadc2f7 SHA512 a72764ca5c5e6139c52f99d16a7981783637cae6dff56d388927f0c54b0db082b97795bd92260b62cb3fa19725d4f36f96ef4d06960bad0d69f5f4b8b26ee20e WHIRLPOOL 1a03219f984950fa3de37a9a1abbae8bb2061fdfbb4b3a9ed0a51ac514cc402427ad7ca251e494cdc82ada9aca425db1ce2a48ef4432a2ed12b5714c695283e5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRRd8CXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88rgoP/3FRujSL8g0619MklBApu44G
-xBB9TqPRz+ncV+FC/ccq7YGrkFtBzGwfsUWypnLzr+CisK1B/NLBRxxPn5fLaxwb
-Cj48jWGoKmIlR8zJEenbm81heMNuR8s/Tlx/u2VHxb3r+I+HIMyTkBatknHDgXyH
-+MaH+pvdSLRXSGW1/Cyon20aIAyAWTfY7peV7iFgZHynvKfkENPg0mEoF6PG9BSV
-FxQV6N6VrHMxClmFz0Pzu2LUm2qHm7tn1yTn+HLxYSzVUhHfoovXQbKmvfeKh1Pk
-ObaCc6KYdxoTahG8IfPEspdvLuxbz8H2WvfumEpevVVgEI6ul0Aubev/yk/5sa2/
-TOvONQ6S+ZR7M5ZRCCcgPd7uN7dcZv9MCx+Fibxd4RtfuGDzSAGqJAMBPRqUP8u3
-dmjAu73ozRJMKHEgHgUnFTG6ARtB4BkT+SeAz8MUqfTAkSCDdR1RURnQNusAQivV
-6VD7nXyLLkLt8u705LfNpx1oNnS6oJ1hSOd7K0ZD0gvtSAc4C4Nx/RCUTEbsTUVI
-1Emxsi4B8iJnnV8AUqFriKDe2hZgAKBUIIaagDIjzRVlmtH5kiyGyypvu+2c0VaA
-rhI3qM9sfpT8M/dB2kvq5js1PI9jIC51ixiADNSmNqwc9Nrvd1TNXtVaEXuByIb5
-xpgWQj0HEYSqg3O8o6Gf
-=q/l7
+iQEcBAEBCAAGBQJTZv/UAAoJEE4V4vFnx44dAdAIAKZ98qft5iGcSHz0eHeqP5di
+BRJEdFIiLyjLoQRSlWVc20iPMz9skWkZAwDbSx1XEH7/8/G1WhrlhRwzgBvB4snv
+vpxfaB5tvRwiWNdogMUw21JtGOGbABpzvJgKgFZi5TWxmZmtxWyNthcO+R1aFcnn
+Z93CZ9ggNSRdLj/Hf2nxT96uQrTeG1KUuQHkmsPMCMiWukwLDaavO7d5JbXGTiYj
+S/S8rdT7wt80zVNRYFiO2cLgQZWURAviFF5IESBmUAtvhBATwAukobxXNuSNJ2oI
+Rb0djK4NymSK0NGwqq4k7vZI6QBvTdk655jDrzQRMVh1aI67NCbSXrkydPIHNxc=
+=yAQb
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.3-fix-cmake.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.3-fix-cmake.patch
new file mode 100644
index 000000000000..5f0669ca3381
--- /dev/null
+++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.3-fix-cmake.patch
@@ -0,0 +1,123 @@
+--- a/CMakeLists.txt	2014-05-04 21:27:59.000000000 -0400
++++ b/CMakeLists.txt	2014-05-04 21:47:31.460572470 -0400
+@@ -38,7 +38,7 @@
+ 
+ if(COMMAND cmake_policy AND POLICY CMP0015)
+ 	cmake_policy(SET CMP0015 NEW)
+-endif(COMMAND cmake_policy)
++endif(COMMAND cmake_policy AND POLICY CMP0015)
+ 
+ #-----------------
+ # CPPFLAGS, CXXFLAGS and LDFLAGS from the environment
+@@ -258,14 +258,14 @@
+ 	${CPACK_RESOURCE_FILE_LICENSE}
+ 	"${CMAKE_SOURCE_DIR}/Licenses_for_Third-Party_Components.txt"
+ 	"${CMAKE_SOURCE_DIR}/ANNOUNCEMENT"
+-	DESTINATION "." OPTIONAL)
++	DESTINATION "${INSTALL_DOCS}" OPTIONAL)
+ 
+ SET(COMMON_IGNORE_FILES "/CMakeFiles/" "/Testing/" "/.bzr/" "_CPack_Packages/"
+     ".cmake$" "~" ".swp" ".log" ".gz" ".directory$" "CMakeCache.txt" "Makefile"
+ 	"install_manifest.txt")
+ SET(PRJ_COMMON_IGNORE_FILES ${COMMON_IGNORE_FILES} "ANNOUNCEMENT_102_ALPHA" "ANNOUNCEMENT_103_ALPHA" "ANNOUNCEMENT_104_BETA" "ANNOUNCEMENT_105_GA" "ANNOUNCEMENT_110_GA" "ANNOUNCEMENT_111_GA" "ANNOUNCEMENT_DRAFT" )
+ 
+-SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES}  "./cppconn/config.h$" "./driver/nativeapi/binding_config.h$")
++SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES}  "${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h$" "${CMAKE_CURRENT_SOURCE_DIR}/driver/nativeapi/binding_config.h$")
+ SET(CPACK_PACKAGE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "something_there" )
+ SET(CPACK_SOURCE_GENERATOR "TGZ")
+ 
+@@ -292,10 +292,6 @@
+ ADD_SUBDIRECTORY(cppconn)
+ ADD_SUBDIRECTORY(driver)
+ ADD_SUBDIRECTORY(examples)
+-ADD_SUBDIRECTORY(test)
+-ADD_SUBDIRECTORY(test/framework)
+-ADD_SUBDIRECTORY(test/CJUnitTestsPort)
+-ADD_SUBDIRECTORY(test/unit)
+ 
+ IF(DEFINED CMAKE_SYSTEM_NAME AND ${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
+ 	# see also README
+--- a/FindMySQL.cm	2014-05-04 22:20:50.000000000 -0400
++++ b/FindMySQL.cm	2014-05-04 22:21:40.325384447 -0400
+@@ -58,7 +58,7 @@
+ 	EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cflags"
+ 					OUTPUT_VARIABLE _mysql_config_output
+ 					)
+-	STRING(REGEX MATCHALL "-m([^\r\n]+)" MYSQL_LINK_FLAGS "${_mysql_config_output}")
++	STRING(REGEX MATCHALL " -m([^\r\n]+)" MYSQL_LINK_FLAGS "${_mysql_config_output}")
+ 	STRING(REGEX REPLACE "[\r\n]$" "" MYSQL_CXXFLAGS "${_mysql_config_output}")
+ #	ADD_DEFINITIONS("${MYSQL_CXXFLAGS}")
+ ELSE (MYSQL_CONFIG_EXECUTABLE AND NOT WIN32)
+diff -urN a/cppconn/CMakeLists.txt b/cppconn/CMakeLists.txt
+--- a/cppconn/CMakeLists.txt	2011-07-30 13:15:44.000000000 +0200
++++ b/cppconn/CMakeLists.txt	2011-07-30 14:10:34.000000000 +0200
+@@ -55,7 +55,7 @@
+ 
+ SET(MYSQLCPPCONN_INSTALL_HEADERS
+ 		build_config.h
+-		config.h
++		${CMAKE_CURRENT_BINARY_DIR}/config.h
+ 		connection.h
+ 		datatype.h
+ 		driver.h
+diff -urN mysql-connector-c++-1.1.0.old/driver/CMakeLists.txt mysql-connector-c++-1.1.0/driver/CMakeLists.txt
+--- a/driver/CMakeLists.txt	2011-07-30 13:15:44.000000000 +0200
++++ b/driver/CMakeLists.txt	2011-07-30 13:20:36.000000000 +0200
+@@ -26,6 +26,9 @@
+ 
+ INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR})
+ INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}/cppconn)
++INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR})
++INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/cppconn)
++INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/driver/nativeapi)
+ INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BOOST_INCLUDE_DIRS})
+ MESSAGE(STATUS "BOOST_INCLUDE_DIRS=${MYSQLCPPCONN_BOOST_INCLUDE_DIRS}")
+ 
+@@ -149,20 +152,22 @@
+ 		nativeapi/native_statement_wrapper.h
+ 		nativeapi/mysql_native_resultset_wrapper.h
+ 		nativeapi/native_resultset_wrapper.h
+-		../cppconn/warning.h
+-		../cppconn/statement.h
+-		../cppconn/sqlstring.h
+-		../cppconn/resultset_metadata.h
+-		../cppconn/resultset.h
+-		../cppconn/prepared_statement.h
+-		../cppconn/parameter_metadata.h
+-		../cppconn/metadata.h
+-		../cppconn/exception.h
+-		../cppconn/driver.h
+-		../cppconn/datatype.h
+-		../cppconn/connection.h
+-		../cppconn/config.h
+-		../cppconn/build_config.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/warning.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/statement.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/sqlstring.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset_metadata.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/prepared_statement.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/parameter_metadata.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/metadata.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/exception.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/driver.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/datatype.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/connection.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h
++		${CMAKE_CURRENT_BINARY_DIR}/cppconn/config.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/build_config.h
++		${CMAKE_CURRENT_BINARY_DIR}/cppconn/build_config.h
+ 
+ 	)
+ 
+@@ -271,8 +276,8 @@
+ 	)
+ ELSE(WIN32)
+ 	INSTALL(TARGETS mysqlcppconn mysqlcppconn-static
+-		LIBRARY DESTINATION lib
+-		ARCHIVE DESTINATION lib
++		LIBRARY DESTINATION lib${LIB_SUFFIX}
++		ARCHIVE DESTINATION lib${LIB_SUFFIX}
+ 	)
+ ENDIF(WIN32)
+ 
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.3.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.3.ebuild
new file mode 100644
index 000000000000..6d980a5ec23a
--- /dev/null
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.3.ebuild,v 1.1 2014/05/05 02:29:33 grknight Exp $
+
+EAPI=5
+
+inherit eutils cmake-utils flag-o-matic multilib
+
+DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
+HOMEPAGE="http://dev.mysql.com/downloads/connector/cpp/"
+URI_DIR="Connector-C++"
+SRC_URI="mirror://mysql/Downloads/${URI_DIR}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug examples gcov static-libs"
+
+DEPEND=">=virtual/mysql-5.1
+	dev-libs/boost
+	dev-libs/openssl"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.3-fix-cmake.patch"
+)
+
+src_configure() {
+	# native lib/wrapper needs this!
+	append-flags "-fno-strict-aliasing"
+
+	local mycmakeargs=(
+		"-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF"
+		"-DMYSQLCPPCONN_ICU_ENABLE=OFF"
+		$(cmake-utils_use debug MYSQLCPPCONN_TRACE_ENABLE)
+		$(cmake-utils_use gcov MYSQLCPPCONN_GCOV_ENABLE)
+		-DINSTALL_DOCS="/usr/share/doc/${PF}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# static lib has wrong name so we need to rename it
+	if use static-libs; then
+		mv "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a \
+			"${ED}"/usr/$(get_libdir)/libmysqlcppconn.a || die
+	else
+		rm -f "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a
+	fi
+
+	# examples
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins "${S}"/examples/*
+	fi
+}
diff --git a/dev-java/java-sdk-docs/ChangeLog b/dev-java/java-sdk-docs/ChangeLog
index 2e321b357caf..b345cacd791b 100644
--- a/dev-java/java-sdk-docs/ChangeLog
+++ b/dev-java/java-sdk-docs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/java-sdk-docs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/ChangeLog,v 1.98 2014/05/03 23:24:42 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/ChangeLog,v 1.99 2014/05/04 20:32:07 tomwij Exp $
+
+*java-sdk-docs-1.8.0.5 (04 May 2014)
+
+  04 May 2014; Tom Wijsman <TomWij@gentoo.org> +java-sdk-docs-1.8.0.5.ebuild,
+  -java-sdk-docs-1.4.2.ebuild, -java-sdk-docs-1.6.0.23.ebuild,
+  -java-sdk-docs-1.7.0.11.ebuild, -java-sdk-docs-1.7.0.17.ebuild,
+  -java-sdk-docs-1.7.0.21.ebuild, -java-sdk-docs-1.7.0.25.ebuild,
+  -java-sdk-docs-1.7.0.40-r1.ebuild, -java-sdk-docs-1.7.0.45.ebuild:
+  Remove old. Version bump to 1.8.0.5; for bug #67266, reported by Thomas Kear.
 
 *java-sdk-docs-1.7.0.55 (03 May 2014)
 
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index 13466d20874b..eb416f33d411 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -1,44 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST j2sdk-1_4_2-doc.zip 34397778 SHA256 5d7ef04d1a9fa721f03eca7751f8eaaebd0de2d629ff90dc1a0d5628bc64ba58
 DIST jdk-1_5_0-doc-r1.zip 46191338 SHA256 accb7b36442ac5bed7a3091abedf4e29ba06e23b541f4faa1d0632a3d02053cc
-DIST jdk-6u23-docs.zip 59091378 SHA256 f984291527fbfd0776ee1fe81f8b1ad3887c54cd2c3118d5011a7a316b29eba0
 DIST jdk-6u25-fcs-bin-b04-apidocs-04_Apr_2011.zip 59089445 SHA256 6e115142c3cf5627f9a378934bf3b807e72c2b979385019d5f23e79019727937
 DIST jdk-6u30-apidocs.zip 59086542 SHA256 92739c56e02fa6e7ac8d60a1f59a0ef4a59ac99ab2979d3cdc495bfecf1a50ab SHA512 5139b1a65765f258f21c629a0cfbf07aed0c12b3eb08d4615b049e825abd90c5b3385af99dba3a4ac6e0a94a5ffaa32ee648fb3e7ac1815ec6b74fe0d8e9f0ee WHIRLPOOL 941236c68b189f9cd23f0e904cc01da9f87cc39967c84cddf4c20a04fa2872eb99af147a21bb770320cad28b2cd86205402a141f7217d5301fa9a6ea41c3a136
-DIST jdk-7u11-apidocs.zip 60762021 SHA256 64f95701ac951af78aa23ca21e965cf430a76a2178173816d39395e9f86c78d4 SHA512 22d483556d4fd8b380daa0fdadff530a5cce11c625cfe3d12fc98243072173f03c8dca5e01d4c7d98d2fa08195f73d04863bb61b551907319b782ed11e915616 WHIRLPOOL 689bad1d20490c33a6f97d524556ec06aeab035e316e7cb1033ffadd9cc382ebd89187588069475168abddd99d5e1d3075195baaa06c0ead808874b806fa3a19
-DIST jdk-7u17-apidocs.zip 60736131 SHA256 dc97bb4e76e288830668a9dae96454d615cf74d6f88f38008923b3248836baba SHA512 668cd818a2893a69b5103a63463584d5c85fe6532e05763dbd7edea7fe7e55d060a36571d2bfb67ae4cbbb6115816d9c86a5b00150b1d07c2a3318eb8c561959 WHIRLPOOL 23be4bfddfda0e7350bd310216491adbcf32cc70c0fff64063496f7e01d671532097093d93eba1dcca45535bd68e1651edab8cb4d527dc80947bb51602a09092
-DIST jdk-7u21-apidocs.zip 60738398 SHA256 06afff0fa76987d52c4a083d73cd8f1d9ebc04d3e732f09f8b7275760bf16bef SHA512 5a7cff4e5e64642fe1f3e0971731ef44f408c1bca50216358fce3f96310276d61ce193dd27d705733041d79f3ad2bfab69bc98a76198adbc26a6f4fe06352eee WHIRLPOOL 3bd6dd47078c123eaf9f691d388b6086c7fce7971b141b2cb3e770111136b288068aa03abfdb80eb1e5a895fee09e092271ddbc14b969394ce6cac648d370709
-DIST jdk-7u25-apidocs.zip 60766618 SHA256 fe99e1b909a9d877fb30c49732a2dcc0a1cc310517073016489750cf04600377 SHA512 21dbebcee94f9a8125d11959c855f8eabee4e25135370dc6a99e5d60bd56f5847c89cb1e5928de65148651034b69b93493f4d20063010d0450d4ed6db7d771e4 WHIRLPOOL cd9fdf16367fd2b3248a8403cebef5b61d529ea0aea8e67208a4a6e111bdcfc923743fbb4aa624bf59c8d29289897d82b9c08d7de795a328f3ad8e8271e50a48
-DIST jdk-7u40-apidocs.zip 60408160 SHA256 50d5f39fa2dea1df3ee6df88d13a298a7b82e4054dca3ef967df894a3d6968c9 SHA512 455a60a9c87126a8b0e1e0f11b63a4e58d9b538f0d92eeed705f069ddfb5ab87474bef304e046ac2af19a0b84282ab56dff563f076738623a4a452bc4ca03c71 WHIRLPOOL f82488110ae63f89a3da87c924de3ee22e6f80401ddb2619a6e53e2dc57df706280d575c5f311d6e206c74f1dc7498daccd3bfdc445c52326fb7457ec43f4991
-DIST jdk-7u45-apidocs.zip 61019770 SHA256 9033a294be366e222c227303b02261b5a0243306de6133db89340c63f83edc8d SHA512 2716ef41d06b421c3cdae553727a0200fcd1a8b655ac5468420cd2afc710d7c4379a9c028540ad87011eeb36ad28a9871cc3a57587235ab4702d2ec8a01cc34c WHIRLPOOL a0f9c3382d75bf6d9f7cbed7f52332dba38aa8c3656d1eef8fa8a3acb474e409ca072a6bbd5ca73c4f18546d2694d6265ff438428e9156058b38cc14ab7d0b62
 DIST jdk-7u51-apidocs.zip 61116819 SHA256 01f567699e9152009505cefa7267b7ac68138aaf1c9d85f16155f2ab30c2bec4 SHA512 31bbe1ef7c48fab381063a937b14b296147d1045a8b41c4cedc4c130965af746cea41e1ee91117fec3b20c1fc04e5917a4c97f1329f01675441f224794213bc3 WHIRLPOOL 7347efb5a36b7de81f2685a3e335e5af92d168c90fd85ced18591bc2fcb8a1e427ccd5ad1726434e420674e27c041d0113960a3ba533546235b529e92ccfe061
 DIST jdk-7u55-apidocs.zip 61123597 SHA256 f5c5a7cc33c45e5b7442076465c5a934bf44d006cdfcff080d7ed00bdf5845e4 SHA512 a7c38a0882aa694552ceb7e50162b75ab2bdcfcaddd0d4f1a730f4fdf70fe55d92076ec237ae756aa7ba7ae62d57d0e0b2e6caee8db6a1864316ceb247dfc5db WHIRLPOOL f2f751fcdb4a2a324c75b1697be526404829d9a4dee7e9a7d8923ebb3c97a51a80d49edaec3c48c3c50f1c8c6992467fc334d307b1667903b4755de78131f11f
 DIST jdk-8-apidocs.zip 88317932 SHA256 3de88cc21051c3a2e94a7def9e937208fec94ed1423dcf7611e26b8a28f00b45 SHA512 2edda9d73ad23e64abbdb5b2363342dc1542d49f04614fac36f5bbec29109e51dfdcec970dad68da7ced75584109c6d29b62c16c37fcce86a504560d2524a45d WHIRLPOOL c013e840759df220686e73d118dd7abf94ff1c1a8d37576f1023d3baac49c724769ade56d62af87a48da308b0fcad97be99a2842f4fc08b11ed9844d808f9b58
-EBUILD java-sdk-docs-1.4.2.ebuild 886 SHA256 09d1b90444fc7dac7d0d536a67380125b28a6fbb95173c156f370058b7e43f30 SHA512 1a4b7366387f6e56220b34118011ff971fd8c3e573bddb28878d5f1300a981cb5501aed674fe8d1eac7c908842a28b91ed16706c0d079e733413ebe02867f06d WHIRLPOOL 78109d2191514f39d1db068aa9db5a67bdb6319970c760a8cba92788114903686efaf54e4391ddcdb283447d5b57fba41d00140f53a42a3c6bc4c77ed5291402
+DIST jdk-8u5-apidocs.zip 88441146 SHA256 89696b9d189066b08ef956345998bc12d0b5a6bea39f22000b7f374afe76f6fe SHA512 f1fc0b194a4e6bfd6e1c2bebb9d1ac066945d32eb0112b521372f2ff440b613fd39d8d357c08f66c5b328346fc09e86ea6758c50c62d9dff355f4500521cd0b5 WHIRLPOOL 5a2215d0a2d067d409bfef8c364c680550be0cb0860cd6b52f4269d22304384ad98c9e807eec66f379e4871ed514d3c68e227a019e801cfe30543fe55b36e80f
 EBUILD java-sdk-docs-1.5.0-r1.ebuild 1586 SHA256 e36befc28935b01a628d745f40bd342819643b6b9ea281c75fb80305783bc87e SHA512 ec4be077de6377c425f7daa334cb0520f638f0e720c98a85722af994534e96fc47333ee8b6106eea7984ab1f52f58fe8c6773752c9aee102cecb407263fba14f WHIRLPOOL 496aa76d5790c1d8f9ef6c280d26412a3f4dc03076e7f0efb494f2a82a76b915437c5bae325ece24ac0da74c79d927ad8105d2d30ba1ffd74a7674e842ec629a
-EBUILD java-sdk-docs-1.6.0.23.ebuild 1771 SHA256 3bda18f63db4039b16a31c0f7fa4020b9de12c4356665fcd615a498347e82156 SHA512 c2940e8bfa50a7684b62b9ecce7c53d10bdef4a380fb7ecf238350f5146a41f9d649901c676f007e8b7f176f12da031ad394766b9af1c14169f456d0dcb0aaca WHIRLPOOL 8aaf02ed6bb2906428773ff489579fea31f01f3bd4797db8d74704e3bf4da47dc029c378e86707dd55587dbd437e83640d13f98ceee4b0dfeecf88272fb31de9
 EBUILD java-sdk-docs-1.6.0.25.ebuild 1478 SHA256 35bac3d6c761e9fb882cb0da58eb1c2e86ab192d57981a379c80803c20437eae SHA512 f784f31fce0b3476cad505cec2c7ae3a9c65b693bbe6d70beba33039eb55451bc6f29c95ac38f1ef9d5e73e99b0d4a0f5f84fe6bbfde31d67a2c789e998e3fce WHIRLPOOL 8d15f412450e775bb8fa8a3b12a4553034f4dae2fdb0245f27f5324284aaf89c5c5a10e0ae2bf6cdb18b0b35f374596c5ef4987608446901e92bf94d34ca6885
 EBUILD java-sdk-docs-1.6.0.30.ebuild 1564 SHA256 389c2cd0367d619a2ea660b5b5a9c5e370c6043486470bf9c1a7127e84aa32da SHA512 bf84b5458071f61798b819ad1186ac15f623df19bf39eb33c1ab29e2e4633c53fee762396de47d03ee51e6990f4886f7a0572e7c7cf6f2ece37444687fa9a8c7 WHIRLPOOL ab8654edcb87a6ebdd91457552c404e9020fc1cfdef00c3b7c0c5d2cd4c2cc61a5b7c7cac6ea6b92c0e7a4e6cad4f3a80cd153ba9dfc52fc43b86758beca4132
-EBUILD java-sdk-docs-1.7.0.11.ebuild 1420 SHA256 9777ed547157167818c20d8380e4451418651b96f325c7ae4d519032d5947fd2 SHA512 a344394b65821a3d0b0b6890d0ca04e4ccb8f2d1b4e84434cea1b64663110b7b8eec7eb1dc7711ce5369ad0be06581d6124d3bec2132965b5ebc4d0aa987a005 WHIRLPOOL 432310e53be27f71c4901bbdce8777c7501b091ae1c643462c9813c2a3c5fb5b5da8a7d02f5b1639a108f663c6c3c446c94c032aaee57fc04f2f54b769d89e4e
-EBUILD java-sdk-docs-1.7.0.17.ebuild 1473 SHA256 65901b44411f0c204934b22358c08d80a434d4142a97703cb40eaaf0cb68345e SHA512 3309def902fb7a7e57bcee8d1b2f1002d1a8a8e4897914bc1aa63a4d57e51866e594ca8af4dbc3bbfbc3d85f95665dec42a4b6f88412cd0303cf0824584edd12 WHIRLPOOL 0bf3246a298b9043d0c0630bc04edad2aa69cd6f3bf9ca1645842e1dcf24fa67f2df6eeb5082201f4dc2ee1e719830ffa041660dd044e9629f58449ea0e4a68b
-EBUILD java-sdk-docs-1.7.0.21.ebuild 1475 SHA256 e20b8988144a18f134eed36aedb46dc3fedd2e88ceca1b40211b96a4db84fa34 SHA512 94004f53b51786b124ead41714b39c3a19ddee190b5cff0a3e3a23b78adba288be3fef1b8f64bde1e1f6f85683c248519e2c3168340b0c0f2391f60293131aaa WHIRLPOOL d4dee10ff655437d69a0f730e0ac4e9f88503fcca734870f9fbf7471629444447dc8e8f7e3b77b20f014e45b8342e4106d53791729fd09e47edf71fd4984530a
-EBUILD java-sdk-docs-1.7.0.25.ebuild 1471 SHA256 a855860c8382d189dff25e6c4c74225845c776e7d6c7fc99e5f0bfa3f6285231 SHA512 4adb9e9af4631bddddd2b1115d99e8951beac19d151551440933a4d13d1633617ee94b8a8a7fb88c8757637f923b6584e9a58998d5040361e857ec1bd06d6701 WHIRLPOOL 871efed76918bb15caafe7367871be0382d66e899cd565afa0bd0a07ccddf9b0e9b851095ef08fb99611cc5a8ec88caced8f11c6384a32f4d71aa3b0c942a1d3
-EBUILD java-sdk-docs-1.7.0.40-r1.ebuild 1478 SHA256 f7be25b0944e9707db8b4e8eb8577914705d8d1d9b5a7eefdb7dfd3fd46c546f SHA512 7e4a962b5040a3964df9ab863c6474807f49af5c7ba22bd74becd255520b6b5d29d84a3df57d8a719ba0ea1835906d8648596279b5eacccbd5464465a7fbed51 WHIRLPOOL 094ed7d09b32403e99f3c3f89234690e00e36465c246817466e90bd57f8ee0a7a21271da740f211bfc1af504137c8e1910baca165c0993fe85f39751290604e9
-EBUILD java-sdk-docs-1.7.0.45.ebuild 1475 SHA256 607ee937ff35345acc5c98a49573e554d3d7c6cb9b81b0837fe0f6f2f07be13b SHA512 e78dc0ec2e4b1c297731477f5121399d29da1edb8f01765ec80f09cb33d77a3b886257959aa40979feb844f211312840181942f803738610fc05d0a990fc289e WHIRLPOOL 7584161fe24081d016382c2e887f6b9d19b29aa956bb6b598f230fea87a62e9f3a8dc9b4a62a99d787f525678ee11f9ebf28d04fbe2acfcc678ee368b38560d5
 EBUILD java-sdk-docs-1.7.0.51.ebuild 1475 SHA256 aa4d631eb4dacb416b4447a30434ff6870482904cd9dfa25661a230e0a555dc5 SHA512 735c371b9c22fe24dc7560457ccfea87d068b7e70a78af121b925eef3d7455cc2e7156a86e797cebec04ebb9b5e345a7106ca93a5ea9f392c9da58fec200e2f9 WHIRLPOOL 9a6b02aedfb1b08bd8d425765806ee34c18428d16687855ccee36214b478b905e528fb476070182e61da7a22b55764fc0c95853f651e7a04b3e856fab1065050
 EBUILD java-sdk-docs-1.7.0.55.ebuild 1475 SHA256 fa4377e95e76db837c04d1793f84fab2e491ca3936533a8fd7e3ebfbdf6fd9e2 SHA512 55e91f357381b63e1bdb36f9f6bf03f53865c4a31ba4936d1552c8e1e67ac5c19ac45bd48b380c571c12c9941c50eb5f99c970f046f16366de6329fb49a5bdcb WHIRLPOOL 44e221d3f7796a56f0a231fa1786e4975c894e4e2ee77c2d41d6147f32ed97ce4b5d1433a28fa171bad83b1e4aad81b0d9ff88b114eb759e0d061d840bee4d75
 EBUILD java-sdk-docs-1.8.0.0.ebuild 1594 SHA256 56fccaddd933c3201e888d83d806f9aba561bbbda3465e71d9ddc8ff1709d405 SHA512 bd04a31a56c5d0ad184b4ba061862614a8b0ed6a2f4fdf7f7cf324a2b9795a7636436cdcb32cd7add369f0086270d8e6187e11d4bd58855d1d45a778c995c154 WHIRLPOOL 8e334e1e0d905d69b953d4c0d1d22d364d44b833a3d95b973e8ec4120efd07c2fd11f197a8ed5f79af5c8718cde2fa854cadc9b6fb47620f03774695ff868ae4
-MISC ChangeLog 14641 SHA256 f38eef67428ff1b2952eeb71cbdf75a060d2f3e855850cef1ed49f007b38137f SHA512 95aa2a8fb9c23da952a821c03d2b7b6d8271ebd5be3a9253d037bd66148c40ce06866500d6bbf93e11003153318e2bed80700dfafa3c973397acf7ba27b24b1a WHIRLPOOL 10c2fb393f4cafaccb142c552519932cf9b6873421453044773add911994d44f64778e2e40d772ea65fa768b8e78465083f99a27fd554e3cb2fade1e4be09b58
+EBUILD java-sdk-docs-1.8.0.5.ebuild 1594 SHA256 f2805916b8bcc699c2f3598900e5ef74415f6bc2744a265a8610c470a814d366 SHA512 931ffdd906f9b55304157b5b66f48f0711454feb6d27e866e6d8180f4c2d5e5c7885393a4350ec8cb6e3bf2fcdcc878137f56446c743780111f1fc6b995f7075 WHIRLPOOL 308dce152b4e1b6d3c61486fd52bb54b27734af402d308a94f1f1a48ee2cea2db3e5b289fb2409035257af2417fe2c1a077ff38c463e6f69b800bb0962d9d6bc
+MISC ChangeLog 15102 SHA256 d99a478eb6308167ba5246eee8b6244ba18fe9e2d8c54cfe00e90803617aba7f SHA512 accf912fb0037dfa9014eb61931eff033505876bce4ef8c2d528ef55da701506fd9ab0b330292a0e01a21054aca2a3b8e811f0b10cb0520d14d9ba8e3b8dd674 WHIRLPOOL 62870e6275ff51a9ca059bc70014b8fcdcb0af387a7fcfd9dd2ab6cb8123a5b12f72022f861c86c2db4c2e88019e1584ffa312f957d97c9fc81235bcb305794d
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTZXpwAAoJEJWyH81tNOV914oIAJldFWkQVRdGBCRh3cWaZsxi
-9BY6YrlZbrj9jKp7DVuAoBJzy4YSAq4vCRGUhfYOtHgWV3I6KAbenwL0azXLEkFy
-J2hKTui08xw/DcOWXJY1NPW1hUHcT39VrynPZ/fmWMoIpbn6jPALYjgbNhWWf8IH
-+5juuRNBma0WHcfOwzkHzjfqXLVDU3VHYRPGE6i3dWUk4D4ubw8Ioyo+myZNxrHU
-5tMOsy24+i9Vn/SjqMA2mlXlZPrqb74GVx+tXXjVfe9wE4UtE6lZtJb7i/C6obPP
-IBKpcp2UEd9auXvwmqXAqlveGkUI+dSgH9Cqiy4NjJXmrQ/B1c+M0a3w36gGD1g=
-=9rT8
+iQEcBAEBCAAGBQJTZqPMAAoJEJWyH81tNOV9GOIH/1ebj7WKkmQZuWqpvGB+jjp0
+0IBRV/rO6ghVLyg2CE3fZskB+dPFrthnDtmM2BUnNl0XGCxCi4SeJ7FxCQDaOHZ3
+/vhz2kUF7vntLbl1OiEKZRT3UrM48twe+cE9gLo/sikBn9wbRcjg3oAUh01TwWL5
+uy+76ocEXeQx+nnJk8EVmrMYuOy4sJ4+0sdfL5jiFv1LQH6ldXwCjgFT5SYfsUmb
+S3yMTeDfAhduiHCTbj+tl3HZJKX1K5mwaNXdsp4RXXK0EeU25Lc8/OzQk4eoFljw
+Zxdohj070IAVjz5GW3NWotQVaqgt1VddN42DknnPI2Ky9+E6/s07EJx39PVIxNA=
+=LFg6
 -----END PGP SIGNATURE-----
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.4.2.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.4.2.ebuild
deleted file mode 100644
index 329aa02f0442..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.4.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.4.2.ebuild,v 1.24 2009/05/29 20:51:48 caster Exp $
-
-At="j2sdk-1_4_2-doc.zip"
-S="${WORKDIR}/docs"
-SRC_URI="j2sdk-1_4_2-doc.zip"
-DESCRIPTION="Sun's documentation bundle (including API) for Java SE"
-HOMEPAGE="http://java.sun.com/j2se/1.4.2/download.html"
-LICENSE="sun-j2sl"
-SLOT="1.4.2"
-KEYWORDS="amd64 ia64 ppc ppc64 x86"
-IUSE=""
-DEPEND=">=app-arch/unzip-5.50-r1"
-RDEPEND=""
-RESTRICT="fetch"
-
-pkg_nofetch() {
-	einfo "Please download ${SRC_URI} from ${HOMEPAGE} and move it to ${DISTDIR}"
-}
-
-src_unpack() {
-	unpack ${At} || die "Failed Unpacking"
-}
-
-src_install(){
-	dohtml index.html
-
-	local dirs="api guide images relnotes tooldocs"
-
-	for i in $dirs ; do
-		cp -pPR $i "${D}"/usr/share/doc/${P}/html
-	done
-}
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.23.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.23.ebuild
deleted file mode 100644
index aa8badeeaafa..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.23.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.23.ebuild,v 1.4 2011/03/23 20:21:21 xarthisius Exp $
-
-ORIG_NAME="jdk-6u23-docs.zip"
-SRC_URI="jdk-6u23-docs.zip"
-DESCRIPTION="Sun's documentation bundle (including API) for Java SE"
-HOMEPAGE="http://java.sun.com/javase/6/docs/"
-LICENSE="sun-j2sl-6"
-SLOT="1.6.0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-DEPEND="app-arch/unzip"
-RDEPEND=""
-RESTRICT="fetch"
-
-DOWNLOAD_URL="https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_Developer-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef=jdk-6u23-docs-oth-JPR@CDS-CDS_Developer"
-S="${WORKDIR}/docs"
-
-pkg_nofetch() {
-	einfo "Please download ${ORIG_NAME} from "
-	einfo "${DOWNLOAD_URL}"
-	einfo "(select English and agree to the license) and place it in ${DISTDIR}"
-
-# It appears they at least bump the filename nowadays
-#	einfo "named as ${SRC_URI}. Because Sun changes the doc zip file"
-#	einfo "without changing the filename, we have to resort to renaming to keep"
-#	einfo "the md5sum verification working for existing and new downloads."
-#	einfo ""
-
-	einfo "If you find the file on the download page replaced with a higher"
-	einfo "version, please report to the bug 67266 (link below)."
-	einfo "If emerge fails because of a checksum error it is possible that"
-	einfo "the upstream release changed without renaming. Try downloading the file"
-	einfo "again (or a newer revision if available). Otherwise report this to"
-	einfo "http://bugs.gentoo.org/67266 and we will make a new revision."
-}
-
-src_install(){
-	insinto /usr/share/doc/${P}/html
-	doins index.html
-
-	for i in *; do
-		[[ -d $i ]] && doins -r $i
-	done
-}
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.11.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.11.ebuild
deleted file mode 100644
index 8d8561d66616..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.11.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.11.ebuild,v 1.2 2013/02/14 13:14:36 ago Exp $
-
-ORIG_NAME="jdk-7u11-apidocs.zip"
-SRC_URI="${ORIG_NAME}"
-
-DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
-HOMEPAGE="http://download.oracle.com/javase/7/docs/"
-LICENSE="oracle-java-documentation-7"
-SLOT="1.7"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-DEPEND="app-arch/unzip"
-RDEPEND=""
-RESTRICT="fetch"
-
-DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/java-se-7-doc-download-435117.html"
-S="${WORKDIR}/docs"
-
-pkg_nofetch() {
-	einfo "Please download ${ORIG_NAME} from "
-	einfo "${DOWNLOAD_URL}"
-	einfo "(agree to the license) and place it in ${DISTDIR}"
-
-	einfo "If you find the file on the download page replaced with a higher"
-	einfo "version, please report to the bug 67266 (link below)."
-	einfo "If emerge fails because of a checksum error it is possible that"
-	einfo "the upstream release changed without renaming. Try downloading the file"
-	einfo "again (or a newer revision if available). Otherwise report this to"
-	einfo "http://bugs.gentoo.org/67266 and we will make a new revision."
-}
-
-src_install(){
-	insinto /usr/share/doc/${P}/html
-	doins index.html
-
-	for i in *; do
-		[[ -d $i ]] && doins -r $i
-	done
-}
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.17.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.17.ebuild
deleted file mode 100644
index 1597882df258..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.17.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.17.ebuild,v 1.1 2013/03/10 12:07:03 sera Exp $
-
-EAPI=5
-
-inherit versionator
-
-DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/java-se-7-doc-download-435117.html"
-ORIG_NAME="jdk-7u$(get_version_component_range 4)-apidocs.zip"
-
-DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
-HOMEPAGE="http://download.oracle.com/javase/7/docs/"
-SRC_URI="${ORIG_NAME}"
-
-LICENSE="oracle-java-documentation-7"
-SLOT="1.7"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="fetch"
-
-S="${WORKDIR}/docs"
-
-pkg_nofetch() {
-	einfo "Please download ${ORIG_NAME} from "
-	einfo "${DOWNLOAD_URL}"
-	einfo "(agree to the license) and place it in ${DISTDIR}"
-
-	einfo "If you find the file on the download page replaced with a higher"
-	einfo "version, please report to the bug 67266 (link below)."
-	einfo "If emerge fails because of a checksum error it is possible that"
-	einfo "the upstream release changed without renaming. Try downloading the file"
-	einfo "again (or a newer revision if available). Otherwise report this to"
-	einfo "http://bugs.gentoo.org/67266 and we will make a new revision."
-}
-
-src_install(){
-	insinto /usr/share/doc/${P}/html
-	doins index.html
-
-	for i in *; do
-		[[ -d $i ]] && doins -r $i
-	done
-}
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.21.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.21.ebuild
deleted file mode 100644
index e717ef8ef293..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.21.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.21.ebuild,v 1.1 2013/05/10 09:16:00 tomwij Exp $
-
-EAPI=5
-
-inherit versionator
-
-DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/java-se-7-doc-download-435117.html"
-ORIG_NAME="jdk-7u$(get_version_component_range 4)-apidocs.zip"
-
-DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
-HOMEPAGE="http://download.oracle.com/javase/7/docs/"
-SRC_URI="${ORIG_NAME}"
-
-LICENSE="oracle-java-documentation-7"
-SLOT="1.7"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="fetch"
-
-S="${WORKDIR}/docs"
-
-pkg_nofetch() {
-	einfo "Please download ${ORIG_NAME} from "
-	einfo "${DOWNLOAD_URL}"
-	einfo "(agree to the license) and place it in ${DISTDIR}"
-
-	einfo "If you find the file on the download page replaced with a higher"
-	einfo "version, please report to the bug 67266 (link below)."
-	einfo "If emerge fails because of a checksum error it is possible that"
-	einfo "the upstream release changed without renaming. Try downloading the file"
-	einfo "again (or a newer revision if available). Otherwise report this to"
-	einfo "http://bugs.gentoo.org/67266 and we will make a new revision."
-}
-
-src_install(){
-	insinto /usr/share/doc/${P}/html
-	doins index.html
-
-	for i in *; do
-		[[ -d $i ]] && doins -r $i
-	done
-}
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.25.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.25.ebuild
deleted file mode 100644
index 92357afe5b47..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.25.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.25.ebuild,v 1.2 2013/06/29 16:39:26 tomwij Exp $
-
-EAPI=5
-
-inherit versionator
-
-DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/java-se-7-doc-download-435117.html"
-ORIG_NAME="jdk-7u$(get_version_component_range 4)-apidocs.zip"
-
-DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
-HOMEPAGE="http://download.oracle.com/javase/7/docs/"
-SRC_URI="${ORIG_NAME}"
-
-LICENSE="oracle-java-documentation-7"
-SLOT="1.7"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="fetch"
-
-S="${WORKDIR}/docs"
-
-pkg_nofetch() {
-	einfo "Please download ${ORIG_NAME} from "
-	einfo "${DOWNLOAD_URL}"
-	einfo "(agree to the license) and place it in ${DISTDIR}"
-
-	einfo "If you find the file on the download page replaced with a higher"
-	einfo "version, please report to the bug 67266 (link below)."
-	einfo "If emerge fails because of a checksum error it is possible that"
-	einfo "the upstream release changed without renaming. Try downloading the file"
-	einfo "again (or a newer revision if available). Otherwise report this to"
-	einfo "http://bugs.gentoo.org/67266 and we will make a new revision."
-}
-
-src_install(){
-	insinto /usr/share/doc/${P}/html
-	doins index.html
-
-	for i in *; do
-		[[ -d $i ]] && doins -r $i
-	done
-}
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.40-r1.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.40-r1.ebuild
deleted file mode 100644
index 7b7dd762fdfc..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.40-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.40-r1.ebuild,v 1.1 2013/09/19 12:03:03 tomwij Exp $
-
-EAPI=5
-
-inherit versionator
-
-DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/java-se-7-doc-download-435117.html"
-ORIG_NAME="jdk-7u$(get_version_component_range 4)-apidocs.zip"
-
-DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
-HOMEPAGE="http://download.oracle.com/javase/7/docs/"
-SRC_URI="${ORIG_NAME}"
-
-LICENSE="oracle-java-documentation-7"
-SLOT="1.7"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="fetch"
-
-S="${WORKDIR}/docs"
-
-pkg_nofetch() {
-	einfo "Please download ${ORIG_NAME} from "
-	einfo "${DOWNLOAD_URL}"
-	einfo "(agree to the license) and place it in ${DISTDIR}"
-
-	einfo "If you find the file on the download page replaced with a higher"
-	einfo "version, please report to the bug 67266 (link below)."
-	einfo "If emerge fails because of a checksum error it is possible that"
-	einfo "the upstream release changed without renaming. Try downloading the file"
-	einfo "again (or a newer revision if available). Otherwise report this to"
-	einfo "http://bugs.gentoo.org/67266 and we will make a new revision."
-}
-
-src_install(){
-	insinto /usr/share/doc/${P}/html
-	doins index.html
-
-	for i in *; do
-		[[ -d $i ]] && doins -r $i
-	done
-}
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.45.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.5.ebuild
similarity index 70%
rename from dev-java/java-sdk-docs/java-sdk-docs-1.7.0.45.ebuild
rename to dev-java/java-sdk-docs/java-sdk-docs-1.8.0.5.ebuild
index 0a4280f72441..848bc45e778b 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.45.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.5.ebuild
@@ -1,24 +1,28 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.45.ebuild,v 1.1 2013/10/19 05:29:42 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.5.ebuild,v 1.1 2014/05/04 20:32:07 tomwij Exp $
 
-EAPI=5
+EAPI="5"
 
 inherit versionator
 
-DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/java-se-7-doc-download-435117.html"
-ORIG_NAME="jdk-7u$(get_version_component_range 4)-apidocs.zip"
+DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/jdk8-doc-downloads-2133158.html"
+
+[[ "$(get_version_component_range 4)" == 0 ]] \
+	|| MY_PV_EXT="u$(get_version_component_range 4)"
+
+MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
+ORIG_NAME="jdk-${MY_PV}-apidocs.zip"
 
 DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
-HOMEPAGE="http://download.oracle.com/javase/7/docs/"
+HOMEPAGE="http://download.oracle.com/javase/8/docs/"
 SRC_URI="${ORIG_NAME}"
 
-LICENSE="oracle-java-documentation-7"
-SLOT="1.7"
+LICENSE="oracle-java-documentation-8"
+SLOT="1.8"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
-DEPEND="app-arch/unzip"
+DEPEND="app-arch/unzip:0"
 
 RESTRICT="fetch"
 
diff --git a/dev-libs/re2/ChangeLog b/dev-libs/re2/ChangeLog
index 8dfda0d5bc82..18f0628956ab 100644
--- a/dev-libs/re2/ChangeLog
+++ b/dev-libs/re2/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/re2
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/re2/ChangeLog,v 1.10 2013/09/22 23:39:45 phajdan.jr Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/re2/ChangeLog,v 1.12 2014/05/04 17:39:10 floppym Exp $
+
+*re2-0_p20140304 (04 May 2014)
+
+  04 May 2014; Mike Gilbert <floppym@gentoo.org> +re2-0_p20140304.ebuild:
+  Version bump. Increment subslot due to ABI breakage.
+
+  04 May 2014; Mike Gilbert <floppym@gentoo.org> re2-0_p20130712.ebuild:
+  Convert to multilib-minimal.
 
   22 Sep 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   +files/re2-compile-r0.patch, re2-0_p20130712.ebuild:
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 689e81685025..c03aa96fadb2 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -5,15 +5,17 @@ AUX re2-compile-r0.patch 782 SHA256 c5034495529d97aaaaa98ab85b54f0fab1ad0e97bb31
 AUX re2-symbols-r0.patch 261 SHA256 7db8997c9610ad4c1e5b7287bcbe005e1a29782a7e4988a6e71688a75ffb4951 SHA512 9f90010d802a017842c9d2a9a5c9cd5002dd4e24e318c13e3d79e8b4031f0cd0a6150257e217f4210ae4efa5e62e9c392dc3c3cd314f66849ed252e9eaabd05c WHIRLPOOL 86d0f59bec9f4073fa05879330348bce27901223201437eafb04dee15e51003bb19eceabbafa6bc594f3f5cbdad80f6946642b66c7e2a0e94223a58002b9b9ee
 DIST re2-20130115.tgz 1020951 SHA256 a95d83ed8203817587f7cc368b6f7199d8a4b1558372c306b07201058b92e1fe SHA512 ef1378d89397bf594ece7817ef91171e467a3408046f769eca08beba900a0e70f652e7c4e3b667b3a9d5cef044b08ed74ef7d564ffb965ab75bb9a3964c9ab5a WHIRLPOOL 2cbf47b1816e35e5c7f359a310b4421ad635d1513167ffabf98db84397be800f8b98d4808705754f0e2db14bbeb0d62e47ac3abb385e299c503126a9f874daf5
 DIST re2-20130712.tgz 1028311 SHA256 c30e43524280ebc2b9afa8c40ad477d0b2665bc81b663e9ae1b8b48e053af54b SHA512 910e7c7f5b3268746355c2e14dc6a4e32105207abcf8cb56b76fc554be41768e4e4a6b526c9335e95be0bb111025876b61ede1cfebcbec4a4062d53bb1448e08 WHIRLPOOL e5cf26a6c8586503c1639dd3f528cace8a4d7ca4c4ff97e08b12f45753ff67ad78656513658eabd678ac8ab88f1de5279960428fffe1b9e0535afdba44e7e8a3
+DIST re2-20140304.tgz 1050493 SHA256 0bffd1a57de2f4b218ca0f77d8850bfd59c82944a98256c6edba25260e0196a7 SHA512 a426e8d69d2c7614087990180539c5b1aa2c544dee14b144098f810b76b6062d7de9efaf1e90e83c61c8e4382a066201862d09965f1a6a9f86e2912011ad9d40 WHIRLPOOL d998a6dd9edac52fe0c4ed7e895940380d9b67220711d68aed02294c8f65a644a59f77bddce116ccf79860c633046fa2b5060ef45d5cb5ea5bc0c1965cdce052
 EBUILD re2-0_p20130115-r1.ebuild 1333 SHA256 595ea395197703935cb060d60baf1813bec2c884738c50a7e173203942cef630 SHA512 20ef887086b9aa478086f44cf88bf4fe5e2f1deafb4e220bde740052acb847259404d439340a5ab623d8d85d17298344746919a41e6424097e465d3c506d0f29 WHIRLPOOL 88745ac3f8f21562699d5606481b4ec07d426674f4736dc3dc6db0c34a222d5c8ace89ab17432a952789cda01db03700c728317f284071d7fc57190fa669ad12
 EBUILD re2-0_p20130115.ebuild 1206 SHA256 f1ef33738516b9a843270b302c238002c0a55c6edb0bcb3f6e2034c228cb612d SHA512 249ea0fe32ddba3081ae32da1629c5d56d47d523f54c8af234c5131c90d0b37ee532e2582cf28c9fb738bfa736bdc3338bf90c2ed101754cde67f4aa75512c50 WHIRLPOOL 26777dc71e23777ed7714841a2921ff63f756039dec97d2ea0ff1101c3e8d396add35305568962346e329c4c14fad6e02f12b9d34f5959a9446ac9559554ff1f
-EBUILD re2-0_p20130712.ebuild 1272 SHA256 2de5c9929559162f86d3bb1f82d7320afd044e5bd9c37906afda2b735042c70d SHA512 6e36d595f8e9713371ef968cc8bef035ad21896468a46c084ec080add00363418eaefe09a5018bbe7728c19b0008ebc47bc8952ef331686326f8c3fec1fc9499 WHIRLPOOL b33a266f65d3051dbd0b5680df75d7eba568a872cc6c6bbba1457d0ecde4e08b34cafcc14e4bfbf8b7798df8d6cd1afdf0c42de8f5ad8968d6349cd594e9791a
-MISC ChangeLog 1975 SHA256 00ae3c27183095772c0be51a918c5371da6ea7d2c32d2179954a32bac1261e87 SHA512 c83420ce76d282e7f4d90f080904fb2d6c12dd6fa5d2ea696a6ea4eac2d4983e384fe66c94df8f0a7d4dad1e7451053802e451dd2073f6a05b4f66099f0ed7c2 WHIRLPOOL 3565ede32432a113ebc23201d4ca0767a6e148e615bcb0a8482ae7057d4136d165c8cb848ac0bc46ba0f8849ea4aa233d574e90658903f0fd72a124d26f91a22
+EBUILD re2-0_p20130712.ebuild 1159 SHA256 8de30e2436514e43fa1ad5d3c7b0cd9cf70053f1c8f3d0690cf2e9a2bfb755a4 SHA512 9b9578efb5ea5df11359d677f6b8b8e44ed7f7dfc3d694ae31defe1c36981828b8f7d449d2aed55bd2c7ce494558f9d03e51e927f6c8ad828a586c334800fbfb WHIRLPOOL a1a636be0a0788ad52e144881512794468f4a8374ef71a3f4598ab307ee5bef2dd68b5d22be396519d588d52acae3dcd259719b98343350936dbac8531928804
+EBUILD re2-0_p20140304.ebuild 1189 SHA256 cedc41d083516b2aa45c1895545e043e55788de36174a6866d7b2fea47a8a369 SHA512 ad20caabc6b350004621bbad2bcef811e58e2d2058d6c5654871fc8f99c8c1d1adf383e8851f526aa76b8bfdf1de1aaecdc2613f537124cf8693a1dc4114cdf6 WHIRLPOOL c656e8366b9949b7c39effd88a640d96f6dd3cbc37189d5fc1faf58a0d1c9f273d97c9f8bfa1c10881885c3d0103e15735fde556afb0c9fa1987cc109ffcffe3
+MISC ChangeLog 2239 SHA256 97cea0a9fcb65c844d3acea83dbe3d4d2af01e863a831fab705bb9a040985af6 SHA512 b2e6e65328e7d8006768e540d7e16d5d8245e2fce489e0106e6253f4e7c7a618c8d3829f043eb4a653ac4da1a7e42f3beca453a15ee82c68b492017854a740a4 WHIRLPOOL 25fcc84dcd714b49913074eb774f03024de87acb9b2285249ece086ad2dc3bb4bfc1d6d7f17204372e5d147dafda06631b34453daffffafcfc8159610c440d77
 MISC metadata.xml 162 SHA256 8a3ecdcf518f45ec4843398f9896c9b4d1c867ff2cf2851cf40b06f756f111e8 SHA512 51796fe7e55b73dbfbe4a6b5fd089f5e8e4d327ff67d4a267692dda38380df5048ea77e8f058c466ae17726af5f099a3240b0500d53e421d95acc583164d3fe9 WHIRLPOOL 279b6ed997fab0d4278c01814bdd067068bceff8d1ce9933087828ce7598513b5a809013c996a3b134da6072c698a87ae151cfb56407fd62ff465b165197f5bf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlI/f8cACgkQuUQtlDBCeQJtSwCaA3Ex8hYp8f+NWqsanWCi+usp
-QTcAnivAIMOW3hDj+R90lSyAw7Muv47J
-=INDu
+iF4EAREIAAYFAlNmez8ACgkQC77qH+pIQ6TdQAD+KZGvmiDD4zjieKCP+Jdqbgh8
+ipu1EaBqLP0pDpvnKzgA/3fb9dxav9CCXmkOUXeHLPrbJsgn/1HLxQOzk44IFmKp
+=E+Z/
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/re2/re2-0_p20130712.ebuild b/dev-libs/re2/re2-0_p20130712.ebuild
index 94c1c274c149..fe5c17f27036 100644
--- a/dev-libs/re2/re2-0_p20130712.ebuild
+++ b/dev-libs/re2/re2-0_p20130712.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/re2/re2-0_p20130712.ebuild,v 1.2 2013/09/22 23:39:45 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/re2/re2-0_p20130712.ebuild,v 1.3 2014/05/04 16:05:10 floppym Exp $
 
 EAPI=5
 
-inherit eutils multilib multilib-build toolchain-funcs
+inherit eutils multilib multilib-minimal toolchain-funcs
 
 DESCRIPTION="An efficent, principled regular expression library"
 HOMEPAGE="http://code.google.com/p/re2/"
@@ -24,7 +24,6 @@ src_prepare() {
 }
 
 mymake() {
-	cd "${BUILD_DIR}" || die
 	local makeopts=(
 		AR="$(tc-getAR)"
 		CXX="$(tc-getCXX)"
@@ -35,21 +34,19 @@ mymake() {
 	emake "${makeopts[@]}" "$@"
 }
 
-src_compile() {
-	multilib_foreach_abi mymake
+multilib_src_compile() {
+	mymake
 }
 
-src_test() {
-	multilib_foreach_abi mymake static-test
+multilib_src_test() {
+	mymake static-test
 }
 
-src_install() {
-	myinstall() {
-		cd "${BUILD_DIR}" || die
-		emake DESTDIR="${ED}" prefix=usr libdir=usr/$(get_libdir) install
-		multilib_check_headers
-	}
-	multilib_foreach_abi myinstall
+multilib_src_install() {
+	emake DESTDIR="${ED}" prefix=usr libdir=usr/$(get_libdir) install
+}
+
+multilib_src_install_all() {
 	dodoc AUTHORS CONTRIBUTORS README doc/syntax.txt
 	dohtml doc/syntax.html
 }
diff --git a/dev-libs/re2/re2-0_p20140304.ebuild b/dev-libs/re2/re2-0_p20140304.ebuild
new file mode 100644
index 000000000000..82141a5c7e3b
--- /dev/null
+++ b/dev-libs/re2/re2-0_p20140304.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/re2/re2-0_p20140304.ebuild,v 1.1 2014/05/04 17:39:10 floppym Exp $
+
+EAPI=5
+
+inherit flag-o-matic eutils multilib multilib-minimal toolchain-funcs
+
+DESCRIPTION="An efficent, principled regular expression library"
+HOMEPAGE="http://code.google.com/p/re2/"
+SRC_URI="http://re2.googlecode.com/files/${PN}-${PV##*_p}.tgz"
+
+LICENSE="BSD"
+# Symbols removed in version 20140110
+# http://upstream-tracker.org/compat_reports/re2/20131024_to_20140110/abi_compat_report.html
+# https://code.google.com/p/re2/issues/detail?id=111
+SLOT="0/0.20140110"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+# TODO: the directory in the tarball should really be versioned.
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	multilib_copy_sources
+}
+
+src_configure() {
+	tc-export AR CXX NM
+	append-cxxflags -pthread
+	append-ldflags -pthread
+}
+
+multilib_src_test() {
+	emake static-test
+}
+
+multilib_src_install() {
+	emake DESTDIR="${ED}" prefix=usr libdir=usr/$(get_libdir) install
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS CONTRIBUTORS README doc/syntax.txt
+	dohtml doc/syntax.html
+}
diff --git a/dev-perl/Daemon-Generic/ChangeLog b/dev-perl/Daemon-Generic/ChangeLog
index 41ba3a2ea052..71559166ca28 100644
--- a/dev-perl/Daemon-Generic/ChangeLog
+++ b/dev-perl/Daemon-Generic/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-perl/Daemon-Generic
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Daemon-Generic/ChangeLog,v 1.18 2013/01/06 21:01:09 tove Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Daemon-Generic/ChangeLog,v 1.19 2014/05/04 15:49:30 zlogene Exp $
+
+*Daemon-Generic-0.840.0 (04 May 2014)
+
+  04 May 2014; Mikle Kolyada <zlogene@gentoo.org>
+  +Daemon-Generic-0.840.0.ebuild:
+  Version bump
 
   06 Jan 2013; Torsten Veller <tove@gentoo.org> -Daemon-Generic-0.720.0.ebuild,
   -Daemon-Generic-0.810.0.ebuild:
diff --git a/dev-perl/Daemon-Generic/Daemon-Generic-0.840.0.ebuild b/dev-perl/Daemon-Generic/Daemon-Generic-0.840.0.ebuild
new file mode 100644
index 000000000000..cca1fba74c19
--- /dev/null
+++ b/dev-perl/Daemon-Generic/Daemon-Generic-0.840.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Daemon-Generic/Daemon-Generic-0.840.0.ebuild,v 1.1 2014/05/04 15:49:30 zlogene Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=MUIR
+MODULE_SECTION=modules
+MODULE_VERSION=0.84
+inherit perl-module
+
+DESCRIPTION="Framework to provide start/stop/reload for a daemon"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/File-Flock
+	dev-perl/File-Slurp
+	dev-perl/AnyEvent
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-perl/Eval-LineNumbers
+	)
+"
+
+SRC_TEST="do"
diff --git a/dev-perl/Daemon-Generic/Manifest b/dev-perl/Daemon-Generic/Manifest
index c6831227aa96..94b28647ef0a 100644
--- a/dev-perl/Daemon-Generic/Manifest
+++ b/dev-perl/Daemon-Generic/Manifest
@@ -3,14 +3,18 @@ Hash: SHA256
 
 DIST Daemon-Generic-0.71.tar.gz 13452 SHA256 8ed8ad1bac46943dd0eb5ab73e4c346a38d087e676d5dadd1bd5da18ff46896a SHA512 875177b81994b525b27be322e86f5dc24c0a89ccdb69abe54a79baf7ec3a9b5cc569475ace37e952f21e0b095ffb52b13f66e7809741175bb8f1c8126855b82a WHIRLPOOL 1b677ab5c994b21f853b44dca1a54d43f87b9243e5508a22b6a879f58d1bfe2ad17707aae6817aaae0838ba4235a63940152c4feebc1fb59990e2415075bcada
 DIST Daemon-Generic-0.82.tar.gz 14146 SHA256 febc92ce5ac235d22a1544b8cd94cc33970e9abef4409515e0260306be2ed0d6 SHA512 c88babdc5ca76be5e0840c8e8a425fbe604c65a4c82802f6c387ec9d82ae9545e71a36b5c5c488a33d93a411aea78fdf577086a78736abc1b0561761140b11ab WHIRLPOOL 0657291078234fe3967da8f0b0026d88c71be9f2e16e90db3ec03d41d1178108cf342c66f08d86a0d440b660f1dfb1d229d15ed48dc1634da0832ef7c3ff1708
+DIST Daemon-Generic-0.84.tar.gz 15065 SHA256 c4ae78bde83c6226da862801e43eddef801a5ae3fab7e1579092b6653341276b SHA512 eadf060653ec86b982f4388777b15bfcad55635042048d389ba7d88d2de5f778b849a2fabce3524f05e041fc76a51eae4af14e759659616b7d28fb4b657178e0 WHIRLPOOL e516dcae16b2b7d8259c418fe402b4d53db620835d32f3976084ac73e1db83c3ab64e12f5a300a22342ca4cd66e40017bd9cdf988433d3c15ebd0de9a5f3d7c0
 EBUILD Daemon-Generic-0.71.ebuild 531 SHA256 ba2f391322422f9ea73856f973f38c27aa590f237f0507623229fe40d3897f88 SHA512 ebb048b53a29b8c5c94cc5a3af412e690fe1399d5690fe2731ef10b53ba701136af5661ccab66fe067a95d4596399c79f8dac32a678a243b3f336dc730c8a4b1 WHIRLPOOL 07b6bbeb0533ad312ffa666bc47a2dc038f6c7ae210939c44c2e8d4568d004ce7090a10396180e71a02524ea478e2c6a2629d03e50beb18a9a495e84d3d9c638
 EBUILD Daemon-Generic-0.820.0.ebuild 618 SHA256 c520c30a7f57be0cea074267bb97750546fc2d602ad04cc20913dbce2b648a3f SHA512 757503a7c0a75604760173f2eb1ee11518c7e77c2607b22dfa61568c6412679ebfc705fdb986c2bdb6e5903fe39d0603a2174950eccbfe9bf3e5fb3cc2b5081e WHIRLPOOL 9e7c55e6618cfec5bd9793519c3b0b9c4cc8398baf055eecb9e848f90d5cc606c0b2f9bf3b3455b220743090e23a60f2d49f5aef7d76b84a1be2213852621dd0
-MISC ChangeLog 2498 SHA256 dfbcd58e6f48e0f2ad480082987bdeb94aed0978f22a80a9ccdcbcf2b6ef25c0 SHA512 251b219edc06589b1ef33a0c37cb7d35c6c432945b5a7f56f1ad5ac88670bf02cbe4261303e4d6d209dc6c024e860d84c81f3428937856de00019c243678ab41 WHIRLPOOL 2b3997b153ac94716d2ebcb3635174ec0289f784d13e7d6d5fbd23936e6636e2157d9a722648127e81aac1d7e84cf094f42603ae9aac52e0d0059f83c66c4cb4
+EBUILD Daemon-Generic-0.840.0.ebuild 621 SHA256 43506129eaf48e3759c24bcf3e22bb714fc71f991942958c40da0097fe21e765 SHA512 b6fcbb540807c185d1fd1b8075d4f6a7fc124b75bd1f206da0d7cb55e6410b91e2be0f82c8f1f54a0c371e6657ec51f521bf64478b7d08d148eb1d3b99956408 WHIRLPOOL 7df3937158ec986c19bc362cafdbb94c8a7ec5d0c29b6d52fe0cd48f4d2151dc52658dd152f5bbc6b77f059fd6554a6f8beb37864e939f11f8ba6d2c41c7672f
+MISC ChangeLog 2640 SHA256 feea5b2e0b1ff761d2a8a16f89fb1a0ec3c3f510d10067e402a22ba00ecc8aba SHA512 e70c18680c16f26b031c5d56ca3730110099c4424f6caa116cd26c7ab30824b1a90cac45d94467c80728bc6fb7b960b989c2a34c1234faf02145f66817e86631 WHIRLPOOL 69e58780c705c451857eef22ecd4de9469c66a0fe6e877fb65b62411f5e352e0d6023f6974849fe29332276802d41aaeea90bc0a2a0cdf6ee2ac7c048ce382f0
 MISC metadata.xml 513 SHA256 3adcc86833a8d713f0f82fccbc5412b06e304357670bf07773c57b91d6b58023 SHA512 e392bda73d7e36aeba64345bff89f41ccd4973a8ede527a30e4f57397f95a9bd8c6bd2e14e1594a17224c85d90653b02151ecdb843f065c7fc0dbd22c7f3e9c6 WHIRLPOOL 4971ae64321218abd5b9f4f00e16c383146b56fc2bd22a2c04e71149e27acdbc33f248893b3d5a83a3bcf1d3415d73fb0dc436ada2c005e5238dfaf3805e91a1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlDp5hYACgkQV3J2n04EauwzegCgkOUBW5+vcsLPKBeWerkdwZMH
-wGUAnikhE05Wv+2OMtQjdiyVmzdHj1I/
-=Dwsl
+iJwEAQEIAAYFAlNmYtgACgkQG9wOWsQutdaVDAQAzNLJ2EGHHgxlQ6FwWUnqSA8R
+lsWr+JSbAOUz0GPGJ8TqFJB4HZgoSf5BmD3oUrTUT8G6LQ9tLx460E/1RnzhU4UU
+fBMNfcCvMQychi4uk1zq4WHuMZ3b6g7AfApVGO5PI9LKawT6xXLJSeOTu2RKjdNZ
+ADC3S5wO5NH56sE9qBE=
+=GAly
 -----END PGP SIGNATURE-----
diff --git a/dev-perl/MediaWiki-API/ChangeLog b/dev-perl/MediaWiki-API/ChangeLog
index 184be1a846d3..069396704d53 100644
--- a/dev-perl/MediaWiki-API/ChangeLog
+++ b/dev-perl/MediaWiki-API/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-perl/MediaWiki-API
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/MediaWiki-API/ChangeLog,v 1.5 2014/01/30 23:13:21 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MediaWiki-API/ChangeLog,v 1.6 2014/05/04 15:14:40 zlogene Exp $
+
+  04 May 2014; Mikle Kolyada <zlogene@gentoo.org> MediaWiki-API-0.390.0.ebuild:
+  amd64 stable wrt bug #501662
 
   30 Jan 2014; Markus Meier <maekke@gentoo.org> MediaWiki-API-0.390.0.ebuild:
   add ~arm, bug #497068
diff --git a/dev-perl/MediaWiki-API/Manifest b/dev-perl/MediaWiki-API/Manifest
index 618629c548ad..e25f8264adad 100644
--- a/dev-perl/MediaWiki-API/Manifest
+++ b/dev-perl/MediaWiki-API/Manifest
@@ -2,13 +2,15 @@
 Hash: SHA256
 
 DIST MediaWiki-API-0.39.tar.gz 33018 SHA256 eda3107f545ac4ddf01380f3fc00863160d7f0db62cf53320e7470d11f06b5d8 SHA512 dcbd330d55e04f42d36bf223da91d3319a696b4217ebd1ed654912cab3c2f16b6ca11acba620fe96fee6b81718fd88ddd6347f5c8577ff747aa065ff5ce7524f WHIRLPOOL 8156b9282588843fb5b0d56342ea7bab1438ac048199808750689d76786741c999c7cc501fe77a6fd1d504605e5c66b2804414cf989505a971650508385641cb
-EBUILD MediaWiki-API-0.390.0.ebuild 625 SHA256 c83d6f2839213fc56285b24c2ff33a433b791f99ca4d5f48babaf0f5af793d13 SHA512 09150f1cb90f12378e1d077025dd7b758aac095f096ca678bd84573619fd1b8c48d60c830f992e40d4d2dcc12457092336bc6357438cfe9c3280065d893fa443 WHIRLPOOL 127ce23058e84a813d76226fb23b9023c71dc65bad19688400b1290447b8944d809e9546e2fa6601818609bf4216139908885fbcf66eeaa0b4b80504220ec0ad
-MISC ChangeLog 855 SHA256 df56d80cf4f2eaf6030af14d2a0c0238d796955d7f80215134329172e184458e SHA512 3133d5a4e9f782de7e866042c1c42bbaa1345aa39b946c5e322e141cb83124a5685beb8921c1bd59ed14cdc88aea7a6a23f9cf4df4358e4d2ec1667cb0c24d19 WHIRLPOOL 9150b7c396b9bbf1d3263144838377bf71b43153c24859c33028c27ca6357291063e7ac8a17f62c492a2224ee878973bc785873c62de626ff3638f4090992759
+EBUILD MediaWiki-API-0.390.0.ebuild 625 SHA256 6b8236b876eafcef2e877670225d309b83794e1568adffe4109ee600a044012e SHA512 46f504a0e6c4f1ec70de9411fd6e8108198c99e1c6ae8d6b20fb51216e8c22a8119b5b880d5362eec2c00d41671c86a0a6425aa856766ecfea36373d6a866a3e WHIRLPOOL a32fc58bfb1b4dae669758d45c847affe92fdff74d67008ef5743d6471bb7e5c4e30f12fcc963c506c095a896a82868bbcb4b7e30671e786b675a795ec482b4c
+MISC ChangeLog 968 SHA256 d5e789e0324853ed4c09655328f1c358379fc2e23022d56356de19c5b355ea3c SHA512 fc1286d8252677be2c3797c640bd49ed5a29d26a1a92138dff48c5ead4de1350ca44b3e7fd6756f148210e89947c0a922b0081c687596db36774c04ca002f214 WHIRLPOOL 3516f364af0774897e954e4ffb1bcb8aec1c4a461f2ef23ff9dcf88869d44d502fb8c8faa3d3319f72a599d05130296fdf7227e8c7a712e70894dd2c763c6279
 MISC metadata.xml 158 SHA256 1fef4c0af5f71b777110f54d9dfbd27d6c85c750fca007f4a2fb38345ebbb710 SHA512 0b83af178d8e59a07953fc2582b6e4177ec933439a6638de4f222e4e9b6c21135ca1702f7f4838624e283d39db0d3f4d4227ddb6108dbb06cdcc09ebf9d6bc55 WHIRLPOOL 696c0536d7047d00bd1590ddb9bebd01caec0e15b3a970828eebe526b46f14d61eec5bd541db7d4628bdff743461198158832e2bdb47e31a5523ad63f16708bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLq3kMACgkQkKaRLQcq0GLGSACgn8gEKICr2ma+8vY6Xn772uRx
-06AAn2zmBKgSbNBr9/3jNuN+ea+tKnoy
-=bdiu
+iJwEAQEIAAYFAlNmWrQACgkQG9wOWsQutdaCmQP+Ow6GpHwOWTLzV4LvwRW0sAlv
+iOjshLrT/iDyVwi/A5SksTOdf+Tpj+FyiPdh23hLWuVdgO2+bRnvbblJj9J6xda5
+DiMxTLMjLUTfEAv8/OrIZqV7xaMwX6veGdxDf+gJWZ+FxWo03Y6JIx6r/hY8w9cE
+oZKOPxrmbsP8qv+cAEk=
+=tbaI
 -----END PGP SIGNATURE-----
diff --git a/dev-perl/MediaWiki-API/MediaWiki-API-0.390.0.ebuild b/dev-perl/MediaWiki-API/MediaWiki-API-0.390.0.ebuild
index 0ebfe21fbc04..27d34db4259c 100644
--- a/dev-perl/MediaWiki-API/MediaWiki-API-0.390.0.ebuild
+++ b/dev-perl/MediaWiki-API/MediaWiki-API-0.390.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/MediaWiki-API/MediaWiki-API-0.390.0.ebuild,v 1.5 2014/01/30 23:13:21 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MediaWiki-API/MediaWiki-API-0.390.0.ebuild,v 1.6 2014/05/04 15:14:40 zlogene Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="A OO interface to the Mediawiki API"
 
 LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/PyGithub/ChangeLog b/dev-python/PyGithub/ChangeLog
index f31a1cc07d76..54db072383cb 100644
--- a/dev-python/PyGithub/ChangeLog
+++ b/dev-python/PyGithub/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/PyGithub
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyGithub/ChangeLog,v 1.22 2014/04/03 02:00:51 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyGithub/ChangeLog,v 1.23 2014/05/04 23:52:02 radhermit Exp $
+
+*PyGithub-1.25.0 (04 May 2014)
+
+  04 May 2014; Tim Harder <radhermit@gentoo.org> +PyGithub-1.25.0.ebuild:
+  Version bump.
 
 *PyGithub-1.24.1 (03 Apr 2014)
 
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index 0eb357fcb4e6..0329ed888f4d 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -5,20 +5,22 @@ DIST PyGithub-1.21.0.tar.gz 2310595 SHA256 93c4b0f2e09d988db3f8f5adabf602f791e87
 DIST PyGithub-1.23.0.tar.gz 2424183 SHA256 b78867c79033ccfe5fd39b1747d024e4db45e7bc03ef3ef09d22caa0c8c304b4 SHA512 259d2e51057214ef8ffdc12690e276fc3825b9923ac238b2608e6277f026d1a691ac4c65c7ec69cd90a93b30da289b67fa15d9ea1c76d299ae6a68730964d980 WHIRLPOOL f59d0dcd7844fb632d7c26227ebf2716d06b518fc49af0b4a71e328924cc724d5c3335d29e54fbc0bcc0c1f2d33cf547263ba37606d66dc69dc364087d35979e
 DIST PyGithub-1.24.0.tar.gz 2502485 SHA256 8658e30bfdea85cf1a4f045e41b28c2f622078bea2ca14ce710ea96d759c56f2 SHA512 7a7428970459d91045cf06065c634e6d607edfca6bc2d3e800bba75147d4ce45a8004cea7ecfb651dd4f10c03607b15758ee6c9d79c6c9c2e4cb61868f5fc314 WHIRLPOOL d5dbe7ef8534bc7942d015f3ec7878d902c367068dc4567ba3acd455f196e96be60f10a112212d02091f67eb5a5a6a1b37848580c905308bdafd23b1b46555ed
 DIST PyGithub-1.24.1.tar.gz 2509518 SHA256 31163c7ee75bfd3d0e6e292f846876622c203dbcb332330cdf676c40a4aeb294 SHA512 457be294804aa646572eae1ff7497c7c232c2c961a4c7ba778afd866585d1165f856d136084fcb8ce987e916779de6056edc0f26442e7e728dd66fcc383f45e4 WHIRLPOOL 935f7677e36db183f7494718060e86c7d0bfa8e35524b6cb216d7e6aae2f305c1afdebdbd579dc77c9b6373f7746d63da409ebd41ae02a7e73e631c741a0a8d5
+DIST PyGithub-1.25.0.tar.gz 2514171 SHA256 bea24a94b8450161efb258257342617617e5582b70419224ee0e436c6a410110 SHA512 02245bf3f75a6144d1632f1eb27b13e719042ed66eaf8540a966b75ec880322a062490d6c3cd0e65599af613add59862201964955f2ff0e3fee75ea46f1f35b1 WHIRLPOOL 5ed09fa21d633e4ca07c5c71870948c1ab90fccfb2caf73178af183b81cfcc45ca95ae4050e3c9ea39fffc9efbca559042d730a8ac2348952cfa49ea5bbcb9e6
 EBUILD PyGithub-1.21.0.ebuild 670 SHA256 198e1b786415c6aec8fe70207777eb1daf5122cb396d53486adf700e3ad9d860 SHA512 d8b405864818a99be35c8423f90d63ae8103fceb31b876aad3a9b5502c65a144e6ce75e81fb81f6d2dd207b3df26c0f19c0a02793039904242eef66d994f062f WHIRLPOOL 9cac8b28ed65b2d0c780517311fad452bf6ef8262386b0abf1bfc5fc0ffccada9b2ec8718b62f70c1cfa38a0362c0c18315ddfa820e1aa84ad1fa46194afddcb
 EBUILD PyGithub-1.23.0.ebuild 670 SHA256 741a9d6d823017d10c1b73764135405cb7b829c2d70038bad93a40fa7ba81e54 SHA512 ff3f5dea3e1bde417b43e58846dd45fe07e8757570dd9a7765feb6a7652e202860d689e29eb0f39b0cddf6630e811b09c5a529261fe35ae2e65fce9115297cf5 WHIRLPOOL 33fac4dc78a1b6549de44bade8e507aac08d38b78b9c190217c84b1777cdf4b1773601d51ac26fbcd425cbb7d8406ca784c03d41bb2bc2375cbcee0a80ce5016
 EBUILD PyGithub-1.24.0.ebuild 670 SHA256 9b9ff2c2cabd1b9e6d612b0b619a877dd2dd8056e1e195b0dd054e8590d1853e SHA512 60ea310ea313ff91501bae3ab0513400e24714ccf354acad1b9f15b8d8d0eb4783776ac68d94985c06ecc02d7a63a6e3073efd1214df977cda3f5e0cb2333861 WHIRLPOOL 2473db24f1678b9e670113112dffa24329e43a412f9fc24916c66935b78b6f8d7da54cff02b3fdb54753e381920532c74c3346b55fafd473bb49e4b674d7abd7
 EBUILD PyGithub-1.24.1.ebuild 674 SHA256 6b27ffdecd55fdaaa589f4c04209968d52aabf5a471b1d2e1255566651cc03fe SHA512 ee6aa56bb59eb598b45f3b03b4f67c1634eb6941e6efc938649f71d7e6f5584ad7972dae1e68e5a43f3c2e3c4aadfad7a4c93ce31ed9ec35af97dce9e2ed24b6 WHIRLPOOL 44b5d6c946bd91e3386d0e086e82c0447e99cb90f9583a771b6fe9b228730f5f8c4a102f9a7b8c4b05b71a13989a75629912c925809fd57753b569ced66d8929
-MISC ChangeLog 3176 SHA256 7fa882fe8ef9717a732c525176fde3c57efd56a54093fc9cd54639958b77c2fa SHA512 e7af3d8bd05c19a077bfd8550b6e8bf22ac8bf32dcf03d1e0636cde729f5233c8d9e9206a88451f9028ac57f3fa6ae6b200f983c1540d834959c6288ab197cef WHIRLPOOL 0db424a7405cee9d5ecce4b47ce6badab1e50f18e4f4c3011d70c74c818cce5dfd1efe6f4feab04c279cc07f1bf5546c2083c71d89e0f555e52b050cc1d1c78f
+EBUILD PyGithub-1.25.0.ebuild 674 SHA256 bfce19dfd509e3c81cc13cf02cd0f503395c7076b9719fadddb929254aa53b3d SHA512 388f751f09b53cedbfc2ba860dc7c06d508f6ac46401e817cb9d1c34623b91f3ffa2833bc83964936e8ae8c10e3f63d7e6d80a09b40897e6b2c6ded05dd23420 WHIRLPOOL a949c3377292c8594849b0e636b6257f8932424c20777267db5ebdf76ad3384c2f36534bda4bb3e0a0c4231e99890796940f8a1aa3484bd5af71676e2db4a66b
+MISC ChangeLog 3299 SHA256 4c627973ee75f353e077f0c0efd4d54adafdc08d9f50c814670328a1feaaf32d SHA512 a272d0f562ed12a05ce88763a6e1a666dbc11b162fdde4f85239ff55a7808ce0521551cd64b30fe59113caa9fb19a464874b6cd7724e2e732c2fe91d85593f00 WHIRLPOOL 1590721afc4b863954179d47caee64db1fd041622ef011c5a140c3a8035c654f713c5fa50c9bba29cbcd07abd99822aba62bc43452bbecdd1b14302eb81f4259
 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTPMDUAAoJEEqz6FtPBkyjI34H/3KElsnCQ8x3Dv0KfDj6ulef
-MFyYGOvww/fukJXXqkxzk446/ctZNfhIYxfTaJsxIzfaJI+PMOXBLAFeM4PVaVxY
-YXWZL/0t2stkUr7yGoReaE1tKLWl2ezCEyB3Zx/g0ICYwhUzlXKSJUNbfM6GpEwM
-A3mZI7OS1RgDlK8+jbknOa+4+V1zTO4XG8xPeRuX6zgx/LfvATJO8+hVEM+BLFwD
-GGqm0Yj+avfwyAddiqZLa9soFQQkl5EMIy12AHAfIR96bKL24vzHslmam1UOYtNb
-ut/EZDn4LJDV2Q6xmOBP6fknM4BhbxDfIXp76hQpA1KwAuNG58OQopy3ys+XZbc=
-=nx24
+iQEcBAEBCAAGBQJTZtKlAAoJEEqz6FtPBkyjG2wIAJKLQYAYHaGCpDSyrJt5RMD+
+KqdGN2wLFYVvbGmK+fFhsBQARYjxsfgCGziFGomA38seX4GM246NopWxLtMu/y2J
+4NbDSTBUcQq0bzUsaSgKR18oDXwnmecuj0bLw3fgdi1J2VADn6hDVumjYyi5IL2A
+qwp7biU6KFykOlGjuUYORfZkL+/sur5zd45GNWDQIxWoytkWjO1xJis4ptM2VmeY
+VLJdh7dswUfsnaEOJDBQgO4NURGyxOsU8jMranP/9CQYV2vIuOEY/JgdBj4TLcyz
+30oq1eCqknhsI2FF8SycLJRmpe4p9iejWwL/j3RO78WxiiWN4+3zxUtN30hM3pE=
+=0VwR
 -----END PGP SIGNATURE-----
diff --git a/dev-python/PyGithub/PyGithub-1.25.0.ebuild b/dev-python/PyGithub/PyGithub-1.25.0.ebuild
new file mode 100644
index 000000000000..53d105e98d9d
--- /dev/null
+++ b/dev-python/PyGithub/PyGithub-1.25.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyGithub/PyGithub-1.25.0.ebuild,v 1.1 2014/05/04 23:52:02 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to access the Github API v3"
+HOMEPAGE="https://github.com/jacquev6/PyGithub/"
+# Use github since pypi is missing test data
+SRC_URI="https://github.com/jacquev6/PyGithub/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/fixtures/ChangeLog b/dev-python/fixtures/ChangeLog
index 26873b2859d5..c620d8e386ef 100644
--- a/dev-python/fixtures/ChangeLog
+++ b/dev-python/fixtures/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/fixtures
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fixtures/ChangeLog,v 1.10 2014/04/25 14:19:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fixtures/ChangeLog,v 1.11 2014/05/04 16:11:28 maekke Exp $
+
+  04 May 2014; Markus Meier <maekke@gentoo.org> fixtures-0.3.14-r1.ebuild:
+  add ~arm, bug #508282
 
   25 Apr 2014; Jeroen Roovers <jer@gentoo.org> fixtures-0.3.14-r1.ebuild:
   Marked ~hppa (bug #508282).
diff --git a/dev-python/fixtures/Manifest b/dev-python/fixtures/Manifest
index 063f9dd967ed..a29f33e10b37 100644
--- a/dev-python/fixtures/Manifest
+++ b/dev-python/fixtures/Manifest
@@ -4,14 +4,14 @@ Hash: SHA256
 DIST fixtures-0.3.12.tar.gz 34405 SHA256 6e70e85f822303f046ad93a15072ba9b98e31a61732642b658f0b7ea68588aa0 SHA512 ede02b5158719c57de8b445f8b840d7b27ca7cc12e5dfa47b99de2cd39be9319c538ee487898c99cccfa6d694839c50619bf3f4811200a949eb4a39056841f9d WHIRLPOOL 837f27bca29806b6bed0b4a6a0779c4233165ff45aa2d5e78bc198b287170ab3456b0941dbf19502edaee24b293606e4782101d06cdd923f85dfb93b6e555cd1
 DIST fixtures-0.3.14.tar.gz 34586 SHA256 4cc3313e52519d2671bd22aacd4b3fde9d96b31eb49db04a7cd5ccc61fec5139 SHA512 096466bfd2d2c2bb73461145e060d351fb4cba4ab52885ee7dc376ce68aced190d4f8d9969e7a94fcf90dcafd9bd6579a3ce2bcccfee33218571cb84c87ac795 WHIRLPOOL ee32650518e8a0fa86f7064d7a4952caed8a4f51a69de959014f82c58ac60765b13e02486261dca118194c683d056d5f3fb2ff0cdccd9abec7316e095862b7a5
 EBUILD fixtures-0.3.12-r1.ebuild 1026 SHA256 e4e1e863aae818a7625741e50cec5732febaefc05ce0c2ae8767f6da8707c0b2 SHA512 b9e6319d1a298a5ea61dd02a3adf983c0d3829e65e4c1427b25184a46db061dd6648cf10a9d56a97c1b7b51618e8d6520b34603ef2e9720da641615b899d4dc0 WHIRLPOOL df19172d09d38c67a40f479e6a60da650632c48027b893e2ced508f2e6633d0b90290d8081d228dcc3503ac5745cde0dce89e2fc1f6ac371e60fd1840829a289
-EBUILD fixtures-0.3.14-r1.ebuild 1111 SHA256 0ba1588dc53eb48bcbc69c8d59107f0ad2aec207ef7d1d37a1951937769859bc SHA512 db194f2f6a00989f744bcfd010f485f9c416f15bb46c20d7c9f9a81ccd207a485301978b2a65e8b0e618391753a200ca848c522d9f128d0d5c5f3093b29b637b WHIRLPOOL 12678c3ed1a9b6a1b7719ff111f541f1fc3acfc92c840c20db7236255932afe8df90c5fd687deaea9bf590977a81469b7f17b865b08fea7826e380c52c3b780f
+EBUILD fixtures-0.3.14-r1.ebuild 1119 SHA256 d6693e3d05cf7ed556f9593f4d535056aff4a16496b8006b2fbc730ecb91806d SHA512 90bd5561f9c95a975a79e1c900f8b508256b0385e998bdf66da4d02f8e398be4ae28bdd94c22af6d164c95233826a1d5544a71c6865535aba13fc385cd9b7980 WHIRLPOOL 5c15ed50a36d59fcf342541f307056aad6e42f7414f9fdce06dfa35d297e1a22f5a1ba7a0a3741d83e35d793d88807da5ef9ab35be272782d7449521b5dcfb1a
 EBUILD fixtures-0.3.14.ebuild 1031 SHA256 1984aad048819e3037bd05a743cdd21d0ab97cf25eb9fdb767ec40ebf6a7b2ca SHA512 6447af73c9d668d2a11b7aa194610bed61d09a3ab32a892d002ac6bb91fee3b689a27585aed7dc74aba19d1288225dd52a265146f9ec2e95463b8e63e0e674e9 WHIRLPOOL ac0e30165f2bb8889a9882ea41cdf4537e1934f3d21a582c43883f5b1b720b2244ec476e8fab1650aabe30da52ba239000ea11583fcf25459a10a54e2a890fd4
-MISC ChangeLog 1667 SHA256 fc358f797d0f29570b71f13150a6ad5c6d5346807d7054c808630f9a686de546 SHA512 f74128b5fbd25f94cc2fef7bf420140acc201f17e98b417a4b09cbf4cfcee4516f3588df2c3182ed01eb367d21557c0d810c59477fbaf6ae5977fe921328d56f WHIRLPOOL 77a878501bad48c77d5868a1477a45c130c7accc36c5d2340eed09a7de2f8e693405785c84b7fee48e40702b5089562d60ed578cd03e72a21e1eb487ae40719b
+MISC ChangeLog 1770 SHA256 b6b9e6acca8dd2d91612570782956b956eb571c1e1d6ab5504e6b4e6e00922be SHA512 114420963962b3dfc0c73ac45a07942ea4a3bfb7957afbe4a6b39a4c3d34ec10dd5e8759a816a1f5250621ad14385c82f160c9b2589a536507648a2f5192a979 WHIRLPOOL 9ead8ef5a115fe84b04f98980ed4dfd17ac1db566c89320d0c47a69bbca534521e28da5cd9ab23f3e3d5c09552e5abdb406dc34a4e00dfd6a5ad37d2a7cefdae
 MISC metadata.xml 678 SHA256 e7ece15556bd90f7c2828900c406d1059d9f378189416116599272b5ccf033ae SHA512 eb5111481b3da15e1750b3cba8cfacd96bae59d66dd3c5d5e1a1d2ed61637733fb40b6d4110ad91c897522eedcf6e05797f0a01f8f3318533a8482f34b81d754 WHIRLPOOL 05569845be0efcd138d4ccc2ae3b9f9e77379d34f85d7205c7ed8f79713879bfcac029f72b182eb4e64ea7fdd98b0916f3699eb22f77ea33c3ba8459b7b2082b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNabuQACgkQVWmRsqeSphMMTQCfTeW7OJgwoxL9f0biG2pwuc3l
-518An1+Xdw02/ZV6BUD4pdXh7c89v1Rs
-=6CVj
+iEYEAREIAAYFAlNmaJcACgkQkKaRLQcq0GKdlQCgizuWOB7i9ZyK+skCFMrZSvhn
+00AAoIQ9AOQHeIrwbPk7HXo6IYBDj6kw
+=ogLo
 -----END PGP SIGNATURE-----
diff --git a/dev-python/fixtures/fixtures-0.3.14-r1.ebuild b/dev-python/fixtures/fixtures-0.3.14-r1.ebuild
index 2c306eeb58f8..37c6557b1b24 100644
--- a/dev-python/fixtures/fixtures-0.3.14-r1.ebuild
+++ b/dev-python/fixtures/fixtures-0.3.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fixtures/fixtures-0.3.14-r1.ebuild,v 1.4 2014/04/25 14:19:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fixtures/fixtures-0.3.14-r1.ebuild,v 1.5 2014/05/04 16:11:28 maekke Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 # nose not listed but provides coverage output of tests
diff --git a/dev-python/flake8/ChangeLog b/dev-python/flake8/ChangeLog
index 7dbf5f4aac54..97abe78b0b96 100644
--- a/dev-python/flake8/ChangeLog
+++ b/dev-python/flake8/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/flake8
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flake8/ChangeLog,v 1.10 2014/04/25 14:24:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flake8/ChangeLog,v 1.11 2014/05/04 16:16:02 maekke Exp $
+
+  04 May 2014; Markus Meier <maekke@gentoo.org> flake8-2.0.ebuild:
+  add ~arm, bug #508282
 
   25 Apr 2014; Jeroen Roovers <jer@gentoo.org> flake8-2.0.ebuild,
   flake8-2.1.0.ebuild:
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index bbda89c20c80..c1615a1a7eb1 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -3,14 +3,14 @@ Hash: SHA256
 
 DIST flake8-2.0.tar.gz 10511 SHA256 8dce4f7e64cc202cc6da93eab84b2ce660110ff684b6738bba64a0a431b3bc69 SHA512 6e3d8030562c4489dce8d4b17464ea8c0239b7c28fcefb7c67bff645e18628bc3074ff0ff197ab54228544d0ff85c2ff9509502c8f98371d8dc5df6f1e3ec047 WHIRLPOOL 46dabf0120b97cf20b58d76745dd0c23aec69f4eeb25b8605944c7ca4f8a05580c6c9df3ce7ec4e507f2402ddb53da2a6730cf6b246eec8472562ec33fcbb9e2
 DIST flake8-2.1.0.tar.gz 25010 SHA256 098ab7991067c08cfaa4716de20066d90f66dbc71502114ea8cad9a9fd5c9512 SHA512 bf961d76ed08dafe7c2a9b767594577a57a2276166e515f1d84654223aa50879c5ee1e20919b3a4c7576c7d549037c8cfe67c11ab1f6648a0205200f5060950b WHIRLPOOL 48982d33cd32f557796ef103da441f46d3a6ddbf1d1cace66f3ceac8b31bf78389c72df4a717881fe3735f6301b8ce0831908d32010f94ce72fc5414404261d4
-EBUILD flake8-2.0.ebuild 852 SHA256 3142f62fc1832908ca64645df86c338ab8d58ea8d6e3cfeed99184f71e8f8ec9 SHA512 344042bad84b58ee3f47f54a22ec1f5c9c00d81e54202906436aba1b53ced4d8e15e2285be6ac1d8840d3b77b8c7dbdbfa25d9a978863d6d9b5cbe9643116ec8 WHIRLPOOL 63ea4c90bfa37d1f912b701786637aed7d6a72b7f8b406ea1ab7bd27aba88a9d79b62041a9a8513802616f3303b7a0b1e23b2be4de6b155db0d768cf9edb6570
+EBUILD flake8-2.0.ebuild 860 SHA256 ccadac8ddc1cf05b28cfc7bae383b6ef2b16b9c48ec289b85998dd397a3c728b SHA512 5733c148f9880e6a057bf48f93d3dae448dfb6a76d870ab857d952667a7e4ab3e46bac6879b8d019ff4349739818c44c8c72429a2a48df16932189b901013fec WHIRLPOOL db26f3cfd176c5e9ea2ec172f673b9c75a055f4d85cc71b7048caa8556d5e64337a7de9536c767fae04d11d89fee536941e2d8c95100a2f5193387a7ceafd546
 EBUILD flake8-2.1.0.ebuild 938 SHA256 5c819d3caa54a22216420097c085a5a1b36415fe15eb11107f2c3b37e1d13c6c SHA512 314c8eeaca2334c828e8717768b018476987675a64c69172bc85f3a6786cf08b7925594d32c4c0b7454ccbf89e7cd5608dac205d4eda4355b68abc9ebf098f05 WHIRLPOOL 7073833280c74b2d04526b0e92018ecd5519c5c4081f78a591e4540720ab4779e8d9d59cd25aba5026edb9a02bafd38b200cc17e557dd677cd322f2a4d559bb6
-MISC ChangeLog 1399 SHA256 eb8363afec3fdb6c55e86d29850696994ab850877d2eb461ebca6aef3267e36f SHA512 39299509b46a066c03854590120dc8f875f92a6d4ca5e0e4c1563b22255a9924e26274321c8f77c0b83589571c21cca7db6a9ba878e2059ce7203760e82f4476 WHIRLPOOL 2254841269f7436d90d409c965ee2c0caa6dd5a58580648c6035b5696bf1f9df904a311c2bc7390f75da2f3789b3a70d21e4dd502683975131b54a674367f64f
+MISC ChangeLog 1494 SHA256 54582c8fadbc7fb7a41c0deaf66dca0160ceebf31e9a8dab73861e18e252fe13 SHA512 f5e759b5798474957dd983eda18c3d808b143ba43eda2bcf89a8c8cada282480c81f732d744ad099d9c248b48c43952cd11efac78b55436c6ccc1abeca4d6b12 WHIRLPOOL 58990a945d8c80b7c4a47a556ea2ddb6161aa990400093abc1b46c1b9d1c77ff6ff2c0b2f1c730fad9c30c9bd0c40cabbd819405828f3a752b4b30d2192cf9af
 MISC metadata.xml 161 SHA256 6f41e9b782499f6bac80760066dc5ebb307e73d31d2080f2eaa383b8a236c68e SHA512 9d77a0cf6ef95d95fe0e41852a1ddedc8bc4a82d39fa75e8bbf760ba835deebe6ac3beddc83b9b70e381cee31936f54bb2db7cb88357ed2228c9e972cf2cac47 WHIRLPOOL 1f1ee9aa1b4b8747fb5f6c9234263952071a1a90100df893eb7fed974ea7c63639796521cfa1fde8929fc2f1bf0cc65e88ef6d703a2dff633816ff87cbf21411
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNacBoACgkQVWmRsqeSphPsGACdHt7RSGCR2wyFDVr8x3dsspr3
-2LMAn2jLinOzvm+AOtohH/xf3c74m9sR
-=3dWc
+iEYEAREIAAYFAlNmaagACgkQkKaRLQcq0GISTwCgihAh8wqFxsE2fQi/3mGnyqdm
+WuQAn3lYiZ8Ot60oEdyZWivt+Sxe/t0q
+=n7Bn
 -----END PGP SIGNATURE-----
diff --git a/dev-python/flake8/flake8-2.0.ebuild b/dev-python/flake8/flake8-2.0.ebuild
index 29cdaf92f992..e558e75e67c9 100644
--- a/dev-python/flake8/flake8-2.0.ebuild
+++ b/dev-python/flake8/flake8-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flake8/flake8-2.0.ebuild,v 1.7 2014/04/25 14:24:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flake8/flake8-2.0.ebuild,v 1.8 2014/05/04 16:16:02 maekke Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
 HOMEPAGE="http://bitbucket.org/tarek/flake8"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~hppa x86"
+KEYWORDS="amd64 ~arm ~hppa x86"
 IUSE="test"
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/futures/ChangeLog b/dev-python/futures/ChangeLog
index 641e62e77978..151a18928e17 100644
--- a/dev-python/futures/ChangeLog
+++ b/dev-python/futures/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/futures
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/futures/ChangeLog,v 1.9 2014/01/23 02:32:24 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/futures/ChangeLog,v 1.10 2014/05/05 04:51:22 idella4 Exp $
+
+  05 May 2014; Ian Delaney <idella4@gentoo.org> futures-2.1.6.ebuild:
+  drop py2.6 add pypy support, upgrade test phase
 
 *futures-2.1.6 (23 Jan 2014)
 
diff --git a/dev-python/futures/Manifest b/dev-python/futures/Manifest
index 2cb5d0ecb9f0..477d12a33e02 100644
--- a/dev-python/futures/Manifest
+++ b/dev-python/futures/Manifest
@@ -6,17 +6,13 @@ DIST futures-2.1.5.tar.gz 25962 SHA256 735b751d66ad20071adf32f7399f6f177f3b46ff1
 DIST futures-2.1.6.tar.gz 26445 SHA256 33f39102b631fa0a030b24c4341ba1f48558e435946d6735d47fe1f739d757c4 SHA512 1563dcfbcdcfe02a5b3d955d88f91a76e802292ab603acde8962a5f7562b3f4a4534e01217eb1d82a5368c98364abf34d2cd899b093594905e071c31ed1d4a34 WHIRLPOOL 88b0e14f9039944b0bdb6516155e4a715f797a2836f923776a3e2834190ca4ba7596ff82db596a6024b3edb033378a0361a54adaf6f4b8fe48ef409956cb7fad
 EBUILD futures-2.1.4.ebuild 945 SHA256 19317d0a6f0f73d689e3a02eccefcd0112aa7c87eca48ef82f75f62b98a92788 SHA512 34b4894d4ba401a16b405a4889c8e200ae8876532faa5104daca71545875fb53b404aae4b681ef2e3d4fac8cdeb4e420eaaafefae808af4fa22e56840972ec74 WHIRLPOOL 77437d440991ca24a7c6eb422b0ab38586b27faf34ecac26bfcff8a88b38e3f44811b0c4bc95177a50a1497c322bc2c46ef573517a30cd6394536c79edecd235
 EBUILD futures-2.1.5.ebuild 1031 SHA256 2d1617466bfb9634bebeb549ee45071127bf8f6a2c61a1b11670302838f18569 SHA512 18e3fcef29a94f1a90cd44dfb545bcfb0c281b5ffad2ee181f576f20b3a0e1d0f1518980593588c8d813a7b8dc1b6abf5877a129f11ec6b5fe6d185e311c024c WHIRLPOOL 44a107c68d79054fc5eb0ffdeabeb485635646725cc04380fec8aa6578e8156f3f9de6a5c5d8d92cc818d690aaf092a2894ce6b699bdaafb96c8d57499f1b2fe
-EBUILD futures-2.1.6.ebuild 929 SHA256 724a4c74e63caf139e3afd4e509ee93e4a16f050dd31dc73f5602f3b505820f6 SHA512 3035c90493750fb8ea806cfc50bff41c9c135f2dfb4f253f21e6a2564f9829e24c7bb9529733448c4f7d7d4e5adb3c4a379dd769ab7000379c66a29d2ed02a4f WHIRLPOOL cf7e4a579ff9f6149190f8f5abbddf6cf0e564de0b40ea5b2b5d99aff3e93e19b7504d9cda550b7f32a50173f575f1c8a6541014af0c3bf89ed4ab141dea85dd
-MISC ChangeLog 1497 SHA256 01e3dc762ca82408bd2bff90da75ad7204f4900f24251b15ebc3b251a62b7bbf SHA512 06811fa067efd9a98c79117ef1f4a8c402b2dd7e49c37fea0ea1042205520d4579f7167873f59a51bc8f0b5fd0e2c115e8360f30b5ce9378c062ee1b9f6a5e36 WHIRLPOOL c84e47a22a9f96b0239876fd625e54c67cf120c1c957cbd4019671ff9a4225d15baf5596c0d1be6540aad63527eccb5aa243ea626e240f342da4e4665e4a48cb
+EBUILD futures-2.1.6.ebuild 1208 SHA256 bc5927eeaf5d286b158eec5a74e0e6d79b95729c59c7b6fecac6a07e0ebb0705 SHA512 b4d827b0940ac13c936ea29b2489b78d77eab4e948c8b6b01b9b81cd4b4af085c5c82ea6ecf9ef1ea1bce468567c8c4296f875bd406e11c8603d2032848f3ead WHIRLPOOL 83b01c22b4df80cf1347730332fb9a10dd101223aea54488a1eb894e9a178fe78d7768c28af2603bc3fb9c9ac788b172dec08bdf87bab1ddc4293c62caca3f6d
+MISC ChangeLog 1617 SHA256 27e2d3a4d34bb26be61543f2ae571bdf000e1f0d279b7933791eac702680320d SHA512 5c976f0576485e68f9b99151c83e472a64abd0d520605ae52a6cff8a05a95d91cd55b263b0e2b6b2f96a47e2a5f864efa7318edc87ab2d1bac1adf848c6f2550 WHIRLPOOL 0362f1584ced0abb90a76568f854c68c1cc338e9ba60c56dd8a98bf4f4705ec7a8f83ed2fc3e49109bee309a258fada1fbc855cb152295a3cc1b481812d9828e
 MISC metadata.xml 230 SHA256 24e1e0ac25023b4ffa2df94267196ae0a779b8c0fb6d86212c51097937b6209b SHA512 c269a4a9029e1d19f97b4d15f45d57c1b31bf75ef86fccb70534d57a19ee42dd62d76b58b5a30f01e8534364d0b8467ce8828df829a139d68e19ada0b433f041 WHIRLPOOL 61b293453ebcea7a5a34cc4fc26e2cbe73982dd52d758f729b32bfd1b02c477f59ef9206a219423be1b33b35d8ac6164231a4ec558ef7adb08b1faeb8b7acdad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS4H85AAoJEEqz6FtPBkyjWDkIAI/CHb2mLCfniaLNXTDOF7NK
-typCJIXBuvVtbJt2p0QNVO5gk0LyBu7h0nYaSDFM456fxyLoyISG6+9rkWTTb+r1
-iIXOcSw7naFqdCDH54aRZbm0k0uSJmuKGlvNXE3S2eNsOWPdCprMmM3h5QmW+vFx
-xVR9CN5k0dYk4qVuTv00q0QvxaDK6YH3uwsZlG4LIARdmH30CTpntHGqwdq+RG7D
-HCkrfN5EGcbw+OgC+pUfmNVCr+iFmJEwdRWXcet/QkQ/0lis3xTW06+lgiPE2joG
-dUd6BrjOeiEnvGrxvVUAAHChhBsSPQ+tzeAbnSwZeqZhrUe4UX8QuDpAQc0IPvI=
-=47Us
+iEYEAREIAAYFAlNnFwwACgkQso7CE7gHKw3FlQCfUD78i5otfcvEBLuGUe0LZBGx
+YDYAoNXb8JPRgwoq4TsL8qO/gbeCQGe+
+=GhcO
 -----END PGP SIGNATURE-----
diff --git a/dev-python/futures/futures-2.1.6.ebuild b/dev-python/futures/futures-2.1.6.ebuild
index bfbb540d857c..3c1e2b56d449 100644
--- a/dev-python/futures/futures-2.1.6.ebuild
+++ b/dev-python/futures/futures-2.1.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/futures/futures-2.1.6.ebuild,v 1.1 2014/01/23 02:32:24 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/futures/futures-2.1.6.ebuild,v 1.2 2014/05/05 04:51:22 idella4 Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Backport of the concurrent.futures package from Python 3.2"
@@ -17,12 +17,19 @@ IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+# Requ'd for failing tests under pypy
+DISTUTILS_IN_SOURCE_BUILD=1
 
 python_compile_all() {
 	use doc && emake -C docs html
 }
 
 python_test() {
+	# tests that fail under pypy
+	# http://code.google.com/p/pythonfutures/issues/detail?id=27
+	if [[ "${EPYTHON}" == pypy ]]; then
+		sed -e 's:test_del_shutdown:_&:g' -e 's:test_repr:_&:' -i test_futures.py || die
+	fi
 	"${PYTHON}" test_futures.py || die "Tests fail with ${EPYTHON}"
 }
 
diff --git a/dev-python/mccabe/ChangeLog b/dev-python/mccabe/ChangeLog
index 1f1e1f6d84ec..25e5b04a790b 100644
--- a/dev-python/mccabe/ChangeLog
+++ b/dev-python/mccabe/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/mccabe
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mccabe/ChangeLog,v 1.5 2014/04/25 14:24:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mccabe/ChangeLog,v 1.6 2014/05/04 16:15:40 maekke Exp $
+
+  04 May 2014; Markus Meier <maekke@gentoo.org> mccabe-0.2.1.ebuild:
+  add ~arm, bug #508282
 
   25 Apr 2014; Jeroen Roovers <jer@gentoo.org> mccabe-0.2.1.ebuild:
   Marked ~hppa (bug #508282).
diff --git a/dev-python/mccabe/Manifest b/dev-python/mccabe/Manifest
index 8b7320c3d79f..e529fbd284fd 100644
--- a/dev-python/mccabe/Manifest
+++ b/dev-python/mccabe/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA256
 
 DIST mccabe-0.2.1.tar.gz 5031 SHA256 5a2a170e47de5593a6abfae1e9542bd2c3924ac62bbe4e6ed96c953c0352243a SHA512 7155e52063e786c140c541f1410d0c319387b4b5f24ec3c60ba3d5a963a92d0ee545254559941ac0dbe961f46750c0e61271fbe82653c6b1465c0a13b31ec325 WHIRLPOOL 1db80033f91a24029e6757847d11528cb01c2aff2a2b40c947f969191f767fe6b93fd9adfb685eee8bcb03ba9719f852d8a5db7e1b27395acb93d973f35d09d8
-EBUILD mccabe-0.2.1.ebuild 622 SHA256 0bac405b4b3a786c0ec25d29de41e0b508bee5046bb467e55a1c9c194ad87a48 SHA512 791754d80f662f0645100d923e66e8d8af8c3cd911968f28bee2d882f8c340faa4ead1fdcca46a06e56e2c4ed226bb22be45d73613ce0587eed9e2138dcf7583 WHIRLPOOL 4d56a94cf172a4baca8041e28c8742a6cfe507519aae6e082182db31a02839ced7e769e44511ac366a7e61b19d31b23b262e5cd8a0f6a6c9b18ebac4159c0e1d
-MISC ChangeLog 815 SHA256 7322bfdb4f4550f99a1f7217ae591a7ce1963a5ada3976008b90e378fd5c33ae SHA512 40af8ec0a0c825fd3e1141819386700d1402712d9101faf2ca7baeb85aaf067097a3c3731462581a29b5ca66227ff375e119864f23b9404f4ab1bd0fe5f26363 WHIRLPOOL 69032940b911b65b2df09cf24ffabbe13ead21d0d0a080cd5fed56d4f03cc5ace2739e6d36a6f1412683031e27222aaee39b5150737e7919958aca1256b4197f
+EBUILD mccabe-0.2.1.ebuild 630 SHA256 d477cd0016848b9d5422168a7f4093c6ccff854e5aa52c118ccb8bb4a2b80d3d SHA512 b200e6a79ffc81ca542514db1343077b6abad3e4df30c47f24f289901881d88cbacf8d60aff59962dabac83bfd1b4ea5ebeeec00b30f738d5bcb8ad1dd1e1aaa WHIRLPOOL 3f699127f4ee51b0b7e37b3bdf4dd64c587091c2ab51cd28e0b26690030103d66bf45046be2eb79cd3265d7ac25636f4607e5f4d811607165fb858a2f7c993a3
+MISC ChangeLog 912 SHA256 2fdec6d5627285fe78d162fe55f5144a6e32e26ba94ccca5d49dcac9d1b19501 SHA512 a471ab6cbbb8b67ed159eb0e019dd4f08f6c5e05105ca5bc44ea56bcff24fb489dd1c8fe1169bcac140af6a29029b4c498d340b6d95effcf2a141ab5ea083761 WHIRLPOOL 8af367d703627b13e79c202905e3f123da6f8020f22870811f5470f14720e0e9c5d4021868fba41b6e0ec32adad5d8604900601e0ba699db2323ddccf0193398
 MISC metadata.xml 161 SHA256 6f41e9b782499f6bac80760066dc5ebb307e73d31d2080f2eaa383b8a236c68e SHA512 9d77a0cf6ef95d95fe0e41852a1ddedc8bc4a82d39fa75e8bbf760ba835deebe6ac3beddc83b9b70e381cee31936f54bb2db7cb88357ed2228c9e972cf2cac47 WHIRLPOOL 1f1ee9aa1b4b8747fb5f6c9234263952071a1a90100df893eb7fed974ea7c63639796521cfa1fde8929fc2f1bf0cc65e88ef6d703a2dff633816ff87cbf21411
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNacAgACgkQVWmRsqeSphOrQACcClFUmJ1o/2YFNuNGGCRvadp0
-+bIAn04xnH25OQEYeRu6Jd0Zc6a6jZpr
-=AAKF
+iEYEAREIAAYFAlNmaZIACgkQkKaRLQcq0GJvegCdHuJRwpRy5/iskDnVVgZkm9o7
+8BUAnjCf83508UpR+Xwxv/Uc8qsVfBiI
+=Bccs
 -----END PGP SIGNATURE-----
diff --git a/dev-python/mccabe/mccabe-0.2.1.ebuild b/dev-python/mccabe/mccabe-0.2.1.ebuild
index f1ee06dc837e..78e69605333f 100644
--- a/dev-python/mccabe/mccabe-0.2.1.ebuild
+++ b/dev-python/mccabe/mccabe-0.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mccabe/mccabe-0.2.1.ebuild,v 1.5 2014/04/25 14:24:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mccabe/mccabe-0.2.1.ebuild,v 1.6 2014/05/04 16:15:40 maekke Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="a plugin for flake8"
 HOMEPAGE="https://github.com/flintwork/mccabe"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~hppa x86"
+KEYWORDS="amd64 ~arm ~hppa x86"
 IUSE=""
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pbr/ChangeLog b/dev-python/pbr/ChangeLog
index cf94156b200d..99751d9af9b8 100644
--- a/dev-python/pbr/ChangeLog
+++ b/dev-python/pbr/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pbr
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pbr/ChangeLog,v 1.15 2014/04/25 14:26:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pbr/ChangeLog,v 1.16 2014/05/04 16:16:47 maekke Exp $
+
+  04 May 2014; Markus Meier <maekke@gentoo.org> pbr-0.8.0.ebuild:
+  add ~arm, bug #508282
 
   25 Apr 2014; Jeroen Roovers <jer@gentoo.org> pbr-0.8.0.ebuild:
   Marked ~hppa (bug #508282).
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index 2ee31d49c8f8..42038fa965c6 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -7,13 +7,13 @@ DIST pbr-0.8.0.tar.gz 75217 SHA256 799cbdd896806ffa736bca0021aa61619fee5813148f8
 EBUILD pbr-0.5.23-r2.ebuild 2242 SHA256 196c28fbe406bae3fd056534e1c7730e95879d57b76d0c1fc42c94b794d5f64b SHA512 780e9a2f2c0be35d66cfdc2a8b3fc966bb153f65d7f5717bbfedeb1a69f067adcbb5afb146f89228a8e46bfbfd309bcfd6799b67a68eaeecabde5d45bd9691d1 WHIRLPOOL 13b27ba22fc758ffa9720850b9a3994eaa36e44e451992496d09f003c497b649ed1eebe86cd97a0e70568eb3aa3bf0baeaa0b3de4e45d6c78e9137616c9c4977
 EBUILD pbr-0.5.23.ebuild 1867 SHA256 8f07f9805f668f7262b2af544235fe0b15269ab1626b77a4074e03c9e06a1197 SHA512 53c63ec1e18e7ff2033c9a1673853843aea7c544d403b2c5ca04a96fd5f32cc57e4c2a01b08b15e1e2ef64980282db6b738a6a3c1d4f61911e342f320dbd7787 WHIRLPOOL f61532f057a4e8620d43f1fece87c87d979f62713fca8ea60b5fca09cd948bb1b383ae443364831cb6fa170493636f7976b1172c5fe85c536dc7d3f3a9ade335
 EBUILD pbr-0.7.0.ebuild 2250 SHA256 a349e0ef48e1cf047c14e9dece9f54e3c213899b4ec30f40dbc07bd98b2f2128 SHA512 fe8e92f865d08570e74a8284087f6dbceb346e5bc0e17c3f9a3b0a6b30ad47908c40f3f6081751f1f23cc407a5f30eab11a7673613f039f9f8050ad52b50fbb3 WHIRLPOOL 09524b30aef63cb2174927e707314c4e8e373663284825207dbf7102410ae6b46c72dd7aace9b7ca4745be1b9a366f647cc340361bb7f25de203f4ba39ae27dc
-EBUILD pbr-0.8.0.ebuild 1913 SHA256 9d85f5c4faffc1d4a69fa0a004e0fd2257afb573fcb41a2d7c1c7754aae95d41 SHA512 92dee35073d794ba9d2b266c019096c6db044120668c556fcaddb75b686b8e2ddd747570cfa5d69a15ce0caae84edfb6a364598a78bf23c5829f86f71349df51 WHIRLPOOL 00db9f2f8966988df54472593ca344cf799d5bca168fbfb6bdd4f9768c3da424ffed354aa750ee931aeb6e2e1c7d92590a89b76fbac738b07d4613f4356adc7d
-MISC ChangeLog 2141 SHA256 5c301d7f7c358330b2761f7b68c28c0eb6d0609f058da4286c3990dc2885791e SHA512 0273f54a4606808baa2e59d24a84ba4a7edb5d42708f462cc8403dd8ced2ea3c4522c721a96be96f3c56b878580097e91cb57f231c79afb6ba7618b1fa4aff1c WHIRLPOOL 8af7bbad5547918a0dd08ad4db225e2f7c8843fb0d7a7c2cd6241e32becd189c747912a31211c9339cc6dd10740c328b08d050d1f94f6f52f2ce3674ee69ad00
+EBUILD pbr-0.8.0.ebuild 1921 SHA256 d948752ef9454ab23781abb13d7f143bf733ffa9163bd3bc9e9d0b65ad25560e SHA512 9b244b74037c9a6402541062c161de4992a4999fa11ff3037d2110213a4fae25c222fa6dafa4affd3e78224bad8727c72d1dcda92913a61b646ed3d9ee4c29cc WHIRLPOOL c98f99a2d0ac4556cd5c8e4ef1b9636633b9024a6e1f48a806f541508d34a112f609f8583cc2f79a7c19995970be7c41a5efd6f156d60174cc7ae2d9e8ad723c
+MISC ChangeLog 2235 SHA256 9455ad74c1465dbc4e785f1576ff3110c3d89924c649f310b3c146dfa0728a67 SHA512 e3ddfd6eb614ad3ad4b4e231644b08524191ec92cd2635e2eacc25337d6bc8eb9791ad2821e8d19c92bb245838d021c921b84e54d567dcdaf8d79a6b63d3abb0 WHIRLPOOL 896ed13687e8d3be1945ff5b1ad85738a1d1b478ccab5f0fbaf13b320695e9f1896ee7e3140a719162d73853a66f432b606d93c9a3295370d00e63cb4a10c067
 MISC metadata.xml 455 SHA256 9c48b9696884d16afd8f5c2e6af02a1cf3d5c295d33979fe9a7733ecfab2a83e SHA512 e81a53ebb90c189faed750506e27932c0e9bd87a90356a47fa0a7fbe69c142ef34010fc4a7175c2804d942754519a3f8a72f27845791aed82a82d517b50f3567 WHIRLPOOL 0f50c128817c9f3bc0fe5762758c1e23528f7b94d8ad25f0397ec083f368886a8c202133bcd94d79bb66869c62fa2d327778c275dffcd4a4a79e70bc797b6cef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNacK0ACgkQVWmRsqeSphNOoQCePREU12XNoRI9BkhQhRruqSrR
-cAEAn2L3XwbIkPz079BBUwfHI3MrQsXa
-=J4sA
+iEYEAREIAAYFAlNmadYACgkQkKaRLQcq0GJHoACgmv0q4yzqxmvdq7S4GFCnG8dB
+CvQAnijvfw3Mrrx8WqZy64RCHcsdjnSa
+=SmA9
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pbr/pbr-0.8.0.ebuild b/dev-python/pbr/pbr-0.8.0.ebuild
index e12e10ac2c06..255531ea9c98 100644
--- a/dev-python/pbr/pbr-0.8.0.ebuild
+++ b/dev-python/pbr/pbr-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pbr/pbr-0.8.0.ebuild,v 1.2 2014/04/25 14:26:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pbr/pbr-0.8.0.ebuild,v 1.3 2014/05/04 16:16:47 maekke Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3} )
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pep8/ChangeLog b/dev-python/pep8/ChangeLog
index 39be02df0c94..3330576a04a5 100644
--- a/dev-python/pep8/ChangeLog
+++ b/dev-python/pep8/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pep8
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pep8/ChangeLog,v 1.28 2014/05/04 08:11:06 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pep8/ChangeLog,v 1.29 2014/05/04 16:12:37 maekke Exp $
+
+  04 May 2014; Markus Meier <maekke@gentoo.org> pep8-1.4.6.ebuild:
+  add ~arm, bug #508282
 
   04 May 2014; Ian Delaney <idella4@gentoo.org> pep8-1.5.6.ebuild:
   drop py2.6 add py3.4 pypy support, doc build
diff --git a/dev-python/pep8/Manifest b/dev-python/pep8/Manifest
index de20b3e43b55..88313132eff6 100644
--- a/dev-python/pep8/Manifest
+++ b/dev-python/pep8/Manifest
@@ -9,14 +9,14 @@ DIST pep8-1.5.6.tar.gz 66944 SHA256 1a8be992f8daac6144af0f3972f40159f46d81cb36dd
 EBUILD pep8-1.2.ebuild 918 SHA256 5e063e15d0126df711d024f883ca108f272111dafd69e8aedccdda60548fec4d SHA512 8bd5da8f53eb06dd8f6b39236b5d0e378329c6f4a9e86172e974c07b56cc636e25e4eeee543ea64e10c383b68fbc6337e14c252b96afcb672bd439dc087091e0 WHIRLPOOL 16144a945df2ab8a71c732354b72e4e9b48a0197de2d8b7a698bca8328b697a9abe49e34a6e529564016d5be9f548a09b8a540a5fea2c9d594880c40950a0509
 EBUILD pep8-1.3.3.ebuild 932 SHA256 163aab5ddd254a308e4b9c787659996a61e70060f0ef6dd28ae9eb5689b20543 SHA512 b24af165a779c9bb0128b7ecf898dcb2ba2d9960402e4d564962e9d9dab8bb628378d37437ac451a36e7824c66a5e41992d510acfb697396594daba6e8d3169e WHIRLPOOL 394af1ccc35478aa626e4307636b88a0afa719cf4614b1184f5cc6db51f02f492086c5f2c5a089a0ca559b3b453857711d1fa1a8a842dffcf775e541a6387814
 EBUILD pep8-1.4.5.ebuild 788 SHA256 171eb76191f11a81c6747f64fe393e814ba3e5f4fca8beb4a2efb6a627e654a3 SHA512 c9ff0418e417db2c48c036e11a4ee7cbad3ff42b5775503fa2f8812be00844f251a3fe42a6fd809a365eff81c1c37dfac00edda8b8acb12d666fb8be5cf540ab WHIRLPOOL 4f3a2292feee8e7f3f29fee526dbafa6aac2bcb36f0f9846c9d72bacf30a1cd8d904790999ebd87d8275b55643d6ff0279a7ee87d7a01623132c128b702f5846
-EBUILD pep8-1.4.6.ebuild 791 SHA256 e7efd00a28600d1ffa24bd339e9946e4199372216047c1f1f454c24a5cd61e9b SHA512 0b555605c741458c392fb8a0157afe7158d49a71f87b2d47db35a8a2d5a74b43ee30171fdb1d8e8359a8eb44dcbe56f0aa58b7254ee0255ba73a1bb102a71cd5 WHIRLPOOL b893f755e7e6b4a6d1e888c1a677ac6223d4d2bae0c33c0fa408409a9d6ff9485f5a0026c807b732366aadb1fb2179a5c8b59309a8ba3b7430e89883017807e6
+EBUILD pep8-1.4.6.ebuild 799 SHA256 13d5260bdaccb9171628ffe38eb98016ecd9a80fc0b7ff4b715d40e666155df7 SHA512 248152ff47cf091a1ddb13979271bf3c9840dcac3a336f09e3e6ed0d6bb61ab8409415fc2cb6b4f720a0a9a67073001df65780afdf78557b01648726cc4e65b3 WHIRLPOOL 9f21f69224b2d0d34cc2f923721533198b7add673d0ed32da68c3c9a5b4e255bb660dd8e9b1d4dc95b37acbbbf051b2d39742f5b06fb9d936ab613131a3e24df
 EBUILD pep8-1.5.6.ebuild 996 SHA256 caf3e1f870e6026e546bfaf80da1657c53f75cf6b09998c433de5f265089b36a SHA512 3297664c3c63753667fb2881f2d2692ac3eaaac2478b55e32955fde8703418ced41bd23ca45f996120183e1e437858279e67b452348f6ff3c872deb96c3a9623 WHIRLPOOL 7e28b3a69560f0a9033afe6a5b5639292d1c719f1c11c72c65035fc80e40a224580263babf6c6f2b40a48c91981bbd0a93a7d60322e68735918abe1c451a2bf9
-MISC ChangeLog 3686 SHA256 3b3059b54ca6fc759ba5cbadfcaa08f28ebda7641a58cb4712e3a3d5434134cc SHA512 463a3baa09dd8eb5dec13252eb54066ca1e5627aa6877dbfb82a800f3f893c94a36d6a646c47e98fd0591464cfddf57d11c9f01ba8e40d848b7bf0c928f18dd7 WHIRLPOOL 1b80c74ae8bef2fea00f9b0311c6c2dfecc43acdf2c6fde2dfda579d3cbd437559d436fbedcad493b2f10ff1e685cdd5ba9fe7fa55500ccfba05706acdd4c4c9
+MISC ChangeLog 3777 SHA256 ea85fcc3f418399424d85ddd3ed5cad503c9ed5beb0a6adfe21f153c8b0f468e SHA512 1b6f60dd5da19fb2b72eaad040c58c65e24a0e61ae6762d0b5e922ad4104783fea27849303e443c1366db6b95cb3a7c03ba31a88599671de7a7b120584c6eb18 WHIRLPOOL 8acb1a338204515792494af702e6c245684bef90ce8535592f818c2e3b6ba5b5217e6efef7e8a2f14881b2d5723a0372afac7a58963180fe15f0e62e784b2b34
 MISC metadata.xml 227 SHA256 cb9606d106937025e91f5f934ecb96cedbbfd3b1a350baab206fa99ce068e842 SHA512 34b11bacafafc785f12ec46b92e02bd34d483ee57bdb9d2d512ebd8003d28be0637984cbaac70ffef66e31348a221fc99195ef9f0e12e37ae601c20c45b9b75a WHIRLPOOL 0e1a063be0dcdb44adabda34e80f7719adb07520af96d12bebad98c36ff41214d91468e9b877e290bfd5cc33e0f189eda5a2655fe4b1506fd7c7c153dc783bb3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNl9FkACgkQso7CE7gHKw3uQQCghj9+lG6lRkBl9yVcqyjsM15y
-3oYAnRRgXs3Cq+ipmedjtsu4zqHfXk2C
-=bUKI
+iEYEAREIAAYFAlNmaNsACgkQkKaRLQcq0GKXLQCfcOZ+FXHTpBeQ9aGeWFi0tLRG
+ZFQAn3lS/UaB2zN7ubrYsRq59FKigAsH
+=ka1e
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pep8/pep8-1.4.6.ebuild b/dev-python/pep8/pep8-1.4.6.ebuild
index 66fc010c12cc..be73cad3fbbd 100644
--- a/dev-python/pep8/pep8-1.4.6.ebuild
+++ b/dev-python/pep8/pep8-1.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pep8/pep8-1.4.6.ebuild,v 1.5 2014/04/25 14:23:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pep8/pep8-1.4.6.ebuild,v 1.6 2014/05/04 16:12:37 maekke Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pip/ChangeLog b/dev-python/pip/ChangeLog
index ff9e7cb9b261..14f4a93905d6 100644
--- a/dev-python/pip/ChangeLog
+++ b/dev-python/pip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pip
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pip/ChangeLog,v 1.33 2014/05/03 07:51:54 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pip/ChangeLog,v 1.35 2014/05/04 16:17:56 maekke Exp $
+
+  04 May 2014; Markus Meier <maekke@gentoo.org> pip-1.5.5.ebuild:
+  add ~arm to latest version too...
+
+  04 May 2014; Markus Meier <maekke@gentoo.org> pip-1.5.4-r1.ebuild:
+  add ~arm, bug #508282
 
 *pip-1.5.5 (03 May 2014)
 
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index ee92f3f3236a..deba73855f2d 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -14,20 +14,16 @@ EBUILD pip-1.3.1.ebuild 1278 SHA256 bc7df553f5496684a321de681f0da46f8017565772e9
 EBUILD pip-1.4.1.ebuild 1215 SHA256 631bab86ca95e95dab623a6d0e23510575807a02a5d82b0dfddc4a8dbb1075b9 SHA512 09c00a82dadba8bc20835f18bc88b8e38d1deae2a7e70c94b6cba4b0781f4b26eda73a4c7b29141089972b7be04d258b8c821838f8d064fcdd8ba458a9b312ac WHIRLPOOL ba8d9efbe10e4a0ab75ea41b929040128538c5fc8fafc04ac0cecbcbce718dcd8c118be7750af45a24c535b8c3f83b9ce8ffb8d7943db87c2449477d2fb8d868
 EBUILD pip-1.4.ebuild 1285 SHA256 7d9c7206406cc9d73e9e521641a8dc1592def684f89f51603a339e80c3328bfd SHA512 ccdf31e19fd370526fde12c6598907a073abfb165673a4abfa2404e9fdcee0ccdd6b2eeaa8de92702ea9e007a2a2d2c4d959ff3b34eaf6a31598c94532fb4c82 WHIRLPOOL 01829d464b6f85a929ae4b4b1aaa7405494276d5bfb639d22c182421ec34b457f0a5f8824ea5008d4868056ef6ce3270ff5cd7a00292b8a6958505cf681f166b
 EBUILD pip-1.5.2.ebuild 1215 SHA256 3a60ed792d4adcb6858bbf8fd5773599f03219c97a6ccb4cc8881c96e46c848d SHA512 20f69adad214ba25d21d95de5b3014586872b47e103fb4c46fc58d8b69d0a44cfbdb3ad4cdb21d1ca6dcecdc46c060d06f657030464d7b18fefca970b0063427 WHIRLPOOL 430f37063e29e0b5f0091905e807a1f175e2a2006d809bd559d456bff17f04155c161df10268da22cab4a7a2f2d12e54ae6c45aca4c55cb05e1d330520efecf2
-EBUILD pip-1.5.4-r1.ebuild 1392 SHA256 7e64be0f3eba3a3ed4b1351883aec0b81bbd38faa25f99257801f1636729363b SHA512 bc24b6a7addae3e92cf539d4ff3c33e87ee82ffbf68336530b46b936c00cfd6e1296c32cb3c94bb5660ffdbb9281260b9a01f80b77618dcdbc362d4ebfa12c89 WHIRLPOOL a257fe180d0be86f5a057faf6608fe979f5d77a8ba9a76762ba227c02b820a9f0d04f24bc9aab5d3f581ee046c6644dd03b69e37c98ab001c59ff7333d3a49af
+EBUILD pip-1.5.4-r1.ebuild 1400 SHA256 086f19b6a6e36fed6c771db8cfce5ff8fc0efeee391c8329ba43902dd22a375a SHA512 c8204bc2a72ecf56dd68c7194cd28a34a20596ab6c31ba802ffa701ffbabc1b374fe2ee0ef19fa66f0ed220317d0d2719db3b64f8841870197c7e02d16ac6d67 WHIRLPOOL 78ad4210cf331345a4661ee39fc0e6cb4f149c12a05fc8e16135242ad156e2186b6ba80827fb8ec56d9554f827b6958de2ae7a339dda342820f77b4b2b67a18b
 EBUILD pip-1.5.4.ebuild 1215 SHA256 ce8bc060e071c4ec00312cf6954be9dc24669b6ba38886f43a8b03f3d450e0a2 SHA512 189bcb37756cbba555d0f6563deccb535c7ca972661c8a961ca70a726c39b38ab44b543e8f9a0772bbb9fe7124d92ecd49858362e20e947131d6a75afaba8639 WHIRLPOOL 824cefc5ebb639323ae0eef51da40d4b938bee1c2c09ae4a18fdc13ee6d2b829ff65452ca098714af08e0b4c15a150ddefa748ce0c9cb76d9527988799030b48
-EBUILD pip-1.5.5.ebuild 1165 SHA256 d7c32650005299fde4306959f0d84ea7aec023d6c0dd291eb15f5bcf1551adfd SHA512 f20cbc4041d3879142e053d531de37c8e067056039b5fe253f00290249d52e2279a29aeae4dca93904346876b35df91dc3739f15de05c69dff8e84c61b1f3258 WHIRLPOOL cc9d93c12bdd181f757bf9f95f49dcc1da5957734543e6a1591179d5acc3dc76794766e8a5162be6b7350257f83d680b2f7568dd3c1a0d1cd37d6631093a0020
+EBUILD pip-1.5.5.ebuild 1167 SHA256 319b39942591cc48aaf7fe0459bf3a0946712ac29b358d3861cfe1f85cdd5033 SHA512 c86ce7963956d680ffb4e07a9657fa50f4e871a8e3d095acb871386df7ec20c0a82368de2be9f8d1e60ef51a33ecca0b20bfe7d4b6273fbf8fcc4c580f0b0885 WHIRLPOOL e09dafcade1bc4b24b1343f83863fa7bcbc32eebaaf0c41b72b7618ea745eebf91a6bd0dcdd34d3f64f23bc7a3714dc2c069b09d9d60bd2e4d8a6dc5850cee4b
 EBUILD pip-1.5.ebuild 1208 SHA256 bb798ecde2110eae9edfa26e1196b01aa6a72feee7b465cd3be44d4b091df4d6 SHA512 bfbcd30fa79c1c0ba5dc48510d8ae8a4028d55f41bca5590571e00b6f84d21dcde5b39b6a222e134011252c71c70c0edb646bd9c89ea54462996a1853b1f6019 WHIRLPOOL 4f5fbf62f034ddd86a31ff8088bb8d17fc40b0db3206335274e104ea1ec67902f2b37c928fb4c40bb4035996e038678f97d6218a7254c1c5690ebfc977f5e827
-MISC ChangeLog 4217 SHA256 68871285e577b6216a0323087752c453322fa315013221b2303997b2e3285b09 SHA512 1233a53539966c2d78ad8fc627786c91b7096d3b42b0b7eb973f8e1259b774c8be52ae63b68d6d03f4460c31624676ed8b76adc154da93e2e35da5bc00f48e36 WHIRLPOOL 1874a8075f561111082783e305710cb4461064c90ffbb6a1be82daa914eeba2eb9464a1496e463ec0fdefe943e138eaa3d01c225966faa176e1e09f19c712925
+MISC ChangeLog 4411 SHA256 80272fd5629d21b5af2adbc40561be04409d6c1152610d3c27c30bc9eef9f709 SHA512 f297d324ad51287e2dc81b1f5e113389f86a7f18ffdf476b2de54725cfbd34b54ffb3e08a41c7c43e660542eafa79680129257cc4776dafb6f272a39e4bcf212 WHIRLPOOL 4bbaa24be431d05ae592837cac0d20ea3b563aa4a0ed5c599438e699716a3fa51f823529abe0b62227034644d873e80842745c5de3cfedbed0222e267f8f2164
 MISC metadata.xml 226 SHA256 be59b97e420abdbddf3e1ca0d5aee7edbac606423b6196f351e06f2f0278a1d6 SHA512 a44d1c871128742ad906119f133a116ed498f55ab5236c7206941b9e6759f6d46290138241510cc7bc212a2f468436aea4a1e05359903d9bfdfeeb490e2d263b WHIRLPOOL f6c2715d2f7badae8432be7968e50df8f684bbad75905740b50b75e6a0096e7506458234e1d169c9ad9faf76225718207f67ed01cf85fbbac536ad89d39a1140
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTZKAbAAoJEEqz6FtPBkyjRPIH/3Nkj82wVY1kdmk0LNwUDHRL
-Ionp5SDNOMn8nxxBDKWDn+ueU0ZwSC0iWOomeoFATaSOEOYFv9bwcDVEQaCdrrAL
-4/6mI4RYaWzrhuwmK1FMIUDQDXpp/Gjf5ycBmHycb8HHzPjEXHuVpuPhAx6zys09
-yz0YpPnJW0afDjtjCw2Qo/ZpL1Mgjq4fB7OZpVjcDJfFsRoDYTz8F+qGkMO0qyzl
-umFPdxCfUlnjtoWYfYsygVz0eBfncYCIrDD3Zng0lacWS7TRXJooW05arV3YjdVg
-2ZcucypUbGrbKNttdLbnHjQf6SC+efGgyyGsoSy3jRYMoeDS4q8kPL0+crj4Va4=
-=0pzw
+iEYEAREIAAYFAlNmahoACgkQkKaRLQcq0GIIwQCfXlzSGHp64osNZmaC6baF8fSn
+qU4AoLMmYBGvNGAAzc2eZAGvGAYl/0TE
+=bxpd
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pip/pip-1.5.4-r1.ebuild b/dev-python/pip/pip-1.5.4-r1.ebuild
index 5afc0189feb1..bf0e193598be 100644
--- a/dev-python/pip/pip-1.5.4-r1.ebuild
+++ b/dev-python/pip/pip-1.5.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pip/pip-1.5.4-r1.ebuild,v 1.3 2014/04/25 14:20:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pip/pip-1.5.4-r1.ebuild,v 1.4 2014/05/04 16:16:24 maekke Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.pip-installer.org/ http://pypi.python.org/pypi/pip/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="zsh-completion"
 
diff --git a/dev-python/pip/pip-1.5.5.ebuild b/dev-python/pip/pip-1.5.5.ebuild
index 7d95186d1139..b43d462f9e1b 100644
--- a/dev-python/pip/pip-1.5.5.ebuild
+++ b/dev-python/pip/pip-1.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pip/pip-1.5.5.ebuild,v 1.1 2014/05/03 07:51:54 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pip/pip-1.5.5.ebuild,v 1.2 2014/05/04 16:17:56 maekke Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy )
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.pip-installer.org/ http://pypi.python.org/pypi/pip/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="zsh-completion"
 
diff --git a/dev-python/pyflakes/ChangeLog b/dev-python/pyflakes/ChangeLog
index 48a98f4e6382..b9a99197d0d8 100644
--- a/dev-python/pyflakes/ChangeLog
+++ b/dev-python/pyflakes/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pyflakes
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyflakes/ChangeLog,v 1.41 2014/04/25 14:22:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyflakes/ChangeLog,v 1.42 2014/05/04 16:14:59 maekke Exp $
+
+  04 May 2014; Markus Meier <maekke@gentoo.org> pyflakes-0.8.1.ebuild:
+  add ~arm, bug #508282
 
   25 Apr 2014; Jeroen Roovers <jer@gentoo.org> pyflakes-0.8.1.ebuild:
   Marked ~hppa (bug #508282).
diff --git a/dev-python/pyflakes/Manifest b/dev-python/pyflakes/Manifest
index 1f27eae2de35..abefa5fdff0d 100644
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@@ -10,13 +10,13 @@ EBUILD pyflakes-0.5.0.ebuild 702 SHA256 97794a3c4b85f54665a9567e7049fd60f584f02c
 EBUILD pyflakes-0.6.1.ebuild 949 SHA256 f0292e8085934e2015529db454521841af2ab5768e493391c1a23b69dcabc79b SHA512 19ecdb60670eb93d95ae4774a8b923d2c2da6537c4314d6d096881dee5a28e5156407d1091c41f61e7b93ce07b3fceed4f606aabcb0629416bf98a15f7452775 WHIRLPOOL 94b48edf9bacfb25e77583aa317cdbca4861e61e32788a62a935d23dc61b0b4b8137a31fd64595c045e70abada1a812c772bbe62bd7982c69d816eb09fa5e671
 EBUILD pyflakes-0.7.2.ebuild 847 SHA256 15370853c027a9171be8e9c93c047feb05f9474728860135cf8503a63da71ea4 SHA512 9ec42fe5aca72fb29058dfe067c5158ed4d2be399bc472f731bf4daa2e9f73fc134e85df40abf3d045f3b2e08ebe6e59cd69712e5c258c5899f578ff9771f5c0 WHIRLPOOL cadee9db496d54cd260c9920e89b8ca2e9b8c690829266ed16f15032a35dad236c3c089a95a22721df197c20fb2860bc0b6e8ee5c5626a0f359823af76bcae09
 EBUILD pyflakes-0.7.3.ebuild 763 SHA256 fd6465f47119d5cf8e45a973472e9c2e2a0052c96195fae727f59fe04c40c112 SHA512 23207487c6e70e2047dc1306264431a32eaffa854c2292f9a880d1f0a809a6785689cbff24ae563ed53eaa380642cfb622ee6eba462e29203e18177ae9d84e6f WHIRLPOOL 242f86b661a323d31b5691d8fa7609d09e0c7490d102e7ca19ea951804d7dd3f3ca50953119bd9ad2b92d4305745a267c876a94837e1bfe72d639ecba2e042d1
-EBUILD pyflakes-0.8.1.ebuild 752 SHA256 27a6c5cb5a7b43d17a995fb9143d08517177389e71c541458b8b8c8024e396bb SHA512 75ed2749f555a3eab2392da5aed7167b6257703d9b1c34b75387ed51fa53d3a8cd87bece9b12ddd50c08b13792607f4db3d214ab933b9c787aeae1acb4f1f426 WHIRLPOOL 2b535c69eeb6b9f88fdca81738995cff5cce42b5c009d478246afe3e6f4ed6730ed75fba8f30ca671fd4e30f545de86a402dc1cf9b19b1f4a29f28d5445d1450
-MISC ChangeLog 5073 SHA256 da3f6c998019d9552c4f716f99344bdea03933d04eea9f700e0ea89881de97ea SHA512 e4c469705d234e36bc9e047a7ba6543defd777994335d8880307e9d86e1daf4068f6b3675f8283602c9606cd94c4934ba7b7c74f522c5e83c2fb647621765339 WHIRLPOOL c57b2c0c9d47155805cfc90b9bde46bf5ab04b0503d038a38ae99527330f1a75b46de7767671870f4fd3c2a1325441308206aed2ad8118b47a68bb6c91cf3806
+EBUILD pyflakes-0.8.1.ebuild 760 SHA256 3cc08e80c3ec6cd8fea42baaa17d65d65e5eecc7c8f0a1f0bf77913ecc995f5e SHA512 af764efde8db85f45cb9c3673a980c57e39038f6af6f2623667cb218f7dae9e8274c404a52af03b0a2fdff84767ba7e9e0acd9500800601a334c838fc4811a4d WHIRLPOOL 6963cb4ec53c22edb3321643080f274ddea0989f0f3df2b78a1e32903eb2006c2c8bf0c4598059f37fc320b23a9b0ba54e9a77e70464a412647182f15c396f1a
+MISC ChangeLog 5172 SHA256 763d657fec39730e3b240becbe42495ec26ff078a3a76689263c4f980d7c9851 SHA512 73032824ef56e1a17764995ac879ff64e359391924312fd5581c08b8ed63e81937b7c5408587d857df67e5a57465edd208ae392d445e9cecaf148dffb49d38ab WHIRLPOOL 6dd15d2188a3fa77516485828a823c673a92d143acce44b2cb68aa48f033f095315ee3e682533777b75932f1588c0138d4140721644518908acab61dcb5696d2
 MISC metadata.xml 600 SHA256 2512e5a45e2e9f1f3e114f91b905d0b7564cf260e9a670ed78edffc0448490e0 SHA512 75d3e82bfd282381d622eca3b24e213711a70bf78d7b24d8140a9248865953f9ce90aacbe5387edf5b5717ce59a625f70e4363e3a75192c094829f010789e4b3 WHIRLPOOL a92dccd8879c4bf127995a630fdfd69b711e98239d3a517e5c4d707736d289e99974d2bb538ab1f8d90ee6cda371bb7bdaded4ef74ff9c712f3bad10d4f766ee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNab5gACgkQVWmRsqeSphP4mgCfYvhC3aFbMtq6mVpsCX3pJzWo
-Un0Anig5GWIIM+Grv3X72LVyE2X/SiEA
-=aBER
+iEYEAREIAAYFAlNmaWkACgkQkKaRLQcq0GJvjwCfRL6gp5vf/iyhH4p4KY0cORZw
+HUYAn0ZSPTYezh2XXW1Ca52DaG+jOSPH
+=DLv6
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pyflakes/pyflakes-0.8.1.ebuild b/dev-python/pyflakes/pyflakes-0.8.1.ebuild
index ca4425f104eb..23760ee6fa23 100644
--- a/dev-python/pyflakes/pyflakes-0.8.1.ebuild
+++ b/dev-python/pyflakes/pyflakes-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyflakes/pyflakes-0.8.1.ebuild,v 1.2 2014/04/25 14:22:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyflakes/pyflakes-0.8.1.ebuild,v 1.3 2014/05/04 16:14:59 maekke Exp $
 
 EAPI=5
 PYTHON_COMPAT=(python{2_6,2_7,3_{2,3}} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sqlalchemy-migrate/ChangeLog b/dev-python/sqlalchemy-migrate/ChangeLog
index 92144c92a7ed..3b45ba67bd8f 100644
--- a/dev-python/sqlalchemy-migrate/ChangeLog
+++ b/dev-python/sqlalchemy-migrate/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/sqlalchemy-migrate
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy-migrate/ChangeLog,v 1.30 2014/04/25 14:27:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy-migrate/ChangeLog,v 1.31 2014/05/04 16:17:11 maekke Exp $
+
+  04 May 2014; Markus Meier <maekke@gentoo.org> sqlalchemy-migrate-0.9.ebuild:
+  add ~arm, bug #508282
 
   25 Apr 2014; Jeroen Roovers <jer@gentoo.org> sqlalchemy-migrate-0.9.ebuild:
   Marked ~hppa (bug #508282).
diff --git a/dev-python/sqlalchemy-migrate/Manifest b/dev-python/sqlalchemy-migrate/Manifest
index 24a9a17c8da7..f20c64f97b2c 100644
--- a/dev-python/sqlalchemy-migrate/Manifest
+++ b/dev-python/sqlalchemy-migrate/Manifest
@@ -9,13 +9,13 @@ EBUILD sqlalchemy-migrate-0.6.1.ebuild 755 SHA256 4c8d69e9fb864ac36350accf42d711
 EBUILD sqlalchemy-migrate-0.7.1.ebuild 866 SHA256 1a007c22fdb438395db4b3d6f7c3b072511692bf25977796fb8c28543032a61c SHA512 2e16ceff80ea30f2436934a1e0c6436263be5b2d3db67d8dbc8dd815606559ef38893b44bff683e6cc2e96f35b1ef981949ab0785a5e3c4aad592528d25d160c WHIRLPOOL 770201c67ec9139bf3e371c96e3c131d7075f32fefb3af41720df3d630e61ab1bd344dbde3f6b01dde08ca4647a12997101c6a221862b1ce0d655d11f9dbae74
 EBUILD sqlalchemy-migrate-0.7.2-r1.ebuild 913 SHA256 5b143fc6fa73fafd23db080f47eada05e041afdbd7188ad928dd621a5a579463 SHA512 63eda07b69721d6eae26eec247709b51681bf5410a15cb580d827c984cf7d279844e223d638ebc9e9f04f27ffb88fab6e3ea44df0482faccc7cef0e3af206ceb WHIRLPOOL ceaa227e72e30bf4e70ee1f640112abc45e98b3bdff013b88e67bc60aa203ba8defdfba1f9ab8ecae334f70a533c0238f5acfe3c6afb6b2b9a5cbc70b6b16f44
 EBUILD sqlalchemy-migrate-0.7.2.ebuild 863 SHA256 7b04cd2ac842b5f2203207cb9266e091849dad20ea5cd6fe77e0efa2bc185b32 SHA512 024f5214eaf0ab9ef83e3890c1c6fb8ec9b1fd0f8ec6423ceed7de03083d35249c32a56c5d0a3c279274f27c69b8af404e95e2b393e86f3a23ee20442c09692a WHIRLPOOL 512b088a914955a854b8d9ee5966ed6bb4e583c03e5e68ea7f118d2dbb1621f641593f7260f2a48ca60f6c2c663523fca1fa5023fe66de694068c9e12b7ed222
-EBUILD sqlalchemy-migrate-0.9.ebuild 932 SHA256 34ba0900134a0ed8206f4167f4895c8be35afda983c3bcde7409a937423f28e2 SHA512 5cc4e29f1b8695534d7f7e00e6e0572c4854669a2c8865fe3f64f9f06afc1fa7f95fc5b5d066d28dafbba2f33904acadec99f61abe170e27c5db994f475c4479 WHIRLPOOL 093574c5f1a6e6103cac719c944601a2611a4d69a76dfdce80b9d9289496e25225020de7cec123a633e18dfac1aec91886a2f776f639983aa9aa185b13638496
-MISC ChangeLog 4369 SHA256 35744020b21f40d2db4846fc9c34cb83212c6b1e1f9674b8525f31e1c39e35ba SHA512 c84a3646b91879f9955d6223f67588e77c86f83e2d835f67567232379eb16823f6da3914d07346d3070614ebf179e61526fce4436691671555fe745cf9cfd009 WHIRLPOOL 78c8bccbdae21e291fc7044556a72f93e0acf5e3598086fae4ca2795b1ab0aa7d4b7473e00ea43f26046b47f8df55016e2ccdb77a1d628408e555c86a53f62d1
+EBUILD sqlalchemy-migrate-0.9.ebuild 940 SHA256 7497e6a5c3325f7dc10f004f360b2a7f74959d484a7161b5431f8dbf3f674842 SHA512 077c4f9a00d7b3eb7b5c9e27c2bc04966fb320ba63b4e6d7327bab5e29094816bc8ad14b6e8232fa0586acbbdc3acee7423cdf35c4a2a05eb9036b9911e0302b WHIRLPOOL 9c62ff4e63c4f892bcf5a82750ad6772745b2726c5c34516da1736b2c8e5bae2b234c6110ded5079eda4b56ca8f6ef6ddba3cc5af82ab870aa321b1fd22c6d2a
+MISC ChangeLog 4476 SHA256 1bbd6a3205d4c0be86bc273dca99510715f98408c8c071444b0be4e92d9ebb35 SHA512 a42a8a45ade9a7d58645b69a7248f460f3fd5609396331f3580f6dd53f0075cb05f8aee0f269878f47ce7ff649d3075c7564b2b8bec6dae32d13fcf9c74414d4 WHIRLPOOL f3574f676b44742b837344015dbf00f136949970ad8501da45aec93f2d8c6d3cdccd88af08871621fdf5458e1f77e8ae20ba406b975fe1711799677684ae4c40
 MISC metadata.xml 248 SHA256 eaade8fd980ee70f3d7ee2ec32c51f17b7ab45d9d3af1088a0d3199ab82d6f28 SHA512 a304fe185c48b7ee1a117b68893f6b1a5ef48fbbafbbc991ffae95502c5a9aa505f0d7366106e015496d38917e17c70dd6b12cc293141d4114346e1ca19d78f8 WHIRLPOOL 65281debfc3d9317e69a82f4bb84a95127943adfe72f5c12680829a2ec0cffbc3267f530433fdde92493c32f94e4e5e16c88bb8a6271655b257fa735f924cb9f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNacMgACgkQVWmRsqeSphMMLACfZyKPTJ5a1lchTSy/hfsSQ0rG
-rRQAoIF1iNHLWldOdS2t02bQ8lEPAXoL
-=p6RB
+iEYEAREIAAYFAlNmae0ACgkQkKaRLQcq0GK9kgCeOSPv4ANP+JrrVNRk1Q6CL3o+
+4IAAnRDTrtqAFUDdluwqjP7qFQB01wQs
+=trv2
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.ebuild
index 44106a76eb21..fac45a5c21b0 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.ebuild,v 1.2 2014/04/25 14:27:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.ebuild,v 1.3 2014/05/04 16:17:11 maekke Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/testrepository/ChangeLog b/dev-python/testrepository/ChangeLog
index 0f752eaa607b..e34a71db4678 100644
--- a/dev-python/testrepository/ChangeLog
+++ b/dev-python/testrepository/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/testrepository
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testrepository/ChangeLog,v 1.8 2014/04/25 14:26:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testrepository/ChangeLog,v 1.9 2014/05/04 16:12:13 maekke Exp $
+
+  04 May 2014; Markus Meier <maekke@gentoo.org> testrepository-0.0.18.ebuild:
+  add ~arm, bug #508282
 
   25 Apr 2014; Jeroen Roovers <jer@gentoo.org> testrepository-0.0.18.ebuild:
   Marked ~hppa (bug #508282).
diff --git a/dev-python/testrepository/Manifest b/dev-python/testrepository/Manifest
index a260db7e6f64..d64e760ddd3d 100644
--- a/dev-python/testrepository/Manifest
+++ b/dev-python/testrepository/Manifest
@@ -5,13 +5,13 @@ DIST testrepository-0.0.17.tar.gz 84255 SHA256 70b70e0ba6aacb44036ed5dcbdbe36008
 DIST testrepository-0.0.18.tar.gz 84886 SHA256 ba15301c6ec6bf1b8e0dad10ac7313b11e17ceb8d28ec4a3625c9aaa766727fd SHA512 4e90db6364f77f464ae063020b016367529588f581af001c2564bf4babb264fc37bb7231413725211c6d483a269360d86201f81d2b24d7eb162dca2463d13c92 WHIRLPOOL c6ced39884ea731173b59a0cbd283d474b3a658e94e2f94a87b5b5e8461d82790cfda2d3e834d51e90b6e57299163cf2dc9ef2cb62440104ac6a046039196abb
 EBUILD testrepository-0.0.17-r1.ebuild 1215 SHA256 4fba2652aeb6f8f0e6d5dabb132456f5dade5ce0fd36ecd46f5013185cc8fb29 SHA512 e2e57bd9226966ac466998c5dfbbbc0380537a5790958e4b50899056b4fb79bad402dc6416d105b5264098b8fc0563aab10f23bd764ee5aef44d9e2d6b0bd417 WHIRLPOOL f8dbfd982c930f168b113d289183a8f760728429806d9aab105e0b33ee5cf55c4cbc0e7c1be6bd4b94880fd828d9858b2100d2dd768f912bbdcce9e32092f2bd
 EBUILD testrepository-0.0.17-r2.ebuild 1353 SHA256 c3402209a0b759a0f75dabd01a2bf59189744c34f5687558533239c7995ce9f0 SHA512 62789fa2b278fa3b51b64248705f51e787f2019cd4a1d74653bb3fe31070bee71684ac4fb7a922870a092a3c421def9a8e1f37c368d96806e65907d0c2b01370 WHIRLPOOL 2220ed508a70b58b50f1770572e47f2dfc3d5ffd00fca10c3f375fccb18ad1611a06026fb918e23161467956cd04fb0e5342bb5517353be556bb02e04e97b601
-EBUILD testrepository-0.0.18.ebuild 1137 SHA256 32733e365e20ed63fd76ea2766954f8060a1f113a5145d6d91e78d85f83a4a57 SHA512 74ff5778e260ce27459411340dff5267b1db3e954ae52a45518aa12f76a3b4c14cb00ac000cb8d7cc0e72c9603ca6176eb932e7327f10c6dcf175f6202a88c77 WHIRLPOOL edbdf29e0d53169850a3bbc07e5f9e1e820b14d6fc1f1f063cf089433e3374e91ea1179caf408f308fe21fac4ecad038f66a06884b0f40175095db3e4cd733f0
-MISC ChangeLog 1603 SHA256 81e3d876f5ad31e77ad3a11df869577485604bae8759a5317c410434f68905de SHA512 7a83722bcde8440f6fe44db92ed9b16bc78dc26095de88f7e531e1c1405f55cec115b92fbdbdae1fcd8a9ab095a45aa38d569787913e52a4505f5e0718ca5a13 WHIRLPOOL 9421c573366a2e34b1872ed1e424240db510f90b060a30a36d62313f0c94ffa2772622d0530095a25832dc718814ec5ca3aecfbdc25b30cd24c863845b3c90fa
+EBUILD testrepository-0.0.18.ebuild 1145 SHA256 2c6ef4f126a8fcd1550491930189b29a2fb34a12a1c719a71b2dca6eb0877d48 SHA512 67f714a5502988b7ee8e468d3e88a28cf609ce984a112b417c49026232c45cf87b63480b442907b8ac87a94812248caebe6c3e1d72947b406c9ee25225f48cb7 WHIRLPOOL 9fe4ac87c12faceb8920079c2411ce3fe34679e262c723bb5ee2e687af412595f5d9f5542ee4dbb8fb59b18b9a3e8c96e2732a758d384f2cff79ac787f8337d8
+MISC ChangeLog 1709 SHA256 b29acdbfbaedd040944f0b013875d8863aab936a1ef33b692537b52dfd23a9e9 SHA512 2a9e5df2cfe8d348703ab00dbc4b92039480ca96155a0505a8a49feca46221dbdbd3a39e59c77f21beac6b431c965b8676160b8b2541d3996f0f4ab502a44710 WHIRLPOOL 4369d04d8058976f6f5dd4feab1a81cab97c539be938a6a0c150f7a0c26973328567779074979144e767643baf52362272c35fda194d5449dbf69231547ce7bf
 MISC metadata.xml 356 SHA256 6a4eb96ee995e8e7062c8a571d874bf35d70ed9c3373bb90aa681542b58c9f02 SHA512 6e2f3bc611a1f6d0d38c1c6fce30c8c7ffe160cb0367392b2997bf078411638f7c770c93e2135134bff751acf28043aea3bbc017f082cedf6e546e900e12cc6a WHIRLPOOL 66d61505c936f1ab11698ebeda73ec1593b387da02d3380306b042cb83ee19170f4811cfd5b455f14477decd631b153ac9834f62be0e1199b9231719bf44a05e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNacJgACgkQVWmRsqeSphOr2wCcC2rZZxAP6hX7HYUorpM8kVzB
-eycAnjuyQeS3xbJc/oujPLbTdWQyeizX
-=sBzt
+iEYEAREIAAYFAlNmaMQACgkQkKaRLQcq0GJK2QCfadwwSGS9rwie3EgL9Z1m5j8v
+5jcAnR/ACs0qyjZVvP/34TlowPvnYfoW
+=149Y
 -----END PGP SIGNATURE-----
diff --git a/dev-python/testrepository/testrepository-0.0.18.ebuild b/dev-python/testrepository/testrepository-0.0.18.ebuild
index 678054f77ae9..4abd354e3e6e 100644
--- a/dev-python/testrepository/testrepository-0.0.18.ebuild
+++ b/dev-python/testrepository/testrepository-0.0.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testrepository/testrepository-0.0.18.ebuild,v 1.5 2014/04/25 14:26:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testrepository/testrepository-0.0.18.ebuild,v 1.6 2014/05/04 16:12:13 maekke Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/testresources/ChangeLog b/dev-python/testresources/ChangeLog
index 918638dddbcc..84e2d3f0598d 100644
--- a/dev-python/testresources/ChangeLog
+++ b/dev-python/testresources/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/testresources
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testresources/ChangeLog,v 1.5 2014/04/25 14:26:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testresources/ChangeLog,v 1.6 2014/05/04 16:11:51 maekke Exp $
+
+  04 May 2014; Markus Meier <maekke@gentoo.org> testresources-0.2.7-r1.ebuild:
+  add ~arm, bug #508282
 
   25 Apr 2014; Jeroen Roovers <jer@gentoo.org> testresources-0.2.7-r1.ebuild:
   Marked ~hppa (bug #508282).
diff --git a/dev-python/testresources/Manifest b/dev-python/testresources/Manifest
index ac71ff01e0bc..a991b080517e 100644
--- a/dev-python/testresources/Manifest
+++ b/dev-python/testresources/Manifest
@@ -2,14 +2,14 @@
 Hash: SHA256
 
 DIST testresources-0.2.7.tar.gz 32050 SHA256 ad0a117383dd463827b199eaa92829b4d6a3147fbd97459820df53bae81d7231 SHA512 29518f7326272c56a5f2f3f1f7741959dde9265ba5ce7e0c7d7afabd91bd44a519d1cad82a11a41944ff12d65e541536476f87afcac9a7cbb4869743a38547b7 WHIRLPOOL c414223960fbd6a1c612d2c79c8b8956ab858aaaa76331ddefb1315dbdd6c6bc1d3a7641c098d7d558b332ee8f4262d8921240adb63f581a3127da6a617dc200
-EBUILD testresources-0.2.7-r1.ebuild 892 SHA256 80117475cbe173fb340d18e5ee57ae1b653d38bfe8327d92f8357c4db842a3b5 SHA512 d78cbc93776d34291f175e447f389cc0d1edb895e10fc9dec34f09e7aac8693bf0286a39d3939113bb9ac84b4a92d8692242fd9aa3e5b32ff418af418225052b WHIRLPOOL b561cffc38330e1b0fa2167a8afe98082ecf4cce59d8a7d92d72f8f2bbb5ea9836782694575f1e07b2b9875d0403486a6da7ee52195f7764909cbb92ac1fac17
+EBUILD testresources-0.2.7-r1.ebuild 900 SHA256 c0701cc28d5af86631fa348a9c08b00e8daec98b2c2ea041302d94bbffae3551 SHA512 73820ab14ee1909889b76b1f890f71411833d52a4631d53e9af4c163918ae32a512b473c9274f117e5aeb430bfabc2c33786ce4d78ddb44b2fb1cf812692c24b WHIRLPOOL abd91c1f5883585fb771e7c7304b47417965c27a37b9ea0899f1b0c770513d188b16e7a944e9c851292a9ef609950e09320e4508b39066756ca779b93e876503
 EBUILD testresources-0.2.7.ebuild 859 SHA256 1f28a1e94043f14bb97acedf9b5f67eaf7f08bdbc1b2e2d066d7c1c85d0692a8 SHA512 18a7833ea3fc2f03ea6ccc00b1aa9c6378ede94d0e8c4a9368d9d52f192c93e73dfef5ba75cb8503f9b68c04ab1cc76aa33e1b3078d2c2181581c3ed76217a0f WHIRLPOOL b0f9dd6de127ad50eedbc42abb4a1bc54e6970491c304bd7ad94a920ff3acf3f65fb6a1dd2c548b3ac67dfdd1de883b3f353d37f2fb6630db91470fd040f5b57
-MISC ChangeLog 931 SHA256 5a685923dc9cb3bbe61f30288006a6e536df9049915f40f527314b74054b6371 SHA512 0b76678440bd3d37e18bf7c995af550a525ae5325f2da87d05ee658b1e0cb94f18884f674523063eab9ebc1970f2d958ab0cc3e4eb2d6c7a6e96e3e62040ab6d WHIRLPOOL f9a0fc286c047c590a07faee939b03778ea34b36efa509ca842fb920a1fe94fcc65dd27c4fa7a031ca92fe9d15e97dcd988234147982963aecfe1e6a0d8d27e3
+MISC ChangeLog 1038 SHA256 75068a787bf39b679fe700e178acf16b2beb568cc212d14c1c1d2d619aa8f833 SHA512 bf0df640d6938b06e545e2f981762551f525ddb5a0ecf2ee5ffd24d695d7e02c614c7373752973ecd86dc63a9650c2e93b10a88696e1bb92c85e52277af39b9d WHIRLPOOL fed633dc1df4eb2a4eba626246d6cda48458da1cca3bb636d97677540d7f6731e56a7393e9da282ac6e3dee61bde7a579750d641a58bca2254e0df0029ec90eb
 MISC metadata.xml 642 SHA256 f68e939f879e354af968e1ddbb6a47abb4b1424872471f8c9a0bf8d81df4c2dd SHA512 9de2662426fbfc854d16b7c87987dc5c8e08b3ba0421a098336f998cffa27b087f4e2ef8ec92e0a3977d8849bb4d04936e7304b4fe6d4ba1b2eceac4af5c4bee WHIRLPOOL 7c27d4fd4804d2b08460e204fe7d8b9262d6ddda61d7826bfdf8aa448d95c9489f71e3c446cdfc4c17bfe52fd3531697655fec7bc30a8d563c920bb74354a893
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNacIYACgkQVWmRsqeSphMYjQCeNEp7aNeodfEiAv2w4YLBrX5/
-2fYAnilVekUrV4yp4tdWt4JcL3DX+NQ1
-=sLhj
+iEYEAREIAAYFAlNmaK0ACgkQkKaRLQcq0GIf9QCfTHIwndijgKcSLYfQSwhdWT96
+pT8An2JJRUsS54SjM/Hl7vBJlRPCsfM+
+=2Mxu
 -----END PGP SIGNATURE-----
diff --git a/dev-python/testresources/testresources-0.2.7-r1.ebuild b/dev-python/testresources/testresources-0.2.7-r1.ebuild
index fd2778deaa3e..d9ed283fa865 100644
--- a/dev-python/testresources/testresources-0.2.7-r1.ebuild
+++ b/dev-python/testresources/testresources-0.2.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testresources/testresources-0.2.7-r1.ebuild,v 1.3 2014/04/25 14:26:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testresources/testresources-0.2.7-r1.ebuild,v 1.4 2014/05/04 16:11:51 maekke Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-ruby/actionmailer/ChangeLog b/dev-ruby/actionmailer/ChangeLog
index e983c7b262e3..ba3ce506793e 100644
--- a/dev-ruby/actionmailer/ChangeLog
+++ b/dev-ruby/actionmailer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/actionmailer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/ChangeLog,v 1.256 2014/04/26 15:09:54 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/ChangeLog,v 1.257 2014/05/04 18:04:14 mrueg Exp $
+
+  04 May 2014; Manuel Rüger <mrueg@gentoo.org> actionmailer-3.2.17.ebuild:
+  Add ruby20 support.
 
 *actionmailer-4.1.0 (26 Apr 2014)
 
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index 5fb2af8573a2..b50302ccde59 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,22 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX actionmailer-2.3.10-rails3.patch 431 SHA256 4eec1446601ffef54a0e8e210ed53b1d72676ab035cf0ab1d8844f11b5611cde SHA512 2421cb97ec78f6a4fe8a191e90cac51f05a4f0389aae574c3f89542feacf7d0d7c589165ec0fac2072704df00117a783d5e9e51cc706f50d5cb1809039a7288c WHIRLPOOL 016e524c2602413b013efda5288274a3b3cf53c101772af27fd03d368941b06b6dfee01ca73b12a0fea71b5ea2eb035f10a63138823483621eb26fda547f7577
 AUX actionmailer-2.3.9-require-uri.patch 507 SHA256 8aa2121eecea068632f38cc03cedf694e22896f1e57dd9bca912585c5fb14efe SHA512 c6236d36edbf711f6511d002d53b11aefc88efa5d72e8d44799286279f3af9ad7fee72d872df7d15c02d2a333230279cdebaa546c1d0d0860e2377243cb35bb9 WHIRLPOOL f43892b7a4bf9ea84c03e81dc902a29414777f951d4e0f8aec62c8886dcd76950ae64aff7b8239f1263e3b0e9dcbb55440cc059d9db0978dc79a4d8cba2e32e1
 DIST rails-3.2.17.tgz 3566537 SHA256 f94972ed71c005ae1f7520d8840852872fbdf6c834bb2eaf1516fe63e406d609 SHA512 4ad32d71108d444bd791ffb2fded25deed69a304a4d6497fb12a586e07348bf4cd1a453614eb932a907063ad6166b89f4778742cb5c2c420f17a116e11b964f6 WHIRLPOOL 0b0911120202e3152a74d31f3b7f8a24261f8e163577ad88c12fd85be088871a0f8ed46b305325250bb830f786231ff349e847b2f642cba02905a95a9a022d68
 DIST rails-4.0.3.tgz 3721788 SHA256 deed80da9b800789a718f95dde5a0a13f18fe6d0169987165a54e7b6d8edd4f8 SHA512 4ac37e5f2c3992aa33020cb7287c9415a014c475dc176b2b51e6112da8bef3b8626216134c5495a8643a9452c7bd78af9a4e2bc77e9c098f8908335d4a27a918 WHIRLPOOL 52bdd5ad2cfe74976b2565963cddc6cefd51ec95fa4f6ca6cc81fe7444271e734caa0800b3cc7a425be0f7dfa47298079b10cacc5909925072935661cfc78974
 DIST rails-4.0.4.tgz 3742294 SHA256 301c7320cf2609a52c230b72f694a669637e39625bbbc42286903b1ebcbc9816 SHA512 781fc5b19ff20da39793ee99761db476de30d55c6b82af040a8f6c69ee608780c14fb91047cd5dbc1d0ba44d2f1b3e862de45210a2373d98fc9bd2beb526e282 WHIRLPOOL 9535db2609e56e0c161beaf50e798334b6619ffc90c09b7dd54cd7b1e0a04b7095d8a21da99a4c6978390f09f1a43341e9e810d13e0eeb2ee54dfaf04f07a139
 DIST rails-4.1.0.tgz 3678238 SHA256 0f2cff305d20d374a7326fbaaae991ac380676b1a4a710f36ac99b410902cabd SHA512 16a6ff43f19cb1bdbe0cdd4729bf9d198ec38ef258362832e6f1d2a065569a133527c7bb4f3394d8544cb012e9af41a643122600b8a196f9d75ab541a32034f5 WHIRLPOOL fb365255d0752104815f0d143f45c696b50863b83af0634a26c407d01d3d1f402b516aac3de425e696cb62e33ccb0395884e0ae68b9eb90608bb203bb1d2ee2c
-EBUILD actionmailer-3.2.17.ebuild 1367 SHA256 c7e42c99cdecc7cc91133aec1bcc9fec193e59099a2895bbd9b3ee2de9dfa6e1 SHA512 608408a7a007e5cef7ab15550a6e36689c60f6a23eedf325985a9f67e2a9ad57752c54160c4e8fc3070d538d8936fe57c8deba02fb69661febd4160488449a79 WHIRLPOOL fe2fa1cde924a53c784ffc44feaebbaf9254fe1968c0c73ba43878cc0160458f680f2f4e5e7e996f019580bce6662f64e73935ac41c997bccedb6aca0180fbb5
+EBUILD actionmailer-3.2.17.ebuild 1366 SHA256 59d5acd8ed318fb9508e1d1f8bd3dd8fa7fc923f912a3ea3a88227dcac7d13fc SHA512 0aa432f1e50686f6ef71f2bfa6cd32ba88ab8c03f54d30a71d3ac5f5a5c6f99d168fc2a4a5699b872da6c0d1f749f932d842386edf08fa7803e84c1882227cc9 WHIRLPOOL d25fd4b889781365646f694cbb1ed03603ab23a3d3fc5a5dd5e0133d7801aafd37e79467bab122570b06a8aca2a07867eb2ada38fa1cabe984d8fa15e1772fe7
 EBUILD actionmailer-4.0.3.ebuild 1242 SHA256 8575e906f989cab0caaa5aa31f9b94b29fa7a9ff8eed462fb4b78265bfa4512a SHA512 9976d8a1ffa5acf99ce22b49b9983634dac874469c27adf979b49dfb43c52e9fa5d6c68a2cfe7d7a503b804bf3c5aba89a3ca84a4385a5a142086ae7d3c8c7f4 WHIRLPOOL 3e421a9e26d55c9d75518ec91b4d1ef02899ac488c117bd5105d953497dcf73e58e2f6fceef8ae4090493d45b7213c0d19a11e4b0ee60afa1ed17e97aa5980dd
 EBUILD actionmailer-4.0.4.ebuild 1258 SHA256 a7af79aee42334737bfbf0bd1be8ccb2974582d4966f84dce2993c1b3849baed SHA512 44cd4f7c1805e3ab47a72d306b6f569ae2061884562a262912c766a5c059482dfbcb08547c7c198a1c40db12951e4750c3905ef9259b908fc33a5f3de01b94e4 WHIRLPOOL e475f026bf8e071b82c770a249338ab6f65d3033ace3d28ee9397a9b0c2432ab7fbc6581bbfa050457fa6620ee1afb95fd05633b32706563104968afd698ff74
 EBUILD actionmailer-4.1.0.ebuild 1253 SHA256 76d2c9a3dc6d2f1b227c91feafede7d959bf0a0162302fe99d1ff77ca3845c94 SHA512 e2511a2f3bf7002cb889b5496becea45c13f2530f0046c148119a89f37b7308bfea72765d1daaed2efc3c4edd597e6d65e5c00659de2a8a585ab537bce081ebf WHIRLPOOL 4de9d5a38fbb0ea04293f85bfedfff28ed20157b588ef33d10285e42cf76da164ba1e98caa594cde4a08df9e22953929800fc4bde503184a0467d72d3c0cb7b3
-MISC ChangeLog 34876 SHA256 e1f649d6ae1f36164e32b3bb605895d2cf6fdc9e3956a4c06feeef03ccec1e5d SHA512 bcb677e135a15dd9eafcb538eb0510790807ec66bbe78b47c859431d1f18845980811f526b61e56574c9db836e62829e6f53e4054f2a032dcd0c0454107695ed WHIRLPOOL a013a8712a4ff6a322d9cfe0fdfa0d0cc64fc7c15fb82eee63cf70a08fade2b1cfdfd8a5926ad158a733959f2a79c3d90acd0f4ab807f69e5f9f9e4cfbf3cd51
+MISC ChangeLog 34974 SHA256 a558760f941cc09fe959b3a4bf7bf79394f4a8773897aaf02aa3c5b396f27d34 SHA512 a4a3c91992b3cadada82a76f2398c69a4c69f8601223738b975cdf214db2bab2a8d1905d2cc23471499dda1648d2da11972f4e3f9784977d39fcd4da6af4bfb8 WHIRLPOOL cda4036bd18ba365fb41602b862903517d237b56942825ae8078fc3d01751721fb57592a516f48f5c35996888c6dc687e3e94298b51b0ea90e35c3cf2c92e7bb
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iF4EAREIAAYFAlNbzEQACgkQiIP6VqMIqNddSQD+N3n8IrKoHkPBXf3kGUi3xQ+p
-+5P6KrpHew2abqI4msEA/jBOn2R0vm6Wh7p5lWBLvZj5dlHLSsh3ewJePhYvDa5L
-=UiDq
------END PGP SIGNATURE-----
diff --git a/dev-ruby/actionmailer/actionmailer-3.2.17.ebuild b/dev-ruby/actionmailer/actionmailer-3.2.17.ebuild
index ea978a145468..72635963e88b 100644
--- a/dev-ruby/actionmailer/actionmailer-3.2.17.ebuild
+++ b/dev-ruby/actionmailer/actionmailer-3.2.17.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/actionmailer-3.2.17.ebuild,v 1.1 2014/02/19 07:19:35 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/actionmailer-3.2.17.ebuild,v 1.2 2014/05/04 18:04:14 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
diff --git a/dev-ruby/actionpack/ChangeLog b/dev-ruby/actionpack/ChangeLog
index e7cea4e6b50b..04d92010322e 100644
--- a/dev-ruby/actionpack/ChangeLog
+++ b/dev-ruby/actionpack/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/actionpack
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.274 2014/04/26 15:09:44 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.275 2014/05/04 18:05:34 mrueg Exp $
+
+  04 May 2014; Manuel Rüger <mrueg@gentoo.org> actionpack-3.2.17.ebuild:
+  Add ruby20 support.
 
 *actionpack-4.1.0 (26 Apr 2014)
 
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 699db41baeb5..e0b70c1156cb 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX actionpack-2.3.10-i18n-0.4.2.patch 2671 SHA256 7060319a5037c3623e8c5beb36133dde6d3e358746fecfc0ee072edbec5b33e5 SHA512 d9e258d26b60166987649b52e7edccc22c37f8e915688a2ceee7088b853a1ca262cf34630b5712c7a02f027984b4eb37296d1274475a16317cbb5778777cd173 WHIRLPOOL cfaa63240a403b09b23893f76205aacc317e010936cca8cd46b7603eab4aacf7c2b09974ff3d5533524f40eb4318db30c0bab3403a688588da194ee2c6df17c7
 AUX actionpack-2.3.11-rails3.patch 416 SHA256 8b2dc793f9e8b996c57dc77b3898a54757f330b8c95ee94c9bdf3b0013350093 SHA512 3e9540bb1777b29736285561ce1d7466f0497150927d40169fd5ce222f803df595105c9f222ff223e923b8b5411d90a92d265b727104f1f494693a7bb100b3d2 WHIRLPOOL 3000e6b584ff572e246d2b281cda1075449af85f905dff6bf591f75de60145868e81af7753882b29af48d45e69f79db3898610646ac5af7862e13f0e24dfbdfe
 AUX actionpack-2.3.8-custom-cookie-fix.patch 3009 SHA256 9368cd7b35fbc0b5d4161e121aa9ced113ea831b738a47b6c59828bb17f24c04 SHA512 4e8a1ed63446c946722922b2cd5901b27df4ddcd7125b0c1777148e675117537e9394ba998093667f79e1349ec79a61b7e2e9c6d704327a3e000992f7ae3deb9 WHIRLPOOL e7a716f7b45b8f20eeb0be4faacdb973b172a7f44168862a228ce242afd88db512c73b64cf9bb8faab1e5ca698e65dad8746ca1fbf7cbdf9273819d722c3d32e
@@ -8,16 +5,9 @@ DIST rails-3.2.17.tgz 3566537 SHA256 f94972ed71c005ae1f7520d8840852872fbdf6c834b
 DIST rails-4.0.3.tgz 3721788 SHA256 deed80da9b800789a718f95dde5a0a13f18fe6d0169987165a54e7b6d8edd4f8 SHA512 4ac37e5f2c3992aa33020cb7287c9415a014c475dc176b2b51e6112da8bef3b8626216134c5495a8643a9452c7bd78af9a4e2bc77e9c098f8908335d4a27a918 WHIRLPOOL 52bdd5ad2cfe74976b2565963cddc6cefd51ec95fa4f6ca6cc81fe7444271e734caa0800b3cc7a425be0f7dfa47298079b10cacc5909925072935661cfc78974
 DIST rails-4.0.4.tgz 3742294 SHA256 301c7320cf2609a52c230b72f694a669637e39625bbbc42286903b1ebcbc9816 SHA512 781fc5b19ff20da39793ee99761db476de30d55c6b82af040a8f6c69ee608780c14fb91047cd5dbc1d0ba44d2f1b3e862de45210a2373d98fc9bd2beb526e282 WHIRLPOOL 9535db2609e56e0c161beaf50e798334b6619ffc90c09b7dd54cd7b1e0a04b7095d8a21da99a4c6978390f09f1a43341e9e810d13e0eeb2ee54dfaf04f07a139
 DIST rails-4.1.0.tgz 3678238 SHA256 0f2cff305d20d374a7326fbaaae991ac380676b1a4a710f36ac99b410902cabd SHA512 16a6ff43f19cb1bdbe0cdd4729bf9d198ec38ef258362832e6f1d2a065569a133527c7bb4f3394d8544cb012e9af41a643122600b8a196f9d75ab541a32034f5 WHIRLPOOL fb365255d0752104815f0d143f45c696b50863b83af0634a26c407d01d3d1f402b516aac3de425e696cb62e33ccb0395884e0ae68b9eb90608bb203bb1d2ee2c
-EBUILD actionpack-3.2.17.ebuild 2868 SHA256 2c7dabeb42ebdcf24f64615475573bf7f8b2bad4d0f330b6321b6076072abfbb SHA512 1c7019bf2c85ea2f80b871b3449566219b92e5b5fedf9f4782bb5754253250abd1bf1bf133b2e91aa44d36843ecbb9975f0af8c77334ac9a7b1a50122f64ecfd WHIRLPOOL a248ea8c21e47328120a0edc01b38d0c7055385fda0b8aaf115aae6e08790defecc01b4cd98cd16bed3bfc700ddfe20185bdf44a38861e821e7b044001c9aa63
+EBUILD actionpack-3.2.17.ebuild 2867 SHA256 747b932a47d677b9f4eefe0e41639b549b60d21f974a6430a9d013fe9e0ff988 SHA512 03beab9a3c2ddf5a6725f48ce6ae65655ba8455a6be603e60afddc6d15283547a9e8c6d6b357b76b5525679b0f758c3d5547e9259db02524cde73eb99f07b79c WHIRLPOOL d32c2923d961a2d7bfd77525862587da1703881e53378c56aaba37fd6584bfeb945a9c4939af8f79548d8156745d3ebc0170f93246ef54709692ea12a94ee051
 EBUILD actionpack-4.0.3.ebuild 2771 SHA256 ebeec611db2676836b269a492cef7bd0d11f02f5ecdc972e0941e03741470bab SHA512 a7f7de5cf3e9b1a24e79fceea840f8d6dbb6487a7ed69e3c29e27cd198a182631bf918706b5ab3bbdb0accda8007c5d4e0929d45a3ec546136ba3690c0830a72 WHIRLPOOL 9f58a9541a1830ce5a4cafd9781117ec0e51859e259e327d5d6b07ff63db26f4d4bb3daf31a7043c7902bebb9373a39908615c6a860773672378dc666ea3bd38
 EBUILD actionpack-4.0.4.ebuild 2755 SHA256 9541b5f7af43b8f18ccea9b4040fe4672a657fd8af892bd35c08826c2a0d19cb SHA512 e218731065f29b08a9464e610f1b9c3a6fceb3a648891045e401928153be31db81a427a7486cea35b92ff4b273bb617bac2faffa5ca37e922209015ac0e85995 WHIRLPOOL d01cc8b9b33d13088c9e310f026d39fa1b61b41b240c8edfe2eef77f7ab8141c7c342bafb9d123a86d323a3de3381dd7ae0d8f108389da2402198791a5780895
 EBUILD actionpack-4.1.0.ebuild 1416 SHA256 a6e0d72ef2c6f2f4efe932b294ce9b43abc5ac0f47ea32eaf746f1491eec5bf9 SHA512 0dfa0e07e9dd801327d8662dce5bc65c8e0bfc0368fa12b75572adc97c1733c3fb8386207d3d94f50ca827ee27e27f408d4aab6f26a1f31f77bd3a5ea311f388 WHIRLPOOL 80b870ffd5fe373cb3efc842cf4843ed8e6c6087fc7e16308f5905838eddb48c091e43db65bd4331aadf23b36a71c3ff33302d833e7fd205c542b639fd14f539
-MISC ChangeLog 36953 SHA256 6cdce8afcc67b0a93d295386065fb88b15ee6dcb1af385c947b9534568391a85 SHA512 8ed03c7aaed4493861a175a4dd75b1d37def8469496949575543baf413255663ed7236a8b272342eafb64958bdef28b6bc6432c06201db884f9043b8dd2d33f5 WHIRLPOOL f0492cb48ad77de390796038ad711a592b39468ad9c803e31b5cfef66578f18a6f8816816461355dd36d0b8df1db75e93b88146f244b0d06d68dd786ce1d5083
+MISC ChangeLog 37049 SHA256 70a7a34441d58651a9e521a0b21466f17d8115672a46b712ac5f7934b1fc0601 SHA512 0e80688cddd40eedc756f2f1b6c9f215b96f7828efd76f60fce2fa4b12a4fd619496aa41daad8d6db48034ffc35889e785fdbe418f4da559b36f2f69319b401a WHIRLPOOL 0d6b6d60d6f55c58029159f4a84af052dac6630d530d2aa36df89161a6919a3d1ed7524aac01485dd40e7627c7d17fb11da79fee25adfd60c3ecc828780624e3
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iF4EAREIAAYFAlNbzDkACgkQiIP6VqMIqNctYgD/RS82q8oL3r/FthGR4oYBLRO/
-8U+GrjsnwLfXmC9IXh0A/33eIXEbiqtXwnxxcTZUnLb2XwTKcVPUYDqvOBU5E3xr
-=D5hE
------END PGP SIGNATURE-----
diff --git a/dev-ruby/actionpack/actionpack-3.2.17.ebuild b/dev-ruby/actionpack/actionpack-3.2.17.ebuild
index e1176717e8de..a37f1a61aa77 100644
--- a/dev-ruby/actionpack/actionpack-3.2.17.ebuild
+++ b/dev-ruby/actionpack/actionpack-3.2.17.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/actionpack-3.2.17.ebuild,v 1.2 2014/04/21 12:23:35 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/actionpack-3.2.17.ebuild,v 1.3 2014/05/04 18:05:34 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19 ruby20"
 
 # The default test task tries to test activerecord with SQLite as well.
 RUBY_FAKEGEM_TASK_TEST="test_action_pack"
diff --git a/dev-ruby/activerecord/ChangeLog b/dev-ruby/activerecord/ChangeLog
index c34bc0d1b028..5e827fc3d55b 100644
--- a/dev-ruby/activerecord/ChangeLog
+++ b/dev-ruby/activerecord/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/activerecord
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/ChangeLog,v 1.262 2014/04/26 15:10:05 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/ChangeLog,v 1.263 2014/05/04 18:04:20 mrueg Exp $
+
+  04 May 2014; Manuel Rüger <mrueg@gentoo.org> activerecord-3.2.17.ebuild:
+  Add ruby20 support.
 
 *activerecord-4.1.0 (26 Apr 2014)
 
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index c9bfa0be3d11..f0b6560108e0 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX activerecord-2.3.10-rails3.patch 295 SHA256 96422289122ca769d24f488bc9ab9af9cdda4162ad83a3fe27894b04106d8567 SHA512 0aea58d477b1be3b664e12895316fb8b39c4e6770107a96cef1331cc483f19126709b99d2b4c257c4b10c03ad4d355e57af8ea82df25740851ab6037e745826c WHIRLPOOL 278f8d6457834fb449f725445bb399321e3040913b74594b990929383cbe51d28bdfd127154e089aa5ae18ec144f5561a18f1635c443b0965c326c64916eddbe
 AUX activerecord-2.3.14-dynamic-finder-injection.patch 2138 SHA256 d24dcb57517b5dc5056a91bea1dd7ac63a587dd6a7fba7bc9e621fbe18fbe26e SHA512 23d12fbd4ff6ba51f3f17bd35c79e71b5304926780626898fcfb0709a12d8403421d939fff615673963f40afc663b62935701eec4a2c0184c943c6345c17bc61 WHIRLPOOL 753facd9e94cb474f09803b8ee19b1afccf4661e7a1eb7a3c20ff66c2355fdf37a772124f2b8b355ea123f2effd615b1eb16d38a74d99f3f855686aeb0291753
 AUX activerecord-2.3.15-null-array-param.patch 907 SHA256 eaac6a89147c2f4ff0cf75301ac199adcdb18bec3b856af005805aac41677651 SHA512 d18ef97cd98b25055a3865789452f32e15e08718c2288f741e6f33c9a5441ca47f4030ef4e4a6d305b59bf68030686cfa637458f75abd6cf84120a6cefae6de0 WHIRLPOOL 155df14956562306f55f5512c3da0fd19f5010c3c908db953d13b446491b8297a02ca3c743c5476c8d53d5505b077908620f72eea28f879709737ec9877db264
@@ -9,16 +6,9 @@ DIST rails-3.2.17.tgz 3566537 SHA256 f94972ed71c005ae1f7520d8840852872fbdf6c834b
 DIST rails-4.0.3.tgz 3721788 SHA256 deed80da9b800789a718f95dde5a0a13f18fe6d0169987165a54e7b6d8edd4f8 SHA512 4ac37e5f2c3992aa33020cb7287c9415a014c475dc176b2b51e6112da8bef3b8626216134c5495a8643a9452c7bd78af9a4e2bc77e9c098f8908335d4a27a918 WHIRLPOOL 52bdd5ad2cfe74976b2565963cddc6cefd51ec95fa4f6ca6cc81fe7444271e734caa0800b3cc7a425be0f7dfa47298079b10cacc5909925072935661cfc78974
 DIST rails-4.0.4.tgz 3742294 SHA256 301c7320cf2609a52c230b72f694a669637e39625bbbc42286903b1ebcbc9816 SHA512 781fc5b19ff20da39793ee99761db476de30d55c6b82af040a8f6c69ee608780c14fb91047cd5dbc1d0ba44d2f1b3e862de45210a2373d98fc9bd2beb526e282 WHIRLPOOL 9535db2609e56e0c161beaf50e798334b6619ffc90c09b7dd54cd7b1e0a04b7095d8a21da99a4c6978390f09f1a43341e9e810d13e0eeb2ee54dfaf04f07a139
 DIST rails-4.1.0.tgz 3678238 SHA256 0f2cff305d20d374a7326fbaaae991ac380676b1a4a710f36ac99b410902cabd SHA512 16a6ff43f19cb1bdbe0cdd4729bf9d198ec38ef258362832e6f1d2a065569a133527c7bb4f3394d8544cb012e9af41a643122600b8a196f9d75ab541a32034f5 WHIRLPOOL fb365255d0752104815f0d143f45c696b50863b83af0634a26c407d01d3d1f402b516aac3de425e696cb62e33ccb0395884e0ae68b9eb90608bb203bb1d2ee2c
-EBUILD activerecord-3.2.17.ebuild 2566 SHA256 bf7b51ea290c20c7e0f43036d1460d8995454610b69befc6b15e562d55c3eb10 SHA512 c3dce1f4be35d54dabbebdc8b660437a596a8ff8db5acf521cf51c373148ead071f0b50112e40dc89998c98b4b39070f584a8d5bb5c4541e7d87fdf42fa96168 WHIRLPOOL e470b53a0c5d368449d77f1f0e72e2fce99dbe8728ab95d1fa75bb2d58e4be58c3b88a7d7fee59e4d049b22f73a61812f1ed9760db2a477d22b76217d3cac598
+EBUILD activerecord-3.2.17.ebuild 2620 SHA256 a3a33b084e912787531f78cf1f4e4d6991de34ff690bfba3820133b29c52af21 SHA512 6455ee0e300c724764fcdc2a483691259725bc013e9d07acd8cbe24787a4e1d93a4387258cbedbcf4fd3e0c427f245a940cab5106e2dd1b0d262bbe256661dd6 WHIRLPOOL 111ebf68dc01512dabde86cff3acbabb17e3047e63592b66988ea3266464bcfe0a9fe56cba2a67b67bf36211a16db8020c961833049f679991ac31a1e96f493e
 EBUILD activerecord-4.0.3.ebuild 2878 SHA256 35e5a8497cbe43e04427384724aaf0415482077f1c355430522341d06bd69ec2 SHA512 eec4beac85a8e89a057e3a24d5b5e11da9924a2dbd5947964ac9ff2b72939cd9acfc76c1136e5f20713e8f0345b9ebcdcdd09e0930aeb10a4b7385343abe8a26 WHIRLPOOL 8bc704f88a26b59e41ed8bc05e74521e565ce60cdaf0884efbe99998d9c0d6d51230337c11603322cd0588506bc26408acc04c702d3a8a403dd0b7a4eb26478b
 EBUILD activerecord-4.0.4.ebuild 2894 SHA256 05c491e5a9fa822d3015e427c311c6351b609038ffd833934ec090d4c8e44663 SHA512 73773c3d2f3ed69446aa44e318d57414d45fa47496a13b6fd6048d7882e5e9c35dd3bb5c72ab7914074f13a5579a02067e8bce28015086c7362991e7d863ee25 WHIRLPOOL 0285f15f78bb3a18793622a59bec90bcc7ecdaff35073e6fceb7cbb18a8bf11cd11c087b1a53429f171daee9525099954c88128297ebd382c12fcade706db90b
 EBUILD activerecord-4.1.0.ebuild 2846 SHA256 1765fd93913fe88d225af19996230f255fb3329d87a91307231bbf7288be643e SHA512 e16c904c4ad7f92f21a7bd54ba7c2ffc0df68d2e02019837201679dd6e49f9c42c9f0223763c1b53dbc8a8738f6a3976ec5f39e7982340dabcee24c2e8c8187f WHIRLPOOL 5370012335d07ea8a835498fbeb9ee694af75a56520d506ccf6f843e6912e0fd73a1418e35497ea2e17654c948e9602c3724784f4b7c0ccd563002f2a34fb6a3
-MISC ChangeLog 36416 SHA256 1c6e52ca3d35c1132bedaafb2894191fff0cb4e50c2949618303adee135d7f9a SHA512 16654d19e0ca3c7a315cf87015c770ae9dd9051012c302bbfb2401195e799a1557ed94aa3dcb1bd431bfa393f20584fc9e37e10820a0865f6b3ce2170e463fe1 WHIRLPOOL 49e2b465c177064d6b30396c0079bea79f43702377d356e9e9e509091e6d52a1a35fb6dbfc473dfb7c48cc1c69480866ff2ee219cd31abf9322c30eea83a1340
+MISC ChangeLog 36514 SHA256 d15ff510208af185f588d70d545dc82dddf18e5bf5ee489ba5a2f4658dab766c SHA512 4bcc5f9ca5c9da8f61c0e10fdf22eb8c524c054c8001e6aef0ad3de4fb7ef5aa92f3dcfe174fa15e8f46878a68573c24ee630ae134f6a0f8a141d56203f8fc65 WHIRLPOOL 26faee2fc41051796c7a54c28d8f347511b24abeabf366950080a134df1c5cc9124af801e62d9209b9184d68361b493db4857452b873b91b1955e44c71f21459
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iF4EAREIAAYFAlNbzE4ACgkQiIP6VqMIqNcp9gEAjCgloDRbgeGEwF1efeIuCh1e
-4ZjqTYZXuPYz6kFsh6UA+wcmzeCBWI9OTYTc1UeVG6MivpjBQO/aFXZoG/Lhd7ft
-=hBV6
------END PGP SIGNATURE-----
diff --git a/dev-ruby/activerecord/activerecord-3.2.17.ebuild b/dev-ruby/activerecord/activerecord-3.2.17.ebuild
index 424910870283..048774d2c4d7 100644
--- a/dev-ruby/activerecord/activerecord-3.2.17.ebuild
+++ b/dev-ruby/activerecord/activerecord-3.2.17.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-3.2.17.ebuild,v 1.2 2014/04/21 12:14:22 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-3.2.17.ebuild,v 1.3 2014/05/04 18:04:20 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19 ruby20"
 
 # this is not null so that the dependencies will actually be filled
 RUBY_FAKEGEM_TASK_TEST="test"
@@ -48,7 +48,7 @@ all_ruby_prepare() {
 	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|benchmark-ips\|nokogiri\)/d" ../Gemfile || die
 	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
 	sed -i -e '/mail/d' ../actionmailer/actionmailer.gemspec || die
-
+	sed -i -e '/[Bb]undler/d' ../load_paths.rb || die
 	sed -i -e '/bcrypt/ s/3.0.0/3.0/' ../Gemfile || die
 
 	# Avoid tests depending on hash ordering
@@ -68,7 +68,7 @@ each_ruby_test() {
 			;;
 		*)
 			if use sqlite3; then
-				${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+				${RUBY} -I. -S rake  test_sqlite3 || die "sqlite3 tests failed"
 			fi
 			;;
 	esac
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 8756c7e3457d..ca584b27b6ce 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-vcs/git
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.258 2014/04/25 10:47:14 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.259 2014/05/04 15:15:16 zlogene Exp $
+
+  04 May 2014; Mikle Kolyada <zlogene@gentoo.org> git-1.8.5.5.ebuild:
+  amd64 stable wrt bug #501662
 
   25 Apr 2014; Lars Wendler <polynomial-c@gentoo.org> git-9999-r3.ebuild,
   +files/git-2.0.0_rc0-optional-cvs.patch:
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 391619cd6c06..2f86a6adadb6 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -54,7 +54,7 @@ EBUILD git-1.8.3.2-r1.ebuild 17641 SHA256 b72b48b74757308f11fa16afa14d58b68f1dba
 EBUILD git-1.8.4.4.ebuild 17770 SHA256 30443b5bb21eb258baeae3d19b2530dd8e2065ab1aa6b35e7585a1a19495c7a3 SHA512 a9e14b4a5675f2064cb77fff32bac5f3ccc3f75160a4bbfb027e69f203a56f7423ea6d7df71f7c716d7a2e9c6bd7f6da92f0b9733df41570d7bc16a513884de2 WHIRLPOOL e268213a8eec750aaac69640c15e55f5480b3ee095b49216d9f401cb6d0ea947a442d76a00c55e2acfb0c64b450f75d29a914c15167a4ced9f3d0fab9c261da6
 EBUILD git-1.8.4.5.ebuild 17939 SHA256 d313fc01d096c23107de80aeb512baf362135d56d99d3ecc753dcddeeeac0f57 SHA512 fe65a8fc2d439f56f332f860e40a5e07161f09abce9dbcd272b460a963414ce05f05b3ddc78162c1c48fb0ee98a391da12a14b9794b6f96a6ae2c223f595ff25 WHIRLPOOL 51d75a2c155e86d715cad75b3fac351636b76dfd9aca2b2cc9439abb6e08839bf1138a5c9b19a3bbc1698d8dd7ae77232397d3141f6718a6dc8330b543e3d7cb
 EBUILD git-1.8.5.4.ebuild 18448 SHA256 d8fa016e7ceeb7d2705b666c82dab3f64a719e32c90f0bd3ae409534367d9fec SHA512 07f7b3844d2c7355e82a3f03ca2b778c43d1b23cf1b7bf09afd318d36540d4e3f99328cd8b592ea0676320182a769e47601742b2232e77c493121b38dded0dd7 WHIRLPOOL 1e3aa1ac370b3659ef79079a44acd663c8fe707893c2c5fabea0480436d3d556cbeea4017f8bbd4f142fccf575ff96856823ade1b4f65cd45afbc730d2ae1b4e
-EBUILD git-1.8.5.5.ebuild 18443 SHA256 a0aafad27d2ba66f80cec82b337e6e31ab0de755a6b6c2f429b04adf5e992c2a SHA512 4c7d02a6e0ead2869ec1a09a85815278d3e88c85a280e6a3d3cff3bab9fac71e16cd628e7bd7d937ee98a3af845f45e63bca59b3fb98bfec1a0ca356f271eb47 WHIRLPOOL c0f8b818ee34facc4ce387170e1e2d93c135619f79e3b05de2fb2fc4d8df9a08c5347507efeadcaf42b7441d4e267747c51144aa1a95a045641e4a0406e48ed5
+EBUILD git-1.8.5.5.ebuild 18439 SHA256 d53cfb2104e318ad6ea9965dd001fc90d1f386bd2c30a6957c9e3c3d3fb0b449 SHA512 324cd78049ab19d896974829e6754b02f7d05dbed295908026950708839333e9939c6b2a1cd24a3984696b6a39f433185350a124bac5c36d06ebe4ed1af0d0f1 WHIRLPOOL 2e8f124fd89f42e3e42382c5a225a9a8bd1ae122ccf3aa97129888c498505dd0251c57b2b93801700cbc8c776e891db83aad3b7d91081f5e3cde1b719d5ef3bc
 EBUILD git-1.9.0.ebuild 18336 SHA256 82103e5e398008e2b99bd3fe13b990acfad8843020bcdd6a858b119103d05678 SHA512 b1f367866929bb35ca474d1a859e3e4e2bf05d04c6588bde660613b39a1d7689a5a6b3d113597d70bfb46ada399549ef2cd132986609fb2ccd84cf1eead166e6 WHIRLPOOL ce2f51d248b311d480dd506a012f41d9e78ad79e17e348b2f716c2828d874ebcaa5fcad618cd7a4015b79f44ffde3046dd35d980e416383066b75bc7b0ece3c4
 EBUILD git-1.9.1.ebuild 18331 SHA256 917144afdb6c4d630b6f12053e6573b0f52e1a3b25ce5b3f755566c2c6bb2dae SHA512 2cf86a3880c2bfed494e7567849be4f3f3df569355b88c1d06dbdd4589ba951eb81ad22cb29aa64d6dd0e443c27f6e383f4d5da0cba7f407ab3c084b6190c53b WHIRLPOOL 2c1edbc4968de563905a83c526cb0534f7d3a095b3316779db30605654adbbeabbb5ce067da3092812a3fd3355c636e942ab0963309dd4423060da5fcd4553f1
 EBUILD git-1.9.2.ebuild 18331 SHA256 88b5163edf05f203ce88584de8f90c78f73c22e743751b8aa60cd16151082b07 SHA512 f347e54b89472615f8c7ecd46c3db9e4fd94404f954a988594c37c6305b1a81af2f76aad12c007ddcac5d6d90c58f07609ab324984e0f300320f3d0d771cff72 WHIRLPOOL 62f52622d149af1cc05ef1cc65916b482c0ad0ee90c069b98ac2fe5bbc42478fe9b46be17b42536a0daab774a160c537c0e93a01bde57e7d97ff25c8b3ed2677
@@ -62,23 +62,15 @@ EBUILD git-9999-r1.ebuild 18351 SHA256 0b619797d439af7a9911a00cff0b08d11baceefbc
 EBUILD git-9999-r2.ebuild 18350 SHA256 64886b9c2a7c7071372d705519e74e1e37d81e693142e0dcff0c8d3e870f6f7d SHA512 3337e7f6289680a0c77540d80c68a95e8bcd100d68eacfc6c460d63d8f64af20533de61f19808ec5ae9e4375d9194f9baccaf115dbf9e6fbe7b1df49b9ce16d3 WHIRLPOOL 4c21230ac25034862756293062553afbde045f3dcc8a559d0806f75ee687266c41e99428b0775bab52ea775ed35351adc205479472fe8e13456d7c821201646a
 EBUILD git-9999-r3.ebuild 18353 SHA256 ffa7eb06ec8d294f67c4a86e689d7e253cc971890afa169249a27b03558ff352 SHA512 103a7d889d8dfe011759be8919037b8640ab0099900480beb8c1bba25c58bfe6a9bfa96d7e25c21347b4d1a5a7541c769928e093334fcba4127d329d92f8e404 WHIRLPOOL 866b3f4d81df7b10485ae8851b5e0961e0cacffd3456aa27cbd90c148c1ec5bcb7de7f4b9b60b766ae8a4079c9eeb54d2923c10853311198dd5a244a2d089b5d
 EBUILD git-9999.ebuild 18350 SHA256 90cad2eaf6bd0558996331210c9de028d4ad81d9b2e374cb2868db7311972b01 SHA512 dc8011ebf3fae80a93d7c91641b847ff66e11a9eac36dd4dec782de10bb47f8c8520b658ff088d75bf005d15073d5177284b6b5992d0aaa4fcfff9b807852414 WHIRLPOOL 128e9cfab049d362471d17510ffe2ff4cfd580cb22af65048234adfa17d2776f5e7224ddd0462d13e5829778b86b6e72a166c4c31618093603d5d736c4d64ad7
-MISC ChangeLog 14807 SHA256 f80334ab975dcb500c93f9db8ade43903afd9b61b6b4a47d2f393273748130ff SHA512 6dcf9d346c276c71fe3d713012ab7b656d95f4dbe416f3aae547481214b1313c0bd8ac5986b4afc47ad387cc5a34a19ede025601cbacebcb4ee19b592e0776f2 WHIRLPOOL 0b6334835c8b9b6e6bd3e7648c7debd46d03a6d37596d404ed8e7289f7dfb258a8838767353f391025bc182e50fd21cb14b7073b5328cea40f65fcb367021a82
+MISC ChangeLog 14904 SHA256 2ec3b69c6849460c8722337ce99297b55d77e82132c09dc8a7e9bbce3c003648 SHA512 9a925315486827b7fa2caa3293929aa1c18c7bd0c1870c5523dfc6ab7863c1825f49c35654bce87bc0eb0b56cabbf9fb9bcca7a36c32391b65e312daf3d3f3a4 WHIRLPOOL 345c3921784c5af17437b3fa0c34e9338674e203ddf917ad81cde5afd726177414fe1165ebde4001eb9c9d9bf2fcaeb0cad1048d7e83913a40f119e848625dba
 MISC ChangeLog-2012 94624 SHA256 7c8c313ea4800194191f7255023cabd205e56bb9761e8877dfab3770024b158c SHA512 f19cae0a29e8598e3bb68f1295baa56ff0edf06b2e3a95081ea2f95c4555d63dd6a0bff5a82345b274a1936104a75a69fe7862d7738a7fa2539ec9a7afd6b28f WHIRLPOOL 059ab6c542757c4524cb20cebb3cfa4bfbbe16d3a66da0805fb972d32f91f2a49bee97d1d73acf74d8e2cf3cc7a552371cf66db0580506d4b1a9e05ee52bdea4
 MISC metadata.xml 1877 SHA256 74e93a953d9484c1f5806efc9c80bfa729b4d53415a00168e5ffec255750f7bd SHA512 3ef0d74206f67c27b82cefa40602cd33e432cc0f06ce900766d32f1ebd0a71d6cfa750ae77660531fc61a1117f7959d7df6ec10f439cfa2ee372d54d7ac87c5c WHIRLPOOL b9d97eb6b92a1894d965a5e9fbfbfd0d64625b31318fab2eb11b4dcb331133dbf678f62a7216c12b53a2546fa5d6a07c6240bddfa7784a925eafed602a7ffa75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTWj00AAoJEPiazRVxLXTFioYP+wYOXk5p53xjaN4kk/Foa11x
-h9Vq3ZgE7QIDu+ZO4+qvjzjbAy3G1Bsg1x9alUFUeiesPtUIfpxI9Q2JRIcY4Qc7
-p93ug6xiO10V4rd2ApD4ome1WBKPP43h7udssd9tWUU0O/CFTeC5aIXYOTIt6QvD
-KPG63xHoIxFhQsCiXDoclySMryoLVkGyJ3Povkpbj/dqg5kUQemLtBc5rhUxTEWo
-3hNmeUF225MM1JNUm0lG1qltyxou9Tz/Qe2RWUSJyE0MA7d9a7tJmll0U5mXZyya
-56Pp9zxKmA8Sehhm2WLm1w5PPcn8p3LElZZi+HWh9CwmN4t7EuXCVICsIpcX77wx
-XDdrqvZYnjEp4FX2zLEHuIxbIdstBc1GW9+/6g/bRgP1M6ksNx7CSxTDdTFwI6iP
-LMqxPdCp+vWsZC7IJqeQndvaoPxJETrl7oKQaiHfwmGgtT6NElx9HVyn1ustjnmc
-AT63jN9h0Zpqhzj/feRHaXpyASf9lBWZtIgKx24i7653olff8oCiyF3KRV9CpYpH
-YuyqLcw/7gEUCAbpkeLA+8qgZbvdxyy+BDDa3t8wgsEFlBSVMP78ntj6t3gr9mKA
-F3ZZLBC+bkSdRl+/6FDUW2/aATM/Xxw1eANJCwOBSWKGgndoW8t1GGCVUxcoT+6P
-jhVUlWS72n6mRY7A7VVM
-=cN/J
+iJwEAQEIAAYFAlNmWtMACgkQG9wOWsQutdYBGwQAhnU9C3mZ8P3nVw3I3d9OKMAz
+2sqtaTjxR/loQ6n6CNVEMaMPFQ6W+iJo7bJWlKxDEcfvPVdMETLGhfk/DjsHAU3a
+8IsoXO3Ys0PN6sMzIaOHkXDm8NqzS/QVV05hM1i0TABgfUvZoh0Kj2ih9c8kDst+
+3uQ1gmL5CK3fng0ENVk=
+=ul/h
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git/git-1.8.5.5.ebuild b/dev-vcs/git/git-1.8.5.5.ebuild
index 5bb2ebf624ea..2002a3020321 100644
--- a/dev-vcs/git/git-1.8.5.5.ebuild
+++ b/dev-vcs/git/git-1.8.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.5.5.ebuild,v 1.4 2014/03/12 05:06:17 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.5.5.ebuild,v 1.5 2014/05/04 15:15:16 zlogene Exp $
 
 EAPI=5
 
@@ -32,7 +32,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
-	KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	SRC_URI=""
 	KEYWORDS=""
diff --git a/games-emulation/dolphin/ChangeLog b/games-emulation/dolphin/ChangeLog
index 58bb09a8a9af..760a4bc864b0 100644
--- a/games-emulation/dolphin/ChangeLog
+++ b/games-emulation/dolphin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/dolphin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/ChangeLog,v 1.19 2014/03/19 03:06:38 twitch153 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/ChangeLog,v 1.20 2014/05/04 21:47:04 twitch153 Exp $
+
+*dolphin-4.0.2 (04 May 2014)
+
+  04 May 2014; Devan Franchini <twitch153@gentoo.org> +dolphin-4.0.2.ebuild:
+  Version bump to 4.0.2
 
   19 Mar 2014; Devan Franchini <twitch153@gentoo.org> dolphin-9999.ebuild:
   Adds gtest to saved External directories.
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index 3373bc7b7bd4..a90746654609 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -3,20 +3,22 @@ Hash: SHA256
 
 AUX dolphin-emu-3.5-gcc-4.8.patch 6682 SHA256 8f153b45b354d52e084694d285fe49409a47f0738e064ca7ba88b38cbbd6f1ca SHA512 98a2e0435b262af4bcf875ef29d14ed5ae204faebadbed7778cfedb3c9841552ecab83ef932e943c779d634d83f6df6d43a656c5e72732e85827902cb08622aa WHIRLPOOL 7128c98fcd22efde2a8067a28d9b064689fa7a5f81b068313a19e41f4fc659b726293bc00539be725077ff5529276c0769e7acbf8146c2c8d578c3812776d488
 DIST 3.5.zip 28805192 SHA256 56a55060aa912562e6fac2b114b8ad8019deb419b784a1db555a158a01021037 SHA512 0f3f30084ca4cd72623a33d33fe212c113bb5034c2bfcdc85b7744da48deae63341a42b0eaf0ae7aca7a5ebcdc99ec5bf0c2e32b3badd567602d4fed7d3c8ff6 WHIRLPOOL b2b99ea310b2362c66480e934a8b10ce33b72be347474099f1fe932e26a6d3bc7634b3e8e527f0d1892e5a78af984f2762a92294fe0ea6e2e3cc59bbf953980b
+DIST 4.0.2.zip 28261421 SHA256 90e49ccd92eddc019bcac3b914bf16ce8d49c59fc2bd165ee02a22ea1a0456da SHA512 cb0c788307e6a0048213a2d947ac44d96b5bab064e5be41ad83c308ab98d0126bb173dd0b8705664f898d02eb571f8cb6d5bd6bfd3bd5e00e70126d04dd1cb99 WHIRLPOOL 5ae2bb04513f91300954cd598555a65527356b5e09d85283cbd8dee1a57a5a068dae8938e25d9a0ac77d6956cd08b33ed12afc774b05208dd432d693e4e2c842
 DIST 4.0.zip 23439392 SHA256 a698caf05f47a55c30e09d0aab053a412df683de2e139a6348156b03c502a0ec SHA512 02e366c2fa95ab5f37b0a66b94a5b56a632ef81e13febd982d6385cfaf7fa3edb4364180d4b8312e82bc7b8f150d02cde10248996f6a12286a20d684024aca20 WHIRLPOOL 0cb7b28b911111f4b7bf93c56f2dd31d080e7e0418fb53d9cc9093ca995d2c99a1fa7d5d82111e2c8db363e2b07384be39ec0062ab0252233f480b8e45e9304e
 EBUILD dolphin-3.5.ebuild 3984 SHA256 e672fafe7926bcb010953b58c727102556e0a39c28386f0c5c394cc73a0f6def SHA512 ce7e2dcccdaca3c5a6d35720306a2aa8025b82ee28c26ed296db6660d61268a0e758c661a1a44cf153af0ea686ea4954ec8811ed78418473c49ba919dff239fe WHIRLPOOL 4b7812849f877b2e4a9be1ad81c2c520ea5d1f2637fd75f0a0484763a8afd4b424a6f779e780564af5bd887cc6db3bd75890977bd24f9dd6a448debc0943ed45
+EBUILD dolphin-4.0.2.ebuild 3476 SHA256 1c1f15bd16756f13fd7267c69fac074636216ae397d97f408b2e315bcf3c9bfe SHA512 0b08c67027b97e77b20f0cd8e1e7866f61fad9e711ff233d042bfc5b931acbf229254c3e46ee37514c2df486052a859350376eae7d784f6df254f92562382bb5 WHIRLPOOL 78998182a1050b41da15a7eb0c8e11d8ee0efc8e4123bcc299ce12c68e22f322c5dbea587c7ceefb1bb56bf4d6c6a48131a820756b82958edeb5b1259061793a
 EBUILD dolphin-4.0.ebuild 3474 SHA256 1412017b6866c67af7402658fc5ea69d62f7c60b942a4e9df4fcbbf5e02eca3f SHA512 233848e65dde009e68acf34f18f32404000e47a786aa58179f22a15a777d39d88f7ea88bc2f6d9b9b5dba29b54f881e59fa15b7289c707929671afb1e4f2558c WHIRLPOOL 45bab6dd58c4a1b4125beac8b0d66bd2fa7dc21343e3a520a7873bf0347e92a6eb03089f567fb547452d5feb252ce8ce5b7b59f992bad938fb556e8378b63b13
 EBUILD dolphin-9999.ebuild 3714 SHA256 19963f4ed3b72abc9e577f233815ea0a7f7802353cd42387c19dc88dfdcb89c3 SHA512 4b4fbf2d9ff8166f5bf26a27458088ad5875da6ddd27a7d74eb808fedab5f78be9cee937839a9c45a49747ee566bbe2829bb5f4ebd0503386e6ede3e5a9d147d WHIRLPOOL 29157e91433dc466b5253f54cab429b7b19858a2b3ae006f010d5b416cff53d7d4eacf7dfb2521785c2cf7ee02616448a51481ea9a9d0b45093ab2bc6d2e2c50
-MISC ChangeLog 3351 SHA256 c9727ce51a2215bbcf499be4a6a2c0714e1a002975cfeb2e680ccc8b952e94ac SHA512 3ccc6cbb484525b6cf7de75fdc2561e9bb815e90f251d0ef0c18fbeb9639816aaf1009239a11f5e52ad7be31e688b63e8ffd35c146baa2eb645eb1c9282b57ba WHIRLPOOL 55ccd309ab7c758efed17de2a2d4cbf814039758e0e27d2e905371377d5cc7cb2ae7abccde0e066d043a876dbd67ba57fe5b4e635dfc90a878689dc03ad8e366
+MISC ChangeLog 3483 SHA256 777366bfcc91badacc6eb98bb7f7cdef0ca02e6cfbd2a46118c52c8994b51eaf SHA512 ccccb6ba6632abcb87f2dbd390f8f1e160863686db3cad527d1c6a5a94f17f6fab7ddcc223a4c2d739332e006c96ed38737bc69e4750bd1add2313b4213d3bc5 WHIRLPOOL 35e2178283e391bec82dd6748d6241edb0892357aee6aca8cad397285c2e88839843fe78ca6cf00bbc884865a555f6a4ae3118e072309a7337a9fdec04601b44
 MISC metadata.xml 442 SHA256 11ac55298ad628e589b592a2da00db1cabfd31ff8621c0fea059d714acdce334 SHA512 96abf53048bb8aea1387eacc40b9cda4e6099f079ddeb669fb23458d67880804fb015970207aa10a21227b87c153208a8dfa4bf4ea279ff7e53dcfebf18ac30e WHIRLPOOL e72458e354da2e4bfeb67de52c31d50a61f3b926fe16c0bcf4aae5e599858e413fcc9057fe1b098e43ee18fabe6a0f05dff008f59065cf34bad02da6480fc120
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTKSZtAAoJEOf5eU+oyPvP9AsH/jKf9eFUJcAy+eprJ0TQic/1
-jD5EJyz9trBiYnOOttdqyc6WhNyZOCBENJ7RztmEoBLQKynI5KqVUVGpOojZBCQ+
-uidfNzWRNMI3s3aXzLbqDvxjHLKzubRVrybFcpKFrawYmiemKMHlOW59Fd8eSP+t
-vQzCBoCKpcXR4fXL2qwpPyWl06ypJnV5B+BoOG/uDyNda+DoWisNI/r9zRO7TuMT
-XevxJ9CgRqV6ma63a4mJ11hXtWmQHQoFKGfqrQbHTuNDEDY3PFwso2lbNecetJWh
-fi6borqKS4ZTC5GlkYJdEjS6m1gNFKJLxfltSi1r6gOBgs7tLmD3P0eVs+MZezk=
-=oF3/
+iQEcBAEBCAAGBQJTZrVgAAoJEOf5eU+oyPvPilAH/23/GX7XSS++dUH6xFhGGwvA
+sOWNGFuFmZ492y5wFyRYiSREbvZ7Ww1o1ZTkDoTxlXrn6cs76BNtUvroni7Tgw2G
+HwK7uOdY6yBWopW0/QM1vtIxFlBSe9MFUkg5m6OkQVO3HybN/dprlovFNGrI2b2h
+ZzOFueNkOXZt9cvFyC++PozIYvFXBLb9XR598tWSKdiVENH+gKD2sYxppgoHqgka
+ctnkdn3usvmOBQ6ydY5a8fat811CNQ8xgGQEO7BnkxSgqInuyhGo26BFTV2KDlu8
+K7GxBOCFDmhU2rQh5Ekuye+a8tDjZBgUmLcFYp9RiFo3MbI7zh6kgG9fFJyix2w=
+=oVVx
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/dolphin/dolphin-4.0.2.ebuild b/games-emulation/dolphin/dolphin-4.0.2.ebuild
new file mode 100644
index 000000000000..ca50c06c7709
--- /dev/null
+++ b/games-emulation/dolphin/dolphin-4.0.2.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-4.0.2.ebuild,v 1.1 2014/05/04 21:47:04 twitch153 Exp $
+
+EAPI=5
+
+WX_GTK_VER="2.9"
+
+inherit cmake-utils eutils pax-utils toolchain-funcs versionator wxwidgets games
+
+SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Gamecube and Wii game emulator"
+HOMEPAGE="https://www.dolphin-emu.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="alsa ao bluetooth doc ffmpeg +lzo openal opengl openmp portaudio pulseaudio"
+
+RESTRICT="mirror"
+
+RDEPEND=">=media-libs/glew-1.6
+	>=media-libs/libsdl-1.2[joystick]
+	<media-libs/libsfml-2.0
+	>=net-libs/miniupnpc-1.8
+	sys-libs/readline
+	x11-libs/libXext
+	x11-libs/libXrandr
+	alsa? ( media-libs/alsa-lib )
+	ao? ( media-libs/libao )
+	bluetooth? ( net-wireless/bluez )
+	ffmpeg? ( virtual/ffmpeg )
+	lzo? ( dev-libs/lzo )
+	openal? ( media-libs/openal )
+	opengl? ( virtual/opengl )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	media-gfx/nvidia-cg-toolkit
+	media-libs/freetype
+	media-libs/libsoundtouch
+	>=sys-devel/gcc-4.6.0
+	x11-libs/wxGTK:2.9
+	"
+
+pkg_pretend() {
+
+	local ver=4.6.0
+	local msg="${PN} needs at least GCC ${ver} set to compile."
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! version_is_at_least ${ver} $(gcc-fullversion); then
+			eerror ${msg}
+			die ${msg}
+		fi
+	fi
+
+}
+
+src_prepare() {
+
+	# Remove automatic dependencies to prevent building without flags enabled.
+	if use !alsa; then
+		sed -i -e '^/include(FindALSA/d' CMakeLists.txt || die
+	fi
+	if use !ao; then
+		sed -i -e '/^check_lib(AO/d' CMakeLists.txt || die
+	fi
+	if use !bluetooth; then
+		sed -i -e '/^check_lib(BLUEZ/d' CMakeLists.txt || die
+	fi
+	if use !openal; then
+		sed -i -e '/^include(FindOpenAL/d' CMakeLists.txt || die
+	fi
+	if use !portaudio; then
+		sed -i -e '/CMAKE_REQUIRED_LIBRARIES portaudio/d' CMakeLists.txt || die
+	fi
+	if use !pulseaudio; then
+		sed -i -e '/^check_lib(PULSEAUDIO/d' CMakeLists.txt || die
+	fi
+
+	# Remove ALL the bundled libraries, aside from:
+	# - SOIL: The sources are not public.
+	# - Bochs-disasm: Don't know what it is.
+	# - CLRun: Part of OpenCL
+	# - polarssl: Currently fails the check as is.
+	mv Externals/SOIL . || die
+	mv Externals/Bochs_disasm . || die
+	mv Externals/CLRun . || die
+	mv Externals/polarssl . || die
+	rm -r Externals/* || die
+	mv polarssl Externals || die
+	mv CLRun Externals || die
+	mv Bochs_disasm Externals || die
+	mv SOIL Externals || die
+}
+
+src_configure() {
+
+	local mycmakeargs=(
+		"-DDOLPHIN_WC_REVISION=${PV}"
+		"-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
+		"-Dprefix=${GAMES_PREFIX}"
+		"-Ddatadir=${GAMES_DATADIR}/${PN}"
+		"-Dplugindir=$(games_get_libdir)/${PN}"
+		$( cmake-utils_use ffmpeg ENCODE_FRAMEDUMPS )
+		$( cmake-utils_use openmp OPENMP )
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+
+	cmake-utils_src_compile
+}
+
+src_install() {
+
+	cmake-utils_src_install
+
+	dodoc Readme.txt
+	if use doc; then
+		dodoc -r docs/ActionReplay docs/DSP docs/WiiMote
+	fi
+
+	doicon Source/Core/DolphinWX/resources/Dolphin.xpm
+	make_desktop_entry "dolphin-emu" "Dolphin" "Dolphin" "Game;"
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	# Add pax markings for hardened systems
+	pax-mark -m "${EPREFIX}"/usr/games/bin/"${PN}"-emu
+
+	if ! use portaudio; then
+		ewarn "If you want microphone capabilities in dolphin-emu, rebuild with"
+		ewarn "USE=\"portaudio\""
+	fi
+}
diff --git a/games-emulation/vbam/ChangeLog b/games-emulation/vbam/ChangeLog
index 414334ca2b2d..24f2a1bd237f 100644
--- a/games-emulation/vbam/ChangeLog
+++ b/games-emulation/vbam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/vbam
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/ChangeLog,v 1.22 2014/02/05 09:57:45 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/ChangeLog,v 1.23 2014/05/04 16:28:45 radhermit Exp $
+
+  04 May 2014; Tim Harder <radhermit@gentoo.org> vbam-1.8.0.1228.ebuild,
+  +files/vbam-1.8.0.1228-ffmpeg2.patch:
+  Fix build with =media-video/ffmpeg-2* (bug #476496, patch by aballier).
 
 *vbam-1.8.0.1228 (05 Feb 2014)
 
diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index 5703d1e8c6a8..23bc2c23fe5e 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -4,24 +4,25 @@ Hash: SHA256
 AUX vbam-1.8.0.1149-desktop.patch 1400 SHA256 97643063490c76bc796a02c3062a0ba3aa5f1a1a7f6023b12d0cf0558c5a0947 SHA512 dc493ced382090b6b98487229e7d13332c626c2787afeeb4c4849773e87851778b6d1724610b3b345ee8e5fce9550cff3242851a35e3f98e2b76d7f4b8f3d2be WHIRLPOOL 9e4607e22145c7de0e9bd9b16d8210ba4cdb1d1ba972851a48e25de3a494f02d7a92a7cff0900b9f4f7328f2f073ab9f04a99f7b7f9b25cf871cab07a1604610
 AUX vbam-1.8.0.1197-desktop.patch 237 SHA256 3c4d12ec056ab25fac3e44d593f5ca3caf4a58acaa4ce39fda685cc8cb37cb3a SHA512 7c9c0eefb8c41f89f9115854f24dbabc9a9126ace12525fde32a0b9113c41b47c94de68f5a85fe23a5a24257fef0071726e936440ccc368e71dd058cccdbb4bf WHIRLPOOL d3ea145f3461b30636fb580678c68ef7cfa000465270df51b4dd4e732290d1f48053da2d79a3bb1396737c81c3fa71c260e0c13c509f7e55e805a74ca7803265
 AUX vbam-1.8.0.1197-libav-9.patch 1363 SHA256 bfa689f5f4e6f04e369c34d5fa341389f3e9bb5b69ab7e01bd66b11517074c64 SHA512 9b0d1f140f2470c612487e508160debcda2e37fc3fcddb5fe6ccb249dbe2dcee2739cfb63769985eea74a40d9a1adf38c40895e8c699bdb50091c39ca3078a7e WHIRLPOOL b4447886ad8f42fd7272d4280000e42fef35fde8d38ad6080c07ce3f766cbb66da594ac7d9d7f5cdc32f7bdd9b9ae3d4f0bc8f650e77fe65bcd10ee818c838cc
+AUX vbam-1.8.0.1228-ffmpeg2.patch 1172 SHA256 33b229eff69a5e0d0fa4d8c32e91b25601e6c41e70f557bf29545d66674ae628 SHA512 cc5abadec34d6a5d0c25cde7354e17fbe446e0ee9bf5f6dd513d5f2a956239ca56f173fe5e2c4fd97b8ccc99d9f049a8c6e9ef77a00076e817c3598437dc43e7 WHIRLPOOL a87d0beb281877773d800024c5751d679edc81e312fc7fda9019a34f4fd98f2b416547fa0bb84b3d7d352f6a44ce58b48bedac2a0aff8900ef6ea1f7ab6c3a35
 AUX vbam-1.8.0.1228-header.patch 383 SHA256 73b7b2119478da89315760d6dea482181206214bd4982002e5990691d3cb145b SHA512 3ecc4d0afe5f36a44e45f549462c3709c4743fff133a6d13670e1203ed458b828fd32697f22c32860f7e60b50c7d07c342da7c3c7144693907bfc4d62aa05267 WHIRLPOOL a930838446d858c871ef06549575355af8c9f867167a033646a764a85bb4f3d18150fc5f3141b05c9de60879f098353f5daa2dbe3a31641326dfb89b6d4459a8
 DIST vbam-1.8.0.1149.tar.xz 824980 SHA256 7eb2c29a416faca9c7ab28cb953c276e76c51b6b45bd5ae83f7f9a32b8c6d252 SHA512 aaf2262780ee723077002c43ca317c81a85bf2350067aa504ad578d1280765f65baac9a8428e595b0c746db1bd37ce29f9bb1758aaef300e7d52b4da45652e46 WHIRLPOOL bc230cb7a485f198a8b3ca050b85b1e167a3b313edf36753c016c8e44a2a10a99a3163c649eb48ffbdb5747fbff35909e30aebd537bcb38c1a72ad0d783e969b
 DIST vbam-1.8.0.1197.tar.xz 842152 SHA256 26fca6a5a19229fa651b2aaeea42566c9a1bbb7ea722e6b15e88699bd30dec7b SHA512 bb900327b67d75d4b99f891994651a9d04e093613ec03f31f19e32541d38d58870d5b4f3c0b1c8f927560df0b3b44b10b5f2f2669846dca69d5420e61276075a WHIRLPOOL acf4b1a4b251cbf8bbbeb7f8f6ea88bc8171132d1c2fa6efba9a761e952e8f68a0e10184db097e4261b0226165f064b9fa18193a4bde4ea8fae852f129f4bdc1
 DIST vbam-1.8.0.1228.tar.xz 866904 SHA256 ff771240b5ec89e452e6c00f45afd2c8f869570b634044cce997f4af797299e6 SHA512 22c7e14e5634c45c5a37be4387be579fceebd200f528514c0ab9059846d60f215e9bb40d73ae9a781a3018e4891d81d56dd50258d21f82b1262735aabab97155 WHIRLPOOL 19bf64ab118f80035f8c97b45c75ebd8cb956854bfc482016e22e0f7a700178115b02f7272ca5ea20cc515f1eac5e2dd22773796a03ff0f9a608ebb0d49c986a
 EBUILD vbam-1.8.0.1149.ebuild 2756 SHA256 3c4e9856caa5aeb1eb9d9becf3ea0a82f0b1c83218e4194ca25a9b5312aa1df8 SHA512 5450530befe22e28f05cde5cd222cc5b5ed04db11fba99eb114559ad1105342fd0cde06574f0bfc351b84ce9a50d107d6f96344c0720e8cef8fd803f6b2e9072 WHIRLPOOL f6d4b84b1224f579496048af23f4ab6d6fb4feecda2a062eb025904a7d3dd865c52d0bf48a89391bdad3241f807d9230ce208b751a166012362f5adc3c561c5e
 EBUILD vbam-1.8.0.1197.ebuild 2892 SHA256 4b1bfb3855ae1b000e070535e826631178f68f73b8edabf5f299029ccbcbf4b4 SHA512 49157d396e9e8d71ad1bb0702bcdb936bc57bbde987fe8437188357d5d1d517d770ca11a9e5ca088c72cde2dc8fcdc450d22521907e3b2e9d86756a264e1317b WHIRLPOOL 04fca498dbbd792d10a0836a7311b8e8acc58ed5d4f42298edc8077c35fbf31d4bd9e74ef8a89c27861041062392f0e068affe6a5734a524412b47791d738f9c
-EBUILD vbam-1.8.0.1228.ebuild 2860 SHA256 426ecd5c2988afe6af471d01502714028fa311b7a3bbaf6f681e8e69212e0061 SHA512 574acf38ba51afe059d919837a4ec53e3a2d6a8f8b8ae1f5d0eef0bd267d0b6b3e83d662fe5abc81c147f1f3e7884e37a5436a69668757a406d7e9d47b89964b WHIRLPOOL 9ec23479d25ff562cd6c6db40dcde03c2361856c55cfea82a58ac86121e5f2f9dbf45a937dd980561f642c5b32db7d30cae7fa5ac93b4c5012db736fa36942fa
+EBUILD vbam-1.8.0.1228.ebuild 2901 SHA256 84c53aa2ad0a1b54a3043f7c87342eadb32744677c8efb8da4520e2c5019e064 SHA512 1647fa9b49555d6498d7d63dab1de3a19244dba2add97bf9e4b798f53f19f1452acb9b6bca7b9cfb9a2c6bf714cf8cd0a8a2ce434872cb943c812e509f75d5db WHIRLPOOL 8d8c8c2a941e96e83557d166dec0df27842fc88681816a65ae89ecba4d76b17ab8488461fecc691210d1d5947db6e73c8c051812cd17f154aa3ba34d1d2cdaa0
 EBUILD vbam-9999.ebuild 2722 SHA256 54ebec810e6914cc4d6697281b9218587a8699bd39e21d31c7b1cb86b5ece9f2 SHA512 16762d5daaf9b4f2f0a0f23cd2ae6e9de911274df01b5f3d34b291b0dc2d43a48d79998ad1465b8e3b48f5d6c73b0297f7b875045dbf1fdc9051fbc00dd5b591 WHIRLPOOL 7fe25306b02e6fd33cebdaac5e22f2f4e5f5120eb4e31b833915d24a948e77d4f723dba909d66a5c55c1084320c76d7395a5e3eea782f1132d74dd5214b07638
-MISC ChangeLog 4268 SHA256 bc50b0a14569e8a26c2bb0c93fde0262da551f2abdf4eb03bfb69a6bf37345ac SHA512 a88f1a265bb438cbf7d346b14639bb4151472c098c37e01049a294d0bc60b62b8503172d323b77097fe4c6802d27edb3ac671534eaf3a066b9bf4748fa60731d WHIRLPOOL 9a794fd686d610e7e6dd4a481eac0f5da7c16d137bba3d4793ac49756efdd11e804604dce06ef0b3e65ba5ba7175e9130f7c9eef60d5e6447777b65bb8193869
+MISC ChangeLog 4456 SHA256 2c1a05c6b3e8271ced0cc9fd89d2fe0daefd48e2f4c81d8c2d26bc1fdb1fb9ff SHA512 4b1bd629ed42148f8a063ebf76c0b789c0111af4211efe18a8944e1e2b73fe9715e4ceb799e99fc133247a3c95f680c3a5d8f05c3c7f3cb66f784289b510dd8b WHIRLPOOL 034fb0193cebdc9270966d6b7302a19327e7175abe64c5baae5cc5d97d1be4f41a02b9efe30c0af62024bcf8ec8eb9c5bf3c9973126f4798db66b7f1d075d42a
 MISC metadata.xml 331 SHA256 d6054d5a8bdfb747166a4b83c1f7db04be3898899323aa316cbef1ab7a6b7daa SHA512 6fad448db04e5a8cf3880de3a34638a7a5791ac3d847318def2163e2cf91637d99eb4adfc2acc8351c62965b8ea95f4f86b1b5d372691565ffbc553250ee1cbd WHIRLPOOL 603a7f5c7378302173ba3758eb57b67489cca71a71af4d15319bfb145b2b332508e7759f44fe6382dccb850a60d1f9e21d43ebf1507e47d61b33c5a21dd809da
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS8gsdAAoJEEqz6FtPBkyjiWEH/RyKHwJ2uYfv3LXVS6FuLT8r
-Fw29jslbjeHglgRjST3Zku6XQfcO53Ph27oCNzqctIM+ddT/T36cbNzcT678fRii
-L7R4mhWpgwylIhm8iCKpapAg1LgiXLwQH099kQTvLpVslWbm7Knmn07emwZAz/zj
-ruId0L0GC2ZZ7BA9KKw5nreZ4JH6er+Ui/jkGHCc8rh61eTCeTitS/xiQQHqayH3
-7FRoJJunwe/q7Wm/zM4IKy5LPlt5Jq9EheV9a686S+zAEwEYx7I/TQvPWoejYG6g
-ZdKxRdwOP8FBvPYL+k8eOAbwS+sH2/HuCUzhJI0XEK+NgOoAlNjhQhd32Sfr3vA=
-=zyG7
+iQEcBAEBCAAGBQJTZmrCAAoJEEqz6FtPBkyjF0cH/0tZZ5kzYLdrDUFCFkC6an2U
++tq7FoKm5I6FbZ8RjUTouObF4H8DQLl4X8k0g/Zjf2wI30Ly51ZgOYt3QE4J2y67
+musX59e7f4/AQTnPY26feiJZClLZIzGdc94/xNRRl4M2tZzyFIHhwEvy+FL8Pg0k
+kVXCrQtT1BPpSMxNZfc6uU9kDriwkNC/lEQ9B09b9dgMhRStzRunkMY9wc1h3Ayl
+JK+PBCn1e7+Tsfhn9bZ10/GTxif0Ss+yieY53PE3taKRzN8NQNNN6PXTFQe9URPw
+VDCi3kHPKSpuC0NYl/a9bK+D1rQMLxSDLlg0FsXcHL2m1l3RxUWpHiulWX5wrbE=
+=a61c
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/vbam/files/vbam-1.8.0.1228-ffmpeg2.patch b/games-emulation/vbam/files/vbam-1.8.0.1228-ffmpeg2.patch
new file mode 100644
index 000000000000..f2f9085f4a7f
--- /dev/null
+++ b/games-emulation/vbam/files/vbam-1.8.0.1228-ffmpeg2.patch
@@ -0,0 +1,34 @@
+--- vbam-1.8.0.1228/src/common/ffmpeg.cpp
++++ vbam-1.8.0.1228/src/common/ffmpeg.cpp
+@@ -178,17 +178,31 @@ MediaRet MediaRecorder::setup_video_stre
+     // make sure RGB is supported (mostly not)
+     if(codec->pix_fmts) {
+ 	const enum PixelFormat *p;
++#if LIBAVCODEC_VERSION_MAJOR < 55
+ 	int64_t mask = 0;
++#endif
+ 	for(p = codec->pix_fmts; *p != -1; p++) {
+ 	    // may get complaints about 1LL; thus the cast
++#if LIBAVCODEC_VERSION_MAJOR < 55
+ 	    mask |= ((int64_t)1) << *p;
++#endif
+ 	    if(*p == pixfmt)
+ 		break;
+ 	}
+ 	if(*p == -1) {
+ 	    // if not supported, use a converter to the next best format
+ 	    // this is swscale, the converter used by the output demo
++#if LIBAVCODEC_VERSION_MAJOR < 55
+ 	    enum PixelFormat dp = (PixelFormat)avcodec_find_best_pix_fmt(mask, pixfmt, 0, NULL);
++#else
++#if LIBAVCODEC_VERSION_MICRO >= 100
++// FFmpeg
++	    enum AVPixelFormat dp = avcodec_find_best_pix_fmt_of_list(codec->pix_fmts, pixfmt, 0, NULL);
++#else
++// Libav
++	    enum AVPixelFormat dp = avcodec_find_best_pix_fmt2(codec->pix_fmts, pixfmt, 0, NULL);
++#endif
++#endif
+ 	    if(dp == -1)
+ 		dp = codec->pix_fmts[0];
+ 	    if(!(convpic = avcodec_alloc_frame()) ||
diff --git a/games-emulation/vbam/vbam-1.8.0.1228.ebuild b/games-emulation/vbam/vbam-1.8.0.1228.ebuild
index 59779c72f2d0..b72b2f2594fc 100644
--- a/games-emulation/vbam/vbam-1.8.0.1228.ebuild
+++ b/games-emulation/vbam/vbam-1.8.0.1228.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/vbam-1.8.0.1228.ebuild,v 1.1 2014/02/05 09:57:45 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/vbam-1.8.0.1228.ebuild,v 1.2 2014/05/04 16:28:45 radhermit Exp $
 
 EAPI=5
 WX_GTK_VER="3.0"
@@ -44,6 +44,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-ffmpeg2.patch
 	epatch "${FILESDIR}"/${P}-header.patch
 
 	# fix issue with zlib-1.2.5.1 macros (bug #383179)
diff --git a/games-fps/quake1-ctf/ChangeLog b/games-fps/quake1-ctf/ChangeLog
index 326d616a093e..6f5683f257b4 100644
--- a/games-fps/quake1-ctf/ChangeLog
+++ b/games-fps/quake1-ctf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/quake1-ctf
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-ctf/ChangeLog,v 1.3 2007/02/21 23:55:40 peper Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-ctf/ChangeLog,v 1.4 2014/05/04 17:50:53 ulm Exp $
+
+  04 May 2014; Ulrich Müller <ulm@gentoo.org> quake1-ctf-4.0.ebuild:
+  Change LICENSE to all-rights-reserved, add mirror and bindist restrictions,
+  bug 505710.
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/games-fps/quake1-ctf/Manifest b/games-fps/quake1-ctf/Manifest
index 82dc34240647..594893f22e08 100644
--- a/games-fps/quake1-ctf/Manifest
+++ b/games-fps/quake1-ctf/Manifest
@@ -1,8 +1,25 @@
-DIST 3wctf301.zip 4088415 RMD160 0d07e5237a43274f2f2444be8f4712c8946b09d8 SHA1 892b40cbe6d696d7976dde62c52d40504aa1ce30 SHA256 320e4c0ec6938f796a5c892ae98bc26f2ac5a486902796ceda5d0426e41cefea
-DIST 3wctfc40.zip 6722412 RMD160 d3605c723522d0c97d46d8c617bd63e3fd00bdf5 SHA1 e633c80392db4f91a6a535639f9844526b0a0186 SHA256 42264b5295c71660eccc4ed27092b5907d998c57e8ccdad40e5715c2a88637f6
-DIST alst101c.zip 16362402 RMD160 68804462f944a9a8d7c4065a0f6390d8cba10c98 SHA1 e7496c0c403cb2a5ca7294254c79643c0341f651 SHA256 5d2711893bdd4479e1ae142994f0ec906d27aa3c3ac9cdee5b7b824afd949f8c
-DIST alst110u.zip 773110 RMD160 8e55b1c3263c2c1af69d733f7d2195898967482b SHA1 557f5cd15a7558d94f3f8c25d008b2d6cf041a34 SHA256 14809f991f4d62e7b563410e056c062c63ff4c6409b472338a00887ebfe4c175
-DIST ctfepc14.zip 9846385 RMD160 6a82a9e89ca9a3b62f5e27c84df66571e7235553 SHA1 6f3dc4d979bb98516659f544c160a0a488be3ab6 SHA256 0ccd4fd05973584f4959c809478d928fa50cc370d9812f65d75e66a9edfeadfc
-EBUILD quake1-ctf-4.0.ebuild 1762 RMD160 60ac85240e1bcdb7aef47588511f1e3186954657 SHA1 54945dec437daeda07d7414e70d909afc32fc122 SHA256 0d1944ee9e0a41cc2120370be33b44a43586aa5e42a46c9b42c70ba0b224c004
-MISC ChangeLog 545 RMD160 a0a33f4f03ea9cf556698512bebadc7609e7a756 SHA1 f74bea22ef8026cf8348c030f818caa658ab6ab1 SHA256 8687c70308495324a0f3230ee34f2b6295dca08b753f3bf18353ef163ef38bab
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST 3wctf301.zip 4088415 SHA256 320e4c0ec6938f796a5c892ae98bc26f2ac5a486902796ceda5d0426e41cefea SHA512 b6f2af198b908d7b27a17f20afdbdc3da09903c32da0b736b60bf3c14c4020b04f88ce12b67d8dc4e9b0f1aba27b65768ae6215f1bd5d0f56eb5aef76053c117 WHIRLPOOL add881339ecb695e21ddeb636b01d12baa6f06cdce50583032bf9e521d84ff770e85d6d985bec7de08181b811d542cc12344ab1ce02442452d2bcb72c90e865f
+DIST 3wctfc40.zip 6722412 SHA256 42264b5295c71660eccc4ed27092b5907d998c57e8ccdad40e5715c2a88637f6 SHA512 a3d27677d84fd5362f76469fc7721406bb46ba867820a55ffd6afe044bf694b626efb7812db43946d66a0ef2178c55c68f9675710b799d2a4948b3355918c72d WHIRLPOOL 15a0a66a113adb252ab29784b2e7b3477f47e4abf4ef868384a38b49b32275f23e48cfd101aec229277407f82d6d6282873620dfe79d1bb1609c7a551991c590
+DIST alst101c.zip 16362402 SHA256 5d2711893bdd4479e1ae142994f0ec906d27aa3c3ac9cdee5b7b824afd949f8c SHA512 adde1c70398f449768497d62995d5b9cc9197b75f98a146a3c6676759cec794d65a91332137efd5b239e91af24d00a66be7226c044abfa130c3434538faa8fed WHIRLPOOL 50fe49d351568e8a496c99f88ed4a58839f45a7522a0f49b09f98d6bf262f274bc855b7eab2549d12733599dfc43ffe93515469d92e7260b2f7474c6eb759a13
+DIST alst110u.zip 773110 SHA256 14809f991f4d62e7b563410e056c062c63ff4c6409b472338a00887ebfe4c175 SHA512 6e2cba68100cb82eb7a97ef01fa9fefb3e9e562ff30bffe21373985f3e981be3dc65f5d0426ca2ee2ecdc3286987f901a1d01a10ffeb90d89ed9ab158a42e55d WHIRLPOOL 3808532ad2e3991c9cc4d9e30925c61c383037986955ae0ee4634457adaab3a19ebb77ab4db15e9a90b5e57b5e2f2212eb03412571eaa0bdd93fbf1796389548
+DIST ctfepc14.zip 9846385 SHA256 0ccd4fd05973584f4959c809478d928fa50cc370d9812f65d75e66a9edfeadfc SHA512 2b29a53c68956553d6aa52f4f7983d16d47cf83324c5f7215abc1f8a27386f7080ca888c4799a496a1071afe25c5d2d3343f4b71f670ed0a656b0d6dee4a9d88 WHIRLPOOL 44812ef7c54cc12298c99138afb0a7230d1d5eac1a8a335d90fb23f11477a631a2ed14762771989905ea1e49168d31593b807de71d6aa97f7dd8d0400ff6fd65
+EBUILD quake1-ctf-4.0.ebuild 1799 SHA256 8cc5a4dd0c3cea216081c503c31202270f4e5a4877b473de1f3bb2e93ea13ef0 SHA512 6de2239fc807d8474eabf0c66ec938fac61f6966710cdbf365cb3713f429bd012fde3ddf449d4cb12a5d910743f1cc830c72291e4cca1230e79f8d51dc455f27 WHIRLPOOL 69d7446191a935045d0b575af7721ee0695580b315cb58bc0251c68708aa1f43369194fde0d21fb71fb8c7fc64bc7e3c19ff6e3501ca229aa2e9902db032304c
+MISC ChangeLog 706 SHA256 b35f8f9aa6e5ddd3f1af834769ca163f7e1df72dd9a0e837a509abc1f61e83eb SHA512 6ae3b9d87f6f8c3d747fd50e181f23bf9efddd9e0747263887a09e5fef52be1934dbef948fe806798dada2868af77843c372619a8c1f13ece4dd066b3b73638f WHIRLPOOL 407d9e57e7e810f56eeac7e9a80d021623757425db35e61e68d8d4f98ed4768649a81a5a343a187270b451950bec4b9efbade181a0c1ed2bf7217e9e4cff8cca
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQGcBAEBCAAGBQJTZn4IAAoJEJQzkH1pP7W4NQUL/3wmjHeA8cLa7xbRP4PcCOVA
+iC5+/r/7KANYRa/WEd4oPdQxusvZKQEMsPE+rqLmOLL4c3wJvZ4D0J1qdIj4B7mF
+7RrlGGXupjI88OQrMVAenN9Pcjoff8aQp47xT/6kP5+O7VFaBFz/7MfS3UHx0nIX
+gC0VPoeEzXnVMC7HaWPfSqcUq9RnhBDQfrx1AA9VV/q7CtlbvjxFyJGf/A0GAb5i
+/liTuc0uo497iomfPVN+CtweMLaPAqW7u3azfL0egq2AEBka//mRqb5B5utIr+al
+esWwwqovNC/+Ksp1H5VKC5nRcJgMVKnLIZxumR2aiB06lIy3Mb6RJ51typmukais
+zJOIPS8JIco4Vx7SO6zMy7wawZHrThex5mzTFWwe83/YhctmHwaJj/EC52BJhxsw
+pbtipdaHQirBNfRXmebSzk+WzxMVpAWovjRoZVBB3KdQ1he9m+dOZgMODKE64U8o
+5Ah+QlpNUA9S8xhXjiMrL2MPseKUwXe5YTdjrqiHzw==
+=4qJk
+-----END PGP SIGNATURE-----
diff --git a/games-fps/quake1-ctf/quake1-ctf-4.0.ebuild b/games-fps/quake1-ctf/quake1-ctf-4.0.ebuild
index 0408301b0a04..96f6b24f324b 100644
--- a/games-fps/quake1-ctf/quake1-ctf-4.0.ebuild
+++ b/games-fps/quake1-ctf/quake1-ctf-4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-ctf/quake1-ctf-4.0.ebuild,v 1.3 2005/11/05 22:37:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-ctf/quake1-ctf-4.0.ebuild,v 1.4 2014/05/04 17:50:53 ulm Exp $
 
 inherit eutils games
 
@@ -14,10 +14,11 @@ SRC_URI="http://www.threewave.com/quake1/files/3wctf301.zip
 #	dedicated? ( http://www.threewave.com/quake1/files/alst110s.zip )
 #	dedicated? ( http://www.threewave.com/quake1/files/3wave421d.zip )
 
-LICENSE="as-is"
+LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
+RESTRICT="mirror bindist"
 
 RDEPEND=""
 DEPEND="app-arch/unzip"
diff --git a/games-fps/quake1-movies/ChangeLog b/games-fps/quake1-movies/ChangeLog
index 2bc639860a92..d28fffd41d9c 100644
--- a/games-fps/quake1-movies/ChangeLog
+++ b/games-fps/quake1-movies/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/quake1-movies
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-movies/ChangeLog,v 1.3 2007/02/21 23:56:56 peper Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-movies/ChangeLog,v 1.4 2014/05/04 18:21:33 ulm Exp $
+
+  04 May 2014; Ulrich Müller <ulm@gentoo.org> quake1-movies-0.ebuild:
+  Change LICENSE to all-rights-reserved, add mirror and bindist restrictions,
+  bug 506860.
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/games-fps/quake1-movies/Manifest b/games-fps/quake1-movies/Manifest
index 52922a406b45..a245bb3121f3 100644
--- a/games-fps/quake1-movies/Manifest
+++ b/games-fps/quake1-movies/Manifest
@@ -1,12 +1,29 @@
-DIST artifact.zip 5102445 RMD160 6aa9f8bb45f95930f7bcd0830c2b494fdb7633fe SHA1 c99c8d49528a4d277a294da0b66dc14bc2bb9f76 SHA256 ad796926dd9eafb41f3d4ecfcce4e25d64f8f8daf14c848253aa27da2c0ab6b0
-DIST blahmov.zip 11384242 RMD160 4377930af736acd02680649eca04450a6b026c9d SHA1 64c74be6ab0f556cdfe9f9eca284d2a19f8899b0 SHA256 19019054151dbe0193437280dcc09ca1e547d920d71178b3fe212d576b72afb8
-DIST blahouts.zip 7409083 RMD160 6572d4a4c7f034cd44ee3648a3994f760c259a26 SHA1 c57466378cf2f592f5846ef207bc255a970a20b9 SHA256 13635fd9969028616231c7a8d3e0b80a09fedd800de831b6035ab98008797b75
-DIST camper.zip 38865 RMD160 9492d1340d98a46e7f7e738676f0846201563fa8 SHA1 0cdf4ea2b94d936d9447d94c62e006ff64573033 SHA256 e5b5ae712dff02966186e141c1c1b56b885e25f9609f7274b9a30bf946dd38a4
-DIST op_bays.zip 3117448 RMD160 04e71e96e893af788c2d176ec6a276b6fcf318d3 SHA1 961975e1e069815f01f1390445102ae5b888913c SHA256 240a69cac6fe2aa6e388cedd4289c64258c7a7134a0cfacae446635890cd66e4
-DIST rgb.zip 189044 RMD160 d59aab50c56857cb62821671cddae67565645d5c SHA1 2e268d8480123fd7091d3690d45e8b46a44e4e7d SHA256 0664e669636d1ff657e9cad2c094941fec7d523259e53d36b1ba8ba801093198
-DIST rgb2.zip 308016 RMD160 96c78af84338d4a77a9980cc0a1d04882f55c9e5 SHA1 ee1154e1fd1fd62a2dcebbec2631564c40e91e02 SHA256 a695bf2187d4ed5a7b762d9eb688a8384c12ba34d6f849c447d09cb2e2740595
-DIST rgb3_preview.zip 7901556 RMD160 46b900e7db7012288d51b757b23011763dbb2337 SHA1 45f037965e111eed909ba9019ed469a397c2e6c1 SHA256 23b9ef1e3793aab03cb8ebc74b290a90dfbd068e3e1eab6ee412092e49703f8a
-DIST ta2.zip 1841879 RMD160 4907ee7403ed6464f69a544afff70aa2b4ce3309 SHA1 67498773ac9e8aa35849fcb67c54c647e20d3432 SHA256 2bd99488d6a96302a0d9fbf61ae4b15f9b969d2de13d3f7a0bef3cd560a7d250
-EBUILD quake1-movies-0.ebuild 2091 RMD160 f09757084fc3fc3b3848dd6c14fb191e6c1fc4bb SHA1 33dc10bf3cde9fc7c16b2b36a5071afb0effc9df SHA256 eec734f8438f33f165a0271dace3a8771a96c76cb0109fa47bf401929f43f2e8
-MISC ChangeLog 555 RMD160 b793726ef8e4082d0b2988f3a580cd2ed46def1d SHA1 36d470440fb4f433ee72ecc78dbd839e5b5e1b39 SHA256 0c2236508bed2c4d53dfa157f0962a9bae2d477bfcf5edd1e4f57a2569310f52
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST artifact.zip 5102445 SHA256 ad796926dd9eafb41f3d4ecfcce4e25d64f8f8daf14c848253aa27da2c0ab6b0 SHA512 99abd5edabf63d1c7d40ef58489fc117603e9d3b573acda6e2bea988315e0d2956dd0cccf528e69ef3280dedd0f705e0bcc0b995de6425088b79acb9f4345365 WHIRLPOOL e516d602ddfb92e67154dc6312e5db6e416e55ccfbfc43826b7d3749e6e7ec7173d0f4b3c5a25e40a2807ad33c21202176de03808417d3aa9f3cebf793d7594d
+DIST blahmov.zip 11384242 SHA256 19019054151dbe0193437280dcc09ca1e547d920d71178b3fe212d576b72afb8 SHA512 5049eb61198f63fa93fec04f193dc0658ea58adcd05113ae1f73d465686baf5295d3e1320f1ba13b06604c46a32fbecee147eab5e7552e6867b9ed4976c374f3 WHIRLPOOL de0a9f595e8243c467977350a0703a4e1385f90191e812359b51c9a7bd93bfde828866677aabdf15633e798e72587ffeaf60100060ba31ae30d33688bad8bc78
+DIST blahouts.zip 7409083 SHA256 13635fd9969028616231c7a8d3e0b80a09fedd800de831b6035ab98008797b75 SHA512 a694cddc002da065d1fa93ea81e8031dbfc8f8ddace3ff05a11efb50a93067601b1324be9c5f07cf46c41b608f7e013ea7b4c6a36ef3913612d58e6c7fba41f2 WHIRLPOOL 6a338ec9df5ecfd470dc5fc7f7b89a99d83596b863dab610ca8aeda0e84ecc01c4f13194f041ccc75983243e0e035f476e96e47ae532baeab12931ad60e127a7
+DIST camper.zip 38865 SHA256 e5b5ae712dff02966186e141c1c1b56b885e25f9609f7274b9a30bf946dd38a4 SHA512 101aa3e3d0077128f970102e5e04b26b946f05b97a58e3771ec0141f3229be7245b43a0d13223a416027828a41fe00572cfff0407ea8827bc455c6b07426cc81 WHIRLPOOL 0f0e849c762b4673b97994d99cab033ea15aeeaa6e6a841a7f8a50dd344ff9bf85a3505e2d8a44918fad7e0c18f1ccaf2fbd2721efd7e9c695ab45cf2d652a6a
+DIST op_bays.zip 3117448 SHA256 240a69cac6fe2aa6e388cedd4289c64258c7a7134a0cfacae446635890cd66e4 SHA512 07616ad170254b7c059bdaf63a630cac2bea138327afc85fdb3a8bed89d5a4d55daec02abf01f21cd8a9fa85ac1462d6329595beb09daf2abcc2188aca4c9921 WHIRLPOOL 0b20f9c0d55e6fcf5575c78bf4c8c31e28f1be03f738797cea77c43902d5cb5072ce18f9b5f27ad8eeb72a73033c93450687afe250cecca4e401f2c316a96dba
+DIST rgb.zip 189044 SHA256 0664e669636d1ff657e9cad2c094941fec7d523259e53d36b1ba8ba801093198 SHA512 b7b9d55672a0b6585961c0e1e6f80357a5d6d2b977fba7000209df71bd0efecced2ffb0d3f6aff042a922699b0ec95f83b47cc13fd6245dd19d328c1b14ba8f0 WHIRLPOOL 1cf3d95d5e87fba133936dfd453459cd86a2855b31c76a7af4d5a1306908a4763f4c862ebc00aa18d18c5eac9f1243c35cc04033a79660f14da4309a676d9abf
+DIST rgb2.zip 308016 SHA256 a695bf2187d4ed5a7b762d9eb688a8384c12ba34d6f849c447d09cb2e2740595 SHA512 e8aa441a48169d9d8832ba705a0da3349d5784952ca7a4bf1a51457958e2e1c829231f9162f531d600d7683f84acd7471c75d85c4e1a538c96f63e46fbb4ea3c WHIRLPOOL aef9972ae792f0d69340525687604cb74d451569e1cb48781ada17ff3b427fa92ac49dde0531fe2f6d0700ac6d3636243b311b342c7a57440ea5b21dcc648c98
+DIST rgb3_preview.zip 7901556 SHA256 23b9ef1e3793aab03cb8ebc74b290a90dfbd068e3e1eab6ee412092e49703f8a SHA512 be94ed20d99c420a1899fbaa078b80bc95e95e74a25aef6cf63b02a99aea411879a5a99b8fe0b47ebd307c0112ef23d3a17802c049ecce8758fc7cf122e155c6 WHIRLPOOL 12fd782d3b9526abdd92f8c05dba2f8314f05f572ed99343990342c37ceb5c7f164246600705667a68de77b7d2cc173c0032639df7403c172fee2490cc7a8873
+DIST ta2.zip 1841879 SHA256 2bd99488d6a96302a0d9fbf61ae4b15f9b969d2de13d3f7a0bef3cd560a7d250 SHA512 99d4834d79d9a6502b48f4b7e5ccfdfe31a341d03ae6d22a0057bd2d5594b79b900e4fb28fc69145433447247dd886166f4a026d06ef475fe9d644b0af1a746a WHIRLPOOL 5612fd5f025272b66650704f6827d7635c9abef91a7c46e80c0d6f4430bd6bac2dacb479d1464e172b55900cf45357ccba072c7a25e7e30c83990d2d9cbbdadc
+EBUILD quake1-movies-0.ebuild 2128 SHA256 40b1df28553446ea7ff7cfb6cfec2fe791c3a839c6d682fc8a0a5bb2893dd6bd SHA512 534c1c0663b4bde3cbde4978f78fe6c22ff14d4030b9b21d895d6563f5ea331c23a1fc738437753eb0056f0db0c67600036e0da1cd28cef9a2c7302180ef6651 WHIRLPOOL 686dc17ea2b48764862d387713e3b341ac05782fd870ceee3c69407f660aa5454f7248d7a00b1327c71ea8db3716430110da7406183e1e711c73bf1fa9305824
+MISC ChangeLog 717 SHA256 fcb7ba42afeb3e41eb0a670002c9774e9090cdc9837ebfb75d355c2f10a10b1b SHA512 eafe5c122ae9fd3b05f5a6dd8a65232f576087e2c6f6c12419169f98fd9fe45528d9ff8fc0c66299dfe9b184974cbf0cd3f5031510b2c390107991903f013d7e WHIRLPOOL 192742a15285c9dc4f07c04230b9106e338462481d71727b0a7d81591bbf966a16fb1a6a8a39a09a661a6ca1ad504423a6d45cb3197e8a57f95453148b1bbde4
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQGbBAEBCAAGBQJTZoU5AAoJEJQzkH1pP7W4vUgL9RqIoiLgdt3EAjz2xoUkheow
+PWbKULZ3jOSp69eCe4tEX5aLY41hz55Ghh9M0nT9wLJORrMxdUlOePMe1/pKA8QX
+IVK+JwUhmV2pJ/0Oz/e/K665Ef+iZCjnAQ9wSM+JY6fJqtiCFquUjZHHctvp6LgB
+rEqEvOLKksEpXx+yBEpUXF9flolCUN9kfZeT05A0xlBRMqY/RI3/l6mJ5ocfHmLi
+21alf/2RSq+vpHWX/6FdH2ShF+p36zJq+S8w5EF6wnz/MNm8yZMWglZcYwmpEex3
+yVde416Ok+vqof3Zr0iLvMuaLH9pxSYQdETVWF2lPvKGJ1Wyzr4UCBHOdRZ3cUKs
+Ld2hzhu9bT5bkhydYGLMeALjIHR/TirZS1+v84WLJs7EGAZrH1pS4vmHpq0FL1tL
++DLBiFQmIQt1BwATHmM48VoB9v5hoP8f3RpBLflca0kYgO529a2h0KFhNx9bcgHY
+jdpXjHWnl/87DwCQ4XiTSFM2WHvW/ju4eLlzznOQ
+=8eoR
+-----END PGP SIGNATURE-----
diff --git a/games-fps/quake1-movies/quake1-movies-0.ebuild b/games-fps/quake1-movies/quake1-movies-0.ebuild
index 0ecad56db21b..37ec643f49b1 100644
--- a/games-fps/quake1-movies/quake1-movies-0.ebuild
+++ b/games-fps/quake1-movies/quake1-movies-0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-movies/quake1-movies-0.ebuild,v 1.5 2005/11/05 22:48:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-movies/quake1-movies-0.ebuild,v 1.6 2014/05/04 18:21:33 ulm Exp $
 
 inherit eutils games
 
@@ -16,10 +16,11 @@ SRC_URI="http://ftp.se.kde.org/pub/pc/games/idgames2/planetquake/cineplex/camper
 	http://ftp.se.kde.org/pub/pc/games/idgames2/planetquake/blah/blahmov.zip
 	http://ftp.se.kde.org/pub/pc/games/idgames2/planetquake/blah/blahouts.zip"
 
-LICENSE="as-is"
+LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
+RESTRICT="mirror bindist"
 
 RDEPEND=""
 DEPEND="app-arch/unzip"
diff --git a/games-strategy/dominions2/ChangeLog b/games-strategy/dominions2/ChangeLog
index b1dddca310e9..fd2243e025ca 100644
--- a/games-strategy/dominions2/ChangeLog
+++ b/games-strategy/dominions2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/dominions2
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2/ChangeLog,v 1.10 2013/06/06 04:29:53 tupone Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2/ChangeLog,v 1.11 2014/05/04 18:40:15 ulm Exp $
+
+  04 May 2014; Ulrich Müller <ulm@gentoo.org> dominions2-2.16.ebuild:
+  Change LICENSE to all-rights-reserved, add bindist restriction, bug 505758.
 
   06 Jun 2013; Alfredo Tupone <tupone@gentoo.org> dominions2-2.16.ebuild:
   Fixing broken homepage. Bug #471806 by Jonas Stein
diff --git a/games-strategy/dominions2/Manifest b/games-strategy/dominions2/Manifest
index 0bfc16396877..5e2947f35830 100644
--- a/games-strategy/dominions2/Manifest
+++ b/games-strategy/dominions2/Manifest
@@ -6,13 +6,20 @@ DIST dominions2.png 1135 SHA256 530479327df7f2940a28eabb09217350fcc6009d0e81a907
 DIST dompatch216_linux_ppc.tgz 1982323 SHA256 224e1cd46d8078798f185ca956a137fdf3b76b339f49cc5b2f3304d553ea0ad9 SHA512 6b1ff8b5a041c42193b8f369ee0ff242048fd589ffd9b610628a7bf7a0d159fe6e590b04b914ecbf3b94ef2b94a66a062be84d595777127d8f11311fa92c3ae9 WHIRLPOOL 8f2f35576026a7e88b90c912ee60cd2e39ffbfb7db228b0c5589d58f9988b3e9dfbc96551822649a03cbabf8efd7ff9697dfceb4f5ed8818a2bc07b6c318165c
 DIST dompatch216_linux_x86.tgz 1892714 SHA256 19efb6b3db9fdfdf752ac53dd4352df990b95f84a37cfc61f729ce77ae142dc1 SHA512 9bb2a024235585181f91d8414c07ce8c490fed5ddab9d25817b7ea01618f0f2cf8714fb39a4406abe88e25b354f14ba1ef2db79c39d4c30b4e399d1b60477c2d WHIRLPOOL 8fcdcc98e43d8392dd38b6bb1300a08eeff4782dd567d47b5471d4363a492b1eb90d6f3c589a8a768100df92d820da8cd3d9d1360cfebc671268663bf232a27b
 DIST manual_addenda.pdf 192454 SHA256 ecbed702d1dae4ef2a08a33d03fb4b92aec8cd39df48ac085ed2748dcd159ab4 SHA512 ec582e9685edf7164ba8e7c6c99880b30c8a6737d2d339eec2642196abd175857bfef2e1ea3da3ccb0110d441c477c8fad64d47fbb8b1aa39b405484eb548443 WHIRLPOOL de3a675380ab67329cb94b8d0c9669c57a855bf3f36f04dcd6d3c7b596dcef0c79f5943ffd9c8aaf3b83bc729368f0d463059934d720a216962a0f6770cf2424
-EBUILD dominions2-2.16.ebuild 2878 SHA256 6df950235e5f0fcb512ce567edf6ad7f08a477810e1b0804900c2c560da53aa8 SHA512 1d73190eb91ad6705d005053761588d944dc3b684e7875f15628f8d6343ff2b6387a7fec3e10f66fbe5c094031dbe0c256e297541fe0d175d2f64df4cb7a70b6 WHIRLPOOL 0bfedc46bedde0e8335d11fc5fc5630218191cce93d339d8b12ac90b38e592b820de631c5d6092e1006d194008bf04fe6c31c8b4e7c3f6deb206519603c78e6e
-MISC ChangeLog 1566 SHA256 ad1d7298ee20930fce6850cf139bdbfe5267c9f4d81e95f8db74034bb6b470fe SHA512 e0ea79b4fd6c0731a1a135ba1daf93adbef5f675658cba80a71bfe0189fb74eb887cc404e575cec54af3aa2a5c37ba121891dfbf729a04f679b90bbb5a64eaa9 WHIRLPOOL f919c974f9d4e486830e09910354316ed4390ee6f5112f52174a5c22bb6972f41290fbee539dbed0c794a5d868cdaefac8fef591992a2a6d24ed80c24be41c3c
+EBUILD dominions2-2.16.ebuild 2916 SHA256 bccd19720f8f8285ec7c9390d61ab2be196012712afdb322303acb25c151ad43 SHA512 be4f50d85f58357c71b71d04b9a4893aac3fa718e60f5de2c479a8fa4335d962dd3f2eb2966a16836a6ceb20c9023368fe63f30baf0a7dad7c37aeba96ca9294 WHIRLPOOL bd0f32f914799abc1746a1131d9baae1ad6c4b644b2982ae6c42edcd0834bfb1ad2a532e37c565edbaa117d275277df5bf6b258e001e588a1828b8cfb5817bc4
+MISC ChangeLog 1713 SHA256 4d677ac4393f720d8a9f16af46accb2fbfb5e23cfced96d9135b398bd002529d SHA512 1925c0281f213b6732d0d1520cbf9ddefe54a3895a33bf3eb40c9b3c45d84d52532aa444bff6bc5b351fb3a6bdeb71597d601ba63f3227e6c28930d7a3abce0a WHIRLPOOL 4170586bd9bd20703a61138aeea14f6b024730837d8d37f2a359d3b0b668415774a60e1f1d2943a8b0bf9a923dc6e40298dbadd01aac650ff9ec0f3a20345c13
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlGwEEYACgkQIY77eQFFFC36NgCgkj6CiNnlufywEjVYkRdqK7Hs
-iiUAoK2/3FlqyrRuBQZzafUGdwfpK6jj
-=pXI8
+iQGcBAEBCAAGBQJTZomdAAoJEJQzkH1pP7W4tGIL/2vZ/exkcJ2RZEeXG7XiSQo0
+PXJzApP7XPP+ZnryywYqXUxJ0BShIkzz3otGMoH0iXY7ZRGxjXd3d+zREUZR0yNk
+DW2fK9wt3QdqkKrKmm7bdtUoSEx01gSjr+3oLkyj6mfISGWx0XqhbQGn2gofASVo
+GpqA1/TaSpJZUJXOmX2THi02bYyGWc02656/vFeDcbyQ2qugITrC3UnDbvdtZszp
+2c0nyEbv4LvytUafXY10gMmoLRNqtrR97Zm/0IuDeLeF/mExbi7LHPPBkEoetvSt
+yRCW6dit8WEM27SyuzPtRa2fG3cH3Y/zFpb7nqpEuiOtF8agyE4U6A0t1jTx7qmn
+vyhPT/RYr2f3hjzdO6RQN5Smetzd1YcZrs2N3Z8NtvO4gZRsEnOkoN+DOC4rMK+U
+wReNIyLHy3TVfH9EWaaLM61NjSMfgfCFs7W1kT7LL9MgfbyCP886Op0oAthVPflh
+w5/02bjea8MOE008OnGpfYodc0EEmPQ5QEPTSnJ0rw==
+=aEka
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/dominions2/dominions2-2.16.ebuild b/games-strategy/dominions2/dominions2-2.16.ebuild
index 1f7981aee0b6..dbbebfec1ea1 100644
--- a/games-strategy/dominions2/dominions2-2.16.ebuild
+++ b/games-strategy/dominions2/dominions2-2.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2/dominions2-2.16.ebuild,v 1.10 2013/06/06 04:29:53 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2/dominions2-2.16.ebuild,v 1.11 2014/05/04 18:40:15 ulm Exp $
 
 inherit eutils cdrom games
 
@@ -16,14 +16,13 @@ SRC_URI="x86? (
 		http://www.shrapnelgames.com/downloads/manual_addenda.pdf )
 	mirror://gentoo/${PN}.png"
 
+# I am not sure what license applies to Dominions II and I couldn't find
+# further information on their homepage or on the game CD :(
+LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc"
-RESTRICT="strip"
-
-# I am not sure what license applies to Dominions II and I couldn't find
-# further information on their homepage or on the game CD :(
-LICENSE="as-is"
+RESTRICT="bindist strip"
 
 DEPEND="virtual/opengl
 	virtual/glu
@@ -31,6 +30,7 @@ DEPEND="virtual/opengl
 	ppc? ( media-libs/libsdl )
 	amd64? ( app-emulation/emul-linux-x86-xlibs
 		app-emulation/emul-linux-x86-sdl )"
+RDEPEND="${DEPEND}"
 
 dir=${GAMES_PREFIX_OPT}/${PN}
 Ddir=${D}/${dir}
diff --git a/mail-filter/libmilter/ChangeLog b/mail-filter/libmilter/ChangeLog
index 79da219e53c9..7418d2fa422b 100644
--- a/mail-filter/libmilter/ChangeLog
+++ b/mail-filter/libmilter/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-filter/libmilter
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/libmilter/ChangeLog,v 1.30 2013/12/30 07:55:20 naota Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/libmilter/ChangeLog,v 1.31 2014/05/04 16:04:35 maekke Exp $
+
+  04 May 2014; Markus Meier <maekke@gentoo.org> libmilter-1.0.2.ebuild:
+  add ~arm, bug #509082
 
   30 Dec 2013; Naohiro Aota <naota@gentoo.org> libmilter-1.0.2.ebuild:
   Add ~x86-fbsd.
diff --git a/mail-filter/libmilter/Manifest b/mail-filter/libmilter/Manifest
index 1fa271d5a5a0..941bfd7a4fc7 100644
--- a/mail-filter/libmilter/Manifest
+++ b/mail-filter/libmilter/Manifest
@@ -4,24 +4,14 @@ Hash: SHA256
 AUX gentoo.config.m4 168 SHA256 d3e541eae2b48528cda2790e346ed3de82f8cd8875d655f179c71ba6a76b7667 SHA512 68b4c02527845ec54c694cbf6f4f7c589aa1317269d25cee6e65ea69243d29215790294180588c3436e72dd6f86163234111d3a762e926da3bfb7acf69f1c4b3 WHIRLPOOL ed7b78fa71f10fd0fddc5f90d61fc68d928fc7571bf335df0b4839be2821bfbe5919bcd4d569e0c1be9b7dfbdfbee83088187d0b5686d047270e26a1a10436de
 AUX libmilter-build-system.patch 6855 SHA256 736ae535cf6b76bf7bbbe2d1a4a0ffd7a7936abbb2f0ceb1ddfe9ebfcef61e58 SHA512 d36adc49d5fec792139a921b5292ad0a6d71c11a31093cb1249f4e19b8255bb5a287beb3537b2ec0316d97505233cdd708bac27c0d4e1f54464918d4730be43b WHIRLPOOL b73c11278050e34013d400ab34c01c6acc9d8f1ac85f830edd8284b61924ef48f82b45e4cba2912da51ca58542ba265c474409df3cf588aa0971990fc6675cec
 AUX libmilter-sharedlib.patch 2843 SHA256 3a753b0881fe622814b471ee5f9037905c7cc3ed08ef74908464ab5307e59d5a SHA512 31c36b57739946c1b9c7c85307fe5c53c45d7f8cbf427a0f2248db8b74871a6f5a30ef1af524915821aeca54310d28272bcd0a587cb918192214fa5c30e4a8da WHIRLPOOL 1ee6cdbee9e32e66c5836d7a296f741476d4cf03625dd4409ecdaba5001063e11b1f6f3d3b07e8150563641eaa78ff336759e278782f04bcab75d2dc73a10e8f
-DIST sendmail.8.14.5.tar.gz 2092508 SHA256 fb65a86a0f87f12aefb933ee8990540f7a680a594f7fedfdd28918f3934bfb88
-EBUILD libmilter-1.0.2.ebuild 2095 SHA256 9a15c5885c2b258a063e180e007f6da86c49827fa70d3fa96b2bd1de1d56f9c4 SHA512 a4d67935b0d4e4a2474700d417f47af77995095ae9c4ca7c0ce9f7f164e8287f65cef67fdc3674dbad39318ea037c836f71179728f8c797650a51c88131cf4a3 WHIRLPOOL 775cb87fb4f3d606e73de33579fa8fb329bc4eaa2b818bd300be659eee2956cd7fe342e54b1004915df83ed7028b64770bcb9dafe1b864e6f1a27bfb7d3a8f63
-MISC ChangeLog 4198 SHA256 7cfe59d2041648c2187e1ad5d7e07854b2a232fad68499e3b4d02215bfec2e42 SHA512 9ef29b8036d0c1bfb0f6437a29a349bcfd6ddb904dcf10acc00643b5f99a8396158fe76970ff4236d316e3305edb256a23dd858b4738d47ac5c021dab28365a6 WHIRLPOOL 8c86f25a71f636c0c13213ec30569e31e9be12fb5e009a39c1683e50208c1f0c338b0aaa72a541db6183049e925e500881b5e528f89722935a9fc274c9e47c44
+DIST sendmail.8.14.5.tar.gz 2092508 SHA256 fb65a86a0f87f12aefb933ee8990540f7a680a594f7fedfdd28918f3934bfb88 SHA512 178addd247f1c7c8ca90d70b9240db4cad4e55f0710d5df0fe979e5473a182d2035150c352836576a28bb2b9660b0d5ebfcd95269a156ac0d2c3dba3edb60452 WHIRLPOOL 2e073759a44d535629d9cce91da4a7082e085defeb9491a4470a8a8c8b18e1545129527c0138a74edb405a9c9724e5a597ee99c7852a423696c495ad8fef783f
+EBUILD libmilter-1.0.2.ebuild 2101 SHA256 3694de77d5e68a5d6432c27f33a610d2dd50a6c0b57c7f531355988979129d1c SHA512 07df3b7b80573ecaa6b2b3e16238a424f164a79b735ea2418d9ce8004c60c84165fe11d529f4729d11b6e3954f8005e0867d9a6eafa32c13f9caf6749209a570 WHIRLPOOL e054138cfa116aa2182cc0eba977418238c8b3b6cb9959e55bd9d31da2f79f478ec70bb0875f0070fdf0da3a1e6c195022db6351c14401abb2a3ddffcc8ce06b
+MISC ChangeLog 4296 SHA256 b37bf77386c39a2d220c2401e09236bf2029781195de1c7da802a591896c587d SHA512 e23f818fce6f9480ff8b2d89198feb2287327dfeab300aaadf1cc93dc82d6b5bbe676936981ce728ca8c5ac8d8a530b9fe0374eaa6dddd88b8c196884f483a47 WHIRLPOOL ca246a4fb8aa9566de0a127ea17d997d038d14e5de6b175c9181eab8cc944a9faa5e9260089bb6d753217ab529faed5f5267c5e6311ee1f90f06fba7856a0c9d
 MISC metadata.xml 295 SHA256 d29b0114e90b420c2b5c1034b1e39722f5ee7f83c0754d529acf880272c188fb SHA512 f79f68126edaa78028ef212ddc58cee40208a02ed4f7f206935ee76ca40cba42972a22415ef5e63940b26660dc0058d0e6249f37cb0bb4c735fdbbcf4c9f70d5 WHIRLPOOL 6f8ef43a478ad60db62f36d50397aa7fddcc05beb083b671040005c9965be278fbbdbe20559cf28ae5cf12c1091ef86b465771892904c6a761e4094f750ac64c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSwSbxAAoJEDYO1FT4VRUULG4QAJmD+eRMaLYifzXGS40fum0+
-/RbkrpYTcgneI5g3JCrfro6ZzT0tBji3ikfu6Q5pm1lgjDBZFWTe9g3XHl5UTSxh
-PymvHkGELcf8Ee+UczKNBoJ5nz61pSa9PFUFhX7EhWQ15V9Jr5kkXuCSLBi6EDH+
-4P8FbHog3SBRZrY1QikkkxP3IICJQEuZ53DyXYur5mCEcM/cVrgQX4L9UQwACG31
-iV9aiZz6z/8iiR2niQYTiXLPBtfKasxM8fDgjRm2b88jQ5QN0ogvqD+0jVfzBTGN
-+ZpLGm0F8QbaKoLBYKiyTI2EOj+fqIVC0CpMcUZ68CeeioVRGIbCXdK3fjEbJ+PF
-6T00rmRMAUDyZBmwQEE4DLf+l3431DSnk8UHKedeqLUpV9vR7ejn/WxbmEYa6jbE
-1rjFE91955V9uo3z7/JxyurYvocMGXUJo1kGqlLCixoBXaF65cfZrkkRt49oxTjy
-gRkAINguhQb/oYsSu7d6dqu3E97x/n1UOxJps7HFbgaUfxtk2WQO6Y9UeNQQvQGR
-UzyX25NZeeyOW2jAJZm8f+TQHY0ylyzTX2OyFPBZt3YvxzvsbVwx2JVq7zWq0m50
-RPg8SPL+DWMNnPoPDxwG7q5nnKWTYS42eiN6Z7y7rc+67G7PoDAbbOt3U4YMdZlX
-D3nUw7/ZJK5pjVZLOerU
-=JpMf
+iEYEAREIAAYFAlNmZvkACgkQkKaRLQcq0GKQFwCffXb5tunn688v84bQk6Ujw5KU
+vl4AoKL4+OJ1gNK5zFKFb68Afd+iaPzf
+=rokZ
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/libmilter/libmilter-1.0.2.ebuild b/mail-filter/libmilter/libmilter-1.0.2.ebuild
index f2d4905487c8..121d1ad5f086 100644
--- a/mail-filter/libmilter/libmilter-1.0.2.ebuild
+++ b/mail-filter/libmilter/libmilter-1.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/libmilter/libmilter-1.0.2.ebuild,v 1.7 2013/12/30 07:55:20 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/libmilter/libmilter-1.0.2.ebuild,v 1.8 2014/05/04 16:04:35 maekke Exp $
 
 EAPI="2"
 
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${SENDMAIL_VER}.tar.gz"
 
 LICENSE="Sendmail"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="ipv6 poll"
 
 DEPEND="!mail-mta/sendmail
diff --git a/mail-filter/opendkim/ChangeLog b/mail-filter/opendkim/ChangeLog
index cc964a48c5af..6c2f0bb4ac50 100644
--- a/mail-filter/opendkim/ChangeLog
+++ b/mail-filter/opendkim/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-filter/opendkim
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.78 2014/05/02 10:46:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.79 2014/05/04 16:11:57 maekke Exp $
+
+  04 May 2014; Markus Meier <maekke@gentoo.org> opendkim-2.9.2-r1.ebuild:
+  add ~arm, bug #509082
 
 *opendkim-2.9.2-r1 (02 May 2014)
 
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index d824136c74ce..150f48ac0fa9 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -11,14 +11,14 @@ DIST opendkim-2.9.2.tar.gz 1229383 SHA256 1f0c66afbe48f6223d2ab985b2c27594ae4503
 EBUILD opendkim-2.8.4.ebuild 6162 SHA256 b0d0bdb46cd8f3cd4489587538e355b2e16ce438a44f0c18f61daac7359a4233 SHA512 3ce2d608ff6a4e44d9025a3e6bc6504c8cd5714a6098e6a35011c7d0323d41957e4aeea0abcadb99e06906d041dc8b401a0dc2599b0d75fa7194c443a547b493 WHIRLPOOL c3b79d90a15296f588244d82e9d7ebcc249a9066e66fc5463a7ccbd35f5da27780be63fe8cba2f131e3b462115ed5c864782e4508866f6bf390e88daa4cffc84
 EBUILD opendkim-2.9.0.ebuild 6038 SHA256 0b73613b9fe124c1fb3d5c7b0d314e29ac82ee7333181a7a256405baae277bef SHA512 97778ad70932eefe34157fa5e23ed46cb135dd6094e48c6d7649937d7cc31e9f6b715df499fc4614eecc29cef7de42c4d2758a84c2e9c9d5166a49dce5e6c1eb WHIRLPOOL 50cc335da37de2e331d5935bc79b4f05d318a9c8e45e17a05b1d8331e505e7c21e14de72d1b5bbdc32c70fa079c16175a84bb6ef564c644039c68344139d2b25
 EBUILD opendkim-2.9.1.ebuild 6398 SHA256 abe29e30c4f18eea892933e81286cd904a3f4b6f077e6974adb04323d5ee42ca SHA512 8cb6a02ca8f8ea4121834f513886cb84338389fe9019b9105d5782fda89f8e595b4bd00e2b108729709dfa5db55782badd564285bc91fcbf2ecdba21ccdd32e2 WHIRLPOOL bf0c647508859914348c470181ffbc19e6110e90f8bae8692c16449b814c8f9bafc20aa4224c0e3ff5ad3ed9ce35a9574952234d1904faa2d8422bb0df8f2ce9
-EBUILD opendkim-2.9.2-r1.ebuild 6306 SHA256 2080a977bef0957ec619329901679683e0e5414804cc27fa58c4a93efaa5c6e8 SHA512 df74e237fe0df3dea0159d62cd4c5cdc999be25e93a8bbfc7c5d6195efefae4bca367607fa8b62ceff2f2654051bf13fd9ffbc26402add489f8063a39f2f1fbb WHIRLPOOL e27b45f655b5fda9ebc69ce71e7bede83e5b777fe1b307d24e0936d6071bcde6d083038bc5faa5c6a431d330a7fcf933b833512deb2990d1f0286f4db18423e4
+EBUILD opendkim-2.9.2-r1.ebuild 6312 SHA256 f127d83ad42fa8045c06ff689511037e25c30294b800fb95dd4d4a5348961ed8 SHA512 dedb0f0b762342de6c06518944cb21912a3ae40b93886c12c23612ef70cf5f63a779474c0500bdc211b7b199d4815fb6dac4c4d55c27b45d8a180523ef6d7dff WHIRLPOOL b7e31f0fbd3ad85447bb088b866647aa5440f78b9091aa57d51aff5fc46d8ee507b947e4c8bc988a95fc9b70d7f61cd202b5e3ea4868d93ded68b3c78a29e44f
 EBUILD opendkim-2.9.2.ebuild 6245 SHA256 60b69e7a90568cc7c406339d2a0d391d3b20f64abdbabf30907241fb0031bf25 SHA512 e1aea5a6b995cb25990b4f5162ac04083d16c1d869e18832d97d6748ab602c84a0a00b7267a18f50a5e60df612e0d7bd8ec1c5c88db2d689e6a83b543cc9759b WHIRLPOOL 796521805e64bb82f56bf0e3d439ef2e5ed62b750d866d9ecb50f37ee66c626046af2f22783fa1480328c640773857bca9d2640d48d46717d91c8983f7089077
-MISC ChangeLog 13682 SHA256 1898ff5754626f9dbc508f7959cae672fc28d66d2c432be8fc74f2b20fa805ce SHA512 3e057735844fe725d2315f74ff85db7873746aee76ba9ed491730929d558d48d468ff1eebd9fd1993bbb4c7f050d3a1b5c41ed0ca2e6433e543fd6f745c0e1bc WHIRLPOOL 57db5fe64c8dcf58338931977374834f6f0de7b72ee986bc57d4cb27f9e8d5ec7e146dfe6da9064b16c349b5bd4b12f79376641b6786beb0ec42a5a5ce4184ef
+MISC ChangeLog 13782 SHA256 f615b879a4a7614a3ff7010745f71fb6725876b865c75dee4d9cc3e848bc4c22 SHA512 ba3181fbeccd75e774522941df0086609dccb3d0f216385adb6a345533fdc78d8687869bf4a1ad21081151469d4b6a91576c47f20c6f33cbd75b141104c6fde8 WHIRLPOOL cc07613b09db362375080b5983147fb72434411a615d9e70044558baad8c5f0fbfa2ac6fa05dd2b44eac59f8d373d2d72734b7a46381cdab0fc44de1021d7899
 MISC metadata.xml 1403 SHA256 85ffb9c9df1fd60d7f22db45e8d4b1edb2b882dd0fb2004a646651e4f7e675a8 SHA512 b7529c54897e04109deeeb30414ab175de5989baeeb398042995fa193ec0302bbc74a43037550c4a2dc60e490443eeaa4bcb038229b1ea179f70e32e27bdf37a WHIRLPOOL 862f684ef7c3d6f40d5b95eca699e003f0085c62cef406c54a307d4be3d8a847582c2bc3c68eb0208e072b506162a27bde6115fcfad548b1865bee7f033ae371
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNjd3cACgkQCaWpQKGI+9QzPwCfY5hQH2k6+ySrmpd2/QO8YWxD
-zOkAn2HICeNYZrjzsxgv05xc/Py4NHTP
-=n3xw
+iEYEAREIAAYFAlNmaLMACgkQkKaRLQcq0GJFoQCgiFO67UUrTzdfz7/G9ZqVlpN6
+ThMAoI7xL2aYl/86j21X6KuZZ71K3HGs
+=J6Yg
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/opendkim/opendkim-2.9.2-r1.ebuild b/mail-filter/opendkim/opendkim-2.9.2-r1.ebuild
index 9a05962769dd..382c1943dc8e 100644
--- a/mail-filter/opendkim/opendkim-2.9.2-r1.ebuild
+++ b/mail-filter/opendkim/opendkim-2.9.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.9.2-r1.ebuild,v 1.1 2014/05/02 10:46:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.9.2-r1.ebuild,v 1.2 2014/05/04 16:11:57 maekke Exp $
 
 EAPI=5
 inherit autotools db-use eutils systemd user
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
 
 LICENSE="Sendmail-Open-Source BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+berkdb gnutls ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
 
 DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
diff --git a/mate-base/mate-file-manager/ChangeLog b/mate-base/mate-file-manager/ChangeLog
index a59cf4f270dd..86423aa887cc 100644
--- a/mate-base/mate-file-manager/ChangeLog
+++ b/mate-base/mate-file-manager/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mate-base/mate-file-manager
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-file-manager/ChangeLog,v 1.7 2014/05/04 14:53:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-file-manager/ChangeLog,v 1.8 2014/05/04 16:57:56 tomwij Exp $
+
+  04 May 2014; Tom Wijsman <TomWij@gentoo.org> -mate-file-manager-1.6.3.ebuild:
+  Remove old.
 
   04 May 2014; Agostino Sarubbo <ago@gentoo.org>
   mate-file-manager-1.6.3-r1.ebuild:
diff --git a/mate-base/mate-file-manager/Manifest b/mate-base/mate-file-manager/Manifest
index aa30233923f6..082effac8a9b 100644
--- a/mate-base/mate-file-manager/Manifest
+++ b/mate-base/mate-file-manager/Manifest
@@ -4,23 +4,16 @@ Hash: SHA256
 AUX mate-file-manager-1.6.3-r1-fix-x-caja-desktop-multiple-windows-issue.patch 4157 SHA256 7917e9ef8d3cf6b0fbdfd646eb089165311f91598f30295c46856adb28bfaf25 SHA512 6d722a687396ebbb8712ebbdb1a9b83c108194504b6f97dc55a67b42c6e904a1f68e3ea8a111b49e4da92dd3f95cf5922d9aed853d2c5cddc127e2e041fa5353 WHIRLPOOL 87009140ad9f764e64344a1468143ac8c3426ac325e4c5b8b8178bd99ed10203ba6bbbd65f275258413a94bee8067de10147a1ae6257c6be6a101c4972a16525
 DIST mate-file-manager-1.6.3.tar.xz 3548484 SHA256 a95a654410bfcf949bec09e61b766ee71c81e64df997ffcb9913023298e55152 SHA512 98b8056879ef093b81587ee7ccaafbd450b8948fc2abd831439bbf58c4a33e47c3f3eb9872eed1466b199612d5590af6485de4b74bbedf524c7f9f18ef18b0fb WHIRLPOOL 5353a54f3d18ac2b83380cc756cc3444f1f04878cb702676ab36c38bb283f10d97770211454375b0a18096f17d627b805956e2adfa5d8f8fabda630683034a48
 EBUILD mate-file-manager-1.6.3-r1.ebuild 2436 SHA256 52bcea591a1db849e002c8f1192531e118fda888b4c14b6b3166dadabb2fbdd9 SHA512 2e343d5b557f89cc4aa05f4eb62f2d168be2fa4a57b9f5b0bab8eb85615235681f2e5201dc2e8f118ea1aeab5b7fcafccdf24c8cc2d8722aa8ab9c6a83e07f47 WHIRLPOOL 55b0038bb7924b5dc569e1113565ac911036e64ad1c39423ddd36e25f36ac871528dc8ed576f88780e8e9f9a846ec0ae2da0d3b8b9827f163627a29b6ff5a1a6
-EBUILD mate-file-manager-1.6.3.ebuild 2351 SHA256 32f86b2c965b827f37c121cf1da3a7384a8f62b6423483b817d16cb5a1123dc3 SHA512 0ca2d76f2fc5d373aba63700cfe59df86f3bda7e8775d7d5ac44e338f32b9ce9623df08a0c9fb4a619523ec7cf0ae3087d5d17902c0033da199133acaa4361e8 WHIRLPOOL 204732a7ec32e1946370113cabd3e7ddd9198376e9b3eaf280fcdbbd50e01b9e17d573bafca4c0eb1fda640def3e84ef27a2c9fb5343e9a8defa1820a9dbec95
-MISC ChangeLog 1713 SHA256 e08a3edaa3e7df796393652a769225edff3ce77fc660c57190ba41cc418f2a56 SHA512 e4cc1f8b20c1b591b0a31650b30ff80ae046407588c8c9c8cfcb848476c68837480129cd45dd2d3078daa358a7e570a1b84601cf2a186f54a9b5fa443023299d WHIRLPOOL 5aca9638179eff52d34ca9174bd5286bcfc7f42e9f160b6df08c73b3921c736e888fe1a3590327d5110a872b796a705e421e582128efae452792e49a39ac984d
+MISC ChangeLog 1811 SHA256 d688a6a28107a47a017ff2d22703e7dad91b2d615b6cfaf2e9288d22ecda1ff8 SHA512 cfc0f6ae9341ec97e501fff1e20c22ad19037977a9d3587024d192a6d212b0e1d031c0287a65dfa107a389ad6916a627c3c2b577200c0b9670e0a950ac76d85c WHIRLPOOL cbd40e0145be34afa1c78043742ed4e6cbdef7dea36542e9ed94d539daa8bf2fdd41d59c887a98ad37ece4f97afc5babe9e27ed2ab132d1fa68f80fb570b78f1
 MISC metadata.xml 499 SHA256 f7df17342fc39ef91a30e5a5fc3fea7083ce3884ae3037419458e01ed06712f0 SHA512 b949a905f073339113ba7de1d7d89a3fa5637a692f5e727c6b1be3bcda6aee768a3f87687eb581324e493cc28a08b6c31065d358d278488e3468fb4a8225e04a WHIRLPOOL b3b2c548a3168d0d5a10067108e907c95af153ecfa22abdf3b1e50a87a26fefa123984975190fd9f3b72fe564abd9135c051ad80a9220556d6412343e18d7671
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTZlSAAAoJELp701BxlEWfhswP/iox7YBCbPCHxlVWb0vcWQnb
-Gq+uR14l8pN5pJIjSGoryu+Pdsy0hJ6m+wFnPV3xn1mm3jIh1G1VxJFW40WPGpCY
-k8lsiZTMeIK/mEoG5iDodAW1SXoYQIK0Oj/fccVPNMaKKLh1yrOTdkp1QRr5xh7H
-MrYq7mh6BxgeNM0IseRehYhIa5fELhdah4aJjd8ulaGig6FGRfiF9zsCfXyJOjuH
-s4DS03k+GgO7TQkPGtel2GyjBGx/lTpRgcYR5EruSOloG656AHXhU9i2HdJui6td
-anX7KrsT0lYNcSYnvRuZyN004mJeiU9QpGSjZzcgkNwE30dRQBlaft+xlmCiXIHS
-TCSZick7rotkz/5RkgzWvcvcVVTMb+lIvkrU1qc1DUWlAgdZNmBReaLxZuU/SGJi
-49Y72+34/Qot3M9eUVuXFhDmA7VmpnUvsH4f5rkdc9OCv/LX/S5WvvxClft2iCIy
-bCCyzkJua+FAA1k8f8HTmYUF3/4KKUPOJoOC0lMbOH39iUZnkU6SNnGQW48wrncF
-XLJ5bvTSMrrfXSQzHAErfXgyW1QuBfG/vYzVHCVPZ8R1H3QEixW+t/EfnIxl9xyP
-ALTEX/QKY1lGSnIxTfkM4Qd4FVSCE1vCEKQpDM1gw2/EYSIJAsIYy4I2feIgq3i+
-hPmWWZJm4PCNRDiGMKUd
-=QhIE
+iQEcBAEBCAAGBQJTZnFDAAoJEJWyH81tNOV99/gH/iOu6NWN+d7Mzo7ZQorQs6K6
+pN39L3gW8Joa8UuNVli4GdD/ZNnhXoHxO508PfGHNW96K/wQ2CSWKxAaQXyFFtcx
+WYosUOxZ+aWst8C9AO8l1QKopdULe6FiQ31mfAnfTfKyh9S3b0jPMqMF5uzNUGkg
+eDbDj1aiHnwowCxtJl8n/2ZySs3sbt/QiXKVU0iGtGFSNGF6GOcQ9Ry3lfJnsv8c
+NIsweLtwMbDIkXCStxxqftDU2XoynynjlWF3Gm2EM9CABhVbM1+4MThqkc5j+tu/
+iO43OyfSyKwcQlfHyarQuqn5GqP5jCr2/1/2fo1aIz7p8vglrdFPyL/lF2DNQW8=
+=Pl8k
 -----END PGP SIGNATURE-----
diff --git a/mate-base/mate-file-manager/mate-file-manager-1.6.3.ebuild b/mate-base/mate-file-manager/mate-file-manager-1.6.3.ebuild
deleted file mode 100644
index d48bea95d8d5..000000000000
--- a/mate-base/mate-file-manager/mate-file-manager-1.6.3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-file-manager/mate-file-manager-1.6.3.ebuild,v 1.5 2014/03/10 22:55:54 tomwij Exp $
-
-EAPI="5"
-
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 versionator virtualx
-
-MATE_BRANCH="$(get_version_component_range 1-2)"
-
-SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
-DESCRIPTION="Caja file manager for the MATE desktop"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="X +mate +introspection +unique xmp"
-
-RDEPEND="dev-libs/atk:0
-	>=dev-libs/glib-2.28:2
-	>=dev-libs/libxml2-2.4.7:2
-	|| (
-		>=gnome-base/gvfs-1.10.1:0[gdu]
-		>=gnome-base/gvfs-1.10.1:0[udisks]
-	)
-	>=mate-base/mate-desktop-1.6:0
-	>=media-libs/libexif-0.5.12:0
-	>=x11-libs/gtk+-2.24:2[introspection?]
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/libXft:0
-	x11-libs/libXrender:0
-	>=x11-libs/pango-1.1.2:0
-	virtual/libintl:0
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:0 )
-	unique? ( >=dev-libs/libunique-1:1 )
-	xmp? ( >=media-libs/exempi-1.99.2:2 )"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5:0=
-	dev-util/gdbus-codegen:0
-	>=dev-util/intltool-0.40.1:*
-	>=mate-base/mate-common-1.6:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PDEPEND="mate? ( >=x11-themes/mate-icon-theme-1.6:0 )"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Remove -n parameter.
-	sed -i -e 's:Exec=caja -n:Exec=caja:g' \
-		data/caja.desktop || die
-
-	# Remove crazy CFLAGS.
-	sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \
-		configure{,.ac} eel/Makefile.{am,in} || die
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-unique \
-		--disable-packagekit \
-		--disable-update-mimedb \
-		--with-gtk=2.0 \
-		$(use_enable introspection) \
-		$(use_enable unique) \
-		$(use_enable xmp) \
-		$(use_with X x)
-}
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-
-src_test() {
-	unset SESSION_MANAGER
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	Xemake check || die "Test phase failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "caja can use gstreamer to preview audio files. Just make sure"
-	elog "to have the necessary plugins available to play the media type you"
-	elog "want to preview."
-}
diff --git a/mate-base/mate-panel/ChangeLog b/mate-base/mate-panel/ChangeLog
index ac31d5d31999..9491bd05a639 100644
--- a/mate-base/mate-panel/ChangeLog
+++ b/mate-base/mate-panel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mate-base/mate-panel
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-panel/ChangeLog,v 1.9 2014/05/04 14:54:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-panel/ChangeLog,v 1.10 2014/05/04 22:20:23 tomwij Exp $
+
+  04 May 2014; Tom Wijsman <TomWij@gentoo.org> mate-panel-1.6.1.ebuild:
+  Restrict upper limit for mate-desktop dependency of mate-panel due to
+  compilation failure.
 
   04 May 2014; Agostino Sarubbo <ago@gentoo.org> mate-panel-1.6.1.ebuild:
   Stable for amd64, wrt bug #509268
diff --git a/mate-base/mate-panel/Manifest b/mate-base/mate-panel/Manifest
index 7034c9dd7abf..b4bda2cf16ea 100644
--- a/mate-base/mate-panel/Manifest
+++ b/mate-base/mate-panel/Manifest
@@ -3,24 +3,18 @@ Hash: SHA256
 
 DIST mate-panel-1.6.1.tar.xz 1938144 SHA256 88bf0620e1eba7e2e165060ac6fa21896b8e24d1ac742ff6f8c884c5408dd53b SHA512 bd2f7c2433dabcae5dd596e81125d70a08e6d6a3beffee97078c0b8c53527271dd1eed6650d39a7e2a24a579821300e4fb2160b1eeebea3b925a996d7add8dd2 WHIRLPOOL da092bccb5830209fc6e51aaed0a8d9484f668f1499b85e034a4f10bb61637b6519d28a3db817764763dbf93ad1b0f6eda7af6c7760fc4cafa143937b0a37252
 DIST mate-panel-1.8.0.tar.xz 1930348 SHA256 ac20c42d1b2ae7bf08e4e701e12165e63753f80648c1ea4ff5297f3381481056 SHA512 bdac2baa567cb52cdb6ddf3ed1d20e9de496e22734538fbca8e9efa6c2d4263ea6c13800ff21cffa8e5383cc5ee875ae7982b0d6e0d0a704abcbd97e3c07c53a WHIRLPOOL 73090851f4410689f184beaafca8c587e8ecf633bffd1356212a8c145c60187de50f7c498e363ebd5f54ae51333e2a6dd6ab1d47c7f04c1318a76d6932fae3ba
-EBUILD mate-panel-1.6.1.ebuild 1945 SHA256 39ae8b81e04ef4c17baa3377e85c446ea2fdb0c156fbe11dcfc3b20bed9f66e9 SHA512 a58d6cd885e81fee004100df4a0360665dd8364ab988fc7cf11cf0e524007666a7698bb24146e6b8cdd312a69d1f8aae96f6658766ce12dfee3fc36222a14a41 WHIRLPOOL ced3ee2d9688ab9a31b8fcc5949ded2ccb06fe0d612869a8de6cfc7407f35874c9488d5800716cdc4710273eea92868f69ef6233b7fe6297a1724a60e01b9f07
+EBUILD mate-panel-1.6.1.ebuild 1978 SHA256 077223051f229aec1d5a2c6b60da265d0ae92663a178a2547577172acae19bff SHA512 36e6cef3b8b6d6b6729a7ae77522b3035bd793c7deebaebd28fa4776c0e1061b9dc3131b15286553f2e2661ce23fbc52206127479218d4ca20087f44bc9df9c0 WHIRLPOOL ef05dae9f40a0423e45c309334e0f90ff8943debd1ddfad15e14ca7e6147d156d6aa7df4ab6e423d02b32ae5c4894df808c54c29bcc4b49a2c62ec10b3cec67b
 EBUILD mate-panel-1.8.0.ebuild 1948 SHA256 73752c8b572c78944a4927d13f7bb5f6c14a023cb0c9c11da8c9421596f15f1e SHA512 97991b63b408d8e8c4c3540d025d8a62c48e1dfe8b7cf2105b7fc9466e69db18c7d9dd02a3d88e7e7bfc1cee23a96467e45457113853f938bc7e27abcc835a5d WHIRLPOOL 18713b1e503304b51254dc2cd0ac74c4141345bb9ca75d3bd892f674488e6c6b3df763483af8cce0c5c37d8bb0c4cb54ef06e5d33c4c02ff3a02fefdac6823d1
-MISC ChangeLog 1650 SHA256 88fa3dc8224bab21ab6f3f48788854a3006beb0bd25a736fb7db383b721ab2a3 SHA512 2ccd915c42f6a7764e54bc0902d46a5dc843533253789ee788ff8e8f532f41a8e22daaa9dd3d80450fe62b3a2eed3d8e41d53189ca6afe7d0ff3af98a29d1d5a WHIRLPOOL 72a14135b61620d01315ae404c55490268d78815ccea8bba01ff1840f1b2ab2b017d72aa8326c2c73f16cd4029fe90062514e4e25a0298d0ce4f87bf0bec8339
+MISC ChangeLog 1822 SHA256 308d703873636ce71df0111c9c34270c39ffe1a9984b97f0194b3da2f946f136 SHA512 015a44ddfa1d2536546593b75269d407a2a100fd0985c28a5bbc29a2220fcc50878bde39d3fd23cf756136057f7539fce037d595420341e8fab2b1898fd4efca WHIRLPOOL 04d30c187d17fac88dc463591cc782a2342104bce39c646199e5abcc8497ae0aec0945272f3ae95189a57305f6e7f266ea573561f4740d01be1d05e41003f24c
 MISC metadata.xml 230 SHA256 c188c403bd41d5dfe348e4809c2350a5a2fca98d46f8adae83a36d89af439ecd SHA512 17d13ca08cb96bf73a2c821019fd00677f17579c54b5543c1653c9f6106d7c52ad14b4a7ff72000ab7f59b7031e4471756b96864ca2fedef2e3a047fa0eb71eb WHIRLPOOL 39073c2fd817e3c41775408adf7271656a744ccd967e74770c673506c8c78cd11356b0cd28eeb16fe7350e8708141ad25037c45066263f2ed1b85d5270743986
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTZlSMAAoJELp701BxlEWfn3YP/i2zdeBA4kll41NNnqqvuAga
-TBOJYSXpCiTwmW1SWrsG/6vtQu8M0Vvbn4YFFyo6tmeqKRCq1TT6KOVcgQcvOUmm
-Fc/O+pO8LIYTX2bXzXbQmf8DhWbQsZVBG2vTqkktRrFfb+php5HsotY/I/aXIMvS
-ShK5jdFdeM9fk/KYhlxgvWCHvicCiIuSJp0iO1ut6xtYyaXLqhk5hdh5xT/9AOO7
-/wymE062+k7ISerKUCmsgpuUZffxJ92uKqzwW9+dPO3727BplM0erOvXMqoSN5N0
-n1t1PWNPmJwBbQm1pYlLTWXULNzOaLN+UPNxpVGF93A/7F9ymWTR6XxPMkxZAr06
-WfLQJQTbnYKwYgc6bMFktf3NAWA5AZzD1SQdYaQDAq83mIzaTeM4fqgHbPdz0DZk
-QCGshQf98xhcRlZAMP4TzXPXC/REFgglVLU+nPWCwjWEctVHLJO3z1LlHkMsNBDB
-EzQiMwXLSQwPqczTm3ZqLmqVwwm/mioyJqNI17BaaWNt/eJ12Tz0tvksF8kEfSie
-CyE5kL4d6D1EqTs8U/Cn9SYEOBsIZDQXcDXxRIiSPvv7Gds8hJxK51C39Gk76/F2
-tiTlwCZtvMC3DIrpQp1m1H4lwY3Nf/a0qW7LvXhzy6b+JqGO114MC5W+cY1ekqVx
-cu7kmSaxKTjJZuhIjIQe
-=H3W8
+iQEcBAEBCAAGBQJTZr0yAAoJEJWyH81tNOV9EowIALm462bGXSYZcNgIwI9cEjXs
+tPrbcgOF+b4tj7quKoZKvxUmByEJTaPaBOAYAQ2dFDN68zJWbDeQrU9PZ4BzkQXO
+kbgwbOmoWIQuIVzAeRdppC6zxAWlGmwFBPL8smLzoBFF8i9t0Uym656BT+AGV4K9
+TnL3Xr0YPzrr1lToyCWridixWpo76nHIPs55ZqPhRexln4mFJgCJ2Fk47eD+T9I6
+f7PP66kWEwuhQ/Ly9sJw/cadXO512DrohuThCOWpqtlXnTUq6y0lqj3agq/u1gGq
+jd1uaVjXrAb9/kj0G6zYTvDb0MMiCWkDINKnzR4v2tOs/bMXw93yMgO6eozlFKs=
+=IcJC
 -----END PGP SIGNATURE-----
diff --git a/mate-base/mate-panel/mate-panel-1.6.1.ebuild b/mate-base/mate-panel/mate-panel-1.6.1.ebuild
index 4808354e781e..f8f3b0cac869 100644
--- a/mate-base/mate-panel/mate-panel-1.6.1.ebuild
+++ b/mate-base/mate-panel/mate-panel-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-panel/mate-panel-1.6.1.ebuild,v 1.8 2014/05/04 14:54:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-panel/mate-panel-1.6.1.ebuild,v 1.9 2014/05/04 22:20:23 tomwij Exp $
 
 EAPI="5"
 
@@ -29,7 +29,7 @@ RDEPEND="
 	dev-libs/libxml2:2
 	>=gnome-base/dconf-0.10:0
 	gnome-base/librsvg:2
-	>=mate-base/mate-desktop-1.6:0
+	>=mate-base/mate-desktop-1.6:0 <mate-base/mate-desktop-1.7:0
 	>=mate-base/mate-menus-1.6:0
 	>=media-libs/libcanberra-0.23:0[gtk]
 	>=sys-apps/dbus-1.1.2:0
diff --git a/mate-base/mate/ChangeLog b/mate-base/mate/ChangeLog
index f8626ad8ce73..e9eced0520e8 100644
--- a/mate-base/mate/ChangeLog
+++ b/mate-base/mate/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mate-base/mate
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-base/mate/ChangeLog,v 1.3 2014/05/04 14:53:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate/ChangeLog,v 1.4 2014/05/04 23:02:06 tomwij Exp $
+
+*mate-1.8.0 (04 May 2014)
+
+  04 May 2014; Tom Wijsman <TomWij@gentoo.org> +mate-1.8.0.ebuild:
+  Version bump to 1.8.0.
 
   04 May 2014; Agostino Sarubbo <ago@gentoo.org> mate-1.6.0.ebuild:
   Stable for amd64, wrt bug #509268
diff --git a/mate-base/mate/Manifest b/mate-base/mate/Manifest
index 95b402921572..2572c6f95e75 100644
--- a/mate-base/mate/Manifest
+++ b/mate-base/mate/Manifest
@@ -2,22 +2,17 @@
 Hash: SHA256
 
 EBUILD mate-1.6.0.ebuild 2299 SHA256 b6ac1190571f8b8d9aedc4c20c087974a0ab161ba08a534149e26f2cabecb4d2 SHA512 146618c48668661cc3670736576c30f2ecf2677aeb05e9e61789fb87ab7863c6db0ab8a5611b60da8646c653751c4bea339a2dc97570a78cfb172507695a141e WHIRLPOOL 70e7f508eba636f5f01cac2aa97227e279141f74a08aba510669135e98cffb13696ce0ed4880306f0518d03fe130b545e98bc104fe047f50eece31694e82434f
-MISC ChangeLog 701 SHA256 fb1708da240a0b99bbf5f15d6457ab7466e617401c628bde2ebbdb18b8cd46bf SHA512 4ca5e12949f019b206678ea7700645885d5ad3024403aa6bacad2a82d7661d99d211b10c5f164aadaa85a8e8f14db3251b278c9fda6c5ce1a0c6913e1614465a WHIRLPOOL 18152de925087f486acac11bd48f4987906dc07b033bab2004cd80ff73f22599ea5d715cc665255fb8b332ff35838b3d1a2371bfda354cab6f9ee2df197e37d9
+EBUILD mate-1.8.0.ebuild 2142 SHA256 edc5d1af56f65e9e9a10e98928d65023553ac3e3d66ef63fbeeb2b8c0d6149c6 SHA512 5212a55c74c764bb019e382ce7d87cd67a73c97d0ea7e18974e19d3a8d4717782566e946dc3fef600f752c3b342b012d45dd92a41552f2f1afa6b8dfdada19c5 WHIRLPOOL f4d98cf2906b2a1825387a7fcdec837344debfd2d71f736f4fb866ab71cd39157d9dc96a4678b5160ed7501ed03ee4329789aef79aafa93de9908bbde56b6188
+MISC ChangeLog 824 SHA256 c7897050db6e66a47e20c1786f0fb558ef459c2430f4ee791e9d2f46746375a4 SHA512 24b1c15d43275439c2eef67f7fb6d1cc0d98e2f91078567fdbb77837611e96eb62f1ca9e4c95d5a94017cca06fb0a7492981359332a1fdd238eedccf604669a9 WHIRLPOOL 93a608803bc639d9e1026b4cab4026ddcaf61e2f01b6fbd34b473a6632a1464b80d5340c61e2347ee330b8bfae4c83b939062b73608e659aca58131b58397a66
 MISC metadata.xml 311 SHA256 268dd7a55dcd821a4551233fd32ed7240d8d6aa1295fa08ae3d50083ec5cbb8e SHA512 53394bfccf39030295b36483a751051b845641ed324b4f9f2543b492ce05b90a02b5f8627e49269ddb1a725d87fb2dfa5dbe5dba2a33acea112dd8ce6bd25c53 WHIRLPOOL 563945aa3a14f806aed7bfd8cc71650bdc197ed408fce036a3abbbb629855e980b27699ef74e2f1dc5c30e1ad92e8a7df6fc41631a7bffeea02e68e30d5764a0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTZlRsAAoJELp701BxlEWfuKUQAKJjM5iGVUmSVBmlgqDSyq1/
-p7FSeOkaomulUl5Auf7ZOVi799dOQa7+sqt5I3V5+9ukVUtlAZOdr8jdSQPVG3Vq
-t58gw7X/Z7yuzRxuNoZ/qedC6mAjS01wgjZ+vPU05PE5XyOMwteQ6sH9mg7MkI2S
-FXjpmf0Qw3Zlbeepx3lBb/hw0f56MwAZzbdybgkgHl5mBZa7a718G9jZ4VeqO2WT
-VX82NhJPi2wdGzra8RgLt6Vpd2rmKYYHnzjC38foD8EyFUk3s4oDKGfn8+57svVe
-kZ/MzNyC3rCrmu63pAVKBSrKU/fC/eUexWmn/kR4S/wK6/PhZh4gxDT36gA+zOU8
-nmgseL+D4Ggs/01MmI0Ovs+HFYl242ThCndevlS4QhMQ3oDtQ6Exzif5mWS9Gmnl
-IzJwBBVrkhumvjo3ZD15N7lQcV1E+0aOpVlce1OtvBDp/1s0PYDx4/pdLg+rzSYU
-YqpwW7M7ehIrtZPXu0IXC6SvumS7S+RUBhUpFdPozh1BCHPmQOBvw7jH23Nckv7W
-dOGdXrLQDwJIgwi0Yj7xJF1lIqTUswWI5lcCt6Nv54Ay24THfXduW27Hsqx0jtk2
-IcGvku9Je+bw7PXGqg0/dYu4kHEGAQcUferWTZ8Kvgh1Un1rn2enQZSfAYhOeoIa
-EQvMb8Sti9JVf7eUaf0n
-=Vad3
+iQEcBAEBCAAGBQJTZsb4AAoJEJWyH81tNOV9IPcH/2DLNceKctQDuLkA0ad7dsia
+zlWNztISep+7EH6j4V2ND7uS7NtJl6HuhzC+cVfhD7BDMVzrioxt74Y+VkDdczae
+J/EgghUdVRVPs+sM4ybRZTJJ+wK3/kqcCre+9Zk9lWeZWUV9HySq7RT2VqXMRyjg
+fgva1hGSYo4PwhIkRg27YxwUmfvLemSVoZ/2U3QryXB3ecXltUKkUNpnFvv/EsAY
+hxI+DoBvMqvfJmrOctGhgrXB5oF/cvb4DRmiR9DQ56pT5T0hTDf8O01NiDFaDz2L
+JMQ5QXsTonH9rEil0E/S7qZ8j5C3cUJ9gpO/JAsluIrTUBaT3sVO3lorVdkGKu0=
+=Cigu
 -----END PGP SIGNATURE-----
diff --git a/mate-base/mate/mate-1.8.0.ebuild b/mate-base/mate/mate-1.8.0.ebuild
new file mode 100644
index 000000000000..c8791ab51ad6
--- /dev/null
+++ b/mate-base/mate/mate-1.8.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate/mate-1.8.0.ebuild,v 1.1 2014/05/04 23:02:06 tomwij Exp $
+
+EAPI="5"
+
+inherit multilib
+
+SRC_URI=""
+DESCRIPTION="Meta ebuild for MATE, a traditional desktop environment"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="metapackage"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="-bluetooth +extras"
+
+S="${WORKDIR}"
+
+RDEPEND="
+	gnome-extra/yelp:0
+	>=mate-base/caja-1.8:0
+	>=mate-base/mate-applets-1.8:0
+	>=mate-base/mate-control-center-1.8:0
+	>=mate-base/mate-desktop-1.8:0
+	>=mate-base/mate-menus-1.8:0
+	>=mate-base/mate-panel-1.8:0
+	>=mate-base/mate-session-manager-1.8:0
+	>=mate-base/mate-settings-daemon-1.8:0
+	>=mate-extra/mate-media-1.8:0
+	>=x11-misc/mozo-1.8:0
+	>=x11-terms/mate-terminal-1.8:0
+	>=x11-themes/mate-backgrounds-1.8:0
+	>=x11-themes/mate-icon-theme-1.8:0
+	>=x11-themes/mate-themes-1.8:0
+	>=x11-wm/marco-1.8:0
+	bluetooth? ( net-wireless/blueman:0 )
+	extras? (
+		>=app-arch/engrampa-1.8:0
+		>=app-editors/pluma-1.8:0
+		>=app-text/atril-1.8:0
+		>=mate-extra/mate-calc-1.8:0
+		>=mate-extra/mate-power-manager-1.8:0
+		>=mate-extra/mate-screensaver-1.8:0
+		>=mate-extra/mate-system-monitor-1.8:0
+		>=mate-extra/mate-utils-1.8:0
+		>=media-gfx/eom-1.8:0
+	)
+"
+
+PDEPEND="virtual/notification-daemon:0"
+
+pkg_postinst() {
+	elog "For installation, usage and troubleshooting details regarding MATE;"
+	elog "read more about it at Gentoo Wiki: https://wiki.gentoo.org/wiki/MATE"
+	elog ""
+	elog "MATE 1.8 had some packages renamed, replaced and/or dropped; for more"
+	elog "details, see http://mate-desktop.org/blog/2014-03-04-mate-1-8-released"
+	elog ""
+	elog "MATE 1.6 has moved from mateconf to gsettings. This means that the"
+	elog "desktop settings and panel applets will return to their default."
+	elog "You will have to reconfigure your desktop appearance."
+	elog ""
+	elog "There is mate-conf-import that converts from mateconf to gsettings."
+	elog ""
+	elog "For support with mate-conf-import see the following MATE forum topic:"
+	elog "http://forums.mate-desktop.org/viewtopic.php?f=16&t=1650"
+}
diff --git a/mate-extra/caja-extensions/ChangeLog b/mate-extra/caja-extensions/ChangeLog
new file mode 100644
index 000000000000..f0f3cf66be3b
--- /dev/null
+++ b/mate-extra/caja-extensions/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for mate-extra/caja-extensions
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/caja-extensions/ChangeLog,v 1.1 2014/05/04 21:43:26 tomwij Exp $
+
+*caja-extensions-1.8.0 (04 May 2014)
+
+  04 May 2014; Tom Wijsman <TomWij@gentoo.org> +caja-extensions-1.8.0.ebuild,
+  +files/caja-extensions-1.8.0-sendto-options.patch, +metadata.xml:
+  New ebuild for mate-extra/caja-extensions for MATE 1.8, several Caja
+  extensions; imported from the mate-overlay, reviewed and adjusted.
diff --git a/mate-extra/caja-extensions/Manifest b/mate-extra/caja-extensions/Manifest
new file mode 100644
index 000000000000..3174d61f7056
--- /dev/null
+++ b/mate-extra/caja-extensions/Manifest
@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX caja-extensions-1.8.0-sendto-options.patch 12563 SHA256 1e00f86c960d28b6495c7a514a3897bc7f1c2e204518b6565fbe0e99f3a274de SHA512 95f78cc155aeb6576c4f938f5960516043897d0353ebf8ecf1fe130dc3771708c4838116efc0de4e8e4cc17bdf76715bb50cac9c4fb5ace0ddaa3348feb100a4 WHIRLPOOL 58a74ac39898c8bc4cfdcfec303a7812db11556a8a7bb37ff546c7a6ca1c26161ba08d78d4eaad5aa64dec414ae4c21107c454b7305c303165aebdfc647f179e
+DIST caja-extensions-1.8.0.tar.xz 343784 SHA256 71b4353236b4f13e1984a8497ff80ed63d74141833ba47a32629a5d3505bbc91 SHA512 1a59bf3ed7300d790f47494d0bef677a760fa069aaf76c2f35eb4d17b67be0fcdfa904e3a05d45ca1ff9f3016961c689aa620d37f020ed199ca2ddb3d8dd3663 WHIRLPOOL f192f8e966de8272ca65d7e856ebf26bfdbca8cf559da7571c6e372b5c9ad3b21f1e08691014546ed4cd9b6b60a5840b8a02c53d9d7ed34a8876a873771dc2be
+EBUILD caja-extensions-1.8.0.ebuild 2067 SHA256 52f7cd9e18a06dd9e891ea36a1694476e9bc1b1b7168c045d564b2f6e9cb7cdf SHA512 2178d12812c4ddcea37873a9c0ddffd5505fa097db92a5aa0a6d15e82442077c0a36b1f88174fc9331455bf5ad338a4128d2273a9beac4bc03818cdb1bd6d222 WHIRLPOOL f4f0abad10fca091db802928f747d48241f8ce3d838eac45a386b044dd0ec39907d065681e671ea141b46114fad32d1a23c77cb425a68e151f2f9aa4f533c5a3
+MISC ChangeLog 549 SHA256 57daa30cb310196b07634c8c9f8cec0f73afe4616de6d0b423d7ac26894f3366 SHA512 fa467e78e9c5a8b895a1c228fd7268456788bad3ae7cddb01d8e1e9021555fab1cf200858231c4c5163138e3375bac2c0450377676bf7604462d1c4f97442daa WHIRLPOOL ae41a4474d9d615e80c90f615ac10713d41ab987cae1ea3fd0eb3ba3ac92cdeee6e8e54f062e44faccf46d1bef13418c3998e9063455dff3968acc6db6036b91
+MISC metadata.xml 706 SHA256 c2c6b441fdc1fe10b607bd29b3806bd23731e7e7e8d8790ae2ea57bc101469ed SHA512 3f4f3ef4d1469c16702347478040c577399a1b15e0fc50e0c8cc0a185a3fff8edc6d4f250ec86f3bb8383974457bf5f1abc70557186676e8460d9a2634b6d371 WHIRLPOOL 15f22542ed634e59c57d4411b50a6cf75c0dfd87437faa3544a230aca8cdad111c29e10f1c0da0bb6f6d1bea83fc55b83f897a48dbf425f2b2fe7e00c18ec187
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJTZrSDAAoJEJWyH81tNOV9ab8IAJpHnZhr3sf+r5OS736vo6lA
+2uwfhoaVPitx3D4971wepxwbA7P9P6fcsGc/ZHSkg3Bs/+6DAn+fXoDR/JtcLcl7
+gzfKSmORbDRpBDKP7JuOsyqHtX5OHqkSwut+gFdTBXtoxKlmr4bGsi0v+yxsOPTn
+dm7gmmmGSiBddP3+1fW53bufDRVeHVOaym4s2XQgDdItPdtm1mhHyL9S35VYP7cg
+4A+f9WQjmfvqhWC593/gMrITjjAgMQTTP1iMT45BLSG/p7UMBdzpXTK5BwMWa0/x
+xNQUEunSGE/cah6+O5pslhSMAm+x8Zq5swFB8NE4nHhBVoBVmm9SkYjmowrJ4GM=
+=K5AD
+-----END PGP SIGNATURE-----
diff --git a/mate-extra/caja-extensions/caja-extensions-1.8.0.ebuild b/mate-extra/caja-extensions/caja-extensions-1.8.0.ebuild
new file mode 100644
index 000000000000..52658fef027d
--- /dev/null
+++ b/mate-extra/caja-extensions/caja-extensions-1.8.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/caja-extensions/caja-extensions-1.8.0.ebuild,v 1.1 2014/05/04 21:43:26 tomwij Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Several Caja extensions"
+HOMEPAGE="http://www.mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+SENDTO="cdr gajim +mail pidgin upnp"
+IUSE="image-converter +open-terminal share ${SENDTO}"
+
+RDEPEND=">=x11-libs/gtk+-2.18:2
+	>=dev-libs/glib-2.26:2
+	>=mate-base/caja-1.8:0
+	virtual/libintl:0
+	x11-libs/gdk-pixbuf:2
+	open-terminal? ( >=mate-base/mate-desktop-1.8:0 )
+	cdr? ( >=app-cdr/brasero-2.32.1:0= )
+	gajim? (
+		net-im/gajim:0
+		>=dev-libs/dbus-glib-0.60:0
+		>=sys-apps/dbus-1:0
+	)
+	pidgin? (
+		>=dev-libs/dbus-glib-0.60:0
+	)
+	upnp? ( >=net-libs/gupnp-0.13:0= )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.18:*
+	>=mate-base/mate-common-1.8:0
+	sys-devel/gettext:*
+	virtual/pkgconfig:*
+	!!mate-extra/mate-file-manager-open-terminal
+	!!mate-extra/mate-file-manager-sendto
+	!!mate-extra/mate-file-manager-image-converter
+	!!mate-extra/mate-file-manager-share"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.8.0-sendto-options.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	MY_CONF=""
+
+	if use cdr || use mail || use pidgin || use gajim || use upnp ; then
+		MY_CONF="${MY_CONF} --enable-sendto"
+		MY_CONF="${MY_CONF} --with-sendto-plugins=removable-devices"
+		use cdr && MY_CONF="${MY_CONF},caja-burn"
+		use mail && MY_CONF="${MY_CONF},emailclient"
+		use pidgin && MY_CONF="${MY_CONF},pidgin"
+		use gajim && MY_CONF="${MY_CONF},gajim"
+		use upnp && MY_CONF="${MY_CONF},upnp"
+	else
+		MYCONF="${MY_CONF} --disable-sendto"
+	fi
+
+	gnome2_src_configure ${MY_CONF} \
+		--disable-gksu \
+		$(use_enable image-converter) \
+		$(use_enable open-terminal) \
+		$(use_enable share)
+}
+
+DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/mate-extra/caja-extensions/files/caja-extensions-1.8.0-sendto-options.patch b/mate-extra/caja-extensions/files/caja-extensions-1.8.0-sendto-options.patch
new file mode 100644
index 000000000000..5e0953a01718
--- /dev/null
+++ b/mate-extra/caja-extensions/files/caja-extensions-1.8.0-sendto-options.patch
@@ -0,0 +1,316 @@
+diff --git a/configure.ac b/configure.ac
+index fcf02d6..c38061f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -102,19 +102,173 @@ if test "x$enable_sendto" = "xyes"; then
+         GUPNP_REQUIRED=0.13
+         PKG_CHECK_MODULES(SENDTO,
+                 glib-2.0    >= $GLIB_REQUIRED
+-                gio-2.0     >= $GLIB_REQUIRED
+                 gthread-2.0 >= $GTHREAD_REQUIRED
+                 gmodule-2.0 >= $GLIB_REQUIRED
+                 gobject-2.0 >= $GLIB_REQUIRED
+-                gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
+-                dbus-1      >= $DBUS_REQUIRED
+-                dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+-                gupnp-1.0   >= $GUPNP_REQUIRED)
++                gtk+-$GTK_API_VERSION >= $GTK_REQUIRED)
+         AC_SUBST(SENDTO_CFLAGS)
+         AC_SUBST(SENDTO_LIBS)
+-        AC_DEFINE_UNQUOTED(GAJIM_SHARE_DIR, "$prefix/share/gajim", [path to gajim share dir])
+-fi
+ 
++    # The full list of plugins
++    allowed_sendto_plugins="emailclient gajim caja-burn pidgin removable-devices upnp"
++
++    sendto_plugin_error_or_ignore()
++    {
++        if test "${error_on_bad_sendto_plugin}" = "1" ; then
++            AC_MSG_ERROR([$1])
++        else
++            AC_MSG_WARN([$1 (disabling sendto plugin)])
++        fi
++    }
++
++    AC_ARG_WITH([sendto-plugins],
++        [AS_HELP_STRING([--with-sendto-plugins],[Which caja-sendto plugins to compile (default: auto; "all", "autodetect" are valid)])],
++        [], [with_sendto_plugins=autodetect])
++
++    used_sendto_plugins=""
++    used_sendto_plugins2=""
++
++    if test "x${with_sendto_plugins}" = "xautodetect" ; then
++        # Default to all plugins and just ignore them if they won't compile
++        with_sendto_plugins="all"
++        error_on_bad_sendto_plugin="0"
++    else
++        # Clean up the plugin list and error if a plugin won't compile
++        with_sendto_plugins=`echo ,"${with_sendto_plugins}", | sed -e 's/[[ ,]][[ ,]]*/ /g' -e 's/,$//'`
++        error_on_bad_sendto_plugin="1"
++    fi
++
++    # Iterate through the wanted plugins and weed out bad ones (or error)
++    for wanted_sendto_plugin in ${with_sendto_plugins}; do
++        for allowed_sendto_plugin in ${allowed_sendto_plugins}; do
++            case ${wanted_sendto_plugin} in
++		all)
++                    # List all plugins as being used
++                    used_sendto_plugins=${allowed_sendto_plugins}
++                ;;
++                autodetect)
++                    # List all plugins as being used
++                    used_sendto_plugins=${allowed_sendto_plugins}
++                ;;
++                ${allowed_sendto_plugin}) used_sendto_plugins="${used_sendto_plugins} ${wanted_sendto_plugin}";; # List the plugin
++                *) ;;
++            esac
++        done
++    done
++
++    # Check for plugin-specific requirements and error if necessary
++    for sendto_plugin in ${used_sendto_plugins}; do
++        add_sendto_plugin="1"
++
++        case ${sendto_plugin} in
++            emailclient)
++                PKG_CHECK_MODULES(EMAILCLIENT, gio-2.0,
++                    enable_emailclient=yes, enable_emailclient=no)
++                if test "${enable_emailclient}" != "yes" ; then
++                    sendto_plugin_error_or_ignore "you need gio-2.0 to build the emailclient plugin"
++                    add_sendto_plugin="0"
++                fi
++            ;;
++            gajim)
++                AC_ARG_WITH(sendto_gajim,
++                    [AS_HELP_STRING(--with-sendto-gajim,[Path to Gajim install prefix])],
++                    [GAJIM_PATH="$withval"],[GAJIM_PATH="$prefix"])
++
++                GAJIM_SHARE_DIR="$GAJIM_PATH"/share/gajim
++
++                PKG_CHECK_MODULES(DBUS, dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED,
++                    [AC_SUBST(DBUS_CFLAGS)
++                    AC_SUBST(DBUS_LIBS)
++                    enable_sendto_gajim=yes
++                    AC_DEFINE_UNQUOTED(GAJIM_SHARE_DIR, "$GAJIM_SHARE_DIR", [path to gajim share dir])],
++                    [enable_gajim=no])
++
++                if test "${enable_gajim}" != "yes" ; then
++                    sendto_plugin_error_or_ignore "you need gajim and dbus-glib installed for the gajim plugin"
++                    add_sendto_plugin="0"
++                fi
++            ;;
++            caja-burn)
++                PKG_CHECK_MODULES(GIO, gio-2.0,
++                    enable_burn=yes, enable_burn=no)
++                if test "${enable_burn}" != "yes" ; then
++                    sendto_plugin_error_or_ignore "you need gio installed for the caja-burn plugin"
++                    add_sendto_plugin="0"
++                fi
++            ;;
++            pidgin)
++                PKG_CHECK_MODULES(PIDGIN, dbus-glib-1 >= $DBUS_GLIB_REQUIRED,
++                    enable_pidgin=yes, enable_pidgin=no)
++                if test "${enable_pidgin}" != "yes" ; then
++                    sendto_plugin_error_or_ignore "you need dbus-glib to build the pidgin plugin"
++                    add_sendto_plugin="0"
++                fi
++            ;;
++            removable-devices)
++                PKG_CHECK_MODULES(GIO, gio-2.0,
++                    enable_removable=yes, enable_removable=no)
++                if test "${enable_removable}" != "yes" ; then
++                    sendto_plugin_error_or_ignore "you need gio-2.0 to build the removable-devices plugin"
++                    add_sendto_plugin="0"
++            fi
++            ;;
++            upnp)
++                PKG_CHECK_MODULES(UPNP, gupnp-1.0 >= $GUPNP_REQUIRED,
++                    enable_upnp=yes, enable_upnp=no)
++                if test "${enable_upnp}" != "yes" ; then
++                    sendto_plugin_error_or_ignore "you need gupnp installed for the upnp plugin"
++                    add_sendto_plugin="0"
++                fi
++            ;;
++        esac
++
++        # Add the specified plugin
++        if test "${add_sendto_plugin}" = "1" ; then
++            used_sendto_plugins2="${used_sendto_plugins2} ${sendto_plugin}"
++        fi
++    done
++
++    ALL_SENDTO_PLUGINS=$allowed_sendto_plugins
++    SENDTO_PLUGINS=$used_sendto_plugins2
++
++    dnl Error out if no plugins will be built
++    if test -z "${SENDTO_PLUGINS}" ; then
++        AC_MSG_ERROR([No sendto plugins will be built, and caja-sendto requires at least one])
++    fi
++
++    AC_MSG_CHECKING([which sendto plugins to compile])
++    AC_MSG_RESULT([$SENDTO_PLUGINS])
++
++    AC_SUBST([ALL_SENDTO_PLUGINS])
++    AC_SUBST([SENDTO_PLUGINS])
++
++    dnl For the pidgin sendto plugin
++    AM_CONDITIONAL(HAVE_SENDTO_PIDGIN, test "x$enable_pidgin" = "xyes")
++
++    dnl For the GIO based plugins
++    enable_nst_common=no
++    if test "x$enable_burn" = "xyes" -o "x$enable_removable" = "xyes"; then
++        enable_nst_common=yes
++    fi
++    AM_CONDITIONAL(HAVE_GIO, test "x$enable_nst_common" = "xyes")
++
++    if test "x${SENDTO_PLUGINS}" != "x" ; then
++        for allowed_sendto_plugin in ${ALL_SENDTO_PLUGINS}; do
++            for sendto_plugin in ${SENDTO_PLUGINS}; do
++                case ${allowed_sendto_plugin} in
++                    ${sendto_plugin})
++                        AC_MSG_NOTICE([** ${allowed_sendto_plugin} sendto plugin enabled])
++                        continue 2
++                    ;;
++                    *);;
++                esac
++            done
++            AC_MSG_NOTICE([ ${allowed_sendto_plugin} sendto plugin disabled])
++        done
++    else
++        AC_MSG_NOTICE([ No caja-sendto plugins enabled])
++    fi
++fi
+ AM_CONDITIONAL(ENABLE_SENDTO, test x"$enable_sendto" = "xyes")
+ 
+ # share extension
+diff --git a/sendto/plugins/Makefile.am b/sendto/plugins/Makefile.am
+index 10097e8..6d17c98 100644
+--- a/sendto/plugins/Makefile.am
++++ b/sendto/plugins/Makefile.am
+@@ -1,16 +1,13 @@
+-SUBDIRS = . \
+-	caja-burn \
+-	emailclient \
+-	gajim \
+-	pidgin \
+-	removable-devices \
+-	upnp
++SUBDIRS = . $(SENDTO_PLUGINS)
++DIST_SUBDIRS = $(ALL_SENDTO_PLUGINS)
+ 
+ NST_COMMON_SOURCES = nst-common.c nst-common.h
+ 
++if HAVE_GIO
+ noinst_LTLIBRARIES = libnstcommon.la
+ libnstcommon_la_SOURCES = $(NST_COMMON_SOURCES)
+ libnstcommon_la_CFLAGS = $(SENDTO_CFLAGS)
+ libnstcommon_la_LIBADD = $(SENDTO_LIBS)
++endif
+ 
+ EXTRA_DIST = $(NST_COMMON_SOURCES)
+diff --git a/sendto/plugins/caja-burn/Makefile.am b/sendto/plugins/caja-burn/Makefile.am
+index 50c309b..00f95c2 100644
+--- a/sendto/plugins/caja-burn/Makefile.am
++++ b/sendto/plugins/caja-burn/Makefile.am
+@@ -9,11 +9,12 @@ AM_CPPFLAGS =                                      \
+         -I$(srcdir)/../				\
+         $(SENDTO_CFLAGS)               \
+ 	$(WARN_CFLAGS)				\
+-	$(DISABLE_DEPRECATED)
++	$(DISABLE_DEPRECATED)                   \
++	$(GIO_CFLAGS)
+ 
+ plugin_LTLIBRARIES = libnstburn.la
+ 
+ libnstburn_la_SOURCES = caja-burn.c
+ libnstburn_la_LDFLAGS = -module -avoid-version
+-libnstburn_la_LIBADD = $(SENDTO_LIBS) $(builddir)/../libnstcommon.la
++libnstburn_la_LIBADD = $(GIO_LIBS) $(SENDTO_LIBS) $(builddir)/../libnstcommon.la
+ 
+diff --git a/sendto/plugins/emailclient/Makefile.am b/sendto/plugins/emailclient/Makefile.am
+index 31ba40e..c4af752 100644
+--- a/sendto/plugins/emailclient/Makefile.am
++++ b/sendto/plugins/emailclient/Makefile.am
+@@ -7,6 +7,7 @@ AM_CPPFLAGS =                                      \
+         -I$(top_srcdir)/sendto                  \
+         -I$(top_builddir)                       \
+         $(SENDTO_CFLAGS)                   \
++	$(EMAILCLIENT_CFLAGS)                   \
+         $(DISABLE_DEPRECATED)                   \
+         $(WARN_CFLAGS)
+ 
+@@ -14,4 +15,4 @@ plugin_LTLIBRARIES = libnstemailclient.la
+ 
+ libnstemailclient_la_SOURCES = emailclient.c
+ libnstemailclient_la_LDFLAGS = -module -avoid-version
+-libnstemailclient_la_LIBADD = $(SENDTO_LIBS)
++libnstemailclient_la_LIBADD = $(SENDTO_LIBS) $(EMAILCLIENT_LIBS)
+diff --git a/sendto/plugins/gajim/Makefile.am b/sendto/plugins/gajim/Makefile.am
+index 5acd5b0..c39a3c0 100644
+--- a/sendto/plugins/gajim/Makefile.am
++++ b/sendto/plugins/gajim/Makefile.am
+@@ -7,6 +7,7 @@ AM_CPPFLAGS =                                      \
+         -I$(top_srcdir)/sendto                  \
+         -I$(top_builddir)                       \
+         $(SENDTO_CFLAGS)               \
++	$(DBUS_CFLAGS)                          \
+         $(DISABLE_DEPRECATED)			\
+ 	$(WARN_CFLAGS)
+ 
+@@ -14,5 +15,5 @@ plugin_LTLIBRARIES = libnstgajim.la
+ 
+ libnstgajim_la_SOURCES = gajim.c
+ libnstgajim_la_LDFLAGS = -module -avoid-version
+-libnstgajim_la_LIBADD = $(SENDTO_LIBS)
++libnstgajim_la_LIBADD = $(DBUS_LIBS) $(SENDTO_LIBS)
+ 
+diff --git a/sendto/plugins/pidgin/Makefile.am b/sendto/plugins/pidgin/Makefile.am
+index b7f650a..bcfe1d3 100644
+--- a/sendto/plugins/pidgin/Makefile.am
++++ b/sendto/plugins/pidgin/Makefile.am
+@@ -7,6 +7,8 @@ AM_CPPFLAGS =                                      \
+         -I$(top_srcdir)/sendto                  \
+         -I$(top_builddir)                       \
+         $(SENDTO_CFLAGS)               \
++	$(NST_EBOOK_CFLAGS)                     \
++	$(PIDGIN_CFLAGS)                        \
+ 	$(DISABLE_DEPRECATED)			\
+ 	$(WARN_CFLAGS)
+ 
+@@ -14,5 +16,5 @@ plugin_LTLIBRARIES = libnstpidgin.la
+ 
+ libnstpidgin_la_SOURCES = pidgin.c
+ libnstpidgin_la_LDFLAGS = -module -avoid-version
+-libnstpidgin_la_LIBADD = $(SENDTO_LIBS)
++libnstpidgin_la_LIBADD = $(PIDGIN_LIBS) $(SENDTO_LIBS)
+ 
+diff --git a/sendto/plugins/removable-devices/Makefile.am b/sendto/plugins/removable-devices/Makefile.am
+index 294ca90..797353b 100644
+--- a/sendto/plugins/removable-devices/Makefile.am
++++ b/sendto/plugins/removable-devices/Makefile.am
+@@ -15,5 +15,5 @@ plugin_LTLIBRARIES = libnstremovable_devices.la
+ 
+ libnstremovable_devices_la_SOURCES = removable-devices.c
+ libnstremovable_devices_la_LDFLAGS = -module -avoid-version
+-libnstremovable_devices_la_LIBADD = $(SENDTO_LIBS) $(builddir)/../libnstcommon.la
++libnstremovable_devices_la_LIBADD = $(GIO_LIBS) $(SENDTO_LIBS) $(builddir)/../libnstcommon.la
+ 
+diff --git a/sendto/plugins/upnp/Makefile.am b/sendto/plugins/upnp/Makefile.am
+index 4127abd..31a8bd6 100644
+--- a/sendto/plugins/upnp/Makefile.am
++++ b/sendto/plugins/upnp/Makefile.am
+@@ -7,6 +7,7 @@ AM_CPPFLAGS =                                      \
+         -I$(top_srcdir)/sendto                  \
+         -I$(top_builddir)                       \
+         $(SENDTO_CFLAGS)               \
++	$(UPNP_CFLAGS)                          \
+ 	$(DISABLE_DEPRECATED)			\
+ 	$(WARN_CFLAGS)
+ 
+@@ -14,5 +15,5 @@ plugin_LTLIBRARIES = libnstupnp.la
+ 
+ libnstupnp_la_SOURCES = upnp.c
+ libnstupnp_la_LDFLAGS = -module -avoid-version
+-libnstupnp_la_LIBADD = $(SENDTO_LIBS)
++libnstupnp_la_LIBADD = $(UPNP_LIBS) $(SENDTO_LIBS)
+ 
diff --git a/mate-extra/caja-extensions/metadata.xml b/mate-extra/caja-extensions/metadata.xml
new file mode 100644
index 000000000000..d4d11f107762
--- /dev/null
+++ b/mate-extra/caja-extensions/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>TomWij@gentoo.org</email>
+		<name>Tom Wijsman</name>
+	</maintainer>
+	<use>
+		<flag name="gajim">Add an extension to support <pkg>net-im/gajim</pkg>.</flag>
+		<flag name="image-converter">Add image conversion support.</flag>
+		<flag name="mail">Add an extension to support e-mail functionality.</flag>
+		<flag name="open-terminal">Add an extension to support an open terminal.</flag>
+		<flag name="pidgin">Add an extension to support <pkg>net-im/pidgin</pkg></flag>
+		<flag name="share">Add an extension to support sharing files.</flag>
+	</use>
+</pkgmetadata>
diff --git a/mate-extra/mate-user-share/ChangeLog b/mate-extra/mate-user-share/ChangeLog
index 2f5735c4b607..fa3782fc557a 100644
--- a/mate-extra/mate-user-share/ChangeLog
+++ b/mate-extra/mate-user-share/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mate-extra/mate-user-share
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-user-share/ChangeLog,v 1.2 2014/05/04 14:55:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-user-share/ChangeLog,v 1.3 2014/05/04 21:57:38 tomwij Exp $
+
+*mate-user-share-1.8.0 (04 May 2014)
+
+  04 May 2014; Tom Wijsman <TomWij@gentoo.org> +mate-user-share-1.8.0.ebuild:
+  Version bump to 1.8.0.
 
   04 May 2014; Agostino Sarubbo <ago@gentoo.org> mate-user-share-1.6.1.ebuild:
   Stable for amd64, wrt bug #509268
diff --git a/mate-extra/mate-user-share/Manifest b/mate-extra/mate-user-share/Manifest
index 5635e78e1b14..ee3da8761668 100644
--- a/mate-extra/mate-user-share/Manifest
+++ b/mate-extra/mate-user-share/Manifest
@@ -2,23 +2,19 @@
 Hash: SHA256
 
 DIST mate-user-share-1.6.1.tar.xz 351588 SHA256 bf36a3542d0c8d05affe261adae3451daa87fbda8d277b66b2b5d92af99c3a7d SHA512 5bfc9ec858597ef34c8fd964326eb4d99af2b4542e46424d2ac5f6570f9ea9e584592a11c2db03072fa23d361564c3d49b4cefbdd8428a9b7105906c83d79a24 WHIRLPOOL 70803e821a3a446c50d11b07e8eac4e6b738c22a172a316af6ad7b855721870698bbe0b14ee79a606a9cb7464b91adaf6fefe2b4fae591224eb5633a34c36b65
+DIST mate-user-share-1.8.0.tar.xz 928348 SHA256 8cfe07fcf728384b073557aa17bc10c9e221c6d714a1009ace582c3c74cc8b5a SHA512 0d0231abfc65fc8d0a16ec871bc534d788d9699f5a3a8b2f967c6532b06266591c11199eb9630121c595513fb7255175bdd8eeae0a265e68c7d0f5059daf4947 WHIRLPOOL ecb66912c6015f97f24156f8b83824873136177acc525bbed72606af35cd21d95e1cd2ea556ac9b7c403e6a756e9e9577189ee4cd19301e721113c51780f6d01
 EBUILD mate-user-share-1.6.1.ebuild 1611 SHA256 3c6d07999bf647e5bc0956614309ae9767e9e118ec7f5afc49a3b0087f3aa002 SHA512 979e91ef0bd1cf82f75a361c40cce9c1d0ebef171f3999599ab00fca0d25293a04f89dc0fc50d9851f61e72746dbd39ba313f145be18a3c7d55fd77f5cd48f9b WHIRLPOOL 150e526c8a0a8223619d4173339f84b55fdcd0fe68cefe2aa2fbe3fb1f999a874aabfd4d3cfe9bea05cdbbf7982ccda81255e46731dd447f1f0c0ad893124933
-MISC ChangeLog 617 SHA256 0de3e443c2b7b9d8b49a979a406aa0dc66a8f568515add43dcd0365c798b6b8c SHA512 e09a73d0e0cfe45ace03d4938a9584e0ab04b4d963952dfde13020b7f44d27fe293baf82f1cb155f35a1adb49b77dbb909fe401cdae03997831292197be02fda WHIRLPOOL fea17ffa8f8779db2712f49add758aeab668e2bd35c0162fc015576f72b8a10263489fcd4abbca9e167b90d9b0626d93f816329001664365a93290f3ab06595c
+EBUILD mate-user-share-1.8.0.ebuild 1635 SHA256 db3323770b1c4891fe6accd01d1eceac49211daa9dea2e63f2e80b1949cc8e44 SHA512 0372d7e78c6a325ba07eb0d6fe3f4689dde5299c333161ff4f169126d872c8a577b031bd744ca2195960db050face21a37e68ad2dcd039f61f7d92c0c8b02b9b WHIRLPOOL 0df2dd5d55fd1c95a9bf17f955ad9ec36a22ada9e28b262a074897c00a32e79a8fe4b26fb6f9c5e1915950e2aa7b99bb209bd0cbc0e64b5e92e1a18848daf81e
+MISC ChangeLog 762 SHA256 ed737485f79b7acef0cfee3f239354455424077cf7fb08d03cd4afedfcd22170 SHA512 2d5aba92c95cff17ea20fb1fcddbb079ba6506456d239f2b11b0d209df2cd3f46391cd98e176402dc97e6ad91a0ea8e37b8f603359d4f45b78aae021de3833c2 WHIRLPOOL 0e14a1f42be6adb345edbedfc8059404cc6f7650583e06d80391ddf988195e9db7e12385b9e78b58e83dfea0b601a9c01adb2ff40d1d0ae8285bb57bc25c1515
 MISC metadata.xml 230 SHA256 c188c403bd41d5dfe348e4809c2350a5a2fca98d46f8adae83a36d89af439ecd SHA512 17d13ca08cb96bf73a2c821019fd00677f17579c54b5543c1653c9f6106d7c52ad14b4a7ff72000ab7f59b7031e4471756b96864ca2fedef2e3a047fa0eb71eb WHIRLPOOL 39073c2fd817e3c41775408adf7271656a744ccd967e74770c673506c8c78cd11356b0cd28eeb16fe7350e8708141ad25037c45066263f2ed1b85d5270743986
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTZlTQAAoJELp701BxlEWfQ8UQAMWVc4wk6j/z4XKQDvodyivo
-/Ee8fKda4aHuTtNKuawMlEcuL90gl//hE87c+mDgezmidV4r0j3L9LcCIvZthMBR
-s871JBr+QSq3qo/iViGIFvk9mnW7YqkmPTx1T+lhkXZP2/zFG9xK+1HuMuy+fF5I
-mDvWoj5XUbPBuCWFg0Cc9zAromKSb+XM/0pFIeXaA/tENKANQEnTC35rRhoySOlb
-7Wpnvr9dzQzaJ8N+j2vj7wEV/yjxsS+8QMwqduzgtvx59YQw6nkl4GnTM3P28IRc
-HkuuLPeGYOGel6Do9XZcjGGObUZxxg8aVxj0CaGcnTtcx9cLaiI9xJU0qs+FVJ/4
-up68FBDnGgb+xlVb+0ihPbcU8POO7qO/yGTBKJlVT++pVFD1Q8sCgtCIh6qr0wF7
-2HMgkSS750703OONTp5bu5n7gXWr7s0FZT2YsQOEsuRnNnFE7KDO+/SoDh7WPCoP
-y/S4vr93nnGwuTthrka29ZPDgRoYzMV7Rnb5saucMwXydJ2VeA3DujXNG5jRnMlA
-1znk1TCzaxHoSPM1rgwjFK4P7QsEtM7/bjGxrUkrLH5LH7b/mrFnN6QAbItipVG4
-cwKQQhojrF77F1ywpz2ss34Cdf9JfFuI84QxpjEmwy8uJlJ2DGHU4Vyx+/PCwa55
-+iU9ffpp1eE9VPYvPvwR
-=GL5c
+iQEcBAEBCAAGBQJTZrfWAAoJEJWyH81tNOV96R0H/RiEuWQ6oLUbYghstfVSnF/m
+T/VzhzYYIRq81ek4jRT+drVJfKBee3W62M66L81Pquk8r8IQJPJF4vdf5GZrOh6s
+Jd5/cFxcNIAs4lTx0AjLikPdc4q3/nud5PNsTcRqAtFhC6dMhHPiiRGZep6Od9nk
+d41mJzHqkVU4LS8UaXh55GqwEP9X9iBwKQpuBui356wAlUpCYWI1AyUKOxJNR7UG
+z52s50ReCEi8HhbFFQTkxVT8nwpForZZqA2kysCCHWCHGJG1XMoAbTMooRjpV8xQ
+gm0XjGABlG0+8iCzmkQOwyE/mmQbfM9CJ9YOlmSoTWdHpuLIhPOttDoeDPIcISk=
+=eTzc
 -----END PGP SIGNATURE-----
diff --git a/mate-extra/mate-user-share/mate-user-share-1.8.0.ebuild b/mate-extra/mate-user-share/mate-user-share-1.8.0.ebuild
new file mode 100644
index 000000000000..5c2695624c69
--- /dev/null
+++ b/mate-extra/mate-user-share/mate-user-share-1.8.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-user-share/mate-user-share-1.8.0.ebuild,v 1.1 2014/05/04 21:57:38 tomwij Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Personal file sharing for the MATE desktop"
+HOMEPAGE="http://www.mate-desktop.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="X bluetooth"
+
+RDEPEND=">=app-mobilephone/obex-data-server-0.4:0
+	>=dev-libs/dbus-glib-0.70:0
+	>=dev-libs/glib-2.15.2:2
+	>=dev-libs/libunique-1:1
+	|| ( >=mate-base/caja-1.8:0 >=mate-base/mate-file-manager-1.6:0 )
+	media-libs/libcanberra:0[gtk]
+	>=sys-apps/dbus-1.1.1:0
+	>=x11-libs/gdk-pixbuf-2:2
+	>=x11-libs/gtk+-2.14:2
+	x11-libs/libX11:0
+	x11-libs/pango:0
+	>=x11-libs/libnotify-0.7:0
+	>=www-apache/mod_dnssd-0.6:0
+	=www-servers/apache-2.2*:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
+	virtual/libintl:0
+	bluetooth? (
+		>=net-wireless/mate-bluetooth-1.6:0
+		>=net-wireless/bluez-4.18:0=
+	)"
+
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.35:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	gnome2_src_configure \
+		--with-httpd=apache2 \
+		--with-modules-path=/usr/$(get_libdir)/apache2/modules/ \
+		$(use_enable bluetooth) \
+		$(use_with X x)
+}
+
+DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/media-gfx/eom/ChangeLog b/media-gfx/eom/ChangeLog
new file mode 100644
index 000000000000..928b5d971eec
--- /dev/null
+++ b/media-gfx/eom/ChangeLog
@@ -0,0 +1,8 @@
+# ChangeLog for media-gfx/eom
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eom/ChangeLog,v 1.1 2014/05/04 22:09:08 tomwij Exp $
+
+*eom-1.8.0 (04 May 2014)
+
+  04 May 2014; Tom Wijsman <TomWij@gentoo.org> +eom-1.8.0.ebuild, +metadata.xml:
+  Version bump to 1.8.0, continuation of media-gfx/mate-image-viewer.
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
new file mode 100644
index 000000000000..c6a13fe178b3
--- /dev/null
+++ b/media-gfx/eom/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST eom-1.8.0.tar.xz 2190980 SHA256 ec8450bf2ebef13c2e376b1674f0f7402f87669a71eb9e2e4d1161a2784aaf9e SHA512 cc9d82ec164043653eae2f73a0b7896c0d09b2eb466a5c919b0e1df732dd18fff58fa978d01a9bbb2bb7b8427c11328affb3f4e6aeb18a77a18585f39a1f3f5a WHIRLPOOL 26c091d74a8a052a4ce1e0295e41d75bb14ed1d93024367f63214139624d61b74fdd74fc66ee02a472f7d7494cbcfa9aac4e1762f1057432f7afd5db1cf0e515
+EBUILD eom-1.8.0.ebuild 1800 SHA256 5970086da6055e5b573c211ed18b9ba5de5e404c24619eb826a8b1f05d32ee61 SHA512 532a721bfa35e0de0786c7dd43948ab6af142b74c3b065fbe272e9ef1544d1abd1210e784609943642beeb5c4d346f269f7036472a724fa95536f4d0b73a5fa1 WHIRLPOOL 43213afadb4fd0408e0cf7ae3198c2d6e596d6c28a0f5fc7d591dc570535d37316c6048d0102d18f4b7684ed51a7b3e7cf4bcb4599b414f28687f5a32ce0e5dc
+MISC ChangeLog 376 SHA256 0abf589e2c2b317b2e19d319ddee1d227b301067b0745df487ea8f871739589e SHA512 276ed8e3fcbe0f8d6146d53e97e1819263475169ea64546083fe6d8ccedaafff8d98a75021eae3abcd340518c785f08542d3d17dde233dfdfa499b395749fde3 WHIRLPOOL 3e0262f6f2bc3ea8345dbc86d73b03186613b1fe9574670d912f59cea74b6d227fd3d747637bdf5e886277ca7f891b424a5006190a83c85ef9523e1bad74c2ea
+MISC metadata.xml 230 SHA256 c188c403bd41d5dfe348e4809c2350a5a2fca98d46f8adae83a36d89af439ecd SHA512 17d13ca08cb96bf73a2c821019fd00677f17579c54b5543c1653c9f6106d7c52ad14b4a7ff72000ab7f59b7031e4471756b96864ca2fedef2e3a047fa0eb71eb WHIRLPOOL 39073c2fd817e3c41775408adf7271656a744ccd967e74770c673506c8c78cd11356b0cd28eeb16fe7350e8708141ad25037c45066263f2ed1b85d5270743986
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJTZrqIAAoJEJWyH81tNOV9PykH/32DSETd21Q2NQ4KeSRnNQeW
+i3GDo1wBHJk289BAzb3Jx+7DgD5s518XLImKIT/d5yBY3w3ULqwrAogkOf8lB0Ad
+73qFduFkYDV73HX/x88RvDV3Ab9/IdWKS3CmAFhALZF8gtVy7SxRH3xKeSqfsfZ7
++UdaYxe8pSOhX8nYq6ln/Tahmamib7Woii2AQxCqNiw38aQAmE6UU5QU9TJBKIdB
+cfQ66cP6WXvorqGbeLMeOfqIQwwqtUlJOixYyf80UG6nyNBe0oB5YAC4VWAgseZ/
+wPK1jSTIQNA9aZMj/eqQ0dkAWUOdgrAzLgehwbA/JTWvqgOuUZEZP10jZjN2OCM=
+=iVJo
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/eom/eom-1.8.0.ebuild b/media-gfx/eom/eom-1.8.0.ebuild
new file mode 100644
index 000000000000..c5a38c4d2825
--- /dev/null
+++ b/media-gfx/eom/eom-1.8.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eom/eom-1.8.0.ebuild,v 1.1 2014/05/04 22:09:08 tomwij Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit gnome2 python-single-r1 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="The MATE image viewer"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="X dbus exif jpeg lcms python svg tiff xmp"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/atk:0
+	>=dev-libs/glib-2.25.9:2
+	>=dev-libs/libxml2-2:2
+	>=mate-base/mate-desktop-1.6:0
+	sys-libs/zlib:0
+	x11-libs/cairo:0
+	>=x11-libs/gdk-pixbuf-2.4:2[jpeg?,tiff?]
+	>=x11-libs/gtk+-2.18:2
+	x11-libs/libX11:0
+	>=x11-misc/shared-mime-info-0.20:0
+	>=x11-themes/mate-icon-theme-1.6:0
+	virtual/libintl:0
+	dbus? ( >=dev-libs/dbus-glib-0.71:0 )
+	exif? (
+		>=media-libs/libexif-0.6.14:0
+		virtual/jpeg:0 )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-2.15.1:2[${PYTHON_USEDEP}]
+		>=dev-python/pygtk-2.13:2[${PYTHON_USEDEP}] )
+	svg? ( >=gnome-base/librsvg-2.26:2 )
+	xmp? ( >=media-libs/exempi-1.99.5:2 )
+	!!media-gfx/mate-image-viewer"
+
+DEPEND="${RDEPEND}
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.40:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable python) \
+		$(use_with jpeg libjpeg) \
+		$(use_with exif libexif) \
+		$(use_with dbus) \
+		$(use_with lcms cms) \
+		$(use_with xmp) \
+		$(use_with svg librsvg) \
+		$(use_with X x) \
+		--without-cms
+}
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README THANKS TODO"
diff --git a/media-gfx/eom/metadata.xml b/media-gfx/eom/metadata.xml
new file mode 100644
index 000000000000..dca1781cb290
--- /dev/null
+++ b/media-gfx/eom/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>TomWij@gentoo.org</email>
+		<name>Tom Wijsman</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-libs/harfbuzz/ChangeLog b/media-libs/harfbuzz/ChangeLog
index 041a17ff5e1a..7d4bf63bf61c 100644
--- a/media-libs/harfbuzz/ChangeLog
+++ b/media-libs/harfbuzz/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/harfbuzz
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v 1.75 2014/04/30 04:53:15 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v 1.76 2014/05/04 17:09:27 tetromino Exp $
+
+*harfbuzz-0.9.28 (04 May 2014)
+
+  04 May 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  harfbuzz-0.9.26-r1.ebuild, +harfbuzz-0.9.28.ebuild, harfbuzz-9999.ebuild:
+  Version bump with small fixes for Indic and Hebrew shaping (bug #509456,
+  thanks to DrSlony). And use multilib_native_use_enable for introspection, not
+  _use_with.
 
   30 Apr 2014; Tim Harder <radhermit@gentoo.org> harfbuzz-0.9.26-r1.ebuild:
   Sync mips keywords.
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 859840991210..aaacdb121e0a 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -5,21 +5,23 @@ AUX harfbuzz-0.9.12-hb-version.h.patch 2003 SHA256 39b7689aac2e60c105b17acd3fb0c
 DIST harfbuzz-0.9.12.tar.bz2 886353 SHA256 c653f70a275e98d109a9f1271373a6e80978c97298d723cb3f370351852f9da5 SHA512 10c0e174789e36a02e616cf922962a7c75d6f89cb378a33487b81947e16818347c888c39703c64d620eb3d29bf90cd900ae832dd573f5081eb4de25ba4737bff WHIRLPOOL 6228766b74a46482811ce0e4c85b6bd80d4c0e37aaade3c2b75b790ed1409255d481688e0def89b75a9a1df3ef10bab221dce105439a433e5b33e65ac8685c63
 DIST harfbuzz-0.9.23.tar.bz2 1027508 SHA256 171ab7f58e7243082a4582f4d1f21b3f44462931ea92a6909d303ad3614794c7 SHA512 b6ddc3e9401d0719757b54aa797cd3a5df58c0740998b95f4d73380cf1734d865099b95683774b393d372bd94fdece2dbee172a10242f36769dd848ec30ce558 WHIRLPOOL d6248a590ef639937483e1b67a21770dc393fbdc57c03fab2c060cea3569ad7d47f07a01854c9b565cb80d41d44e0f09d3f07fb4d81828c7eb346ddcade8196d
 DIST harfbuzz-0.9.26.tar.bz2 1060264 SHA256 5ded7dc3d15fb5c9230d7a224b9256b67b35fde30193b4c3a4c3f6b13110e257 SHA512 73a6588fddb7f33ee90f96f3e34b8c6ba4bafffc4879560e38c4b7550adbd56154169de916c48bd46b34e771641a1f83226e9bfae7ea04ccb31576c4a1aca802 WHIRLPOOL a5758675f42a47de766b695698b242baff9a127b28c24727210341aa5bfbcf7a6e86bf2ec1ab2b68a389dff9d54d672d2d7fbda71f4b2d535e0705dfbc3dc27e
+DIST harfbuzz-0.9.28.tar.bz2 1063769 SHA256 a567f7c58018af0a9751e18641fd8434bfcef8307122dabe47dd652ce8bde048 SHA512 6b475cc05fc7707d60138573bfcf97f2415c3b8a17ddf844dcf919c215eee882f220a54792ceb9a15b009a5f574f965a06ed1d8b2cbcc990b758fcca3503f021 WHIRLPOOL cbb3a9ae0d3e00c8cd28b145982f396d75a7e56f659657e21f2ed9767c756b0a72e43c3b5b233667dcd29102a8307a791f5ef48e64d9abd1a45a495066264048
 EBUILD harfbuzz-0.9.12.ebuild 1695 SHA256 e6841761c214dbda69c314c5bf1ff6e84d38909a49bfe9d54767ac071b943999 SHA512 5becf409cad878a9a8b6dbbb112aa93bd6376e0d5be79b58b269e663c036761851da80590bc13cc99fff92bcfa3d5f2b633ce3c6cc1218494293808979dadb28 WHIRLPOOL f1caba836acca66390503e7ca2a17d971172dc55ebf24258e543a873f2279a0996662b3465155b0527bc827203c6b041b4f19857a6c8237f9034fe65f5fc4802
 EBUILD harfbuzz-0.9.23.ebuild 2460 SHA256 4925e1697e90cf62db0a742cfdb861976732a18376a858cb70c1d077cd7e1b60 SHA512 e568bf150f5fabd2ba4b1141858db8245d507b53771cdf8dc38d8700914e92836d9d996a54ec96981b4c20a3eee89f88ac41fde25da3b9384e84df341d694e21 WHIRLPOOL 7f94bb7f9532baf082a5632b4d8aa1cd8b02e20052c6e462f76e8bdde6d8bfcf033f4ffe65135f565631c6ad7399a4761f4c375972fe1b4e82bd91c8663f65ce
-EBUILD harfbuzz-0.9.26-r1.ebuild 2689 SHA256 ce202bd0ef7ac548a097edea1e3cb36c357ce29abe931b92a799a38bcb600e55 SHA512 885363aa66f9ccf3978c37cc35c682b32ce9469c2ff7af9cab94b56a2a340bfc3dec1ad74bace4949ca94c8fd86854b64b38f6af9bcb4a273d2c39dce524003c WHIRLPOOL 60bef4097decb688dc46bf244f677d00d08a56e00fac365e6e0a044ddaaffe9be76d548c6b3868558aa35b191054c7d642ca9d4c34149b2f61792f262030f198
+EBUILD harfbuzz-0.9.26-r1.ebuild 2691 SHA256 9c7331f42b614e6ef39fe4cb39021c1a504aa68952b03e7ff344a422aa2a23d7 SHA512 30c9cd49ab18bae22422286b755fdfc87ddbb9dcaefe582710b308792563138021e686a67a21eecfae87856cda653ce3553644baaadf01bd35385252b5f27705 WHIRLPOOL e6ff9f6cc951a23b968ca8016435cb323594a04b26f0f98a1d680c5bd6f6c2d19e42ab9cb00dca2360b9269c8765b8a523c5f6aaed8283acc9128fb5efc87510
 EBUILD harfbuzz-0.9.26.ebuild 2521 SHA256 c65895e11e5f26e68b01fea8c02a9675333c6a5cfa0a959046955dbc96652d33 SHA512 4590a2d6cec5f063bcadc8b77d5747adb3640d38186d8a2fda15defcf7753a2a4a8c49a4e9861daa5c26cddd37a91063c578ce9b871fdec77e7b4d71a07b304e WHIRLPOOL 4f3cd1893b6f442301e09338e9067a8c83d1c6b9ad2c7253d25aa7e6d984749056b208cb1ece92e8658b1387de93cca054ce6d9b2ec86d60381edbbb371804a1
-EBUILD harfbuzz-9999.ebuild 2676 SHA256 2b4a3832f9c020c8ec4eaf89c683a35dd5fc1cab4aa31c0998986822b5b2a4cd SHA512 37d59445aee4235c972e8726bdef8be5e6874a586109992b2bd180c40a4008f15fd51d3db638c3c06dedb01c1a8c26f395e6b9c4284413f7a3c1e6d44c41bbbd WHIRLPOOL da6b861d8936e469b05a34cc292cc67244ff75d7b38b202cfa7bd499e876386b227948c0fc5497b97b6aaa5c64520c542edd446b4c178613ba5e021ffd6e0bb4
-MISC ChangeLog 11403 SHA256 c702046090dd3d4aca3fdc03d4a8b09e7901aabf748726125f2b9b337965d190 SHA512 acc0e0eb13b9c84a08fe106ac1ec239c1774e738b74e9f8635d3727e99022e21c77df9737ccabc7a0f270418c80c55b4598362d28a1fcc3430a19fefab4dfdef WHIRLPOOL 36c510643b40401ee1dfec057415215c1e9633d73c241cb4f912da4371a5939374b25965ff90f40004913b4a05731e525725ddf13acf4579d03cb896a417b1ac
+EBUILD harfbuzz-0.9.28.ebuild 2688 SHA256 af20f342311ad06214fca39c8e26b148e24b54281a06c4e4057d1a081710960b SHA512 01377b79ca9d87146f2e8576be72b0658529436d15179cef5912c422bfe7f4d9edf69c9259d2c04dd14adb728f71facd56b52f17e6c66b536ba9340eca7d2e90 WHIRLPOOL 968e889fd73d79682ee401efe3dae9a69fe938ebc9bfbe0084357d1e0c9f8e95490fd3d8617be0a3ab66d25a6dbbf6ea94d3bb10c23a3c2dace31fc6bc8b1799
+EBUILD harfbuzz-9999.ebuild 2687 SHA256 ae8dbfcdb2adc95aee14c8064901f597a66aaa43f0d5f73b7bd4d135a1e54aeb SHA512 7b5f380319688d9acd60f975b125d58af59599d032747e3879e0699460db3d406e6315ec46a6f1035aa6281dfd80cd498ab2320dbce5cd944b660649d72f9b21 WHIRLPOOL 9fe4d4ccd322603f414a004263a03e28d908ce9882c22f220bc9bcc7cb2aa814bc2f173c7a33cdaa840f6a49ccdec203b9f27a4298707dc91902b528d644da05
+MISC ChangeLog 11739 SHA256 d7ccde62bd5edaae6bec6dc9a9f28ff03d80dec0b646f13dc39a324bb2f727c4 SHA512 5793b93a6fe54592639af3463953c5e992e4316330bd4370b164319f9525b6755493f5805ca55bf4e001328af57bae93fbf429e710bd0bea14ddf360f2349075 WHIRLPOOL b992f5774044d31314194031022a6f41b3c3500867bb436dbeb0c1685812ed297b42ade6a0364597d86789a99370901a5751d89f51d8968da41de791d49fa4c7
 MISC metadata.xml 348 SHA256 ab40ba306c3499687d57b89247a77e7e8093c88196e6c0fb2333f014ee37c3da SHA512 057542963b2698ddd474970f6b49a6b99c5ff1982c29d7495b6ea05a8bc5266007e328b6658c13052cad8cd2b1c44e2bd6d60ef3e4ef43755c6b4c785b908485 WHIRLPOOL f1799f9bedccd73989ce42f234a28222de692f147553bf4a8bdf154bb544f22ead4ade109700fea7785747d27adbcf30c5543d435f3584f43817b1ed1111b1a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTYIG+AAoJEEqz6FtPBkyjkl4IAKrdfeKgReECrxy5W4GnPQ1X
-4CcXVpsHVFdiusfIVg3VmdlZiUSB0eOcbQmZZNDjeW18ZRbnl8uCHLOL/ZU2I6o7
-RMdl4A13JN7E+5xStDUnhEmDIMOUggwaS+eBOM0r23JzM244k1KkOW1nlhNIuGeU
-Zc2PsS0zz8F1VfVulzyZLxcvfOhIgEqPDoju0hWHuUlme46psDT4TIJ9NaQhzbTf
-XUi7PFY3QRR5kuebOnIphy1HimWLVwfW+8t9iqVkmwbPHCvQoehU6h9wXiUqVm6I
-g9uFtll6tQuIVNtcutQMSCNhB8GSwiHBTVoyS4UOHqjimeT1YJplr8UtygMLYHk=
-=HDAZ
+iQEcBAEBCAAGBQJTZnQUAAoJEJ0WA1zPCt1hUEIIAKpteQqgkNKNI4zfxWLJDMp0
+v48T/1zSOi3khxyAwyt+Cy3hMXVzT3Pdy2w5sh/eAtPmS5bVqrqGgvejpGJ1opVd
+eFpeFTNWqs67E0rb7CaQ1xXv7wwZkwVvotbFRV9RoFTwZWG9x3P6bHwkRDGXO6xZ
+q9MR4DTn8AvkPw/T+/vr2S8+upBQciobIigHfJKJoFEG41/rc35xnVcTB+xb3wkb
+oG+bSxj0tRAgqtqW4N/wwvF6RjeJI2Dlj2RFE9SCbpiFiX9ACQTnuctW6AKd7S4Z
+PIVN2DiMvjJkUGJme7Ud0+n5rUhOaGVFpDgdIQ9BUuBq/fR87f/98vbZ8ThJMDQ=
+=MFC+
 -----END PGP SIGNATURE-----
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.26-r1.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.26-r1.ebuild
index 7bc8cde2e589..24ccd0f4341e 100644
--- a/media-libs/harfbuzz/harfbuzz-0.9.26-r1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-0.9.26-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.9.26-r1.ebuild,v 1.4 2014/04/30 04:53:15 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.9.26-r1.ebuild,v 1.5 2014/05/04 17:09:27 tetromino Exp $
 
 EAPI=5
 
@@ -77,7 +77,7 @@ multilib_src_configure() {
 		$(use_with glib gobject) \
 		$(use_with graphite graphite2) \
 		$(use_with icu) \
-		$(multilib_native_use_with introspection) \
+		$(multilib_native_use_enable introspection) \
 		$(use_with truetype freetype)
 }
 
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.28.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.28.ebuild
new file mode 100644
index 000000000000..e83e78192a70
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-0.9.28.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.9.28.ebuild,v 1.1 2014/05/04 17:09:27 tetromino Exp $
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
+[[ ${PV} == 9999 ]] && inherit git-2 autotools
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils libtool multilib-minimal python-any-r1
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
+[[ ${PV} == 9999 ]] || SRC_URI="http://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="+cairo +glib +graphite icu +introspection static-libs test +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+	graphite? ( media-gfx/graphite2:=[${MULTILIB_USEDEP}] )
+	icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34 )
+	truetype? ( media-libs/freetype:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
+	>=dev-libs/gobject-introspection-common-1.34
+	dev-util/ragel
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+		sed -i \
+			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+			test/api/Makefile.in || die
+	fi
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+	elibtoolize # for Solaris
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf \
+		--without-coretext \
+		--without-uniscribe \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_with cairo) \
+		$(use_with glib) \
+		$(use_with glib gobject) \
+		$(use_with graphite graphite2) \
+		$(use_with icu) \
+		$(multilib_native_use_enable introspection) \
+		$(use_with truetype freetype)
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --modules
+}
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 88390b1319c6..cd4a3f609df9 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild,v 1.25 2014/04/28 18:10:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild,v 1.26 2014/05/04 17:09:27 tetromino Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
 LICENSE="Old-MIT ISC icu"
 SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="+cairo +glib +graphite icu +introspection static-libs test +truetype"
 REQUIRED_USE="introspection? ( glib )"
 
@@ -77,7 +77,7 @@ multilib_src_configure() {
 		$(use_with glib gobject) \
 		$(use_with graphite graphite2) \
 		$(use_with icu) \
-		$(multilib_native_use_with introspection) \
+		$(multilib_native_use_enable introspection) \
 		$(use_with truetype freetype)
 }
 
diff --git a/media-libs/sdl-mixer/ChangeLog b/media-libs/sdl-mixer/ChangeLog
index 4e100922ee23..2d91834f8516 100644
--- a/media-libs/sdl-mixer/ChangeLog
+++ b/media-libs/sdl-mixer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/sdl-mixer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.125 2014/05/03 10:34:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.126 2014/05/05 03:39:56 mr_bones_ Exp $
+
+  05 May 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  sdl-mixer-1.2.12-r3.ebuild:
+  collision avoidance for sdl2-mixer[playtools] (bug #509448)
 
 *sdl-mixer-1.2.12-r4 (03 May 2014)
 
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index 4076965ff52c..efc188522478 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -1,32 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX sdl-mixer-1.2.12-clang.patch 276 SHA256 4d34bb8ac7f7e33b6f9fb9280d187d6b47c8ccd414489eefb68e5ce7c287c2d8 SHA512 2f318a73991783c75b32d05c9f81a42a7fd145a9d78e1cef00d1f2184f7c498e4c0a5a578bd2866315a940af76d4296de660ee94488530815694b7524d1d452e WHIRLPOOL db4b23b541cf0850eb5fda27698cc87b25659e2366445dabf428720d04ba69b68d964cc91682fcbe8ed947e6011bc6d5f984f286552837f8aaff4bb01c382414
 AUX sdl-mixer-1.2.12-mikmod-r587.patch 1416 SHA256 f61866f35dbd5e7dc9927df64db2c72cefa32a1093008bf0fe1c7cbc0501def0 SHA512 64ad577331eceea0eb060d0c2b333b664d4edb62cb3336f97b53e5c88f6b4ecdc4004136fef0461cdf999b282064b5809e79308591239bfafbdc3df8360bf123 WHIRLPOOL cf0e6aebfe512b30d5889d98272b0df91f531e8b881adb242ea3c3533d42bc675aea61ad9169783c1c9bebee0991eff57ff1c5dd5ec72d20a8392a7df2473086
 AUX sdl-mixer-1.2.12-mikmod-r588.patch 1128 SHA256 3b9d959dc6660b3b765d8b4a53bc1b56858ba7023a76fb95798391b6a7c43522 SHA512 36bbc5d10a63a73b7860a6f381a88849cc465dcabbfe3db21d6bd156110eb01e03e8369f0ed234f72f0227566919f5f823d0350d431575f0ae0f2a4b244cf704 WHIRLPOOL b07f267348d6cd202f35ae59b79c41ee1dd38799bb561cc5179812b63baba9d580234b2a0ef97dc614324d68a546fe16d9c35e21b10931f939d7b60e3c13d711
 AUX sdl-mixer-1.2.12-wav.patch 796 SHA256 7d455c08d79c4a957a8ae25e83f7253c5ff307a7fdc2c4d433b482dc3b7d70b9 SHA512 9fed330d6bcae546752434a0ea29168e2a8fa432c8670d7290e70905f3431746b15126e5ce05820e4dd4dd09c982c880a6ce901ab9b3cff298e7f2c8d6a8b491 WHIRLPOOL 8b26551b494cdb6658538a4220c01d48f3996c2eb74f4a4e97b7b4f1aa4945d951e26d885911ef0cd2d7183befd5cace209e3f88469ab21d4981864c6ee2063c
 DIST SDL_mixer-1.2.12.tar.gz 3707781 SHA256 1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a SHA512 230f6c5a73f4bea364f8aa3d75f76694305571dea45f357def742b2b50849b2d896af71e08689981207edc99a9836088bee2d0bd98d92c7f4ca52b12b3d8cf96 WHIRLPOOL 046b7a160cfe214cdac8c1a5ea424024a8850d3737908e5630b504f1f12817bfd2f391909f37be3d6994cab7f71ab24ecab92e99f5429dd8405f0e4046bc00a7
 EBUILD sdl-mixer-1.2.12-r1.ebuild 2878 SHA256 7bc2f9790155808aec3623e10e697234ba9bb4346458334b018a6e10909f314b SHA512 1b4feef7c11c74af8ceca50914be97b386d40936baa2913e851507fd8d71c5efebc84bd439709af8715afdc4b998714ebfcd55f8fab8427656b8bd8a8bb2b32c WHIRLPOOL 9de71f8ac0e54aa1f290cab52e741bf09ad8f9f021c74e67e6d9b456603b1daf74a1aa580b0176bac18682858b98fba3e86e44961053bc20eaa75de8f20e8ac8
-EBUILD sdl-mixer-1.2.12-r3.ebuild 2966 SHA256 78f0790a1c29f00b1616cc936cbe8105340ac97a0fd62b462f892aa26c3898cd SHA512 9980e7439bd790a9ed9f39d5efab9c059270999986a747c6101bcce71587a5c9f827f8808ba7e729230d19c3784c149709239b4764c4cea5228318a8dbbdade9 WHIRLPOOL 845034b02fb00ad3e424f6adb43f73c0187a77331e69c9a9953c0b8ba9b3b3ec4961e3938c3084b83b2d973d538e4c8444039106b4fa68bf1ab075c561e02238
+EBUILD sdl-mixer-1.2.12-r3.ebuild 3024 SHA256 b5ba50b391f5505ffe8ec39952aaac3503358f486b1462ec1f31529c5b11edd5 SHA512 6d267c23f4a9b7b21c411e6b9cc2ab48830f32c90b339c13490376d2df1b494e617a6e3919f4a83fd749fd1ca5631b553bf71616d9f04e978e56e46ec717d829 WHIRLPOOL 3fe5ae9352f18370f191547feacb9ec51f387797d828416deb3ac9a320b91bc4633a481aa3d01242ca56822151b0ca7871182a6a5f4077ef9ac4c5b280fed59b
 EBUILD sdl-mixer-1.2.12-r4.ebuild 3358 SHA256 747af2aeeb4ca307a5e75406bdbb4ad368208690092fa32d457bf4dce691c931 SHA512 c82701e0158191aced1c25431d37178521479ef62fb102b2448fb8d467b841c54d66a853ff0307d639a5bc6ebf9dfd1f21a434ca56b0553d3e75e73fe0968560 WHIRLPOOL cd0121cd7e47888383b96ef8129ccea2cfdf880d92eaaa8cf2a3da450e8e9d771944811a6771440a536882cd5421a7cd2bdcd269bfce5123359307d49fa6c658
-MISC ChangeLog 16663 SHA256 50f24c3fd8c32633986ff5ac13847a7de054634196ffa16fb5ec84ee56f7973e SHA512 8b13c445f61518c2bd68d8dc8ffef761882e452becf9e783676004aa93f38a35c45cb63187486ea60d11aad1ef843639339299fa20d74796282e61efb6bc1718 WHIRLPOOL e2e73ea58a684d0154d0665e0df5a778c17818f861af50e7f146f064f9126a5c27930056682935d9400cb5f5aacb63c75fea5402e34c89738feabce1983de622
+MISC ChangeLog 16814 SHA256 b84b4267cc4f5a2acd468ae1700ca86cd849706b48cac41ed0ba57c850b32971 SHA512 1b2cd35b13748f5032183c1824d75185d5d517852022e6644fccec270cee066db0c83db5897df506debe412ae76a7da7515c679e8a366d9290e4d0e669df4024 WHIRLPOOL eb54954e38a7d2b42f6abbb36a389e82696d562678c7554db7d46f81e61b3a512cbf3c8c6e1a4d363e7f118000a1db25c04cf704c23c078c2f7199ee23566bc5
 MISC metadata.xml 572 SHA256 d4c6ae5e121255b47dd978176db7002fd8db1753cbfdf58792e9b4fa7565de35 SHA512 2b0cd28223fffbda314ad0f08415ca39b47b5734e105aea2f802b7ad22bee5aaa1c29c5583848de0605cbfde133901ac7bb1f61dd06c195ed731fc3a1847c656 WHIRLPOOL 50908664fc647d1c2d7c9d83cdb3bb4cb350ae38222dd15ad415bee3e5a85a7caa95ee65f79db44242bf7d94ff48ebe2354d21b1738cfc7a116eedaf4e32dc29
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQJ8BAEBCABmBQJTZMZDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO7z4P/3rHZ0TcSc3gVYFiRrDclyXx
-ipTHoT/EfkO/HWSZHrs6ERw40OYflqBA2f9xh74b4grTJ8B26k5tAswqhEsj2rCQ
-Gmjyh3nSxyVg2Q5LW6e6nHsq0IJsMp7/4v3OgwDTBoTqNKicvCTUO1bHTYlaQ81q
-tnVSmc5D5iHEKM/hRFLQVZ41Af4DZFcDj32Powo+v9SVrYApvB8WcpBhSmtmrrtM
-maLZnZAtLv7WPAcoylMx7M78TRywL9zzlxan5oejtJfMYgSEVTl/BNj+jVKf1qX0
-TfJrxmSiQqmrCj/ydPol4MAPusjpzYfBVe1XGoWtApmiLB4BziuDtcbuw+DpckSv
-2XHSMhja465iS5nRA2bJ82PqfysAXq58L+3o35wZP0++c4xWSLHZ7eYv/cIC9hkx
-yMxaMoDcHCReIM8LBMK7pNHHOVXfe8RzPkCBe7BcRx8CqOGt092D+IduLYy0m/qM
-E+GPJkkXLMplmTlStxXSgbnYPWZX5lvgPHyrsZPBiTZfTbwah86SJfW6YSmE1IsJ
-9JZEY7uvJMd3hnIdyu326Q+XIV8402DsJE6ZCSYaATfGVdlHXWTX01T7+dE4S12m
-cF4CZVEIVUbGkTZTenJ25oTfzzlJT/WvWGXr4yN2EaW+agaXlOq+nVfP72Hzd8y9
-ra9fYQtCkktss7LfH+KX
-=w7Ac
------END PGP SIGNATURE-----
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild
index beb9502147b6..cb0055ba6f2d 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild,v 1.11 2013/02/24 18:04:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild,v 1.12 2014/05/05 03:39:56 mr_bones_ Exp $
 
 EAPI=4
 inherit eutils
@@ -41,7 +41,8 @@ DEPEND=">=media-libs/libsdl-1.2.10
 		mikmod? ( >=media-libs/libmikmod-3.1.10 )
 	)
 	vorbis? ( >=media-libs/libvorbis-1.0_beta4 media-libs/libogg )"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}
+	playtools? ( !media-libs/sdl2-mixer[playtools] )"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 15c64a2b072f..9b96c8864edf 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mpd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.342 2014/04/15 16:35:25 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.343 2014/05/04 21:27:54 hasufell Exp $
+
+  04 May 2014; Julian Ospald <hasufell@gentoo.org> mpd-0.17.6.ebuild,
+  +files/mpd-0.17.6-opus-linking.patch:
+  fix build wrt #508888
 
 *mpd-0.18.10-r1 (15 Apr 2014)
 
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index a6bd2c73bba0..7422ffb95089 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX mpd-0.16.conf.patch 2646 SHA256 5994735065e0e4a8b9b0fbb7ff8219088b7015c573a379dfeacecdfe55834653 SHA512 9a6cd76d0327d30063659084e72005c85c7a9541c93bacfec098bce93839040ec6da78da9bd4beb5dcb1625c7b0ac6d0cb3f42ca5e7313f0a05cd46286f0c9a1 WHIRLPOOL 06639909305319b818b8fa008bcaeb29b54b70403a4119d627b3d7eda56bdf3a9b246fb5f68bbabe1f52a65d78fb39058ce87f03aeb98f1fd34dec505f84e353
 AUX mpd-0.17.4-ffmpeg2.patch 572 SHA256 d525dd6abc07577c54355dd2eb0721cda2b66c8250dbf97494ed8fc07d30a048 SHA512 72c9cab4ecb8479a3b22b3b571ed0cd22317d331a2016b6e8f357f379b46595b6c01096bb8a51a28c9d62542cfb0ceb61a7363792e85a5cb01334b4f965ae3a8 WHIRLPOOL 79383eae9cf4e95d18c5e1278056b83e32373f549c2ecf3855696ef0e1c5e9c18d9ec79f02847f141100021ed52228e8ac2802e51f3f0a28dbe181b971ca6e41
+AUX mpd-0.17.6-opus-linking.patch 549 SHA256 6e2caa3a445e4001b8918d2bb7d8c05c73ce9aa2b39842aa72e711879e1b04eb SHA512 bbb6699dc4de8de8908464cb4086b610e597bb7cd1006b8d17770e3665872861644ddb795c450fe3784bf1f5cae3c724ac845f27565a9a57f632e9a9d79792ad WHIRLPOOL 480f62ed28dffe1a227a5cfe41ec30701a14014313bca97d6d68cf2f15d410c60bdfab2a3d7e69e263131c15741bea5d310ee864912cf9ae99e5838b112b8463
 AUX mpd-0.18.conf.patch 2969 SHA256 a8eb3e339513d6284f6be0a63f9676e44d768fc77d40ebe9f3073dd3171f0fae SHA512 4b646bc5d8fe4c76421f4cb0dbc7894cf9118492662ea1127f90c48f84760a1167988692c2b63f49182afcd46c578de7203356bbf9dd47787f9129f7c3dbf4a5 WHIRLPOOL 58f4a56426f66cd3337aafbfd6612bfc850fa022d13a150ff7f923e48f5d225c376ff751dab0ac5c6753320c060f04fc53a88e64b5ae3238499d3ce563df7654
 AUX mpd.init 836 SHA256 aa4156c9941aba452a9a53e17a8731063bb6c7f6ce4d67fe289502847e70d8b0 SHA512 de8dcede929d9785d6da904d38a985feb3091d2962d0ca0c294aa5e3a2a1e693f58d0ae1bc7cd339b8dadd751e6fbaf1f044b5677a82614457c13290ef94c5fe WHIRLPOOL bc382e87d4f85a565107e2f4bb0bcc32d2dd4b6368a9ea622bd2672ac2f0721dfb37ff555768d7e1466e1d9056c398afa6c6911e8a70994f81bddc2bb13316e3
 AUX mpd.logrotate 131 SHA256 18b3e7cb82984a846737494393edbebacfc7d06b79fddda5cd17d1710134f686 SHA512 39b7f58a2b7b50afdbb6d0a3a5e4f323b97ed1c59b37d238cdf7664ed0471f88b5592bccf49a6446d0d1ff4ffe7af3fdb6210e0024557e72fb9f79c3f4021561 WHIRLPOOL 9b2f6e46c787e617a12053914321b51dd5e6d382193fec610245e23a20654e6802a6d727202d038e36d1b9054c3be6487398b159fc5a741e3071b812df4333d5
@@ -10,16 +11,28 @@ AUX mpd2.init 828 SHA256 3591473024005cdb15f13809c7675fbb964dc1b13e7658a01e12e34
 DIST mpd-0.17.6.tar.bz2 585951 SHA256 9788948175157dc1c4da4a7d36e04a4b4812cb3a79f6b935e4fc9f93cb60c332 SHA512 014629b913e7bd537f38303ffee295648b55fe18dc0ea669b463b82c3d60334792eeedb624f96849c834cf32e0bb5107f804e59d62be293ff78d3d940dbbb9e2 WHIRLPOOL dee52fe02174b3818ce4483385b7b91e0667fddfd4912023551032b29a67b80a9d3aba2f2d49781266eceb25d5af2c3fe1285f46ad1513cafcd0f5d3766d2705
 DIST mpd-0.18.10.tar.xz 584312 SHA256 dd506ca1d81b61ec10be6a3e7181869bd5adf0ffbb0a2e948f730826933f1c81 SHA512 120ebbcae7de24f2d660ab7d50cdd7e80ab39da2c9479cda0ad117f8f0729c0a87fa4363f06866cf6e154d6f44e09ce8f3e4f3fff240de12eb600eaec351c140 WHIRLPOOL b5e0e38903d1bf6e6bd12694944ac909c09de4e66b4d63b54e2865886206aa94577070622e8e45f09ade2674afc420778e5885729cbe49d412ca597e005de29e
 DIST mpd-0.18.9.tar.xz 584328 SHA256 0d4d3e6977cb607419abbb14c63d1e2b982acb84cd2be5346f19de5f699a68de SHA512 12e45e14108cce0a3a993b6d17dfc05ed7d14ea99cce85f202904b9bf1624bfecadbd4d465e3c9057822691a1a245e67524229b160fceb2f72d27d6a8bd56479 WHIRLPOOL 2c94529b592b953f653a3f0b76fc27a4e9bc61297e097274708dbe425b5d3559394e1e9524df874803ce3eb5ea004ea47c7066632459e574070f8e10218a6d5b
-EBUILD mpd-0.17.6.ebuild 6308 SHA256 d1f9f9e12f74c5fda255aebd3e994f43511c48b17e9289791a6c470f4c6cd721 SHA512 cbd8aaf31b04821151607e0827c159808b0b681f7e991d6d10322a7d8151b35346b53b9b942a8e24254e812f67bac0bd83c7c82c4c3251cb3b0defe5346e3864 WHIRLPOOL 977ab20709e003002d8a415a003a07b498e8329da89dccd0a1988a30f4019159f752681e0e13f2b84fe2e40d8f683576c3e05e9c0e2e87bcc7ce83d8d4f4a958
+EBUILD mpd-0.17.6.ebuild 6384 SHA256 96f02117a10f2de49634c6f17f8cc8c09800af6c9f94bd84028cfa13d1fadb3e SHA512 41070e80edbb52c78f71a47eb51b96d8423b6842a46f369bf659c5b7928b8ac178fdafcbbb4dd24fd2bd5fbc360715c31e46ba05bd02cca6961c336e64b3eebd WHIRLPOOL 458e6d63bc70a8e8b87ae2fcd60d6f71bc99a0e90657a4204fc230c7b5cf16eb145c9794870a5e55e64559c9a955bd64f9af2670bc7f9c3ee7207f47b3141a35
 EBUILD mpd-0.18.10-r1.ebuild 6297 SHA256 a7be2a8f648ea34c19b1b7c95791625ce6ee675ac9c02287725e73fc9ba9d24a SHA512 d4ba82de4c1d4ae27bf8d8cbfd9c5d230fed183d566202837020281db9f439a84520bb2098e62ce54c9bf247cb66006e891fed33632d5bd14f381d8fe9512879 WHIRLPOOL 66e67eebf8de6c423138fb1477d1b73697a0e01e3d948de9ee3cb51a687e9e2d540f93d04fcdaaedd1ac0ad7495b11199bafccc2eb8a3e000735fa3be914131c
 EBUILD mpd-0.18.10.ebuild 6289 SHA256 d033b083ceccc908f37b7bcf6c3bb7423a3acd9235bfa3d3fb4ccecd302fc6e0 SHA512 df7954f58852593d6ca11b39d37887a84be486bd78c17006270155824a5bd5216484816fba68869cb52a31d175d2e4ec0898132bfe17e7d4c5314a15e4b1dfcc WHIRLPOOL e1eb15477baa59887cded5abd5b119da8607fdc40826e03747096e3bdd5948e58a0421c83f6532e88e0634f74a60d18248eca562698e7d09de46eb47afbd9b08
 EBUILD mpd-0.18.9.ebuild 6290 SHA256 3981fa0b502bf632e60e0dfd6b4ac65e2bd314f67583432d66c400706a4b9ebb SHA512 2d42b3c465b3acc60fc98e3d9c76b7aa680c3ba938e550cc90437f0877437a92804d32fa8660ae4bbf3fd667946b03cecc492ea7a400e81d486d43624eb9d503 WHIRLPOOL 09d631885aa0aba9226701abe194b86739d597ecb8c6c7eba6c05dea1b6811dfd9da9759a9691c0394ef2b204b14a6d0a27ed4414b059f804f36fdbb4e5fd11c
-MISC ChangeLog 48766 SHA256 8cb5631f99b0671b7167990c84c33ac173d8d5b634f5d21f36e7905a25c81592 SHA512 940e3dde086c76ad88d3d2fdcc97230caae8a46abd545b9a336d61c3340aa12ac375bd03310d2872f6dce03c8f31d101c3acd8bacf54929654b654edc004f74c WHIRLPOOL 891a6d9dec44777643ddbe10144d6e97596bcabaa48d4a3af503a5c4cfbd4eb71be9754b3ba655ac0fb9aab1e1e195f7f3b5884c8f3185dcb44f2dfe4bb28589
+MISC ChangeLog 48902 SHA256 fcc56acf46687ed45a36f23c68eed4adb83642686d6c1038a57123e70ddc5530 SHA512 8c35013404d6158866aded5590fca2b1afff55ef040f849a0391d1225022289322ae249d857596a510c90745300a1dac32897eb29107fdad8e07d52ea5c63029 WHIRLPOOL 93f0c420d3d9dd2de5e9dda01027841f67ee988adb5154f2ee3328d425c2e2bb0d7ccce85bb45e20ee62430bbd1a8685af68febedf1849dbb0e9f3b305194a03
 MISC metadata.xml 2057 SHA256 03ab12c4339334c9925649d19c61844c14600680d33b83736922b4537b94515c SHA512 71f55e89be531d5e1aa32182b8348899b87dfa3ef13782f52cc39748cce307273b714975016e2737d4e9941f2f4e71f31d6b38856eb5a9f1c1d33b2afc28fbb6 WHIRLPOOL 160272fbeffa01fbec0fc5bbb75f643cc4540def81f6e31bde450e18865bf43a6a329890db0bb8d3c6a22fdd740c1c1bf213cf87bc54fe103c7fadcba892a9d6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlNNX88ACgkQmWq1bYTyC0MnmwD6AqoqxuZotFwZ+MF8QdTPSMY3
-+Yv7Ejs74s7FTolFtLMA/iX6NhZZ7D/OoUu42mWJVjkXqJPmo7ZXmwBHpwpiSoLQ
-=QTMN
+iQJ8BAEBCABmBQJTZrDeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgcJkP/iMPflwJ2NP+yhU/KQK+TnUd
+XoApaEfPgwfjC5b0t+AnmvZBl3BcgToHaADoLNLWW6MxHw1atg+3diupSkHNQTf4
+nHa4UITbjXGCz0HRR2fzwGCXRrM9fqCXaOZ4BdCF+bmBGFbXkcYuYKuJYfLotVLk
+gFq5NOcnEtCTT0Qi6b4nuvrd5UGUYdiQcxdyoQfAfSs3C14dO9eycREmaRMP8+0L
+DU09xySqLFpknvdfsyBohCEfSyRoEUId1MkUHHEbIXcjmQ9M3MkUsDt4uNuJ7Peo
+e+p7CFocW1QQRp58dsz4hgiHp+KEHuASJ8zEgsiMHf8ZTWhWy+F00BbK2dEpn5CL
+eo4AJ/1nPz8HQtBnpLDM7uxakyCDR5rudbekeJXmfzY07ZN/zeIO4JHdNrVC8nwO
+NhAKPWpbRnhj6tPMqvGThUFjCI4m2Ie0yzhzgivXeEC0tutF0gqkXN2P1WZIZ76n
+C5oiosIn+oANrl/71sTSxe9RsCs6w9DITJb3oihS5D7KNDJsmkaCZkuij7FUdZWX
+DUcfHz4TNahHbn7W2N0YbaNuQ/YmbY4L65N+9fzzXFapYz11RQzIy62J+ss59EmR
+EI25B0tlkrb9vOd46wLU6qC2SD3XsSAyAl3xjPqbyUwcYTdN709HC+9bQTY2CvPi
+W8DtSeH1raC8BFFsrRAQ
+=QXkX
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpd/files/mpd-0.17.6-opus-linking.patch b/media-sound/mpd/files/mpd-0.17.6-opus-linking.patch
new file mode 100644
index 000000000000..fa3250ce0149
--- /dev/null
+++ b/media-sound/mpd/files/mpd-0.17.6-opus-linking.patch
@@ -0,0 +1,15 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun May  4 11:59:48 UTC 2014
+Subject: fix linking
+
+--- mpd-0.17.6/configure.ac
++++ mpd-0.17.6/configure.ac
+@@ -1149,7 +1149,7 @@
+ AM_CONDITIONAL(ENABLE_FLAC_ENCODER, test x$enable_flac_encoder = xyes)
+ 
+ dnl ---------------------------- Ogg Vorbis Encoder ---------------------------
+-MPD_AUTO_PKG(vorbis_encoder, VORBISENC, [vorbisenc],
++MPD_AUTO_PKG(vorbis_encoder, VORBISENC, [vorbisenc vorbis ogg],
+ 	[Ogg Vorbis encoder], [libvorbisenc not found])
+ 
+ if test x$enable_vorbis_encoder = xyes; then
diff --git a/media-sound/mpd/mpd-0.17.6.ebuild b/media-sound/mpd/mpd-0.17.6.ebuild
index d69baf49eb91..48fa30166843 100644
--- a/media-sound/mpd/mpd-0.17.6.ebuild
+++ b/media-sound/mpd/mpd-0.17.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.17.6.ebuild,v 1.8 2013/12/25 09:38:06 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.17.6.ebuild,v 1.9 2014/05/04 21:27:54 hasufell Exp $
 
 EAPI=4
-inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
+inherit autotools eutils flag-o-matic linux-info multilib readme.gentoo systemd user
 
 DESCRIPTION="The Music Player Daemon (mpd)"
 HOMEPAGE="http://www.musicpd.org"
@@ -93,13 +93,16 @@ src_prepare() {
 
 	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
 	epatch "${FILESDIR}"/${PN}-0.16.conf.patch \
-		"${FILESDIR}"/${PN}-0.17.4-ffmpeg2.patch
+		"${FILESDIR}"/${PN}-0.17.4-ffmpeg2.patch \
+		"${FILESDIR}"/${PN}-0.17.6-opus-linking.patch
 
 	if has_version dev-libs/libcdio-paranoia; then
 		sed -i \
 			-e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
 			src/input/cdio_paranoia_input_plugin.c || die
 	fi
+
+	eautoreconf
 }
 
 src_configure() {
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 6357daa6d937..bf4741141e9a 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 04 May 2014 15:07:28 +0000
+Mon, 05 May 2014 05:07:02 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 073ce60e691b..9d39962017d5 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 04 May 2014 15:07:29 +0000
+Mon, 05 May 2014 05:07:03 +0000
diff --git a/metadata/herds.xml b/metadata/herds.xml
index 112b556dbad6..3b1821cb1be4 100644
--- a/metadata/herds.xml
+++ b/metadata/herds.xml
@@ -20,7 +20,7 @@
    always a description without a lang attribute. Also there are no overlapping
    descriptions allowed (multiple description tags with the same language)
 
-   $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/metastructure/herds/herds.xml,v 1.1093 2014/04/26 20:47:41 zx2c4 Exp $
+   $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/metastructure/herds/herds.xml,v 1.1094 2014/05/05 01:11:55 grknight Exp $
 
 -->
 <herds>
@@ -2021,6 +2021,10 @@
     <email>jmbsvicetto@gentoo.org</email>
     <name>Jorge Manuel B. S. Vicetto</name>
   </maintainer>
+  <maintainer>
+    <email>grknight@gentoo.org</email>
+    <name>Brian Evans</name>
+  </maintainer>
 </herd>
 <herd>
   <name>net-ftp</name>
diff --git a/metadata/md5-cache/app-backup/bareos-13.2.2 b/metadata/md5-cache/app-backup/bareos-13.2.2
index 8a2a0daf1061..9bb9e2bd1d05 100644
--- a/metadata/md5-cache/app-backup/bareos-13.2.2
+++ b/metadata/md5-cache/app-backup/bareos-13.2.2
@@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/bareos/bareos/archive/Release/13.2.2.tar.gz -> bareos-13.2.2.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	qmake-utils	6f4ff01a55830f6d86647dc56dfaf3a7	qt4-r2	25e4f17ed047d9242cb40b70acfb2943	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=42afba8413f7bd363baadb5b869ebcc8
+_md5_=90207766e32114c261be9a003c04616e
diff --git a/metadata/md5-cache/app-backup/bareos-13.2.3 b/metadata/md5-cache/app-backup/bareos-13.2.3
new file mode 100644
index 000000000000..b8e8014cc0af
--- /dev/null
+++ b/metadata/md5-cache/app-backup/bareos-13.2.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup unpack
+DEPEND=!app-backup/bacula dev-libs/gmp !clientonly? ( postgres? ( dev-db/postgresql-base[threads] ) mysql? ( virtual/mysql ) sqlite3? ( dev-db/sqlite:3 ) director? ( virtual/mta ) ) qt4? ( dev-qt/qtsvg:4 x11-libs/qwt:5 ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses[static-libs] ssl? ( dev-libs/openssl[static-libs] ) ) !static? ( acl? ( virtual/acl ) sys-libs/zlib dev-libs/lzo sys-libs/ncurses ssl? ( dev-libs/openssl ) ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[threads] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
+DESCRIPTION=Featureful client/server network backup suite
+EAPI=5
+HOMEPAGE=http://www.bareos.org/
+IUSE=acl clientonly +director ipv6 logwatch mysql ndmp postgres python qt4 readline scsi-crypto sql-pooling +sqlite3 ssl static +storage-daemon tcpd vim-syntax X python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=!app-backup/bacula dev-libs/gmp !clientonly? ( postgres? ( dev-db/postgresql-base[threads] ) mysql? ( virtual/mysql ) sqlite3? ( dev-db/sqlite:3 ) director? ( virtual/mta ) ) qt4? ( dev-qt/qtsvg:4 x11-libs/qwt:5 ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses[static-libs] ssl? ( dev-libs/openssl[static-libs] ) ) !static? ( acl? ( virtual/acl ) sys-libs/zlib dev-libs/lzo sys-libs/ncurses ssl? ( dev-libs/openssl ) ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[threads] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+REQUIRED_USE=static? ( clientonly ) python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/bareos/bareos/archive/Release/13.2.3.tar.gz -> bareos-13.2.3.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	qmake-utils	6f4ff01a55830f6d86647dc56dfaf3a7	qt4-r2	25e4f17ed047d9242cb40b70acfb2943	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=5e8fd9ba531c8e3c80ae176b0a87c5a5
diff --git a/metadata/md5-cache/app-misc/emelfm2-0.9.1 b/metadata/md5-cache/app-misc/emelfm2-0.9.1
new file mode 100644
index 000000000000..c515057c82f7
--- /dev/null
+++ b/metadata/md5-cache/app-misc/emelfm2-0.9.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-libs/glib-2.26:2 !gtk3? ( >=x11-libs/gtk+-2.12:2 ) gtk3? ( x11-libs/gtk+:3 ) acl? ( sys-apps/acl ) gimp? ( media-gfx/gimp ) policykit? ( sys-auth/polkit ) spell? ( >=app-text/gtkspell-2.0.14:2 ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=A file manager that implements the popular two-pane design
+EAPI=5
+HOMEPAGE=http://emelfm2.net/
+IUSE=acl ansi gimp gtk3 kernel_linux nls policykit spell udev linguas_de linguas_fr linguas_ja linguas_pl linguas_ru linguas_zh_CN
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3 LGPL-3
+RDEPEND=>=dev-libs/glib-2.26:2 !gtk3? ( >=x11-libs/gtk+-2.12:2 ) gtk3? ( x11-libs/gtk+:3 ) acl? ( sys-apps/acl ) gimp? ( media-gfx/gimp ) policykit? ( sys-auth/polkit ) spell? ( >=app-text/gtkspell-2.0.14:2 ) udev? ( sys-fs/udisks:0 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://emelfm2.net/rel/emelfm2-0.9.1.tar.bz2
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=0a015557e341f6a577b8d41b765fb931
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.1 b/metadata/md5-cache/app-portage/mirrorselect-2.2.1
new file mode 100644
index 000000000000..b26e3de9cd79
--- /dev/null
+++ b/metadata/md5-cache/app-portage/mirrorselect-2.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Mirrorselect
+IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-util/dialog net-analyzer/netselect dev-python/ssl-fetch python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-2.2.1.tar.gz http://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	prefix	21058c21ca48453d771df15500873ede	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=1d5ebdef67426bfbdaeef7fbd4649ce3
diff --git a/metadata/md5-cache/app-portage/mirrorselect-9999 b/metadata/md5-cache/app-portage/mirrorselect-9999
index dd209db5d704..5bc5105f0996 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-9999
+++ b/metadata/md5-cache/app-portage/mirrorselect-9999
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst prepare test unpack
 DEPEND=userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-vcs/git
 DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
 EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/portage/tools/index.xml
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Mirrorselect
 IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
 LICENSE=GPL-2
 RDEPEND=dev-util/dialog net-analyzer/netselect =dev-python/ssl-fetch-9999 python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	prefix	21058c21ca48453d771df15500873ede	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=84e8c828576bea041cdcfb3423da8840
+_md5_=1b68b8d071d84df05c8fb11786e7a337
diff --git a/metadata/md5-cache/dev-cpp/gmock-1.7.0-r1 b/metadata/md5-cache/dev-cpp/gmock-1.7.0-r1
index fbebaa1b11bc..823081bc082f 100644
--- a/metadata/md5-cache/dev-cpp/gmock-1.7.0-r1
+++ b/metadata/md5-cache/dev-cpp/gmock-1.7.0-r1
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND==dev-cpp/gtest-1.7.0*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] app-arch/unzip userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND==dev-cpp/gtest-1.7.0*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) app-arch/unzip userland_GNU? ( >=sys-apps/coreutils-8.5 )
 DESCRIPTION=Google's C++ mocking framework
 EAPI=4
 HOMEPAGE=http://code.google.com/p/googlemock/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-cpp/gtest-1.7.0*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?]
 SLOT=0
 SRC_URI=http://googlemock.googlecode.com/files/gmock-1.7.0.zip
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=322636f7d80d797ebfdb5b623ebb8b31
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=7b0175ee26af58d7276bdf59bd3047e2
diff --git a/metadata/md5-cache/dev-db/myodbc-5.2.6 b/metadata/md5-cache/dev-db/myodbc-5.2.6
new file mode 100644
index 000000000000..c7bd5415a891
--- /dev/null
+++ b/metadata/md5-cache/dev-db/myodbc-5.2.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile config configure install postinst prepare test
+DEPEND=dev-db/unixODBC >=virtual/mysql-4.1 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=ODBC driver for MySQL
+EAPI=5
+HOMEPAGE=http://www.mysql.com/products/myodbc/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-db/unixODBC >=virtual/mysql-4.1
+RESTRICT=primaryuri
+SLOT=5.2
+SRC_URI=mirror://mysql/Downloads/Connector-ODBC/5.2/mysql-connector-odbc-5.2.6-src.tar.gz
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=1ff34aa5c19f78a1ad117547c32941ee
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.3 b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.3
new file mode 100644
index 000000000000..30f86db3dad4
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=virtual/mysql-5.1 dev-libs/boost dev-libs/openssl sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
+EAPI=5
+HOMEPAGE=http://dev.mysql.com/downloads/connector/cpp/
+IUSE=debug examples gcov static-libs
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=virtual/mysql-5.1 dev-libs/boost dev-libs/openssl
+SLOT=0
+SRC_URI=mirror://mysql/Downloads/Connector-C++/mysql-connector-c++-1.1.3.tar.gz
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=e9a0c0bdafa4f910054f07a1fa89ea21
diff --git a/metadata/md5-cache/dev-java/java-sdk-docs-1.4.2 b/metadata/md5-cache/dev-java/java-sdk-docs-1.4.2
deleted file mode 100644
index a71a0df9919c..000000000000
--- a/metadata/md5-cache/dev-java/java-sdk-docs-1.4.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DEPEND=>=app-arch/unzip-5.50-r1
-DESCRIPTION=Sun's documentation bundle (including API) for Java SE
-HOMEPAGE=http://java.sun.com/j2se/1.4.2/download.html
-KEYWORDS=amd64 ia64 ppc ppc64 x86
-LICENSE=sun-j2sl
-RESTRICT=fetch
-SLOT=1.4.2
-SRC_URI=j2sdk-1_4_2-doc.zip
-_md5_=8d1a8351f7ab4b4d3af1ef5aa88b2a8d
diff --git a/metadata/md5-cache/dev-java/java-sdk-docs-1.6.0.23 b/metadata/md5-cache/dev-java/java-sdk-docs-1.6.0.23
deleted file mode 100644
index 01bd04b6cc33..000000000000
--- a/metadata/md5-cache/dev-java/java-sdk-docs-1.6.0.23
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install nofetch
-DEPEND=app-arch/unzip
-DESCRIPTION=Sun's documentation bundle (including API) for Java SE
-HOMEPAGE=http://java.sun.com/javase/6/docs/
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=sun-j2sl-6
-RESTRICT=fetch
-SLOT=1.6.0
-SRC_URI=jdk-6u23-docs.zip
-_md5_=440a8b6764eba586cd767f5ef2d27998
diff --git a/metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.11 b/metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.11
deleted file mode 100644
index 5fbd0d21150a..000000000000
--- a/metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.11
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install nofetch
-DEPEND=app-arch/unzip
-DESCRIPTION=Oracle's documentation bundle (including API) for Java SE
-HOMEPAGE=http://download.oracle.com/javase/7/docs/
-KEYWORDS=~amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=oracle-java-documentation-7
-RESTRICT=fetch
-SLOT=1.7
-SRC_URI=jdk-7u11-apidocs.zip
-_md5_=8ca711efffa7028ef2964bb6f143030e
diff --git a/metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.17 b/metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.17
deleted file mode 100644
index 7f6c4d3aadd5..000000000000
--- a/metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.17
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch
-DEPEND=app-arch/unzip
-DESCRIPTION=Oracle's documentation bundle (including API) for Java SE
-EAPI=5
-HOMEPAGE=http://download.oracle.com/javase/7/docs/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=oracle-java-documentation-7
-RESTRICT=fetch
-SLOT=1.7
-SRC_URI=jdk-7u17-apidocs.zip
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=4996a2a55b2fedb1ffb79948ddf35720
diff --git a/metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.25 b/metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.25
deleted file mode 100644
index d196b0e919ef..000000000000
--- a/metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.25
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch
-DEPEND=app-arch/unzip
-DESCRIPTION=Oracle's documentation bundle (including API) for Java SE
-EAPI=5
-HOMEPAGE=http://download.oracle.com/javase/7/docs/
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=oracle-java-documentation-7
-RESTRICT=fetch
-SLOT=1.7
-SRC_URI=jdk-7u25-apidocs.zip
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=6dde35358bd30cee75ee7e095a0fba8b
diff --git a/metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.40-r1 b/metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.40-r1
deleted file mode 100644
index 459a5042b683..000000000000
--- a/metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.40-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch
-DEPEND=app-arch/unzip
-DESCRIPTION=Oracle's documentation bundle (including API) for Java SE
-EAPI=5
-HOMEPAGE=http://download.oracle.com/javase/7/docs/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=oracle-java-documentation-7
-RESTRICT=fetch
-SLOT=1.7
-SRC_URI=jdk-7u40-apidocs.zip
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=da7035bacd40dfc182da4e38e2d38fd5
diff --git a/metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.45 b/metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.45
deleted file mode 100644
index 39aa63ffb675..000000000000
--- a/metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.45
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch
-DEPEND=app-arch/unzip
-DESCRIPTION=Oracle's documentation bundle (including API) for Java SE
-EAPI=5
-HOMEPAGE=http://download.oracle.com/javase/7/docs/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=oracle-java-documentation-7
-RESTRICT=fetch
-SLOT=1.7
-SRC_URI=jdk-7u45-apidocs.zip
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=6003c7f9a0da4a27f5c1c2e4bc47fc24
diff --git a/metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.21 b/metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.5
similarity index 66%
rename from metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.21
rename to metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.5
index 94f79cff937a..12ee891ce68e 100644
--- a/metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.21
+++ b/metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.5
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install nofetch
-DEPEND=app-arch/unzip
+DEPEND=app-arch/unzip:0
 DESCRIPTION=Oracle's documentation bundle (including API) for Java SE
 EAPI=5
-HOMEPAGE=http://download.oracle.com/javase/7/docs/
+HOMEPAGE=http://download.oracle.com/javase/8/docs/
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=oracle-java-documentation-7
+LICENSE=oracle-java-documentation-8
 RESTRICT=fetch
-SLOT=1.7
-SRC_URI=jdk-7u21-apidocs.zip
+SLOT=1.8
+SRC_URI=jdk-8u5-apidocs.zip
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=c9eb43dd89f88b06d986ff8ee66a980c
+_md5_=4473404e99e0ec96bde755186f004aa1
diff --git a/metadata/md5-cache/dev-libs/re2-0_p20130712 b/metadata/md5-cache/dev-libs/re2-0_p20130712
index 533bc5ee8859..ed2f3db61073 100644
--- a/metadata/md5-cache/dev-libs/re2-0_p20130712
+++ b/metadata/md5-cache/dev-libs/re2-0_p20130712
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install prepare test
+DEFINED_PHASES=compile configure install prepare test
 DEPEND=userland_GNU? ( >=sys-apps/coreutils-8.5 )
 DESCRIPTION=An efficent, principled regular expression library
 EAPI=5
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://re2.googlecode.com/files/re2-20130712.tgz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=474376ffdc4a573af75ca036831d95a0
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=d8ae9db134234f47af1b70d8d11ecf9b
diff --git a/metadata/md5-cache/dev-libs/re2-0_p20140304 b/metadata/md5-cache/dev-libs/re2-0_p20140304
new file mode 100644
index 000000000000..faf95c17cc04
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/re2-0_p20140304
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DESCRIPTION=An efficent, principled regular expression library
+EAPI=5
+HOMEPAGE=http://code.google.com/p/re2/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+SLOT=0/0.20140110
+SRC_URI=http://re2.googlecode.com/files/re2-20140304.tgz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=927cab6163379ac9fdf2d85352fa3a81
diff --git a/metadata/md5-cache/dev-perl/Daemon-Generic-0.840.0 b/metadata/md5-cache/dev-perl/Daemon-Generic-0.840.0
new file mode 100644
index 000000000000..c8b1350c712d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Daemon-Generic-0.840.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-perl/File-Flock dev-perl/File-Slurp dev-perl/AnyEvent test? ( dev-perl/Eval-LineNumbers ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=Framework to provide start/stop/reload for a daemon
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/Daemon-Generic/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=dev-perl/File-Flock dev-perl/File-Slurp dev-perl/AnyEvent dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MU/MUIR/modules/Daemon-Generic-0.84.tar.gz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641
+_md5_=7e918a9df96654880b9f2c73e5061df9
diff --git a/metadata/md5-cache/dev-perl/MediaWiki-API-0.390.0 b/metadata/md5-cache/dev-perl/MediaWiki-API-0.390.0
index 6331e4fb7840..50b6142c79c0 100644
--- a/metadata/md5-cache/dev-perl/MediaWiki-API-0.390.0
+++ b/metadata/md5-cache/dev-perl/MediaWiki-API-0.390.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=A OO interface to the Mediawiki API
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/MediaWiki-API/
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ~x86 ~x86-fbsd
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=dev-perl/DateTime-1 dev-perl/DateTime-Format-ISO8601 dev-perl/JSON dev-perl/libwww-perl virtual/perl-Encode virtual/perl-Test-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXOBUZZ/MediaWiki-API-0.39.tar.gz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641
-_md5_=bd3f1cf975d88beb988ad67ca3ee2af3
+_md5_=a6593167b7249b54a1997a671e185ad5
diff --git a/metadata/md5-cache/dev-python/PyGithub-1.25.0 b/metadata/md5-cache/dev-python/PyGithub-1.25.0
new file mode 100644
index 000000000000..176a55c5427d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PyGithub-1.25.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Python library to access the Github API v3
+EAPI=5
+HOMEPAGE=https://github.com/jacquev6/PyGithub/
+IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://github.com/jacquev6/PyGithub/archive/v1.25.0.tar.gz -> PyGithub-1.25.0.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=d716916a372ab685e36d304a0c1565f8
diff --git a/metadata/md5-cache/dev-python/fixtures-0.3.14-r1 b/metadata/md5-cache/dev-python/fixtures-0.3.14-r1
index 3b75620926be..e02243839d48 100644
--- a/metadata/md5-cache/dev-python/fixtures-0.3.14-r1
+++ b/metadata/md5-cache/dev-python/fixtures-0.3.14-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Fixtures, reusable state for writing clean tests and more.
 EAPI=5
 HOMEPAGE=https://launchpad.net/python-fixtures https://pypi.python.org/pypi/fixtures
 IUSE=test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy
-KEYWORDS=~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Apache-2.0 BSD )
 RDEPEND=>=dev-python/testtools-0.9.22 python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/f/fixtures/fixtures-0.3.14.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=6beeefe49c7b37c0e05192b580c8b629
+_md5_=39926c817d89819a227b742505f20435
diff --git a/metadata/md5-cache/dev-python/flake8-2.0 b/metadata/md5-cache/dev-python/flake8-2.0
index bdf5e314d34c..43f0a8c18037 100644
--- a/metadata/md5-cache/dev-python/flake8-2.0
+++ b/metadata/md5-cache/dev-python/flake8-2.0
@@ -4,7 +4,7 @@ DESCRIPTION=A wrapper around PyFlakes, pep8 & mccabe
 EAPI=5
 HOMEPAGE=http://bitbucket.org/tarek/flake8
 IUSE=test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=amd64 ~hppa x86
+KEYWORDS=amd64 ~arm ~hppa x86
 LICENSE=MIT
 PDEPEND=dev-python/mccabe[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(-)]
 RDEPEND=>=dev-python/pyflakes-0.6.1[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(-)] >=dev-python/pep8-1.4.3[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.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_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(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8/flake8-2.0.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=febbc29b2add3022e9cf508a55e697aa
+_md5_=806df56b90b352b24cf4f95760352c1b
diff --git a/metadata/md5-cache/dev-python/futures-2.1.6 b/metadata/md5-cache/dev-python/futures-2.1.6
index 01b1412a2386..ddc65730a428 100644
--- a/metadata/md5-cache/dev-python/futures-2.1.6
+++ b/metadata/md5-cache/dev-python/futures-2.1.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=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(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 DESCRIPTION=Backport of the concurrent.futures package from Python 3.2
 EAPI=5
 HOMEPAGE=http://code.google.com/p/pythonfutures http://pypi.python.org/pypi/futures
-IUSE=doc python_targets_python2_6 python_targets_python2_7
+IUSE=doc python_targets_python2_7 python_targets_pypy
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/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 )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/f/futures/futures-2.1.6.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=a9e33124fb2c69fb8ba1e018fc6281a7
+_md5_=aa19263d6705a9a08e0df3e1ac34e9d0
diff --git a/metadata/md5-cache/dev-python/mccabe-0.2.1 b/metadata/md5-cache/dev-python/mccabe-0.2.1
index f96c29d5dbea..a48cac3e614f 100644
--- a/metadata/md5-cache/dev-python/mccabe-0.2.1
+++ b/metadata/md5-cache/dev-python/mccabe-0.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=a plugin for flake8
 EAPI=5
 HOMEPAGE=https://github.com/flintwork/mccabe
 IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=amd64 ~hppa x86
+KEYWORDS=amd64 ~arm ~hppa x86
 LICENSE=MIT
 RDEPEND=>=dev-python/pep8-1.4.3[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(-)] dev-python/flake8[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.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_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/m/mccabe/mccabe-0.2.1.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=25ca661643cf6097eea67030237ec048
+_md5_=c5e4717e494c773c6bc7b301e35afae6
diff --git a/metadata/md5-cache/dev-python/pbr-0.8.0 b/metadata/md5-cache/dev-python/pbr-0.8.0
index f9b1f540c75b..76166ffc6f02 100644
--- a/metadata/md5-cache/dev-python/pbr-0.8.0
+++ b/metadata/md5-cache/dev-python/pbr-0.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=PBR is a library that injects some useful and sensible default behav
 EAPI=5
 HOMEPAGE=https://github.com/openstack-dev/pbr
 IUSE=test python_targets_python2_7 python_targets_python3_3
-KEYWORDS=~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>dev-python/pip-1.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-0.8.0.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=a8cac4b4e1c10b8cea7ed1c507dd9c68
+_md5_=478a05eeca1b0520fe9521bd1fd4a453
diff --git a/metadata/md5-cache/dev-python/pep8-1.4.6 b/metadata/md5-cache/dev-python/pep8-1.4.6
index dd8390f9a3f6..145abac0c21c 100644
--- a/metadata/md5-cache/dev-python/pep8-1.4.6
+++ b/metadata/md5-cache/dev-python/pep8-1.4.6
@@ -4,11 +4,11 @@ DESCRIPTION=Python style guide checker
 EAPI=5
 HOMEPAGE=http://github.com/jcrocholl/pep8 http://pypi.python.org/pypi/pep8
 IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[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.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_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/p/pep8/pep8-1.4.6.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=1603679bbc1feb8dfba7013a358faaa4
+_md5_=83366ccdab524b6652348ab3ca9e9dc3
diff --git a/metadata/md5-cache/dev-python/pip-1.5.4-r1 b/metadata/md5-cache/dev-python/pip-1.5.4-r1
index 459bdf95dee6..ab040af4ebcb 100644
--- a/metadata/md5-cache/dev-python/pip-1.5.4-r1
+++ b/metadata/md5-cache/dev-python/pip-1.5.4-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Installs python packages -- replacement for easy_install
 EAPI=5
 HOMEPAGE=http://www.pip-installer.org/ http://pypi.python.org/pypi/pip/
 IUSE=zsh-completion python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy
-KEYWORDS=~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pip/pip-1.5.4.tar.gz
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=8eae20011fc9200122604f8601f98cc3
+_md5_=74bb6e42dfaa9a2773fd989aa4168556
diff --git a/metadata/md5-cache/dev-python/pip-1.5.5 b/metadata/md5-cache/dev-python/pip-1.5.5
index 07f7f5b72c91..aaaa07b85c61 100644
--- a/metadata/md5-cache/dev-python/pip-1.5.5
+++ b/metadata/md5-cache/dev-python/pip-1.5.5
@@ -4,7 +4,7 @@ DESCRIPTION=Installs python packages -- replacement for easy_install
 EAPI=5
 HOMEPAGE=http://www.pip-installer.org/ http://pypi.python.org/pypi/pip/
 IUSE=zsh-completion python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pip/pip-1.5.5.tar.gz
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=ce747b4cec9241a6247e3eadee7bf00c
+_md5_=da56e7750366842efe520c178706f84c
diff --git a/metadata/md5-cache/dev-python/pyflakes-0.8.1 b/metadata/md5-cache/dev-python/pyflakes-0.8.1
index 4beba7fa86a0..48e08875a7ef 100644
--- a/metadata/md5-cache/dev-python/pyflakes-0.8.1
+++ b/metadata/md5-cache/dev-python/pyflakes-0.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=Passive checker for Python programs
 EAPI=5
 HOMEPAGE=https://launchpad.net/pyflakes http://pypi.python.org/pypi/pyflakes
 IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[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.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_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/p/pyflakes/pyflakes-0.8.1.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=d9edeb12c05a1f83335ab4b8366b6864
+_md5_=d334265e97e061e4d1ee6773f26ebe3a
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.9 b/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.9
index 841589fa132a..e5c89ff6a4d8 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.9
+++ b/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.9
@@ -4,11 +4,11 @@ DESCRIPTION=SQLAlchemy Schema Migration Tools
 EAPI=5
 HOMEPAGE=http://code.google.com/p/sqlalchemy-migrate/ http://pypi.python.org/pypi/sqlalchemy-migrate
 IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~hppa ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~x86
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.5.21[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-0.7.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/decorator[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/tempita-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sqlalchemy-migrate/sqlalchemy-migrate-0.9.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=b52f50f5348091cd8239d9a40f3bb871
+_md5_=81fb9d79c8a7b53010a0fb9e26f2718e
diff --git a/metadata/md5-cache/dev-python/testrepository-0.0.18 b/metadata/md5-cache/dev-python/testrepository-0.0.18
index fb239eb145c1..5612244b7120 100644
--- a/metadata/md5-cache/dev-python/testrepository-0.0.18
+++ b/metadata/md5-cache/dev-python/testrepository-0.0.18
@@ -4,11 +4,11 @@ DESCRIPTION=A repository of test results.
 EAPI=5
 HOMEPAGE=https://launchpad.net/testscenarios
 IUSE=test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/subunit-0.0.10[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/testtools-0.9.30[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/fixtures[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
 SRC_URI=mirror://pypi/t/testrepository/testrepository-0.0.18.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=0b8bb5f2891d26680035505df35bba03
+_md5_=89d0baf0985cfa41d973484aa74c56f4
diff --git a/metadata/md5-cache/dev-python/testresources-0.2.7-r1 b/metadata/md5-cache/dev-python/testresources-0.2.7-r1
index 462018f4dd90..d2af06e1e1a6 100644
--- a/metadata/md5-cache/dev-python/testresources-0.2.7-r1
+++ b/metadata/md5-cache/dev-python/testresources-0.2.7-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Testresources, a pyunit extension for managing expensive test resour
 EAPI=5
 HOMEPAGE=https://launchpad.net/testresources
 IUSE=test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
 SRC_URI=mirror://pypi/t/testresources/testresources-0.2.7.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=c1236a072709d6afc72b3b8bdfb43c99
+_md5_=0555f53d274c21c23e32bdf47f37fd36
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-3.2.17 b/metadata/md5-cache/dev-ruby/actionmailer-3.2.17
index b8b8b1447d1d..93d488f88759 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-3.2.17
+++ b/metadata/md5-cache/dev-ruby/actionmailer-3.2.17
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/actionpack-3.2.17[ruby_targets_ruby18] >=dev-ruby/mail-2.5.4:2.5[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/actionpack-3.2.17[ruby_targets_ruby19] >=dev-ruby/mail-2.5.4:2.5[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby18] dev-ruby/mocha:0.13[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] dev-ruby/mocha:0.13[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( ~dev-ruby/actionpack-3.2.17[ruby_targets_ruby19] >=dev-ruby/mail-2.5.4:2.5[ruby_targets_ruby19] ) ruby_targets_ruby20? ( ~dev-ruby/actionpack-3.2.17[ruby_targets_ruby20] >=dev-ruby/mail-2.5.4:2.5[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] dev-ruby/mocha:0.13[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby20] dev-ruby/mocha:0.13[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=Framework for designing email-service layers
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/actionmailer/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/actionpack-3.2.17[ruby_targets_ruby18] >=dev-ruby/mail-2.5.4:2.5[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/actionpack-3.2.17[ruby_targets_ruby19] >=dev-ruby/mail-2.5.4:2.5[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/actionpack-3.2.17[ruby_targets_ruby19] >=dev-ruby/mail-2.5.4:2.5[ruby_targets_ruby19] ) ruby_targets_ruby20? ( ~dev-ruby/actionpack-3.2.17[ruby_targets_ruby20] >=dev-ruby/mail-2.5.4:2.5[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=3.2
 SRC_URI=http://github.com/rails/rails/archive/v3.2.17.tar.gz -> rails-3.2.17.tgz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=f208996b942c9e2a69c2d7311a383c41
+_md5_=2348dd146f8718856d12e6b0df9f9ea6
diff --git a/metadata/md5-cache/dev-ruby/actionpack-3.2.17 b/metadata/md5-cache/dev-ruby/actionpack-3.2.17
index 0ce6fe70d77f..fe5847691da8 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-3.2.17
+++ b/metadata/md5-cache/dev-ruby/actionpack-3.2.17
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/activemodel-3.2.17[ruby_targets_ruby18] ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby18] >=dev-ruby/rack-cache-1.2[ruby_targets_ruby18] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby18] >=dev-ruby/rack-1.4.5:1.4[ruby_targets_ruby18] >=dev-ruby/rack-test-0.6.1:0.6[ruby_targets_ruby18] >=dev-ruby/journey-1.0.4:1.0[ruby_targets_ruby18] >=dev-ruby/sprockets-2.2.1:2.2[ruby_targets_ruby18] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activemodel-3.2.17[ruby_targets_ruby19] ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby19] >=dev-ruby/rack-cache-1.2[ruby_targets_ruby19] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby19] >=dev-ruby/rack-1.4.5:1.4[ruby_targets_ruby19] >=dev-ruby/rack-test-0.6.1:0.6[ruby_targets_ruby19] >=dev-ruby/journey-1.0.4:1.0[ruby_targets_ruby19] >=dev-ruby/sprockets-2.2.1:2.2[ruby_targets_ruby19] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/mocha:0.13[ruby_targets_ruby18] dev-ruby/bundler[ruby_targets_ruby18] ~dev-ruby/activerecord-3.2.17[ruby_targets_ruby18] ~dev-ruby/actionmailer-3.2.17[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.29:0[ruby_targets_ruby18] >=dev-ruby/uglifier-1.0.3[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/mocha:0.13[ruby_targets_ruby19] dev-ruby/bundler[ruby_targets_ruby19] ~dev-ruby/activerecord-3.2.17[ruby_targets_ruby19] ~dev-ruby/actionmailer-3.2.17[ruby_targets_ruby19] >=dev-ruby/tzinfo-0.3.29:0[ruby_targets_ruby19] >=dev-ruby/uglifier-1.0.3[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( ~dev-ruby/activemodel-3.2.17[ruby_targets_ruby19] ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby19] >=dev-ruby/rack-cache-1.2[ruby_targets_ruby19] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby19] >=dev-ruby/rack-1.4.5:1.4[ruby_targets_ruby19] >=dev-ruby/rack-test-0.6.1:0.6[ruby_targets_ruby19] >=dev-ruby/journey-1.0.4:1.0[ruby_targets_ruby19] >=dev-ruby/sprockets-2.2.1:2.2[ruby_targets_ruby19] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( ~dev-ruby/activemodel-3.2.17[ruby_targets_ruby20] ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby20] >=dev-ruby/rack-cache-1.2[ruby_targets_ruby20] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby20] >=dev-ruby/rack-1.4.5:1.4[ruby_targets_ruby20] >=dev-ruby/rack-test-0.6.1:0.6[ruby_targets_ruby20] >=dev-ruby/journey-1.0.4:1.0[ruby_targets_ruby20] >=dev-ruby/sprockets-2.2.1:2.2[ruby_targets_ruby20] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/mocha:0.13[ruby_targets_ruby19] dev-ruby/bundler[ruby_targets_ruby19] ~dev-ruby/activerecord-3.2.17[ruby_targets_ruby19] ~dev-ruby/actionmailer-3.2.17[ruby_targets_ruby19] >=dev-ruby/tzinfo-0.3.29:0[ruby_targets_ruby19] >=dev-ruby/uglifier-1.0.3[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/mocha:0.13[ruby_targets_ruby20] dev-ruby/bundler[ruby_targets_ruby20] ~dev-ruby/activerecord-3.2.17[ruby_targets_ruby20] ~dev-ruby/actionmailer-3.2.17[ruby_targets_ruby20] >=dev-ruby/tzinfo-0.3.29:0[ruby_targets_ruby20] >=dev-ruby/uglifier-1.0.3[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=Eases web-request routing, handling, and response.
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/actionpack/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/activemodel-3.2.17[ruby_targets_ruby18] ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby18] >=dev-ruby/rack-cache-1.2[ruby_targets_ruby18] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby18] >=dev-ruby/rack-1.4.5:1.4[ruby_targets_ruby18] >=dev-ruby/rack-test-0.6.1:0.6[ruby_targets_ruby18] >=dev-ruby/journey-1.0.4:1.0[ruby_targets_ruby18] >=dev-ruby/sprockets-2.2.1:2.2[ruby_targets_ruby18] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activemodel-3.2.17[ruby_targets_ruby19] ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby19] >=dev-ruby/rack-cache-1.2[ruby_targets_ruby19] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby19] >=dev-ruby/rack-1.4.5:1.4[ruby_targets_ruby19] >=dev-ruby/rack-test-0.6.1:0.6[ruby_targets_ruby19] >=dev-ruby/journey-1.0.4:1.0[ruby_targets_ruby19] >=dev-ruby/sprockets-2.2.1:2.2[ruby_targets_ruby19] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activemodel-3.2.17[ruby_targets_ruby19] ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby19] >=dev-ruby/rack-cache-1.2[ruby_targets_ruby19] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby19] >=dev-ruby/rack-1.4.5:1.4[ruby_targets_ruby19] >=dev-ruby/rack-test-0.6.1:0.6[ruby_targets_ruby19] >=dev-ruby/journey-1.0.4:1.0[ruby_targets_ruby19] >=dev-ruby/sprockets-2.2.1:2.2[ruby_targets_ruby19] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( ~dev-ruby/activemodel-3.2.17[ruby_targets_ruby20] ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby20] >=dev-ruby/rack-cache-1.2[ruby_targets_ruby20] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby20] >=dev-ruby/rack-1.4.5:1.4[ruby_targets_ruby20] >=dev-ruby/rack-test-0.6.1:0.6[ruby_targets_ruby20] >=dev-ruby/journey-1.0.4:1.0[ruby_targets_ruby20] >=dev-ruby/sprockets-2.2.1:2.2[ruby_targets_ruby20] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=3.2
 SRC_URI=http://github.com/rails/rails/archive/v3.2.17.tar.gz -> rails-3.2.17.tgz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=0d2d82898ba779f878a48de595972539
+_md5_=206c89a454b6c3fb624db4d23ead6bd4
diff --git a/metadata/md5-cache/dev-ruby/activerecord-3.2.17 b/metadata/md5-cache/dev-ruby/activerecord-3.2.17
index 7b7be36a8245..ae951d486a10 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-3.2.17
+++ b/metadata/md5-cache/dev-ruby/activerecord-3.2.17
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby18] ~dev-ruby/activemodel-3.2.17[ruby_targets_ruby18] >=dev-ruby/arel-3.0.2:3.0[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.29:0[ruby_targets_ruby18] sqlite3? ( >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby18] ) mysql? ( >=dev-ruby/mysql2-0.3.10:0.3[ruby_targets_ruby18] ) postgres? ( >=dev-ruby/pg-0.11.0[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby19] ~dev-ruby/activemodel-3.2.17[ruby_targets_ruby19] >=dev-ruby/arel-3.0.2:3.0[ruby_targets_ruby19] >=dev-ruby/tzinfo-0.3.29:0[ruby_targets_ruby19] sqlite3? ( >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby19] ) mysql? ( >=dev-ruby/mysql2-0.3.10:0.3[ruby_targets_ruby19] ) postgres? ( >=dev-ruby/pg-0.11.0[ruby_targets_ruby19] ) ) ) ruby_targets_ruby18? ( test? ( dev-ruby/bundler[ruby_targets_ruby18] ~dev-ruby/actionpack-3.2.17[ruby_targets_ruby18] >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby18] dev-ruby/mocha:0.13[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/bundler[ruby_targets_ruby19] ~dev-ruby/actionpack-3.2.17[ruby_targets_ruby19] >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby19] dev-ruby/mocha:0.13[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby19] ~dev-ruby/activemodel-3.2.17[ruby_targets_ruby19] >=dev-ruby/arel-3.0.2:3.0[ruby_targets_ruby19] >=dev-ruby/tzinfo-0.3.29:0[ruby_targets_ruby19] sqlite3? ( >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby19] ) mysql? ( >=dev-ruby/mysql2-0.3.10:0.3[ruby_targets_ruby19] ) postgres? ( >=dev-ruby/pg-0.11.0[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby20] ~dev-ruby/activemodel-3.2.17[ruby_targets_ruby20] >=dev-ruby/arel-3.0.2:3.0[ruby_targets_ruby20] >=dev-ruby/tzinfo-0.3.29:0[ruby_targets_ruby20] sqlite3? ( >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby20] ) mysql? ( >=dev-ruby/mysql2-0.3.10:0.3[ruby_targets_ruby20] ) postgres? ( >=dev-ruby/pg-0.11.0[ruby_targets_ruby20] ) ) ) ruby_targets_ruby19? ( test? ( dev-ruby/bundler[ruby_targets_ruby19] ~dev-ruby/actionpack-3.2.17[ruby_targets_ruby19] >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby19] dev-ruby/mocha:0.13[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/bundler[ruby_targets_ruby20] ~dev-ruby/actionpack-3.2.17[ruby_targets_ruby20] >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby20] dev-ruby/mocha:0.13[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/activerecord/
-IUSE=mysql postgres sqlite3 test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test test
+IUSE=mysql postgres sqlite3 test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby18] ~dev-ruby/activemodel-3.2.17[ruby_targets_ruby18] >=dev-ruby/arel-3.0.2:3.0[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.29:0[ruby_targets_ruby18] sqlite3? ( >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby18] ) mysql? ( >=dev-ruby/mysql2-0.3.10:0.3[ruby_targets_ruby18] ) postgres? ( >=dev-ruby/pg-0.11.0[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby19] ~dev-ruby/activemodel-3.2.17[ruby_targets_ruby19] >=dev-ruby/arel-3.0.2:3.0[ruby_targets_ruby19] >=dev-ruby/tzinfo-0.3.29:0[ruby_targets_ruby19] sqlite3? ( >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby19] ) mysql? ( >=dev-ruby/mysql2-0.3.10:0.3[ruby_targets_ruby19] ) postgres? ( >=dev-ruby/pg-0.11.0[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby19] ~dev-ruby/activemodel-3.2.17[ruby_targets_ruby19] >=dev-ruby/arel-3.0.2:3.0[ruby_targets_ruby19] >=dev-ruby/tzinfo-0.3.29:0[ruby_targets_ruby19] sqlite3? ( >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby19] ) mysql? ( >=dev-ruby/mysql2-0.3.10:0.3[ruby_targets_ruby19] ) postgres? ( >=dev-ruby/pg-0.11.0[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby20] ~dev-ruby/activemodel-3.2.17[ruby_targets_ruby20] >=dev-ruby/arel-3.0.2:3.0[ruby_targets_ruby20] >=dev-ruby/tzinfo-0.3.29:0[ruby_targets_ruby20] sqlite3? ( >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby20] ) mysql? ( >=dev-ruby/mysql2-0.3.10:0.3[ruby_targets_ruby20] ) postgres? ( >=dev-ruby/pg-0.11.0[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=3.2
 SRC_URI=http://github.com/rails/rails/archive/v3.2.17.tar.gz -> rails-3.2.17.tgz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=a5cb08ec91c751500d3592e2a8c58512
+_md5_=33741fd57527c8feabdaf32c70e0692e
diff --git a/metadata/md5-cache/dev-vcs/git-1.8.5.5 b/metadata/md5-cache/dev-vcs/git-1.8.5.5
index 6e6eb4b22d88..ea79abc21d76 100644
--- a/metadata/md5-cache/dev-vcs/git-1.8.5.5
+++ b/metadata/md5-cache/dev-vcs/git-1.8.5.5
@@ -4,11 +4,11 @@ DESCRIPTION=GIT - the stupid content tracker, the revision control system heavil
 EAPI=5
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=http://git-core.googlecode.com/files/git-1.8.5.5.tar.gz mirror://kernel/software/scm/git/git-1.8.5.5.tar.gz http://git-core.googlecode.com/files/git-manpages-1.8.5.5.tar.gz mirror://kernel/software/scm/git/git-manpages-1.8.5.5.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.8.5.5.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.8.5.5.tar.gz )
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641
-_md5_=9fc90e4af528a88dc1ced6d053a325f3
+_md5_=e41d5b2b77618173912a59edd25895b0
diff --git a/metadata/md5-cache/games-emulation/dolphin-4.0.2 b/metadata/md5-cache/games-emulation/dolphin-4.0.2
new file mode 100644
index 000000000000..ab10d3f0c9d7
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/dolphin-4.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
+DEPEND=>=media-libs/glew-1.6 >=media-libs/libsdl-1.2[joystick] <media-libs/libsfml-2.0 >=net-libs/miniupnpc-1.8 sys-libs/readline x11-libs/libXext x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) ffmpeg? ( virtual/ffmpeg ) lzo? ( dev-libs/lzo ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) app-arch/zip media-gfx/nvidia-cg-toolkit media-libs/freetype media-libs/libsoundtouch >=sys-devel/gcc-4.6.0 x11-libs/wxGTK:2.9 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Gamecube and Wii game emulator
+EAPI=5
+HOMEPAGE=https://www.dolphin-emu.org/
+IUSE=alsa ao bluetooth doc ffmpeg +lzo openal opengl openmp portaudio pulseaudio
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=media-libs/glew-1.6 >=media-libs/libsdl-1.2[joystick] <media-libs/libsfml-2.0 >=net-libs/miniupnpc-1.8 sys-libs/readline x11-libs/libXext x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) ffmpeg? ( virtual/ffmpeg ) lzo? ( dev-libs/lzo ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) games-misc/games-envd
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/dolphin-emu/dolphin/archive/4.0.2.zip
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	games	016d5de1968de77e56a90938ed6e5aba	multilib	fac675dcccf94392371a6abee62d909f	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
+_md5_=b9712df42b9df97cf4ea88f4be98baa0
diff --git a/metadata/md5-cache/games-emulation/vbam-1.8.0.1228 b/metadata/md5-cache/games-emulation/vbam-1.8.0.1228
index b76463712506..c26c1f0e7e76 100644
--- a/metadata/md5-cache/games-emulation/vbam-1.8.0.1228
+++ b/metadata/md5-cache/games-emulation/vbam-1.8.0.1228
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( sdl gtk wxwidgets )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~radhermit/distfiles/vbam-1.8.0.1228.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	games	016d5de1968de77e56a90938ed6e5aba	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
-_md5_=fc8145139238b4480adf397db831d96b
+_md5_=b2e55b46599cb1cccd85a5411da763b7
diff --git a/metadata/md5-cache/games-fps/quake1-ctf-4.0 b/metadata/md5-cache/games-fps/quake1-ctf-4.0
index 33f0105cbcfe..33fa808ca2d8 100644
--- a/metadata/md5-cache/games-fps/quake1-ctf-4.0
+++ b/metadata/md5-cache/games-fps/quake1-ctf-4.0
@@ -3,9 +3,10 @@ DEPEND=app-arch/unzip
 DESCRIPTION=The original Three Wave Capture The Flag
 HOMEPAGE=http://www.threewave.com/
 KEYWORDS=amd64 x86
-LICENSE=as-is
+LICENSE=all-rights-reserved
 RDEPEND=games-misc/games-envd
+RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://www.threewave.com/quake1/files/3wctf301.zip http://www.threewave.com/quake1/files/3wctfc40.zip http://www.threewave.com/quake1/files/ctfepc14.zip http://www.threewave.com/quake1/files/alst101c.zip http://www.threewave.com/quake1/files/alst110u.zip
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	games	016d5de1968de77e56a90938ed6e5aba	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=44b61afa1cd866833740b76e2a71c7fc
+_md5_=627690b34d2bfabe890eeda6ab3d575d
diff --git a/metadata/md5-cache/games-fps/quake1-movies-0 b/metadata/md5-cache/games-fps/quake1-movies-0
index e68251034cbc..b13809e1221e 100644
--- a/metadata/md5-cache/games-fps/quake1-movies-0
+++ b/metadata/md5-cache/games-fps/quake1-movies-0
@@ -3,9 +3,10 @@ DEPEND=app-arch/unzip
 DESCRIPTION=a collection of all the greatest Quake movies
 HOMEPAGE=http://www.planetquake.com/cineplex/history.html
 KEYWORDS=amd64 x86
-LICENSE=as-is
+LICENSE=all-rights-reserved
 RDEPEND=games-misc/games-envd
+RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://ftp.se.kde.org/pub/pc/games/idgames2/planetquake/cineplex/camper.zip http://ftp.se.kde.org/pub/pc/games/idgames2/planetquake/cineplex/rgb.zip http://ftp.se.kde.org/pub/pc/games/idgames2/planetquake/cineplex/rgb2.zip http://ftp.se.kde.org/pub/pc/games/idgames2/planetquake/cineplex/rgb3_preview.zip http://ftp.se.kde.org/pub/pc/games/idgames2/planetquake/cineplex/ta2.zip http://ftp.se.kde.org/pub/pc/games/idgames2/planetquake/cineplex/op_bays.zip http://ftp.se.kde.org/pub/pc/games/idgames2/planetquake/cineplex/artifact.zip http://ftp.se.kde.org/pub/pc/games/idgames2/planetquake/blah/blahmov.zip http://ftp.se.kde.org/pub/pc/games/idgames2/planetquake/blah/blahouts.zip
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	games	016d5de1968de77e56a90938ed6e5aba	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0355e0b8599f6f3a37bc05660ccdc7c1
+_md5_=0478f432926a8d9dcfa624eda32ff8c7
diff --git a/metadata/md5-cache/games-strategy/dominions2-2.16 b/metadata/md5-cache/games-strategy/dominions2-2.16
index 8ec61358024f..119734112d46 100644
--- a/metadata/md5-cache/games-strategy/dominions2-2.16
+++ b/metadata/md5-cache/games-strategy/dominions2-2.16
@@ -4,11 +4,11 @@ DESCRIPTION=Dominions 2: The Ascension Wars is an epic turn-based fantasy strate
 HOMEPAGE=http://www.illwinter.com/dom2/index.html
 IUSE=doc
 KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=as-is
+LICENSE=all-rights-reserved
 PROPERTIES=interactive
 RDEPEND=virtual/opengl virtual/glu x86? ( media-libs/libsdl ) ppc? ( media-libs/libsdl ) amd64? ( app-emulation/emul-linux-x86-xlibs app-emulation/emul-linux-x86-sdl ) games-misc/games-envd
-RESTRICT=strip
+RESTRICT=bindist strip
 SLOT=0
 SRC_URI=x86? ( http://www.shrapnelgames.com/downloads/dompatch216_linux_x86.tgz ) amd64? ( http://www.shrapnelgames.com/downloads/dompatch216_linux_x86.tgz ) ppc? ( http://www.shrapnelgames.com/downloads/dompatch216_linux_ppc.tgz ) doc? ( http://www.shrapnelgames.com/downloads/DOM2_Walkthrough.pdf http://www.shrapnelgames.com/downloads/manual_addenda.pdf ) mirror://gentoo/dominions2.png
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cdrom	415b847346ef9001a89e5c7da6711215	eutils	025442f2eecab39ad0b4e541b6e142af	games	016d5de1968de77e56a90938ed6e5aba	multilib	fac675dcccf94392371a6abee62d909f	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=70740e13a90d58147f09acb1d2c7d564
+_md5_=c617f5d2d66ecc0944be26fb08357692
diff --git a/metadata/md5-cache/mail-filter/libmilter-1.0.2 b/metadata/md5-cache/mail-filter/libmilter-1.0.2
index 43dfc90a1659..a42de3a43fe2 100644
--- a/metadata/md5-cache/mail-filter/libmilter-1.0.2
+++ b/metadata/md5-cache/mail-filter/libmilter-1.0.2
@@ -4,10 +4,10 @@ DESCRIPTION=The Sendmail Filter API (Milter)
 EAPI=2
 HOMEPAGE=http://www.sendmail.org/
 IUSE=ipv6 poll
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=Sendmail
 RDEPEND=!mail-mta/sendmail
 SLOT=0
 SRC_URI=ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.14.5.tar.gz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=7e0333315f0aa6a34f63aeea39187b0d
+_md5_=dd9232cbf7dac3ff4ab0b54499a36509
diff --git a/metadata/md5-cache/mail-filter/opendkim-2.9.2-r1 b/metadata/md5-cache/mail-filter/opendkim-2.9.2-r1
index d548c9ee3328..5849053ed698 100644
--- a/metadata/md5-cache/mail-filter/opendkim-2.9.2-r1
+++ b/metadata/md5-cache/mail-filter/opendkim-2.9.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A milter-based application to provide DKIM signing and verification
 EAPI=5
 HOMEPAGE=http://opendkim.org
 IUSE=+berkdb gnutls ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Sendmail-Open-Source BSD
 RDEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd ssl? ( >=dev-libs/openssl-0.9.8 ) berkdb? ( >=sys-libs/db-3.2 ) opendbx? ( >=dev-db/opendbx-1.4.0 ) lua? ( dev-lang/lua ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb ) memcached? ( dev-libs/libmemcached ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( sec-policy/selinux-dkim ) unbound? ( >=net-dns/unbound-1.4.1 net-dns/dnssec-root ) !unbound? ( net-libs/ldns ) gnutls? ( >=net-libs/gnutls-2.11.7 ) sys-process/psmisc
 REQUIRED_USE=sasl? ( ldap )
 SLOT=0
 SRC_URI=mirror://sourceforge/opendkim/opendkim-2.9.2.tar.gz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	db-use	1c719875d6599536f956fafea9e1f404	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=6e954822b52b74c571e6681627030b27
+_md5_=8f40bd64fe7b88bf313a64d69bd081a2
diff --git a/metadata/md5-cache/mate-base/mate-1.8.0 b/metadata/md5-cache/mate-base/mate-1.8.0
new file mode 100644
index 000000000000..fe5d2533e3f7
--- /dev/null
+++ b/metadata/md5-cache/mate-base/mate-1.8.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=Meta ebuild for MATE, a traditional desktop environment
+EAPI=5
+HOMEPAGE=http://mate-desktop.org
+IUSE=-bluetooth +extras
+KEYWORDS=~amd64
+LICENSE=metapackage
+PDEPEND=virtual/notification-daemon:0
+RDEPEND=gnome-extra/yelp:0 >=mate-base/caja-1.8:0 >=mate-base/mate-applets-1.8:0 >=mate-base/mate-control-center-1.8:0 >=mate-base/mate-desktop-1.8:0 >=mate-base/mate-menus-1.8:0 >=mate-base/mate-panel-1.8:0 >=mate-base/mate-session-manager-1.8:0 >=mate-base/mate-settings-daemon-1.8:0 >=mate-extra/mate-media-1.8:0 >=x11-misc/mozo-1.8:0 >=x11-terms/mate-terminal-1.8:0 >=x11-themes/mate-backgrounds-1.8:0 >=x11-themes/mate-icon-theme-1.8:0 >=x11-themes/mate-themes-1.8:0 >=x11-wm/marco-1.8:0 bluetooth? ( net-wireless/blueman:0 ) extras? ( >=app-arch/engrampa-1.8:0 >=app-editors/pluma-1.8:0 >=app-text/atril-1.8:0 >=mate-extra/mate-calc-1.8:0 >=mate-extra/mate-power-manager-1.8:0 >=mate-extra/mate-screensaver-1.8:0 >=mate-extra/mate-system-monitor-1.8:0 >=mate-extra/mate-utils-1.8:0 >=media-gfx/eom-1.8:0 )
+SLOT=0
+_eclasses_=multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=55796105f153f514398b0103cac5d479
diff --git a/metadata/md5-cache/mate-base/mate-file-manager-1.6.3 b/metadata/md5-cache/mate-base/mate-file-manager-1.6.3
deleted file mode 100644
index 9a2a8f88c0b2..000000000000
--- a/metadata/md5-cache/mate-base/mate-file-manager-1.6.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.28:2 >=dev-libs/libxml2-2.4.7:2 || ( >=gnome-base/gvfs-1.10.1:0[gdu] >=gnome-base/gvfs-1.10.1:0[udisks] ) >=mate-base/mate-desktop-1.6:0 >=media-libs/libexif-0.5.12:0 >=x11-libs/gtk+-2.24:2[introspection?] x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXrender:0 >=x11-libs/pango-1.1.2:0 virtual/libintl:0 introspection? ( >=dev-libs/gobject-introspection-0.6.4:0 ) unique? ( >=dev-libs/libunique-1:1 ) xmp? ( >=media-libs/exempi-1.99.2:2 ) >=dev-lang/perl-5:0= dev-util/gdbus-codegen:0 >=dev-util/intltool-0.40.1:* >=mate-base/mate-common-1.6:0 sys-devel/gettext:* virtual/pkgconfig:* app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Caja file manager for the MATE desktop
-EAPI=5
-HOMEPAGE=http://mate-desktop.org
-IUSE=X +mate +introspection +unique xmp debug test
-KEYWORDS=~amd64
-LICENSE=GPL-2 LGPL-2 FDL-1.1
-PDEPEND=mate? ( >=x11-themes/mate-icon-theme-1.6:0 )
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.28:2 >=dev-libs/libxml2-2.4.7:2 || ( >=gnome-base/gvfs-1.10.1:0[gdu] >=gnome-base/gvfs-1.10.1:0[udisks] ) >=mate-base/mate-desktop-1.6:0 >=media-libs/libexif-0.5.12:0 >=x11-libs/gtk+-2.24:2[introspection?] x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXrender:0 >=x11-libs/pango-1.1.2:0 virtual/libintl:0 introspection? ( >=dev-libs/gobject-introspection-0.6.4:0 ) unique? ( >=dev-libs/libunique-1:1 ) xmp? ( >=media-libs/exempi-1.99.2:2 )
-SLOT=0
-SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-file-manager-1.6.3.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=12f4292fced9c8641e8fa8a059e31616
diff --git a/metadata/md5-cache/mate-base/mate-panel-1.6.1 b/metadata/md5-cache/mate-base/mate-panel-1.6.1
index 9f19d0f2de7b..5d20014439e4 100644
--- a/metadata/md5-cache/mate-base/mate-panel-1.6.1
+++ b/metadata/md5-cache/mate-base/mate-panel-1.6.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.80:0 >=dev-libs/glib-2.26:2 >=dev-libs/libmateweather-1.6 dev-libs/libxml2:2 >=gnome-base/dconf-0.10:0 gnome-base/librsvg:2 >=mate-base/mate-desktop-1.6:0 >=mate-base/mate-menus-1.6:0 >=media-libs/libcanberra-0.23:0[gtk] >=sys-apps/dbus-1.1.2:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.7.1:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/pango-1.15.4:0[introspection?] >=x11-libs/gtk+-2.19.7:2[introspection?] >=x11-libs/libmatewnck-1.5.1:0 x11-libs/libXau:0 >=x11-libs/libXrandr-1.2:0 virtual/libintl:0 introspection? ( >=dev-libs/gobject-introspection-0.6.7:0 ) networkmanager? ( >=net-misc/networkmanager-0.6:0 ) app-text/docbook-xml-dtd:4.1.2 >=app-text/mate-doc-utils-1.2.1:0 >=dev-lang/perl-5:0= >=dev-util/intltool-0.40:* >=mate-base/mate-common-1.6:0 sys-devel/gettext:* virtual/pkgconfig:* !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.80:0 >=dev-libs/glib-2.26:2 >=dev-libs/libmateweather-1.6 dev-libs/libxml2:2 >=gnome-base/dconf-0.10:0 gnome-base/librsvg:2 >=mate-base/mate-desktop-1.6:0 <mate-base/mate-desktop-1.7:0 >=mate-base/mate-menus-1.6:0 >=media-libs/libcanberra-0.23:0[gtk] >=sys-apps/dbus-1.1.2:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.7.1:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/pango-1.15.4:0[introspection?] >=x11-libs/gtk+-2.19.7:2[introspection?] >=x11-libs/libmatewnck-1.5.1:0 x11-libs/libXau:0 >=x11-libs/libXrandr-1.2:0 virtual/libintl:0 introspection? ( >=dev-libs/gobject-introspection-0.6.7:0 ) networkmanager? ( >=net-misc/networkmanager-0.6:0 ) app-text/docbook-xml-dtd:4.1.2 >=app-text/mate-doc-utils-1.2.1:0 >=dev-lang/perl-5:0= >=dev-util/intltool-0.40:* >=mate-base/mate-common-1.6:0 sys-devel/gettext:* virtual/pkgconfig:* !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=The MATE panel
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=X +introspection networkmanager
 KEYWORDS=amd64
 LICENSE=GPL-2 FDL-1.1 LGPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.80:0 >=dev-libs/glib-2.26:2 >=dev-libs/libmateweather-1.6 dev-libs/libxml2:2 >=gnome-base/dconf-0.10:0 gnome-base/librsvg:2 >=mate-base/mate-desktop-1.6:0 >=mate-base/mate-menus-1.6:0 >=media-libs/libcanberra-0.23:0[gtk] >=sys-apps/dbus-1.1.2:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.7.1:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/pango-1.15.4:0[introspection?] >=x11-libs/gtk+-2.19.7:2[introspection?] >=x11-libs/libmatewnck-1.5.1:0 x11-libs/libXau:0 >=x11-libs/libXrandr-1.2:0 virtual/libintl:0 introspection? ( >=dev-libs/gobject-introspection-0.6.7:0 ) networkmanager? ( >=net-misc/networkmanager-0.6:0 )
+RDEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.80:0 >=dev-libs/glib-2.26:2 >=dev-libs/libmateweather-1.6 dev-libs/libxml2:2 >=gnome-base/dconf-0.10:0 gnome-base/librsvg:2 >=mate-base/mate-desktop-1.6:0 <mate-base/mate-desktop-1.7:0 >=mate-base/mate-menus-1.6:0 >=media-libs/libcanberra-0.23:0[gtk] >=sys-apps/dbus-1.1.2:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.7.1:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/pango-1.15.4:0[introspection?] >=x11-libs/gtk+-2.19.7:2[introspection?] >=x11-libs/libmatewnck-1.5.1:0 x11-libs/libXau:0 >=x11-libs/libXrandr-1.2:0 virtual/libintl:0 introspection? ( >=dev-libs/gobject-introspection-0.6.7:0 ) networkmanager? ( >=net-misc/networkmanager-0.6:0 )
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-panel-1.6.1.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=cc04e218abd32459a96eb55fb00d8a1d
+_md5_=26cfd0e6b991f450376b65146b257126
diff --git a/metadata/md5-cache/mate-extra/caja-extensions-1.8.0 b/metadata/md5-cache/mate-extra/caja-extensions-1.8.0
new file mode 100644
index 000000000000..846f093d6d71
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/caja-extensions-1.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=x11-libs/gtk+-2.18:2 >=dev-libs/glib-2.26:2 >=mate-base/caja-1.8:0 virtual/libintl:0 x11-libs/gdk-pixbuf:2 open-terminal? ( >=mate-base/mate-desktop-1.8:0 ) cdr? ( >=app-cdr/brasero-2.32.1:0= ) gajim? ( net-im/gajim:0 >=dev-libs/dbus-glib-0.60:0 >=sys-apps/dbus-1:0 ) pidgin? ( >=dev-libs/dbus-glib-0.60:0 ) upnp? ( >=net-libs/gupnp-0.13:0= ) >=dev-util/intltool-0.18:* >=mate-base/mate-common-1.8:0 sys-devel/gettext:* virtual/pkgconfig:* !!mate-extra/mate-file-manager-open-terminal !!mate-extra/mate-file-manager-sendto !!mate-extra/mate-file-manager-image-converter !!mate-extra/mate-file-manager-share !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Several Caja extensions
+EAPI=5
+HOMEPAGE=http://www.mate-desktop.org
+IUSE=image-converter +open-terminal share cdr gajim +mail pidgin upnp debug
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=x11-libs/gtk+-2.18:2 >=dev-libs/glib-2.26:2 >=mate-base/caja-1.8:0 virtual/libintl:0 x11-libs/gdk-pixbuf:2 open-terminal? ( >=mate-base/mate-desktop-1.8:0 ) cdr? ( >=app-cdr/brasero-2.32.1:0= ) gajim? ( net-im/gajim:0 >=dev-libs/dbus-glib-0.60:0 >=sys-apps/dbus-1:0 ) pidgin? ( >=dev-libs/dbus-glib-0.60:0 ) upnp? ( >=net-libs/gupnp-0.13:0= )
+SLOT=0
+SRC_URI=http://pub.mate-desktop.org/releases/1.8/caja-extensions-1.8.0.tar.xz
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=03242d81ecf8ac66ab43129414ea85d4
diff --git a/metadata/md5-cache/mate-extra/mate-user-share-1.8.0 b/metadata/md5-cache/mate-extra/mate-user-share-1.8.0
new file mode 100644
index 000000000000..b1f03bdcfc05
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/mate-user-share-1.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=app-mobilephone/obex-data-server-0.4:0 >=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.15.2:2 >=dev-libs/libunique-1:1 || ( >=mate-base/caja-1.8:0 >=mate-base/mate-file-manager-1.6:0 ) media-libs/libcanberra:0[gtk] >=sys-apps/dbus-1.1.1:0 >=x11-libs/gdk-pixbuf-2:2 >=x11-libs/gtk+-2.14:2 x11-libs/libX11:0 x11-libs/pango:0 >=x11-libs/libnotify-0.7:0 >=www-apache/mod_dnssd-0.6:0 =www-servers/apache-2.2*:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile] virtual/libintl:0 bluetooth? ( >=net-wireless/mate-bluetooth-1.6:0 >=net-wireless/bluez-4.18:0= ) app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools:0 >=dev-util/intltool-0.35:* sys-devel/gettext:* virtual/pkgconfig:* app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Personal file sharing for the MATE desktop
+EAPI=5
+HOMEPAGE=http://www.mate-desktop.org/
+IUSE=X bluetooth
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=app-mobilephone/obex-data-server-0.4:0 >=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.15.2:2 >=dev-libs/libunique-1:1 || ( >=mate-base/caja-1.8:0 >=mate-base/mate-file-manager-1.6:0 ) media-libs/libcanberra:0[gtk] >=sys-apps/dbus-1.1.1:0 >=x11-libs/gdk-pixbuf-2:2 >=x11-libs/gtk+-2.14:2 x11-libs/libX11:0 x11-libs/pango:0 >=x11-libs/libnotify-0.7:0 >=www-apache/mod_dnssd-0.6:0 =www-servers/apache-2.2*:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile] virtual/libintl:0 bluetooth? ( >=net-wireless/mate-bluetooth-1.6:0 >=net-wireless/bluez-4.18:0= )
+SLOT=0
+SRC_URI=http://pub.mate-desktop.org/releases/1.8/mate-user-share-1.8.0.tar.xz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=b76dfa9cf6b9e8ae0e26d03531de696b
diff --git a/metadata/md5-cache/media-gfx/eom-1.8.0 b/metadata/md5-cache/media-gfx/eom-1.8.0
new file mode 100644
index 000000000000..95e1f2ee1349
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/eom-1.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.25.9:2 >=dev-libs/libxml2-2:2 >=mate-base/mate-desktop-1.6:0 sys-libs/zlib:0 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.4:2[jpeg?,tiff?] >=x11-libs/gtk+-2.18:2 x11-libs/libX11:0 >=x11-misc/shared-mime-info-0.20:0 >=x11-themes/mate-icon-theme-1.6:0 virtual/libintl:0 dbus? ( >=dev-libs/dbus-glib-0.71:0 ) exif? ( >=media-libs/libexif-0.6.14:0 virtual/jpeg:0 ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygobject-2.15.1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtk-2.13:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) svg? ( >=gnome-base/librsvg-2.26:2 ) xmp? ( >=media-libs/exempi-1.99.5:2 ) !!media-gfx/mate-image-viewer app-text/yelp-tools:0 >=dev-util/intltool-0.40:* sys-devel/gettext:* virtual/pkgconfig:* app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=The MATE image viewer
+EAPI=5
+HOMEPAGE=http://mate-desktop.org
+IUSE=X dbus exif jpeg lcms python svg tiff xmp debug python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.25.9:2 >=dev-libs/libxml2-2:2 >=mate-base/mate-desktop-1.6:0 sys-libs/zlib:0 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.4:2[jpeg?,tiff?] >=x11-libs/gtk+-2.18:2 x11-libs/libX11:0 >=x11-misc/shared-mime-info-0.20:0 >=x11-themes/mate-icon-theme-1.6:0 virtual/libintl:0 dbus? ( >=dev-libs/dbus-glib-0.71:0 ) exif? ( >=media-libs/libexif-0.6.14:0 virtual/jpeg:0 ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygobject-2.15.1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtk-2.13:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) svg? ( >=gnome-base/librsvg-2.26:2 ) xmp? ( >=media-libs/exempi-1.99.5:2 ) !!media-gfx/mate-image-viewer
+REQUIRED_USE=python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
+SLOT=0
+SRC_URI=http://pub.mate-desktop.org/releases/1.8/eom-1.8.0.tar.xz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=2a1443b2652d82262ef7db6ef5770f5e
diff --git a/metadata/md5-cache/media-libs/harfbuzz-0.9.26-r1 b/metadata/md5-cache/media-libs/harfbuzz-0.9.26-r1
index 970e5860c89f..9830ddcb83c2 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-0.9.26-r1
+++ b/metadata/md5-cache/media-libs/harfbuzz-0.9.26-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=introspection? ( glib )
 SLOT=0/0.9.18
 SRC_URI=http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.26.tar.bz2
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=88128162829832dd7c55ca15ee836950
+_md5_=72c774af707867865972460e257016bd
diff --git a/metadata/md5-cache/media-libs/harfbuzz-0.9.28 b/metadata/md5-cache/media-libs/harfbuzz-0.9.28
new file mode 100644
index 000000000000..926850ceaae7
--- /dev/null
+++ b/metadata/md5-cache/media-libs/harfbuzz-0.9.28
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=cairo? ( x11-libs/cairo:= ) glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) graphite? ( media-gfx/graphite2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) icu? ( dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34 ) truetype? ( media-libs/freetype:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) dev-util/gtk-doc-am virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) ) userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DESCRIPTION=An OpenType text shaping engine
+EAPI=5
+HOMEPAGE=http://www.freedesktop.org/wiki/Software/HarfBuzz
+IUSE=+cairo +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=Old-MIT ISC icu
+RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) graphite? ( media-gfx/graphite2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) icu? ( dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34 ) truetype? ( media-libs/freetype:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] )
+REQUIRED_USE=introspection? ( glib )
+SLOT=0/0.9.18
+SRC_URI=http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.28.tar.bz2
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=e46c85f79fb74990789815dea88d2ff5
diff --git a/metadata/md5-cache/media-libs/harfbuzz-9999 b/metadata/md5-cache/media-libs/harfbuzz-9999
index c2b9d357d6d7..4d6705e7fa25 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-9999
+++ b/metadata/md5-cache/media-libs/harfbuzz-9999
@@ -9,4 +9,4 @@ RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x
 REQUIRED_USE=introspection? ( glib )
 SLOT=0/0.9.18
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=7f90ed11601ccf79fbe692f2c5b2e129
+_md5_=20538ad1605d1fb9be97fb97d6282104
diff --git a/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r3 b/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r3
index a81761daaf19..9e1b84c4b981 100644
--- a/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r3
+++ b/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r3
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.libsdl.org/projects/SDL_mixer/
 IUSE=flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=ZLIB
-RDEPEND=>=media-libs/libsdl-1.2.10 flac? ( media-libs/flac ) midi? ( fluidsynth? ( media-sound/fluidsynth ) timidity? ( media-sound/timidity++ ) ) mp3? ( mad? ( media-libs/libmad ) smpeg? ( >=media-libs/smpeg-0.4.4-r1 ) ) mod? ( modplug? ( media-libs/libmodplug ) mikmod? ( >=media-libs/libmikmod-3.1.10 ) ) vorbis? ( >=media-libs/libvorbis-1.0_beta4 media-libs/libogg )
+RDEPEND=>=media-libs/libsdl-1.2.10 flac? ( media-libs/flac ) midi? ( fluidsynth? ( media-sound/fluidsynth ) timidity? ( media-sound/timidity++ ) ) mp3? ( mad? ( media-libs/libmad ) smpeg? ( >=media-libs/smpeg-0.4.4-r1 ) ) mod? ( modplug? ( media-libs/libmodplug ) mikmod? ( >=media-libs/libmikmod-3.1.10 ) ) vorbis? ( >=media-libs/libvorbis-1.0_beta4 media-libs/libogg ) playtools? ( !media-libs/sdl2-mixer[playtools] )
 REQUIRED_USE=midi? ( || ( timidity fluidsynth ) ) timidity? ( midi ) fluidsynth? ( midi ) mp3? ( || ( smpeg mad ) ) smpeg? ( mp3 ) mad? ( mp3 ) mod? ( || ( mikmod modplug ) ) mikmod? ( mod ) modplug? ( mod )
 SLOT=0
 SRC_URI=http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.12.tar.gz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=f5fedb1c7ac17c6a59f8f53dee6438f9
+_md5_=d45d8dc9bf105e4502dd2d6b8cdcd9d8
diff --git a/metadata/md5-cache/media-sound/mpd-0.17.6 b/metadata/md5-cache/media-sound/mpd-0.17.6
index d9b09d8541ee..9935691158db 100644
--- a/metadata/md5-cache/media-sound/mpd-0.17.6
+++ b/metadata/md5-cache/media-sound/mpd-0.17.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=!<sys-cluster/mpich2-1.4_rc2 dev-libs/glib:2 alsa? ( media-sound/alsa-utils media-libs/alsa-lib ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile ) bzip2? ( app-arch/bzip2 ) cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) ) curl? ( net-misc/curl ) faad? ( media-libs/faad2 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac[ogg?] ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2 ) soup? ( net-libs/libsoup:2.4 ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) virtual/pkgconfig virtual/pkgconfig
+DEPEND=!<sys-cluster/mpich2-1.4_rc2 dev-libs/glib:2 alsa? ( media-sound/alsa-utils media-libs/alsa-lib ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile ) bzip2? ( app-arch/bzip2 ) cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) ) curl? ( net-misc/curl ) faad? ( media-libs/faad2 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac[ogg?] ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2 ) soup? ( net-libs/libsoup:2.4 ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=The Music Player Daemon (mpd)
 EAPI=4
 HOMEPAGE=http://www.musicpd.org
@@ -10,5 +10,5 @@ RDEPEND=!<sys-cluster/mpich2-1.4_rc2 dev-libs/glib:2 alsa? ( media-sound/alsa-ut
 REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder ) || ( audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) lastfmradio? ( curl )
 SLOT=0
 SRC_URI=http://www.musicpd.org/download/mpd/0.17/mpd-0.17.6.tar.bz2
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=d06b24007bbbc835e14a91b16441cdd3
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=0391f09559f469a5bba85b75a202f827
diff --git a/metadata/md5-cache/net-dialup/freeradius-3.0.2-r1 b/metadata/md5-cache/net-dialup/freeradius-3.0.2-r1
new file mode 100644
index 000000000000..91f390f4f7ec
--- /dev/null
+++ b/metadata/md5-cache/net-dialup/freeradius-3.0.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install preinst prepare setup
+DEPEND=!net-dialup/cistronradius !net-dialup/gnuradius sys-devel/libtool dev-lang/perl sys-libs/gdbm python? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) readline? ( sys-libs/readline ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) firebird? ( dev-db/firebird ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) sqlite? ( dev-db/sqlite:3 ) odbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) oracle? ( dev-db/oracle-instantclient-basic ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Highly configurable free RADIUS server
+EAPI=5
+HOMEPAGE=http://www.freeradius.org/
+IUSE=bindist debug firebird iodbc kerberos ldap mysql odbc oracle pam pcap postgres python readline sqlite ssl
+LICENSE=GPL-2
+RDEPEND=!net-dialup/cistronradius !net-dialup/gnuradius sys-devel/libtool dev-lang/perl sys-libs/gdbm python? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) readline? ( sys-libs/readline ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) firebird? ( dev-db/firebird ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) sqlite? ( dev-db/sqlite:3 ) odbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) oracle? ( dev-db/oracle-instantclient-basic )
+REQUIRED_USE=bindist? ( !firebird )
+RESTRICT=test
+SLOT=0
+SRC_URI=ftp://ftp.freeradius.org/pub/radius/freeradius-server-3.0.2.tar.gz ftp://ftp.freeradius.org/pub/radius/old/freeradius-server-3.0.2.tar.gz
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=da94a02074f12bcb6119a873ffd1ea25
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.21-r1 b/metadata/md5-cache/net-firewall/iptables-1.4.21-r1
index 6b4c14a1eccc..f9d92834f274 100644
--- a/metadata/md5-cache/net-firewall/iptables-1.4.21-r1
+++ b/metadata/md5-cache/net-firewall/iptables-1.4.21-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
 EAPI=5
 HOMEPAGE=http://www.netfilter.org/projects/iptables/
 IUSE=ipv6 netlink static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=netlink? ( net-libs/libnfnetlink )
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/iptables/files/iptables-1.4.21.tar.bz2
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=b9093e9f3b8adb3baf3aed454e828640
+_md5_=618947e0c4c0666e0569c806ccaf390f
diff --git a/metadata/md5-cache/net-im/gajim-0.16_rc1 b/metadata/md5-cache/net-im/gajim-0.16_rc1
index 7680841254f9..fb1649115cd5 100644
--- a/metadata/md5-cache/net-im/gajim-0.16_rc1
+++ b/metadata/md5-cache/net-im/gajim-0.16_rc1
@@ -4,7 +4,7 @@ DESCRIPTION=Jabber client written in PyGTK
 EAPI=5
 HOMEPAGE=http://www.gajim.org/
 IUSE=avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~x86 ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[sqlite,xml] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] x11-libs/gtk+:2 dev-python/pyasn1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.14[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/python-nbxmpp-0.4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] crypt? ( app-crypt/gnupg dev-python/pycrypto[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) dbus? ( dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-libs/dbus-glib libnotify? ( dev-python/notify-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) avahi? ( net-dns/avahi[dbus,gtk,python,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) ) gnome? ( dev-python/libgnome-python dev-python/egg-python ) gnome-keyring? ( dev-python/gnome-keyring-python ) idle? ( x11-libs/libXScrnSaver ) jingle? ( net-libs/farstream:0.1[python] ) kde? ( || ( kde-base/kwallet kde-base/kwalletmanager ) ) networkmanager? ( dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] net-misc/networkmanager ) spell? ( app-text/gtkspell:2 ) srv? ( || ( dev-python/libasyncns-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] net-dns/bind-tools ) ) xhtml? ( dev-python/docutils[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 ) libnotify? ( dbus ) avahi? ( dbus ) gnome? ( gnome-keyring )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.gajim.org/downloads/0.16/gajim-0.16-rc1.tar.bz2
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=90ad6c4457f97a544dc481b666eb7ee0
+_md5_=65f4e62fc7950dd21d5444f91ec66e92
diff --git a/metadata/md5-cache/net-print/cups-filters-1.0.52 b/metadata/md5-cache/net-print/cups-filters-1.0.52
deleted file mode 100644
index 99660c5a2253..000000000000
--- a/metadata/md5-cache/net-print/cups-filters-1.0.52
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=app-text/ghostscript-gpl-9.09 app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)] >=app-text/qpdf-3.0.2:= media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >net-print/cups-1.5.9999 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff ) zeroconf? ( net-dns/avahi[dbus] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
-DESCRIPTION=Cups PDF filters
-EAPI=5
-HOMEPAGE=http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat
-IUSE=dbus +foomatic jpeg perl png static-libs tiff zeroconf
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint
-LICENSE=MIT GPL-2
-RDEPEND=>=app-text/ghostscript-gpl-9.09 app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)] >=app-text/qpdf-3.0.2:= media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >net-print/cups-1.5.9999 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff ) zeroconf? ( net-dns/avahi[dbus] )
-SLOT=0
-SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.0.52.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641
-_md5_=65a2275f50cf5c2fa801d1367fde4dd2
diff --git a/metadata/md5-cache/net-print/cups-filters-1.0.53 b/metadata/md5-cache/net-print/cups-filters-1.0.53
index 59a4147a78f4..8c7667fd4773 100644
--- a/metadata/md5-cache/net-print/cups-filters-1.0.53
+++ b/metadata/md5-cache/net-print/cups-filters-1.0.53
@@ -10,4 +10,4 @@ RDEPEND=>=app-text/ghostscript-gpl-9.09 app-text/poppler:=[cxx,jpeg?,lcms,tiff?,
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.0.53.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641
-_md5_=04ea4a596c7faef405dd2f623b8fd3d6
+_md5_=cf447d1584e0f058d49f2e43c6c6b8a0
diff --git a/metadata/md5-cache/net-proxy/dante-1.4.0-r1 b/metadata/md5-cache/net-proxy/dante-1.4.0-r1
index 3a23ac4c4c5b..fd53b3fa2f55 100644
--- a/metadata/md5-cache/net-proxy/dante-1.4.0-r1
+++ b/metadata/md5-cache/net-proxy/dante-1.4.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A free socks4,5 and msproxy implementation
 EAPI=5
 HOMEPAGE=http://www.inet.no/dante/
 IUSE=debug kerberos pam selinux static-libs tcpd upnp
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD GPL-2
 RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-dante ) tcpd? ( sys-apps/tcp-wrappers ) userland_GNU? ( virtual/shadow ) upnp? ( net-libs/miniupnpc )
 SLOT=0
 SRC_URI=ftp://ftp.inet.no/pub/socks/dante-1.4.0.tar.gz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c37b5778c417768e53e2b230b3bdfc26
+_md5_=583c1a84ed3bb8a5c0d5e3509b1ba9f2
diff --git a/metadata/md5-cache/sys-auth/bioapi-1.2.4 b/metadata/md5-cache/sys-auth/bioapi-1.2.4
new file mode 100644
index 000000000000..383aaedf200a
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/bioapi-1.2.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=config configure install postinst preinst prepare prerm
+DESCRIPTION=Framework for biometric-based authentication
+EAPI=4
+HOMEPAGE=http://code.google.com/p/bioapi-linux/
+IUSE=static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=bioapi
+SLOT=0
+SRC_URI=http://bioapi-linux.googlecode.com/files/bioapi_1.2.4.tar.gz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=25b49846c1846252304404d54a478967
diff --git a/metadata/md5-cache/sys-fs/eudev-1.5.3-r1 b/metadata/md5-cache/sys-fs/eudev-1.5.3-r1
index b4cfcb6d8544..a1feb82a69e3 100644
--- a/metadata/md5-cache/sys-fs/eudev-1.5.3-r1
+++ b/metadata/md5-cache/sys-fs/eudev-1.5.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace de
 EAPI=5
 HOMEPAGE=https://github.com/gentoo/eudev
 IUSE=doc gudev +hwdb kmod introspection +keymap +modutils +openrc +rule-generator selinux static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=~amd64 ~arm hppa ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm hppa ~mips ~ppc ~ppc64 x86
 LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=hwdb? ( >=sys-apps/hwids-20130717-r1[udev] ) keymap? ( >=sys-apps/hwids-20130717-r1[udev] ) openrc? ( >=sys-fs/udev-init-scripts-18 )
 RDEPEND=gudev? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) kmod? ( sys-apps/kmod ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) selinux? ( sys-libs/libselinux ) >=sys-apps/util-linux-2.20 !<sys-libs/glibc-2.11 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !sys-fs/udev !sys-apps/coldplug !sys-apps/systemd !<sys-fs/lvm2-2.02.97 !sys-fs/device-mapper !<sys-fs/udev-init-scripts-18
@@ -12,4 +12,4 @@ REQUIRED_USE=keymap? ( hwdb )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~blueness/eudev/eudev-1.5.3.tar.gz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	90944ede7e9761bd7ef07602acdef9e3	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=cfbf0dea5ed2088697d8cd5eadc28504
+_md5_=429e64c49e72cdbdf128c828be00a214
diff --git a/metadata/md5-cache/www-apache/passenger-3.0.21-r1 b/metadata/md5-cache/www-apache/passenger-3.0.21-r1
index 8daf68a40f08..115177c72829 100644
--- a/metadata/md5-cache/www-apache/passenger-3.0.21-r1
+++ b/metadata/md5-cache/www-apache/passenger-3.0.21-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-ruby/rake[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( >=dev-ruby/daemon_controller-1.0.0[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] ) ) >=dev-libs/libev-3.90 net-misc/curl[ssl] doc? ( >=app-text/asciidoc-8.6.5[highlight] ) =www-servers/apache-2* ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+DEPEND=ruby_targets_ruby19? ( dev-ruby/rake[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( >=dev-ruby/daemon_controller-1.0.0[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] ) ) >=dev-libs/libev-3.90 net-misc/curl[ssl] www-servers/apache[apache2_modules_unixd(+)] doc? ( >=app-text/asciidoc-8.6.5[highlight] ) =www-servers/apache-2* ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 DESCRIPTION=Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails applications a breeze
 EAPI=5
 HOMEPAGE=http://modrails.com/
 IUSE=debug doc test elibc_FreeBSD ruby_targets_ruby19
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/daemon_controller-1.0.0[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] ) >=dev-libs/libev-3.90 net-misc/curl[ssl] =www-servers/apache-2* ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/daemon_controller-1.0.0[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] ) >=dev-libs/libev-3.90 net-misc/curl[ssl] www-servers/apache[apache2_modules_unixd(+)] =www-servers/apache-2* ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubyforge/passenger/passenger-3.0.21.tar.gz
 _eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=cf8dc0984f4912df2c0ef570cc8b19e0
+_md5_=e6f317dd26590c464fb2af59b276fb63
diff --git a/metadata/md5-cache/www-apache/passenger-4.0.41 b/metadata/md5-cache/www-apache/passenger-4.0.41
index 850b48aaae3d..543aad299ac6 100644
--- a/metadata/md5-cache/www-apache/passenger-4.0.41
+++ b/metadata/md5-cache/www-apache/passenger-4.0.41
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-ruby/rake[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/rake[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( >=dev-ruby/daemon_controller-1.1.0[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/daemon_controller-1.1.0[ruby_targets_ruby20] >=dev-ruby/rack-1.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/daemon_controller-1.1.0[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0[ruby_targets_ruby21] ) ) >=dev-libs/libev-4.11 net-misc/curl[ssl] =www-servers/apache-2* ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
+DEPEND=ruby_targets_ruby19? ( dev-ruby/rake[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/rake[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( >=dev-ruby/daemon_controller-1.1.0[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/daemon_controller-1.1.0[ruby_targets_ruby20] >=dev-ruby/rack-1.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/daemon_controller-1.1.0[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0[ruby_targets_ruby21] ) ) >=dev-libs/libev-4.11 net-misc/curl[ssl] www-servers/apache[apache2_modules_unixd(+)] =www-servers/apache-2* ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
 DESCRIPTION=Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails applications a breeze
 EAPI=5
 HOMEPAGE=http://modrails.com/
 IUSE=debug test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/daemon_controller-1.1.0[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/daemon_controller-1.1.0[ruby_targets_ruby20] >=dev-ruby/rack-1.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/daemon_controller-1.1.0[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0[ruby_targets_ruby21] ) >=dev-libs/libev-4.11 net-misc/curl[ssl] =www-servers/apache-2* ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/daemon_controller-1.1.0[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/daemon_controller-1.1.0[ruby_targets_ruby20] >=dev-ruby/rack-1.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/daemon_controller-1.1.0[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0[ruby_targets_ruby21] ) >=dev-libs/libev-4.11 net-misc/curl[ssl] www-servers/apache[apache2_modules_unixd(+)] =www-servers/apache-2* ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://s3.amazonaws.com/phusion-passenger/releases/passenger-4.0.41.tar.gz
 _eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=0162333b646712c03e86b075229ba849
+_md5_=4b72f9126535f93297f75843a426819e
diff --git a/metadata/md5-cache/x11-libs/cairo-1.12.16-r3 b/metadata/md5-cache/x11-libs/cairo-1.12.16-r3
index ddfdb5fc8ae9..41d9f90e3945 100644
--- a/metadata/md5-cache/x11-libs/cairo-1.12.16-r3
+++ b/metadata/md5-cache/x11-libs/cairo-1.12.16-r3
@@ -3,7 +3,7 @@ DEPEND=dev-libs/lzo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-
 DESCRIPTION=A vector graphics library with cross-device output support
 EAPI=5
 HOMEPAGE=http://cairographics.org/
-IUSE=X aqua debug directfb drm gallium gles2 +glib legacy-drivers +lto opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
+IUSE=X aqua debug directfb drm gallium gles2 +glib legacy-drivers lto opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=dev-libs/lzo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/freetype:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] >=x11-libs/pixman-0.28.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] directfb? ( dev-libs/DirectFB ) gles2? ( media-libs/mesa[gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) glib? ( >=dev-libs/glib-2.28.6:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) opengl? ( || ( media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/opengl-apple ) ) openvg? ( media-libs/mesa[openvg,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) qt4? ( >=dev-qt/qtgui-4.8:4 ) X? ( >=x11-libs/libXrender-0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] drm? ( >=virtual/udev-136[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] gallium? ( media-libs/mesa[gallium,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ) ) xcb? ( x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20131008-r1 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://cairographics.org/releases/cairo-1.12.16.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=5a0e8845249389a9844bb86e3ca7fcd9
+_md5_=5f7c5c60abd1f5611889e622f25d0d3b
diff --git a/metadata/md5-cache/x11-libs/cairo-9999 b/metadata/md5-cache/x11-libs/cairo-9999
index 883dbc49c5d3..d9d8cee5fbb7 100644
--- a/metadata/md5-cache/x11-libs/cairo-9999
+++ b/metadata/md5-cache/x11-libs/cairo-9999
@@ -3,11 +3,11 @@ DEPEND=dev-libs/lzo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-
 DESCRIPTION=A vector graphics library with cross-device output support
 EAPI=5
 HOMEPAGE=http://cairographics.org/
-IUSE=X aqua debug directfb drm gallium gles2 +glib legacy-drivers +lto opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
+IUSE=X aqua debug directfb drm gallium gles2 +glib legacy-drivers lto opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=dev-libs/lzo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/freetype:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] >=x11-libs/pixman-0.30.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] directfb? ( dev-libs/DirectFB ) gles2? ( media-libs/mesa[gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) glib? ( >=dev-libs/glib-2.28.6:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) opengl? ( || ( media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/opengl-apple ) ) openvg? ( media-libs/mesa[openvg,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) qt4? ( >=dev-qt/qtgui-4.8:4 ) X? ( >=x11-libs/libXrender-0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] drm? ( >=virtual/udev-136[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] gallium? ( media-libs/mesa[gallium,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ) ) xcb? ( x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20131008-r1 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 REQUIRED_USE=drm? ( X ) gallium? ( drm ) gles2? ( !opengl ) openvg? ( || ( gles2 opengl ) ) xlib-xcb? ( xcb )
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=59bfd504b935a9006e3701d1f3456393
+_md5_=4a6bd54539230d8857aaaa430a0c0ec8
diff --git a/metadata/md5-cache/x11-misc/gxmessage-3.4.0 b/metadata/md5-cache/x11-misc/gxmessage-3.4.0
new file mode 100644
index 000000000000..1eb8907207bb
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/gxmessage-3.4.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/pango virtual/pkgconfig >=dev-util/intltool-0.40.1 sys-devel/gettext >=sys-apps/sed-4
+DESCRIPTION=A GTK+ based xmessage clone
+EAPI=5
+HOMEPAGE=http://savannah.gnu.org/projects/gxmessage/ http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-3 public-domain
+RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/pango
+SLOT=0
+SRC_URI=mirror://gnu/gxmessage/gxmessage-3.4.0.tar.gz http://homepages.ihug.co.nz/~trmusson/stuff/gxmessage-3.4.0.tar.gz
+_eclasses_=gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=289beba07d79a49267d4d783671a9f74
diff --git a/metadata/md5-cache/x11-misc/mozo-1.8.0 b/metadata/md5-cache/x11-misc/mozo-1.8.0
new file mode 100644
index 000000000000..d91a2171b65f
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/mozo-1.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=dev-python/pygobject-2.15.1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/pygtk-2.13:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=mate-base/mate-menus-1.6:0[introspection,python] >=dev-util/intltool-0.40:* sys-devel/gettext:* virtual/pkgconfig:* app-arch/xz-utils >=sys-apps/sed-4 userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DESCRIPTION=Mozo menu editor for MATE
+EAPI=5
+HOMEPAGE=http://mate-desktop.org
+IUSE=python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=dev-python/pygobject-2.15.1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/pygtk-2.13:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=mate-base/mate-menus-1.6:0[introspection,python] python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=mate-base/mate-panel-1.6:0 x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:2[introspection] virtual/libintl:0 !!x11-misc/mate-menu-editor
+SLOT=0
+SRC_URI=http://pub.mate-desktop.org/releases/1.8/mozo-1.8.0.tar.xz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=c1f39227953b8e17e1db911185ed21da
diff --git a/metadata/md5-cache/x11-misc/piedock-1.6.2 b/metadata/md5-cache/x11-misc/piedock-1.6.4
similarity index 88%
rename from metadata/md5-cache/x11-misc/piedock-1.6.2
rename to metadata/md5-cache/x11-misc/piedock-1.6.4
index 8ee8f11ad77d..d51766e462fe 100644
--- a/metadata/md5-cache/x11-misc/piedock-1.6.2
+++ b/metadata/md5-cache/x11-misc/piedock-1.6.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure prepare
 DEPEND=media-libs/libpng x11-libs/libX11 x11-libs/libXft x11-libs/libXmu x11-libs/libXrender gtk? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) kde? ( kde-base/kdelibs:4 dev-qt/qtcore:4 dev-qt/qtgui:4 )
 DESCRIPTION=A little bit like the famous OS X dock but in shape of a pie menu
-EAPI=4
+EAPI=5
 HOMEPAGE=http://markusfisch.de/PieDock
 IUSE=gtk kde
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=media-libs/libpng x11-libs/libX11 x11-libs/libXft x11-libs/libXmu x11-libs/libXrender gtk? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) kde? ( kde-base/kdelibs:4 dev-qt/qtcore:4 dev-qt/qtgui:4 )
 SLOT=0
-SRC_URI=http://markusfisch.de/downloads/piedock-1.6.2.tar.bz2
+SRC_URI=http://markusfisch.de/downloads/piedock-1.6.4.tar.bz2
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=2fc85bdf74f553eca4c4f07fee41d09d
+_md5_=5cb5463db27f325f35b0085c22e0e29d
diff --git a/metadata/md5-cache/x11-misc/vym-2.2.4 b/metadata/md5-cache/x11-misc/vym-2.2.4
deleted file mode 100644
index e80e1ba1aa0d..000000000000
--- a/metadata/md5-cache/x11-misc/vym-2.2.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-qt/qtdbus:4 dev-qt/qtgui:4[qt3support] dev-qt/qtsvg:4
-DESCRIPTION=View Your Mind, a mindmap tool
-EAPI=4
-HOMEPAGE=http://www.insilmaril.de/vym/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtdbus:4 dev-qt/qtgui:4[qt3support] dev-qt/qtsvg:4 app-arch/zip
-SLOT=0
-SRC_URI=mirror://sourceforge/vym/vym-2.2.4.tar.bz2
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	qmake-utils	6f4ff01a55830f6d86647dc56dfaf3a7	qt4-r2	25e4f17ed047d9242cb40b70acfb2943	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=51927387884fab3c400927a87432f34f
diff --git a/metadata/md5-cache/x11-misc/vym-2.3.11 b/metadata/md5-cache/x11-misc/vym-2.3.11
deleted file mode 100644
index d366a3e5f580..000000000000
--- a/metadata/md5-cache/x11-misc/vym-2.3.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-qt/qtdbus:4 dev-qt/qtgui:4[qt3support] dev-qt/qtsvg:4
-DESCRIPTION=View Your Mind, a mindmap tool
-EAPI=5
-HOMEPAGE=http://www.insilmaril.de/vym/
-IUSE=linguas_cs_CZ linguas_de_DE linguas_es linguas_fr linguas_ia linguas_it linguas_pt_BR linguas_ru linguas_sv linguas_zh_CN linguas_zh_TW
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtdbus:4 dev-qt/qtgui:4[qt3support] dev-qt/qtsvg:4 app-arch/zip
-SLOT=0
-SRC_URI=mirror://sourceforge/vym/vym-2.3.11.tar.bz2
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	qmake-utils	6f4ff01a55830f6d86647dc56dfaf3a7	qt4-r2	25e4f17ed047d9242cb40b70acfb2943	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=b01c8ac4c16df938171b52a990d12d8f
diff --git a/metadata/md5-cache/x11-misc/vym-2.3.18 b/metadata/md5-cache/x11-misc/vym-2.3.18
deleted file mode 100644
index 82a4dad38146..000000000000
--- a/metadata/md5-cache/x11-misc/vym-2.3.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtgui:4[qt3support] dev-qt/qtsvg:4 dbus? ( dev-qt/qtdbus:4 ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=View Your Mind, a mindmap tool
-EAPI=5
-HOMEPAGE=http://www.insilmaril.de/vym/
-IUSE=dbus linguas_cs_CZ linguas_de_DE linguas_es linguas_fr linguas_ia linguas_it linguas_pt_BR linguas_ru linguas_sv linguas_zh_CN linguas_zh_TW
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtgui:4[qt3support] dev-qt/qtsvg:4 dbus? ( dev-qt/qtdbus:4 ) app-arch/zip
-SLOT=0
-SRC_URI=mirror://sourceforge/vym/vym-2.3.18.tar.bz2
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=b5c3caed7a68f575ae6e3022f1e4bb34
diff --git a/metadata/md5-cache/x11-misc/vym-2.3.20 b/metadata/md5-cache/x11-misc/vym-2.3.22
similarity index 89%
rename from metadata/md5-cache/x11-misc/vym-2.3.20
rename to metadata/md5-cache/x11-misc/vym-2.3.22
index e2116acabf30..e3b2f0a85a22 100644
--- a/metadata/md5-cache/x11-misc/vym-2.3.20
+++ b/metadata/md5-cache/x11-misc/vym-2.3.22
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtgui:4[qt3support] dev-qt/qtsvg:4 dbus? ( dev-qt/qtdbus:4 ) app-arch/zip
 SLOT=0
-SRC_URI=mirror://sourceforge/vym/vym-2.3.20.tar.bz2
+SRC_URI=mirror://sourceforge/vym/vym-2.3.22.tar.bz2
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=9f7c1f1b03d72f69fd0675986f6cbaa7
+_md5_=dabfbb2a4a952eb8cc90abfb9799da72
diff --git a/metadata/md5-cache/x11-misc/vym-2.3.8 b/metadata/md5-cache/x11-misc/vym-2.3.8
deleted file mode 100644
index 86a3fc42ae33..000000000000
--- a/metadata/md5-cache/x11-misc/vym-2.3.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-qt/qtdbus:4 dev-qt/qtgui:4[qt3support] dev-qt/qtsvg:4
-DESCRIPTION=View Your Mind, a mindmap tool
-EAPI=4
-HOMEPAGE=http://www.insilmaril.de/vym/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtdbus:4 dev-qt/qtgui:4[qt3support] dev-qt/qtsvg:4 app-arch/zip
-SLOT=0
-SRC_URI=mirror://sourceforge/vym/vym-2.3.8.tar.bz2
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	qmake-utils	6f4ff01a55830f6d86647dc56dfaf3a7	qt4-r2	25e4f17ed047d9242cb40b70acfb2943	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=ebd8749f11e8ef5eb30ede5ec0dc4d77
diff --git a/metadata/md5-cache/x11-themes/gnome-themes-standard-3.10.0 b/metadata/md5-cache/x11-themes/gnome-themes-standard-3.10.0
index 8cac7c47b399..4a317cb79590 100644
--- a/metadata/md5-cache/x11-themes/gnome-themes-standard-3.10.0
+++ b/metadata/md5-cache/x11-themes/gnome-themes-standard-3.10.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=gnome-base/librsvg:2 x11-libs/cairo >=x11-themes/gtk-engines-2.15.3:2 gtk? ( >=x11-libs/gtk+-2.24.15:2 >=x11-libs/gtk+-3.9.12:3 ) >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=gnome-base/librsvg:2 x11-libs/cairo gtk? ( >=x11-libs/gtk+-2.24.15:2 >=x11-libs/gtk+-3.9.12:3 ) >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Standard Themes for GNOME Applications
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/gnome-themes-standard/
 IUSE=+gtk
 KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
-RDEPEND=gnome-base/librsvg:2 x11-libs/cairo >=x11-themes/gtk-engines-2.15.3:2 gtk? ( >=x11-libs/gtk+-2.24.15:2 >=x11-libs/gtk+-3.9.12:3 ) >=gnome-base/gsettings-desktop-schemas-3.4 !<x11-themes/gnome-themes-2.32.1-r1
+RDEPEND=gnome-base/librsvg:2 x11-libs/cairo gtk? ( >=x11-libs/gtk+-2.24.15:2 >=x11-libs/gtk+-3.9.12:3 ) >=gnome-base/gsettings-desktop-schemas-3.4 !<x11-themes/gnome-themes-2.32.1-r1
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-themes-standard/3.10/gnome-themes-standard-3.10.0.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=bc60066035a5e7847006fd1c30bb6b4c
+_md5_=ff9f1047fdb297b71b5781b5cd8ba2fd
diff --git a/metadata/md5-cache/x11-themes/gnome-themes-standard-3.12.0 b/metadata/md5-cache/x11-themes/gnome-themes-standard-3.12.0
index b1abd586f37f..5b7ec7da42c5 100644
--- a/metadata/md5-cache/x11-themes/gnome-themes-standard-3.12.0
+++ b/metadata/md5-cache/x11-themes/gnome-themes-standard-3.12.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=gnome-base/librsvg:2 x11-libs/cairo >=x11-themes/gtk-engines-2.15.3:2 gtk? ( >=x11-libs/gtk+-2.24.15:2 >=x11-libs/gtk+-3.12:3 ) >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=gnome-base/librsvg:2 x11-libs/cairo gtk? ( >=x11-libs/gtk+-2.24.15:2 >=x11-libs/gtk+-3.12:3 ) >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Standard Themes for GNOME Applications
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/gnome-themes-standard/
 IUSE=+gtk
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
-RDEPEND=gnome-base/librsvg:2 x11-libs/cairo >=x11-themes/gtk-engines-2.15.3:2 gtk? ( >=x11-libs/gtk+-2.24.15:2 >=x11-libs/gtk+-3.12:3 ) >=gnome-base/gsettings-desktop-schemas-3.4 !<x11-themes/gnome-themes-2.32.1-r1
+RDEPEND=gnome-base/librsvg:2 x11-libs/cairo gtk? ( >=x11-libs/gtk+-2.24.15:2 >=x11-libs/gtk+-3.12:3 ) >=gnome-base/gsettings-desktop-schemas-3.4 !<x11-themes/gnome-themes-2.32.1-r1
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-themes-standard/3.12/gnome-themes-standard-3.12.0.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=e109fc14887aaf7b620e7ca91c7cbcd7
+_md5_=6adb0db223d7f95e46ee5f6969b3bfa3
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index c90084d3d432..617c152cd857 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 04 May 2014 15:07:31 +0000
+Mon, 05 May 2014 05:07:05 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index c0b424d499d2..c9599080ef3c 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun May  4 15:07:28 UTC 2014
+Mon May  5 05:07:02 UTC 2014
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index c64b732d0959..c83d08a7f2c5 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -2229,7 +2229,7 @@
 1302210001 ./dev-cpp/eigen/eigen-3.0.6.ebuild
 1304191120 ./dev-cpp/eigen/eigen-3.1.3.ebuild
 1208290201 ./dev-cpp/gmock/gmock-1.4.0.ebuild
-1403270635 ./dev-cpp/gmock/gmock-1.7.0-r1.ebuild
+1405041931 ./dev-cpp/gmock/gmock-1.7.0-r1.ebuild
 1206122301 ./dev-cpp/gmock/gmock-1.5.0.ebuild
 1402142001 ./dev-cpp/gmock/gmock-1.6.0.ebuild
 1401121034 ./dev-cpp/gmock/gmock-1.7.0.ebuild
@@ -2954,7 +2954,7 @@
 1402071201 ./dev-vcs/git/git-1.8.2.1.ebuild
 1402071201 ./dev-vcs/git/git-1.8.1.5-r1.ebuild
 1402220607 ./dev-vcs/git/git-9999-r2.ebuild
-1403120931 ./dev-vcs/git/git-1.8.5.5.ebuild
+1405041931 ./dev-vcs/git/git-1.8.5.5.ebuild
 1402071201 ./dev-vcs/git/git-1.8.1.5.ebuild
 1402171637 ./dev-vcs/git/git-1.9.0.ebuild
 1404100359 ./dev-vcs/git/git-1.8.4.4.ebuild
@@ -4218,8 +4218,8 @@
 1212152201 ./www-apache/modsecurity-crs/modsecurity-crs-2.2.6-r1.ebuild
 1302212031 ./www-apache/modsecurity-crs/modsecurity-crs-2.2.7.ebuild
 1311060631 ./www-apache/mod-auth-mysql/mod-auth-mysql-4.3.9.ebuild
-1404090953 ./www-apache/passenger/passenger-4.0.41.ebuild
-1404242001 ./www-apache/passenger/passenger-3.0.21-r1.ebuild
+1405042231 ./www-apache/passenger/passenger-4.0.41.ebuild
+1405042231 ./www-apache/passenger/passenger-3.0.21-r1.ebuild
 1209082301 ./www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1.ebuild
 1204051331 ./www-apache/mod_xsendfile/mod_xsendfile-0.12.ebuild
 1005212254 ./www-apache/mod_xsendfile/mod_xsendfile-0.9.ebuild
@@ -4619,12 +4619,12 @@
 1404302231 ./x11-libs/libpciaccess/libpciaccess-0.13.2.ebuild
 1108191558 ./x11-libs/libpciaccess/libpciaccess-0.12.1.ebuild
 1301210531 ./x11-libs/libpciaccess/libpciaccess-0.13.1.ebuild
-1405030151 ./x11-libs/cairo/cairo-1.12.16-r3.ebuild
+1405042201 ./x11-libs/cairo/cairo-1.12.16-r3.ebuild
 1404201231 ./x11-libs/cairo/cairo-1.12.16.ebuild
 1401201701 ./x11-libs/cairo/cairo-1.12.14-r4.ebuild
 1405021401 ./x11-libs/cairo/cairo-1.10.2-r3.ebuild
 1405021401 ./x11-libs/cairo/cairo-1.12.16-r2.ebuild
-1405030201 ./x11-libs/cairo/cairo-9999.ebuild
+1405042201 ./x11-libs/cairo/cairo-9999.ebuild
 1309060001 ./x11-libs/xvba-video/xvba-video-0.8.0-r1.ebuild
 1403032231 ./x11-libs/xvba-video/xvba-video-0.8.0-r2.ebuild
 1402110201 ./x11-libs/xvba-video/xvba-video-9999.ebuild
@@ -4917,11 +4917,7 @@
 1305111201 ./x11-misc/xac/xac-0.6_pre4.ebuild
 1210250131 ./x11-misc/xcb/xcb-2.4-r1.ebuild
 1210250131 ./x11-misc/xcb/xcb-2.4.ebuild
-1303030401 ./x11-misc/vym/vym-2.2.4.ebuild
-1307091538 ./x11-misc/vym/vym-2.3.18.ebuild
-1303030401 ./x11-misc/vym/vym-2.3.8.ebuild
-1310210335 ./x11-misc/vym/vym-2.3.20.ebuild
-1303030401 ./x11-misc/vym/vym-2.3.11.ebuild
+1405050351 ./x11-misc/vym/vym-2.3.22.ebuild
 1402071101 ./x11-misc/xdo/xdo-0.3.ebuild
 1402261837 ./x11-misc/xfe/xfe-1.37.ebuild
 1306251501 ./x11-misc/xfe/xfe-1.34.ebuild
@@ -4940,6 +4936,7 @@
 1205050901 ./x11-misc/grun/grun-0.9.3-r1.ebuild
 1212211419 ./x11-misc/kbdd/kbdd-0.5.2.ebuild
 1212271031 ./x11-misc/kbdd/kbdd-0.7.ebuild
+1405050240 ./x11-misc/mozo/mozo-1.8.0.ebuild
 1011081542 ./x11-misc/pogo/pogo-2.2-r1.ebuild
 1011081542 ./x11-misc/pogo/pogo-2.2.ebuild
 1307041631 ./x11-misc/qtfm/qtfm-5.5.ebuild
@@ -5340,8 +5337,9 @@
 0704281654 ./x11-misc/Xorgautoconfig/Xorgautoconfig-0.2.4-r1.ebuild
 1206171131 ./x11-misc/touchcal/touchcal-0.50.ebuild
 1404132031 ./x11-misc/gxmessage/gxmessage-2.20.1.ebuild
+1405050358 ./x11-misc/gxmessage/gxmessage-3.4.0.ebuild
 1207292101 ./x11-misc/gxmessage/gxmessage-2.12.4.ebuild
-1306062001 ./x11-misc/piedock/piedock-1.6.2.ebuild
+1405050446 ./x11-misc/piedock/piedock-1.6.4.ebuild
 1310210316 ./x11-misc/piedock/piedock-1.6.3.ebuild
 1303030401 ./x11-misc/appmenu-qt/appmenu-qt-0.2.6.ebuild
 1309082331 ./x11-misc/xbindkeys/xbindkeys-1.8.5.ebuild
@@ -5666,7 +5664,7 @@
 1401182301 ./games-strategy/triplea/triplea-1.7.0.3.ebuild
 1202051031 ./games-strategy/gorky17-demo/gorky17-demo-1.0.1.0.1.ebuild
 1209031431 ./games-strategy/lgeneral/lgeneral-1.2.3.ebuild
-1306060831 ./games-strategy/dominions2/dominions2-2.16.ebuild
+1405042301 ./games-strategy/dominions2/dominions2-2.16.ebuild
 1401220901 ./games-strategy/wargus-data/wargus-data-0.ebuild
 1312241701 ./games-strategy/outerspace/outerspace-0.5.68.ebuild
 1303100645 ./games-strategy/freesynd/freesynd-0.7.ebuild
@@ -7958,8 +7956,8 @@
 1006070110 ./x11-themes/gartoon-redux/gartoon-redux-1.10.ebuild
 1404290231 ./x11-themes/dekorator/dekorator-0.5.1-r1.ebuild
 1011111333 ./x11-themes/yasis-icon-theme/yasis-icon-theme-0.4.2.ebuild
-1404211431 ./x11-themes/gnome-themes-standard/gnome-themes-standard-3.10.0.ebuild
-1404280202 ./x11-themes/gnome-themes-standard/gnome-themes-standard-3.12.0.ebuild
+1405050631 ./x11-themes/gnome-themes-standard/gnome-themes-standard-3.10.0.ebuild
+1405050631 ./x11-themes/gnome-themes-standard/gnome-themes-standard-3.12.0.ebuild
 1302080331 ./x11-themes/solar-backgrounds/solar-backgrounds-0.92.0.5.ebuild
 1401140223 ./x11-themes/comix-xcursors/comix-xcursors-0.8.2.ebuild
 1303031901 ./x11-themes/comix-xcursors/comix-xcursors-0.7.3.ebuild
@@ -8390,6 +8388,7 @@
 1401171031 ./perl-core/MIME-Base64/MIME-Base64-3.130.0.ebuild
 1404101623 ./mate-base/caja/caja-1.8.0.ebuild
 1405041901 ./mate-base/mate/mate-1.6.0.ebuild
+1405050302 ./mate-base/mate/mate-1.8.0.ebuild
 1405041901 ./mate-base/libmatekbd/libmatekbd-1.6.2.ebuild
 1404120229 ./mate-base/libmatekbd/libmatekbd-1.8.0.ebuild
 1404171911 ./mate-base/mate-session-manager/mate-session-manager-1.8.1.ebuild
@@ -8406,12 +8405,11 @@
 1404120414 ./mate-base/mate-menus/mate-menus-1.8.0.ebuild
 1405041901 ./mate-base/mate-menus/mate-menus-1.6.0.ebuild
 1404130228 ./mate-base/mate-panel/mate-panel-1.8.0.ebuild
-1405041901 ./mate-base/mate-panel/mate-panel-1.6.1.ebuild
+1405050231 ./mate-base/mate-panel/mate-panel-1.6.1.ebuild
 1405041901 ./mate-base/libmatekeyring/libmatekeyring-1.6.1.ebuild
 1404171945 ./mate-base/mate-applets/mate-applets-1.8.0.ebuild
 1405041901 ./mate-base/mate-applets/mate-applets-1.6.2.ebuild
 1405041901 ./mate-base/mate-file-manager/mate-file-manager-1.6.3-r1.ebuild
-1403110301 ./mate-base/mate-file-manager/mate-file-manager-1.6.3.ebuild
 1405041631 ./gnome-base/gdm/gdm-3.10.0.1-r1.ebuild
 1404272048 ./gnome-base/gdm/gdm-3.12.1.ebuild
 1401040031 ./gnome-base/gdm/gdm-2.20.11-r1.ebuild
@@ -9516,6 +9514,7 @@
 1205102031 ./app-misc/datefudge/datefudge-1.17.ebuild
 1102222211 ./app-misc/datefudge/datefudge-1.14.ebuild
 1309231401 ./app-misc/emelfm2/emelfm2-0.8.1.ebuild
+1405050420 ./app-misc/emelfm2/emelfm2-0.9.1.ebuild
 1309231401 ./app-misc/emelfm2/emelfm2-0.8.2.ebuild
 1309231401 ./app-misc/emelfm2/emelfm2-0.9.0.ebuild
 1303172001 ./app-misc/geekcode/geekcode-1.7.3-r1.ebuild
@@ -10532,7 +10531,7 @@
 1302081831 ./net-firewall/iptables/iptables-1.4.16.3.ebuild
 1210101631 ./net-firewall/iptables/iptables-1.4.13-r2.ebuild
 1206260901 ./net-firewall/iptables/iptables-1.4.10.ebuild
-1405021701 ./net-firewall/iptables/iptables-1.4.21-r1.ebuild
+1405042031 ./net-firewall/iptables/iptables-1.4.21-r1.ebuild
 1210101631 ./net-firewall/iptables/iptables-1.4.14-r1.ebuild
 1206260901 ./net-firewall/iptables/iptables-1.4.10-r1.ebuild
 1401181001 ./net-firewall/iptables/iptables-1.4.21.ebuild
@@ -10629,7 +10628,8 @@
 1309052231 ./app-portage/pqlop/pqlop-0.02-r1.ebuild
 1302130431 ./app-portage/splat/splat-0.08-r1.ebuild
 1004070822 ./app-portage/udept/udept-0.5.99.0.2.95-r1.ebuild
-1405040101 ./app-portage/mirrorselect/mirrorselect-9999.ebuild
+1405050901 ./app-portage/mirrorselect/mirrorselect-9999.ebuild
+1405050832 ./app-portage/mirrorselect/mirrorselect-2.2.1.ebuild
 1205210901 ./app-portage/mirrorselect/mirrorselect-2.1.0-r3.ebuild
 1212161012 ./app-portage/mirrorselect/mirrorselect-2.2.0-r1.ebuild
 1405040101 ./app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild
@@ -11423,6 +11423,7 @@
 1206041101 ./dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.2-r1.ebuild
 1404041224 ./dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.4.ebuild
 1305101231 ./dev-db/myodbc/myodbc-5.1.6.ebuild
+1405042337 ./dev-db/myodbc/myodbc-5.2.6.ebuild
 1402220038 ./dev-db/percona-toolkit/percona-toolkit-2.2.6.ebuild
 1212031101 ./dev-db/m17n-db/m17n-db-1.5.3.ebuild
 1212031101 ./dev-db/m17n-db/m17n-db-1.5.5.ebuild
@@ -11558,6 +11559,7 @@
 1312110753 ./dev-db/hyperdex/hyperdex-1.0.1.ebuild
 1402101101 ./dev-db/hyperdex/hyperdex-1.0.5.ebuild
 1212181931 ./dev-db/mysql-connector-c++/mysql-connector-c++-1.1.1.ebuild
+1405050629 ./dev-db/mysql-connector-c++/mysql-connector-c++-1.1.3.ebuild
 1403020231 ./dev-db/recutils/recutils-1.5.ebuild
 1110200401 ./dev-db/mysql-udf-infusion/mysql-udf-infusion-20110109.ebuild
 1305101231 ./dev-db/bucardo/bucardo-4.5.0-r1.ebuild
@@ -13215,8 +13217,9 @@
 1404102013 ./app-backup/bacula/bacula-7.0.2.ebuild
 1401112301 ./app-backup/amanda/amanda-3.3.3.ebuild
 1401112331 ./app-backup/amanda/amanda-3.3.3-r1.ebuild
-1403080231 ./app-backup/bareos/bareos-13.2.2.ebuild
+1405042101 ./app-backup/bareos/bareos-13.2.2.ebuild
 1312140731 ./app-backup/bareos/bareos-12.4.5-r1.ebuild
+1405050237 ./app-backup/bareos/bareos-13.2.3.ebuild
 1103311923 ./app-backup/cdbkup/cdbkup-1.0.ebuild
 1103311923 ./app-backup/cdbkup/cdbkup-1.0-r1.ebuild
 1403020231 ./app-backup/fsarchiver/fsarchiver-0.6.16.ebuild
@@ -13397,6 +13400,7 @@
 1403091631 ./media-gfx/eog/eog-3.10.2.ebuild
 1210271301 ./media-gfx/eog/eog-2.32.1.ebuild
 1404272126 ./media-gfx/eog/eog-3.12.1.ebuild
+1405050209 ./media-gfx/eom/eom-1.8.0.ebuild
 1403042331 ./media-gfx/feh/feh-2.10.ebuild
 1401261501 ./media-gfx/feh/feh-2.9.3.ebuild
 1404280628 ./media-gfx/feh/feh-2.11.ebuild
@@ -14902,11 +14906,12 @@
 1302070001 ./media-libs/libprojectm/libprojectm-2.1.0-r1.ebuild
 1108131725 ./media-libs/compface/compface-1.5.1.ebuild
 1206021831 ./media-libs/compface/compface-1.5.2.ebuild
-1404300901 ./media-libs/harfbuzz/harfbuzz-0.9.26-r1.ebuild
+1405042131 ./media-libs/harfbuzz/harfbuzz-0.9.26-r1.ebuild
 1403050001 ./media-libs/harfbuzz/harfbuzz-0.9.26.ebuild
 1401202331 ./media-libs/harfbuzz/harfbuzz-0.9.12.ebuild
+1405042109 ./media-libs/harfbuzz/harfbuzz-0.9.28.ebuild
 1404211431 ./media-libs/harfbuzz/harfbuzz-0.9.23.ebuild
-1404282231 ./media-libs/harfbuzz/harfbuzz-9999.ebuild
+1405042131 ./media-libs/harfbuzz/harfbuzz-9999.ebuild
 1205090601 ./media-libs/libuninameslist/libuninameslist-20091231.ebuild
 1001151243 ./media-libs/libuninameslist/libuninameslist-20080409.ebuild
 1403050001 ./media-libs/libopenraw/libopenraw-0.0.9.ebuild
@@ -15206,7 +15211,7 @@
 1404182308 ./media-libs/sdl-image/sdl-image-1.2.12-r1.ebuild
 1405031434 ./media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
 1210202301 ./media-libs/sdl-mixer/sdl-mixer-1.2.12-r1.ebuild
-1302242231 ./media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild
+1405050801 ./media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild
 1205051231 ./media-libs/sdl-pango/sdl-pango-0.1.2.ebuild
 1202080922 ./media-libs/icc-profiles-basiccolor-printing2009/icc-profiles-basiccolor-printing2009-1.2.0.ebuild
 1404190043 ./media-libs/sdl-sound/sdl-sound-1.0.3-r1.ebuild
@@ -15362,7 +15367,7 @@
 1307041432 ./mail-filter/amavisd-new/amavisd-new-2.8.1.ebuild
 1209302031 ./mail-filter/amavisd-new/amavisd-new-2.7.2.ebuild
 1212172231 ./mail-filter/amavisd-new/amavisd-new-2.8.0.ebuild
-1312301201 ./mail-filter/libmilter/libmilter-1.0.2.ebuild
+1405042031 ./mail-filter/libmilter/libmilter-1.0.2.ebuild
 1403030417 ./mail-filter/pypolicyd-spf/pypolicyd-spf-1.2.ebuild
 1305200631 ./mail-filter/pypolicyd-spf/pypolicyd-spf-1.1.2.ebuild
 1302261531 ./mail-filter/pypolicyd-spf/pypolicyd-spf-1.1.ebuild
@@ -15415,7 +15420,7 @@
 1404201817 ./mail-filter/spampd/spampd-2.42.ebuild
 1106161030 ./mail-filter/spampd/spampd-2.30.ebuild
 1404151041 ./mail-filter/opendkim/opendkim-2.9.2.ebuild
-1405021446 ./mail-filter/opendkim/opendkim-2.9.2-r1.ebuild
+1405042031 ./mail-filter/opendkim/opendkim-2.9.2-r1.ebuild
 1404151101 ./mail-filter/opendkim/opendkim-2.9.1.ebuild
 1404151101 ./mail-filter/opendkim/opendkim-2.9.0.ebuild
 1404151101 ./mail-filter/opendkim/opendkim-2.8.4.ebuild
@@ -16692,6 +16697,7 @@
 1310281735 ./sys-auth/pam_yubico/pam_yubico-2.14.ebuild
 1403151701 ./sys-auth/consolekit/consolekit-0.4.6.ebuild
 1402071301 ./sys-auth/pam-csync/pam-csync-0.42.0-r1.ebuild
+1405041951 ./sys-auth/bioapi/bioapi-1.2.4.ebuild
 1205240931 ./sys-auth/bioapi/bioapi-1.2.3-r2.ebuild
 1403301701 ./sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.14.ebuild
 1310281756 ./sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.11.ebuild
@@ -18055,7 +18061,7 @@
 1405011601 ./net-im/gajim/gajim-0.15.4.ebuild
 1402190531 ./net-im/gajim/gajim-0.15.3-r1.ebuild
 1403061631 ./net-im/gajim/gajim-0.16_beta2.ebuild
-1403181730 ./net-im/gajim/gajim-0.16_rc1.ebuild
+1405042031 ./net-im/gajim/gajim-0.16_rc1.ebuild
 1403061631 ./net-im/gajim/gajim-0.16_beta2-r1.ebuild
 1403061631 ./net-im/gajim/gajim-0.16_beta1.ebuild
 0512180656 ./net-im/imcom/imcom-1.33.ebuild
@@ -19802,9 +19808,8 @@
 1404160131 ./net-print/cups/cups-9999.ebuild
 1403020301 ./net-print/cups/cups-1.7.1.ebuild
 1310142231 ./net-print/cndrvcups-common-lb/cndrvcups-common-lb-2.70-r2.ebuild
-1405031831 ./net-print/cups-filters/cups-filters-1.0.53.ebuild
+1405050001 ./net-print/cups-filters/cups-filters-1.0.53.ebuild
 1401060201 ./net-print/cups-filters/cups-filters-9999.ebuild
-1404261331 ./net-print/cups-filters/cups-filters-1.0.52.ebuild
 1402201831 ./net-print/cups-filters/cups-filters-1.0.43-r1.ebuild
 1207250727 ./net-print/c2esp/c2esp-25c.ebuild
 1403102107 ./net-print/c2esp/c2esp-26.ebuild
@@ -19870,7 +19875,7 @@
 1401081031 ./net-proxy/dante/dante-1.3.2.ebuild
 1401081031 ./net-proxy/dante/dante-1.4.0_pre1.ebuild
 1401081031 ./net-proxy/dante/dante-1.4.0.ebuild
-1405021701 ./net-proxy/dante/dante-1.4.0-r1.ebuild
+1405042031 ./net-proxy/dante/dante-1.4.0-r1.ebuild
 1401081031 ./net-proxy/dante/dante-1.4.0_pre1-r1.ebuild
 1401081031 ./net-proxy/dante/dante-1.3.2-r1.ebuild
 1401081031 ./net-proxy/cntlm/cntlm-0.92.3.ebuild
@@ -20940,20 +20945,13 @@
 1310161343 ./dev-java/netbeans-enterprise/netbeans-enterprise-7.4.ebuild
 1205071031 ./dev-java/netbeans-enterprise/netbeans-enterprise-7.1.1.ebuild
 0912281155 ./dev-java/xml-writer/xml-writer-0.2.ebuild
-1310190929 ./dev-java/java-sdk-docs/java-sdk-docs-1.7.0.45.ebuild
-0905300051 ./dev-java/java-sdk-docs/java-sdk-docs-1.4.2.ebuild
-1309191603 ./dev-java/java-sdk-docs/java-sdk-docs-1.7.0.40-r1.ebuild
 1402262127 ./dev-java/java-sdk-docs/java-sdk-docs-1.7.0.51.ebuild
 1203101212 ./dev-java/java-sdk-docs/java-sdk-docs-1.6.0.30.ebuild
+1405050032 ./dev-java/java-sdk-docs/java-sdk-docs-1.8.0.5.ebuild
 1403281720 ./dev-java/java-sdk-docs/java-sdk-docs-1.8.0.0.ebuild
-1103232321 ./dev-java/java-sdk-docs/java-sdk-docs-1.6.0.23.ebuild
-1305101316 ./dev-java/java-sdk-docs/java-sdk-docs-1.7.0.21.ebuild
 1005140028 ./dev-java/java-sdk-docs/java-sdk-docs-1.5.0-r1.ebuild
-1303101607 ./dev-java/java-sdk-docs/java-sdk-docs-1.7.0.17.ebuild
 1405040324 ./dev-java/java-sdk-docs/java-sdk-docs-1.7.0.55.ebuild
 1203070131 ./dev-java/java-sdk-docs/java-sdk-docs-1.6.0.25.ebuild
-1306292101 ./dev-java/java-sdk-docs/java-sdk-docs-1.7.0.25.ebuild
-1302141731 ./dev-java/java-sdk-docs/java-sdk-docs-1.7.0.11.ebuild
 1001032344 ./dev-java/jarbundler/jarbundler-1.8.1-r1.ebuild
 0707222353 ./dev-java/jarbundler/jarbundler-1.7.ebuild
 1401141801 ./dev-java/httpunit/httpunit-1.7.ebuild
@@ -22291,7 +22289,8 @@
 1403160701 ./dev-libs/pth/pth-2.0.7-r3.ebuild
 1304050031 ./dev-libs/re2/re2-0_p20130115.ebuild
 1304070301 ./dev-libs/re2/re2-0_p20130115-r1.ebuild
-1309230401 ./dev-libs/re2/re2-0_p20130712.ebuild
+1405042139 ./dev-libs/re2/re2-0_p20140304.ebuild
+1405042031 ./dev-libs/re2/re2-0_p20130712.ebuild
 1205042301 ./dev-libs/qof/qof-0.8.1.ebuild
 1310131901 ./dev-libs/ucl/ucl-1.03-r1.ebuild
 1205042301 ./dev-libs/tre/tre-0.8.0.ebuild
@@ -24077,7 +24076,7 @@
 1210142301 ./dev-perl/Text-WikiFormat/Text-WikiFormat-0.800.0.ebuild
 1211042005 ./dev-perl/DBIx-Class-InflateColumn-Boolean/DBIx-Class-InflateColumn-Boolean-0.2.0.ebuild
 1309141818 ./dev-perl/Text-Markdown/Text-Markdown-1.0.31-r1.ebuild
-1401310331 ./dev-perl/MediaWiki-API/MediaWiki-API-0.390.0.ebuild
+1405041931 ./dev-perl/MediaWiki-API/MediaWiki-API-0.390.0.ebuild
 1211231731 ./dev-perl/IPC-ShareLite/IPC-ShareLite-0.170.0.ebuild
 1404061931 ./dev-perl/Text-CharWidth/Text-CharWidth-0.40.0.ebuild
 1211231731 ./dev-perl/Cache-Cache/Cache-Cache-1.60.0.ebuild
@@ -24868,6 +24867,7 @@
 1203252131 ./dev-perl/XML-Generator/XML-Generator-1.40.0.ebuild
 1203171538 ./dev-perl/Daemon-Generic/Daemon-Generic-0.820.0.ebuild
 1101272212 ./dev-perl/Daemon-Generic/Daemon-Generic-0.71.ebuild
+1405041949 ./dev-perl/Daemon-Generic/Daemon-Generic-0.840.0.ebuild
 1212032120 ./dev-perl/XML-LibXSLT/XML-LibXSLT-1.790.0.ebuild
 1403061501 ./dev-perl/XML-LibXSLT/XML-LibXSLT-1.810.0.ebuild
 1209302301 ./dev-perl/XML-LibXSLT/XML-LibXSLT-1.770.0.ebuild
@@ -25159,7 +25159,7 @@
 1404051901 ./dev-ruby/rubyforge/rubyforge-2.0.4-r2.ebuild
 1404051901 ./dev-ruby/rubyforge/rubyforge-2.0.4-r3.ebuild
 1403120031 ./dev-ruby/activerecord/activerecord-4.0.3.ebuild
-1404211631 ./dev-ruby/activerecord/activerecord-3.2.17.ebuild
+1405042231 ./dev-ruby/activerecord/activerecord-3.2.17.ebuild
 1404261910 ./dev-ruby/activerecord/activerecord-4.1.0.ebuild
 1404211031 ./dev-ruby/activerecord/activerecord-4.0.4.ebuild
 1403310517 ./dev-ruby/cocaine/cocaine-0.5.4.ebuild
@@ -25463,7 +25463,7 @@
 1404051831 ./dev-ruby/fast_xs/fast_xs-0.8.0.ebuild
 1404201024 ./dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild
 1405021001 ./dev-ruby/protected_attributes/protected_attributes-1.0.7.ebuild
-1404211631 ./dev-ruby/actionpack/actionpack-3.2.17.ebuild
+1405042231 ./dev-ruby/actionpack/actionpack-3.2.17.ebuild
 1403120031 ./dev-ruby/actionpack/actionpack-4.0.3.ebuild
 1404261909 ./dev-ruby/actionpack/actionpack-4.1.0.ebuild
 1404211031 ./dev-ruby/actionpack/actionpack-4.0.4.ebuild
@@ -26061,7 +26061,7 @@
 1403060131 ./dev-ruby/shoulda-context/shoulda-context-1.1.6.ebuild
 1404201601 ./dev-ruby/mime-types/mime-types-1.25.1.ebuild
 1404201531 ./dev-ruby/mime-types/mime-types-1.23.ebuild
-1402191119 ./dev-ruby/actionmailer/actionmailer-3.2.17.ebuild
+1405042231 ./dev-ruby/actionmailer/actionmailer-3.2.17.ebuild
 1404261909 ./dev-ruby/actionmailer/actionmailer-4.1.0.ebuild
 1404211031 ./dev-ruby/actionmailer/actionmailer-4.0.4.ebuild
 1403120031 ./dev-ruby/actionmailer/actionmailer-4.0.3.ebuild
@@ -26827,17 +26827,17 @@
 1010052349 ./dev-python/mox/mox-0.5.3.ebuild
 1309052301 ./dev-python/mox/mox-0.5.3-r1.ebuild
 1403280148 ./dev-python/pbr/pbr-0.7.0.ebuild
-1404251831 ./dev-python/pbr/pbr-0.8.0.ebuild
+1405042031 ./dev-python/pbr/pbr-0.8.0.ebuild
 1401210601 ./dev-python/pbr/pbr-0.5.23.ebuild
 1403200331 ./dev-python/pbr/pbr-0.5.23-r2.ebuild
 1311060931 ./dev-python/orm/orm-1.0.1.ebuild
 1309052301 ./dev-python/pip/pip-1.4.ebuild
-1405031151 ./dev-python/pip/pip-1.5.5.ebuild
+1405042031 ./dev-python/pip/pip-1.5.5.ebuild
 1309052301 ./dev-python/pip/pip-1.3.1.ebuild
 1404010101 ./dev-python/pip/pip-1.5.2.ebuild
 1404010101 ./dev-python/pip/pip-1.5.ebuild
 1404010101 ./dev-python/pip/pip-1.4.1.ebuild
-1404251831 ./dev-python/pip/pip-1.5.4-r1.ebuild
+1405042031 ./dev-python/pip/pip-1.5.4-r1.ebuild
 1404010101 ./dev-python/pip/pip-1.5.4.ebuild
 1305231231 ./dev-python/ply/ply-3.4.ebuild
 1404030101 ./dev-python/ply/ply-3.4-r1.ebuild
@@ -27023,7 +27023,7 @@
 1308031401 ./dev-python/nose/nose-1.1.2.ebuild
 1309052301 ./dev-python/pep8/pep8-1.4.5.ebuild
 1307250621 ./dev-python/pep8/pep8-1.3.3.ebuild
-1404251831 ./dev-python/pep8/pep8-1.4.6.ebuild
+1405042031 ./dev-python/pep8/pep8-1.4.6.ebuild
 1307250622 ./dev-python/pep8/pep8-1.2.ebuild
 1405041231 ./dev-python/pep8/pep8-1.5.6.ebuild
 1304271631 ./dev-python/pivy/pivy-0.5_alpha20110303.ebuild
@@ -27649,7 +27649,7 @@
 1205041931 ./dev-python/python-virtkey/python-virtkey-0.60.0.ebuild
 1401031931 ./dev-python/testrepository/testrepository-0.0.17-r2.ebuild
 1401021931 ./dev-python/testrepository/testrepository-0.0.17-r1.ebuild
-1404251831 ./dev-python/testrepository/testrepository-0.0.18.ebuild
+1405042031 ./dev-python/testrepository/testrepository-0.0.18.ebuild
 1304112231 ./dev-python/thunarx-python/thunarx-python-0.3.0.ebuild
 1309052301 ./dev-python/asciitable/asciitable-0.8.0-r1.ebuild
 1405010831 ./dev-python/nosehtmloutput/nosehtmloutput-0.0.4-r1.ebuild
@@ -27837,7 +27837,7 @@
 1303030031 ./dev-python/pyside-tools/pyside-tools-0.2.14.ebuild
 1312260601 ./dev-python/pyside-tools/pyside-tools-0.2.15.ebuild
 1312130701 ./dev-python/testresources/testresources-0.2.7.ebuild
-1404251831 ./dev-python/testresources/testresources-0.2.7-r1.ebuild
+1405042031 ./dev-python/testresources/testresources-0.2.7-r1.ebuild
 1211080031 ./dev-python/gst-python/gst-python-0.10.22.ebuild
 1310221031 ./dev-python/gst-python/gst-python-0.10.22-r1.ebuild
 1404061428 ./dev-python/gst-python/gst-python-1.2.0.ebuild
@@ -28019,7 +28019,7 @@
 1402250301 ./dev-python/retry-decorator/retry-decorator-1.0.0.ebuild
 1310092031 ./dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.7.2-r1.ebuild
 1303250031 ./dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.7.2.ebuild
-1404251831 ./dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.ebuild
+1405042031 ./dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.ebuild
 1102120050 ./dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.6.1.ebuild
 1303250031 ./dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.7.1.ebuild
 1404010131 ./dev-python/discogs-client/discogs-client-1.1.1.ebuild
@@ -28294,7 +28294,7 @@
 1403171959 ./dev-python/rackspace-monitoring/rackspace-monitoring-0.6.0.ebuild
 1402080513 ./dev-python/rackspace-monitoring/rackspace-monitoring-0.5.4.ebuild
 1404251831 ./dev-python/flake8/flake8-2.1.0.ebuild
-1404251831 ./dev-python/flake8/flake8-2.0.ebuild
+1405042031 ./dev-python/flake8/flake8-2.0.ebuild
 1305071857 ./dev-python/git-python/git-python-0.3.2_rc1-r1.ebuild
 1010302352 ./dev-python/git-python/git-python-0.1.7.ebuild
 1304240531 ./dev-python/git-python/git-python-0.3.2_rc1.ebuild
@@ -28371,7 +28371,7 @@
 1304180950 ./dev-python/tracing/tracing-0.7-r1.ebuild
 1308091919 ./dev-python/tracing/tracing-0.8.ebuild
 1309052301 ./dev-python/fixtures/fixtures-0.3.12-r1.ebuild
-1404251831 ./dev-python/fixtures/fixtures-0.3.14-r1.ebuild
+1405042031 ./dev-python/fixtures/fixtures-0.3.14-r1.ebuild
 1309260443 ./dev-python/fixtures/fixtures-0.3.14.ebuild
 1303091447 ./dev-python/joblib/joblib-0.7.0d-r1.ebuild
 1203021330 ./dev-python/joblib/joblib-0.6.3.ebuild
@@ -28407,7 +28407,7 @@
 1405031831 ./dev-python/testscenarios/testscenarios-0.4-r4.ebuild
 1401141101 ./dev-python/testscenarios/testscenarios-0.4.ebuild
 1309052301 ./dev-python/futures/futures-2.1.4.ebuild
-1401230632 ./dev-python/futures/futures-2.1.6.ebuild
+1405050901 ./dev-python/futures/futures-2.1.6.ebuild
 1312051110 ./dev-python/futures/futures-2.1.5.ebuild
 1103222204 ./dev-python/totem-python/totem-python-2.32.0.ebuild
 1104031547 ./dev-python/python-cdb/python-cdb-0.34.ebuild
@@ -28433,7 +28433,7 @@
 1405031124 ./dev-python/llvmpy/llvmpy-0.12.5.ebuild
 1402230401 ./dev-python/llvmpy/llvmpy-0.12.2.ebuild
 1404142109 ./dev-python/llvmpy/llvmpy-0.12.4.ebuild
-1404251831 ./dev-python/mccabe/mccabe-0.2.1.ebuild
+1405042031 ./dev-python/mccabe/mccabe-0.2.1.ebuild
 1311231359 ./dev-python/cliff-tablib/cliff-tablib-1.1.ebuild
 1306081908 ./dev-python/munkres/munkres-1.0.5.4-r2.ebuild
 1011082103 ./dev-python/log4py/log4py-1.3.ebuild
@@ -28758,7 +28758,7 @@
 1204210235 ./dev-python/mkpythonproj/mkpythonproj-1.8.ebuild
 1011082109 ./dev-python/mkpythonproj/mkpythonproj-1.7.ebuild
 1404121701 ./dev-python/pyflakes/pyflakes-0.7.3.ebuild
-1404251831 ./dev-python/pyflakes/pyflakes-0.8.1.ebuild
+1405042031 ./dev-python/pyflakes/pyflakes-0.8.1.ebuild
 1312151931 ./dev-python/pyflakes/pyflakes-0.7.2.ebuild
 1307030801 ./dev-python/pyflakes/pyflakes-0.6.1.ebuild
 1212112131 ./dev-python/pyflakes/pyflakes-0.5.0.ebuild
@@ -29320,6 +29320,7 @@
 1404030600 ./dev-python/PyGithub/PyGithub-1.24.1.ebuild
 1401020031 ./dev-python/PyGithub/PyGithub-1.23.0.ebuild
 1403080148 ./dev-python/PyGithub/PyGithub-1.24.0.ebuild
+1405050352 ./dev-python/PyGithub/PyGithub-1.25.0.ebuild
 1401020031 ./dev-python/PyGithub/PyGithub-1.21.0.ebuild
 1104142301 ./dev-python/promise/promise-0.2.2.ebuild
 1309111325 ./dev-python/flask-whooshalchemy/flask-whooshalchemy-0.55a.ebuild
@@ -29883,7 +29884,7 @@
 1404282201 ./sys-fs/eudev/eudev-1.4-r1.ebuild
 1404282201 ./sys-fs/eudev/eudev-1.5.3.ebuild
 1404282201 ./sys-fs/eudev/eudev-1.6.ebuild
-1404282201 ./sys-fs/eudev/eudev-1.5.3-r1.ebuild
+1405042031 ./sys-fs/eudev/eudev-1.5.3-r1.ebuild
 1404282201 ./sys-fs/eudev/eudev-9999.ebuild
 1309252131 ./sys-fs/mdadm/mdadm-3.2.6-r1.ebuild
 1404131242 ./sys-fs/mdadm/mdadm-3.3-r3.ebuild
@@ -30194,6 +30195,7 @@
 1010060720 ./dev-scheme/sigscheme/sigscheme-0.8.5.ebuild
 1404231649 ./mate-extra/mate-sensors-applet/mate-sensors-applet-1.8.0.ebuild
 1405041901 ./mate-extra/mate-sensors-applet/mate-sensors-applet-1.6.1.ebuild
+1405050143 ./mate-extra/caja-extensions/caja-extensions-1.8.0.ebuild
 1405041901 ./mate-extra/mate-file-manager-share/mate-file-manager-share-1.6.0.ebuild
 1405041901 ./mate-extra/mate-dialogs/mate-dialogs-1.6.2.ebuild
 1404222347 ./mate-extra/mate-dialogs/mate-dialogs-1.8.0.ebuild
@@ -30213,6 +30215,7 @@
 1405041901 ./mate-extra/mate-utils/mate-utils-1.6.1.ebuild
 1405041901 ./mate-extra/mate-file-manager-open-terminal/mate-file-manager-open-terminal-1.6.0.ebuild
 1405041901 ./mate-extra/mate-file-manager-sendto/mate-file-manager-sendto-1.6.0.ebuild
+1405050157 ./mate-extra/mate-user-share/mate-user-share-1.8.0.ebuild
 1405041901 ./mate-extra/mate-user-share/mate-user-share-1.6.1.ebuild
 1404231619 ./mate-extra/mate-polkit/mate-polkit-1.8.0.ebuild
 1405041901 ./mate-extra/mate-polkit/mate-polkit-1.6.1.ebuild
@@ -30805,7 +30808,7 @@
 1310311521 ./media-sound/mpc/mpc-0.24.ebuild
 1305251231 ./media-sound/mpc/mpc-0.23.ebuild
 1404131345 ./media-sound/mpd/mpd-0.18.10.ebuild
-1312251401 ./media-sound/mpd/mpd-0.17.6.ebuild
+1405050131 ./media-sound/mpd/mpd-0.17.6.ebuild
 1403090655 ./media-sound/mpd/mpd-0.18.9.ebuild
 1404152035 ./media-sound/mpd/mpd-0.18.10-r1.ebuild
 1201191313 ./media-sound/mup/mup-5.4.ebuild
@@ -34101,6 +34104,7 @@
 1405040131 ./net-dialup/freeradius/freeradius-3.0.2.ebuild
 1405041231 ./net-dialup/freeradius/freeradius-2.2.5.ebuild
 1401031631 ./net-dialup/freeradius/freeradius-2.2.0.ebuild
+1405050401 ./net-dialup/freeradius/freeradius-3.0.2-r1.ebuild
 1102070135 ./net-dialup/mingetty/mingetty-1.07-r1.ebuild
 0811151247 ./net-dialup/mingetty/mingetty-1.08.ebuild
 1404032339 ./net-dialup/mgetty/mgetty-1.1.37-r1.ebuild
@@ -34359,7 +34363,7 @@
 1404172031 ./games-emulation/kigb/kigb-2.02.ebuild
 1306151331 ./games-emulation/vbam/vbam-1.8.0.1149.ebuild
 1402051401 ./games-emulation/vbam/vbam-9999.ebuild
-1402051357 ./games-emulation/vbam/vbam-1.8.0.1228.ebuild
+1405042031 ./games-emulation/vbam/vbam-1.8.0.1228.ebuild
 1306160339 ./games-emulation/vbam/vbam-1.8.0.1197.ebuild
 0911262356 ./games-emulation/vgba/vgba-3.6.ebuild
 1304141131 ./games-emulation/zinc/zinc-1.1.ebuild
@@ -34383,6 +34387,7 @@
 1402170601 ./games-emulation/dolphin/dolphin-3.5.ebuild
 1403190731 ./games-emulation/dolphin/dolphin-9999.ebuild
 1403182331 ./games-emulation/dolphin/dolphin-4.0.ebuild
+1405050147 ./games-emulation/dolphin/dolphin-4.0.2.ebuild
 1404191531 ./games-emulation/mastergear-bin/mastergear-bin-2.0.ebuild
 1312192101 ./games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.0.ebuild
 1311230231 ./games-emulation/sdlmame/sdlmame-0.148_p1-r1.ebuild
@@ -37020,7 +37025,7 @@
 0910102120 ./games-fps/quake3-alliance/quake3-alliance-3.3-r1.ebuild
 1404101201 ./games-fps/quake1-killer/quake1-killer-2.2z.ebuild
 1304292031 ./games-fps/ut2004-unwheel/ut2004-unwheel-0_beta5.ebuild
-0511060148 ./games-fps/quake1-movies/quake1-movies-0.ebuild
+1405042231 ./games-fps/quake1-movies/quake1-movies-0.ebuild
 1008092103 ./games-fps/tenebrae/tenebrae-1.04.ebuild
 1301221131 ./games-fps/enemy-territory-truecombat/enemy-territory-truecombat-0.49b.ebuild
 0910102134 ./games-fps/ut2004-strikeforce/ut2004-strikeforce-4.1.ebuild
@@ -37036,7 +37041,7 @@
 1305301931 ./games-fps/quake1-textures/quake1-textures-20050820.ebuild
 1201261950 ./games-fps/quake3-defrag/quake3-defrag-1.91.20.ebuild
 1301261249 ./games-fps/quake3-defrag/quake3-defrag-1.91.21.ebuild
-0511060137 ./games-fps/quake1-ctf/quake1-ctf-4.0.ebuild
+1405042201 ./games-fps/quake1-ctf/quake1-ctf-4.0.ebuild
 0910102122 ./games-fps/quake3-bfp/quake3-bfp-1.2-r1.ebuild
 1301131531 ./games-fps/quake3-bin/quake3-bin-1.32c-r1.ebuild
 0910102128 ./games-fps/quake3-osp/quake3-osp-1.03a-r1.ebuild
@@ -39466,7 +39471,7 @@
 1404272339 metadata/md5-cache/dev-cpp/pangomm-2.34.0
 1404272339 metadata/md5-cache/dev-cpp/gtkmm-utils-0.4.1
 1404272339 metadata/md5-cache/dev-cpp/libxmlpp-2.36.0
-1405022036 metadata/md5-cache/dev-cpp/gmock-1.7.0-r1
+1405041936 metadata/md5-cache/dev-cpp/gmock-1.7.0-r1
 1404272339 metadata/md5-cache/dev-cpp/gconfmm-2.28.3
 1404272339 metadata/md5-cache/dev-cpp/libsexymm-0.1.9
 1404272339 metadata/md5-cache/dev-cpp/tclap-1.2.1
@@ -40244,7 +40249,7 @@
 1405012337 metadata/md5-cache/dev-vcs/git-1.8.4.4
 1405012337 metadata/md5-cache/dev-vcs/git-1.8.4.5
 1405012337 metadata/md5-cache/dev-vcs/git-1.8.5.4
-1405012337 metadata/md5-cache/dev-vcs/git-1.8.5.5
+1405041936 metadata/md5-cache/dev-vcs/git-1.8.5.5
 1404272347 metadata/md5-cache/dev-vcs/archway-0.2.1
 1404272347 metadata/md5-cache/dev-vcs/cvs-1.12.12-r6
 1404272347 metadata/md5-cache/dev-vcs/cvs-1.12.12-r7
@@ -41484,7 +41489,7 @@
 1404272359 metadata/md5-cache/www-apache/mod_backtrace-0.0.1-r1
 1404272359 metadata/md5-cache/www-apache/mod_depends-0.7.0_p200702041
 1401171230 metadata/md5-cache/www-apache/mod_ftpd-0.14-r1
-1404272359 metadata/md5-cache/www-apache/passenger-3.0.21-r1
+1405042236 metadata/md5-cache/www-apache/passenger-3.0.21-r1
 1403210006 metadata/md5-cache/www-apache/mod_gnutls-0.5.9
 1404272359 metadata/md5-cache/www-apache/mod_jk-1.2.30
 1404272359 metadata/md5-cache/www-apache/mod_jk-1.2.32
@@ -41520,7 +41525,7 @@
 1404272359 metadata/md5-cache/www-apache/mod_fcgid-2.3.9
 1401171230 metadata/md5-cache/www-apache/mod_proxy_fcgi-0_p816361
 1401171230 metadata/md5-cache/www-apache/mod_xml2enc-1.0.3
-1404272359 metadata/md5-cache/www-apache/passenger-4.0.41
+1405042236 metadata/md5-cache/www-apache/passenger-4.0.41
 1404272359 metadata/md5-cache/www-apache/mod_auth_kerb-5.4-r1
 1404272359 metadata/md5-cache/www-apache/mod_evasive-1.10.1
 1404272359 metadata/md5-cache/www-apache/modsec-flameeyes-20130216
@@ -41913,7 +41918,7 @@
 1404280000 metadata/md5-cache/x11-libs/goocanvas-1.0.0
 1404280000 metadata/md5-cache/x11-libs/rep-gtk-0.90.8.1
 1405011809 metadata/md5-cache/x11-libs/goocanvas-2.0.2
-1405030207 metadata/md5-cache/x11-libs/cairo-9999
+1405042207 metadata/md5-cache/x11-libs/cairo-9999
 1405022037 metadata/md5-cache/x11-libs/libva-9999
 1404280000 metadata/md5-cache/x11-libs/xcb-util-0.3.6
 1404280000 metadata/md5-cache/x11-libs/xcb-util-0.3.8
@@ -42094,7 +42099,7 @@
 1405022037 metadata/md5-cache/x11-libs/libXdmcp-1.1.1-r1
 1404280000 metadata/md5-cache/x11-libs/cairo-1.12.14-r4
 1405022037 metadata/md5-cache/x11-libs/cairo-1.12.16-r2
-1405030207 metadata/md5-cache/x11-libs/cairo-1.12.16-r3
+1405042207 metadata/md5-cache/x11-libs/cairo-1.12.16-r3
 1404280000 metadata/md5-cache/x11-libs/libview-0.6.6-r2
 1405022037 metadata/md5-cache/x11-libs/libva-intel-driver-9999
 1404280000 metadata/md5-cache/x11-libs/gtkdatabox-0.9.2.0
@@ -42251,8 +42256,6 @@
 1401171231 metadata/md5-cache/x11-misc/cbatticon-1.3.2
 1404280000 metadata/md5-cache/x11-misc/peksystray-0.2.1
 1404280000 metadata/md5-cache/x11-misc/peksystray-0.4.0
-1404280000 metadata/md5-cache/x11-misc/vym-2.2.4
-1404280000 metadata/md5-cache/x11-misc/vym-2.3.8
 1211091753 metadata/md5-cache/x11-misc/bbmail-0.8.3
 1404280000 metadata/md5-cache/x11-misc/bbmail-0.9.3
 1404280000 metadata/md5-cache/x11-misc/idesk-0.7.5-r2
@@ -42300,9 +42303,7 @@
 1404280000 metadata/md5-cache/x11-misc/lineak-xosdplugin-0.9.0-r1
 1404280000 metadata/md5-cache/x11-misc/mixer_app-1.8.0
 1211091753 metadata/md5-cache/x11-misc/xrestop-0.4
-1404280000 metadata/md5-cache/x11-misc/vym-2.3.11
-1404280000 metadata/md5-cache/x11-misc/vym-2.3.18
-1404280000 metadata/md5-cache/x11-misc/vym-2.3.20
+1405050406 metadata/md5-cache/x11-misc/vym-2.3.22
 1404280000 metadata/md5-cache/x11-misc/treeline-1.4.1
 1404280000 metadata/md5-cache/x11-misc/lineakd-0.9.0-r1
 1404280000 metadata/md5-cache/x11-misc/xosview-1.14
@@ -42336,8 +42337,8 @@
 1211091753 metadata/md5-cache/x11-misc/whaw-0.1.2
 1302130536 metadata/md5-cache/x11-misc/gtkdialog-0.8.2
 1302060736 metadata/md5-cache/x11-misc/gtkdialog-0.8.3
-1404280000 metadata/md5-cache/x11-misc/piedock-1.6.2
 1404280000 metadata/md5-cache/x11-misc/piedock-1.6.3
+1405050507 metadata/md5-cache/x11-misc/piedock-1.6.4
 1405041036 metadata/md5-cache/x11-misc/alltray-0.7.5.1
 1402061008 metadata/md5-cache/x11-misc/obmenu-1.0
 1402061008 metadata/md5-cache/x11-misc/googsystray-1.3.1
@@ -42368,6 +42369,7 @@
 1211091753 metadata/md5-cache/x11-misc/gtk2fontsel-0.1
 1404280000 metadata/md5-cache/x11-misc/simpleswitcher-9999
 1404280000 metadata/md5-cache/x11-misc/viewglob-2.0.4
+1405050406 metadata/md5-cache/x11-misc/gxmessage-3.4.0
 1404280000 metadata/md5-cache/x11-misc/gmrun-0.9.2
 1402061008 metadata/md5-cache/x11-misc/dragbox-0.4.0
 1404280000 metadata/md5-cache/x11-misc/screengrab-1.0
@@ -42467,6 +42469,7 @@
 1404280000 metadata/md5-cache/x11-misc/util-macros-1.18.0
 1404280000 metadata/md5-cache/x11-misc/xfe-1.34
 1404280000 metadata/md5-cache/x11-misc/xfe-1.37
+1405050306 metadata/md5-cache/x11-misc/mozo-1.8.0
 1404280000 metadata/md5-cache/x11-misc/lndir-1.0.2
 1404280000 metadata/md5-cache/x11-misc/lndir-1.0.3
 1404280000 metadata/md5-cache/x11-misc/fbdesk-1.4.1
@@ -42870,7 +42873,7 @@
 1404272339 metadata/md5-cache/dev-games/hlsdk-2.3
 1404272339 metadata/md5-cache/dev-games/guichan-0.8.2
 1404272348 metadata/md5-cache/games-strategy/seven-kingdoms-2.14.4
-1404272348 metadata/md5-cache/games-strategy/dominions2-2.16
+1405042306 metadata/md5-cache/games-strategy/dominions2-2.16
 1404272348 metadata/md5-cache/games-strategy/ufo-ai-2.4
 1404272348 metadata/md5-cache/games-strategy/freeciv-2.3.4
 1405012338 metadata/md5-cache/games-strategy/knights-demo-1.32
@@ -45245,8 +45248,8 @@
 1304110036 metadata/md5-cache/x11-themes/sound-theme-freedesktop-0.8
 1403050107 metadata/md5-cache/x11-themes/gentoo10-backgrounds-20110309
 1404280001 metadata/md5-cache/x11-themes/slim-themes-1.2.3a-r6
-1404280001 metadata/md5-cache/x11-themes/gnome-themes-standard-3.10.0
-1404280236 metadata/md5-cache/x11-themes/gnome-themes-standard-3.12.0
+1405050636 metadata/md5-cache/x11-themes/gnome-themes-standard-3.10.0
+1405050636 metadata/md5-cache/x11-themes/gnome-themes-standard-3.12.0
 1403011440 metadata/md5-cache/x11-themes/nuovo-icon-theme-0.5
 1211091753 metadata/md5-cache/x11-themes/fluxbox-styles-fluxmod-20050128-r1
 1405041907 metadata/md5-cache/x11-themes/mate-icon-theme-1.6.3
@@ -45650,14 +45653,14 @@
 1405041906 metadata/md5-cache/mate-base/mate-common-1.6.2
 1404272350 metadata/md5-cache/mate-base/mate-common-1.8.0
 1405041906 metadata/md5-cache/mate-base/mate-session-manager-1.6.1-r1
-1404272350 metadata/md5-cache/mate-base/mate-file-manager-1.6.3
-1405041906 metadata/md5-cache/mate-base/mate-panel-1.6.1
+1405050236 metadata/md5-cache/mate-base/mate-panel-1.6.1
 1404272350 metadata/md5-cache/mate-base/mate-panel-1.8.0
 1404272350 metadata/md5-cache/mate-base/caja-1.8.0
 1405041906 metadata/md5-cache/mate-base/mate-keyring-1.6.1
 1405041906 metadata/md5-cache/mate-base/libmatekbd-1.6.2
 1404272350 metadata/md5-cache/mate-base/libmatekbd-1.8.0
 1405041906 metadata/md5-cache/mate-base/mate-1.6.0
+1405050336 metadata/md5-cache/mate-base/mate-1.8.0
 1405041906 metadata/md5-cache/mate-base/libmatekeyring-1.6.1
 1405041906 metadata/md5-cache/mate-base/mate-applets-1.6.2
 1405011808 metadata/md5-cache/mate-base/mate-applets-1.8.0
@@ -46900,6 +46903,7 @@
 1404272338 metadata/md5-cache/app-misc/emelfm2-0.8.1
 1404272338 metadata/md5-cache/app-misc/emelfm2-0.8.2
 1404272338 metadata/md5-cache/app-misc/emelfm2-0.9.0
+1405050436 metadata/md5-cache/app-misc/emelfm2-0.9.1
 1404272338 metadata/md5-cache/app-misc/task-2.1.2
 1404272338 metadata/md5-cache/app-misc/task-2.2.0
 1404272338 metadata/md5-cache/app-misc/regex-markup-0.10.0
@@ -47789,7 +47793,7 @@
 1404272353 metadata/md5-cache/net-firewall/iptables-1.4.13-r2
 1404272353 metadata/md5-cache/net-firewall/iptables-1.4.14-r1
 1404272353 metadata/md5-cache/net-firewall/iptables-1.4.15-r1
-1405021706 metadata/md5-cache/net-firewall/iptables-1.4.21-r1
+1405042036 metadata/md5-cache/net-firewall/iptables-1.4.21-r1
 1404272353 metadata/md5-cache/net-firewall/rtsp-conntrack-3.7
 1404272353 metadata/md5-cache/net-firewall/nufw-2.2.21
 1404272353 metadata/md5-cache/net-firewall/nufw-2.2.22
@@ -47841,7 +47845,7 @@
 1404272353 metadata/md5-cache/net-firewall/ebtables-2.0.9.2-r1
 1404272353 metadata/md5-cache/net-firewall/ebtables-2.0.9.2-r2
 1404272353 metadata/md5-cache/net-firewall/ufw-0.34_pre805
-1405040106 metadata/md5-cache/app-portage/mirrorselect-9999
+1405050906 metadata/md5-cache/app-portage/mirrorselect-9999
 1402061006 metadata/md5-cache/app-portage/maintainer-helper-0.1.2
 1404272338 metadata/md5-cache/app-portage/ufed-0.40.2-r1
 1404272338 metadata/md5-cache/app-portage/elogv-0.7.6.1
@@ -47995,6 +47999,7 @@
 1405011806 metadata/md5-cache/app-portage/gpyutils-9999
 1404272338 metadata/md5-cache/app-portage/fquery-0.2.1.4
 1404272338 metadata/md5-cache/app-portage/fquery-0.2.1.5
+1405050906 metadata/md5-cache/app-portage/mirrorselect-2.2.1
 1405011806 metadata/md5-cache/app-portage/kportagetray-0.2.4-r1
 1404272355 metadata/md5-cache/sci-calculators/qalculate-units-0.9.4-r2
 1404272355 metadata/md5-cache/sci-calculators/tiemu-3.03
@@ -48530,6 +48535,7 @@
 1404272358 metadata/md5-cache/sys-devel/make-3.82-r4
 1404272339 metadata/md5-cache/dev-db/qdbm-1.8.78-r1
 1404272339 metadata/md5-cache/dev-db/myodbc-5.1.6
+1405050006 metadata/md5-cache/dev-db/myodbc-5.2.6
 1211091735 metadata/md5-cache/dev-db/pgmemcache-2.0.4
 1211091735 metadata/md5-cache/dev-db/pgmemcache-2.0.6
 1402091106 metadata/md5-cache/dev-db/pgmemcache-2.1.1
@@ -48736,6 +48742,7 @@
 1404272339 metadata/md5-cache/dev-db/phppgadmin-9999
 1211091735 metadata/md5-cache/dev-db/mysql-init-scripts-1.2
 1404272339 metadata/md5-cache/dev-db/mysql-connector-c++-1.1.1
+1405050636 metadata/md5-cache/dev-db/mysql-connector-c++-1.1.3
 1404272339 metadata/md5-cache/dev-db/mysql-5.0.96
 1404272339 metadata/md5-cache/dev-db/mysql-5.1.70
 1404272339 metadata/md5-cache/dev-db/mysql-5.1.73
@@ -50467,7 +50474,8 @@
 1211091733 metadata/md5-cache/app-backup/ccollect-0.8
 1405041636 metadata/md5-cache/app-backup/duplicity-0.6.23-r1
 1310200106 metadata/md5-cache/app-backup/tarsnap-1.0.35
-1405011806 metadata/md5-cache/app-backup/bareos-13.2.2
+1405042106 metadata/md5-cache/app-backup/bareos-13.2.2
+1405050306 metadata/md5-cache/app-backup/bareos-13.2.3
 1405012336 metadata/md5-cache/app-backup/spideroak-bin-5.0.3
 1405012336 metadata/md5-cache/app-backup/spideroak-bin-5.1.1
 1405012336 metadata/md5-cache/app-backup/spideroak-bin-5.1.3
@@ -50889,6 +50897,7 @@
 1308151236 metadata/md5-cache/media-gfx/jp2a-1.0.6-r1
 1404272350 metadata/md5-cache/media-gfx/byzanz-0.2.3
 1404272351 metadata/md5-cache/media-gfx/panini-0.71.104
+1405050236 metadata/md5-cache/media-gfx/eom-1.8.0
 1404272350 metadata/md5-cache/media-gfx/duhdraw-2.8.13
 1303101806 metadata/md5-cache/media-gfx/splash-themes-gentoo-20101212-r1
 1312221536 metadata/md5-cache/media-gfx/splash-themes-gentoo-20101212-r2
@@ -51718,7 +51727,7 @@
 1403011608 metadata/md5-cache/media-libs/opus-1.0.2-r1
 1405022036 metadata/md5-cache/media-libs/opus-1.0.2-r2
 1404272351 metadata/md5-cache/media-libs/libsmf-1.3
-1405022036 metadata/md5-cache/media-libs/harfbuzz-0.9.26-r1
+1405042136 metadata/md5-cache/media-libs/harfbuzz-0.9.26-r1
 1404272351 metadata/md5-cache/media-libs/gstreamer-1.2.0
 1404272351 metadata/md5-cache/media-libs/gstreamer-1.2.3
 1404272351 metadata/md5-cache/media-libs/libilbc-1.1.1
@@ -51834,7 +51843,7 @@
 1404272351 metadata/md5-cache/media-libs/gst-plugins-base-1.2.3
 1211091745 metadata/md5-cache/media-libs/phat-0.4.1
 1405022036 metadata/md5-cache/media-libs/sdl-sound-1.0.3-r1
-1405022036 metadata/md5-cache/media-libs/harfbuzz-9999
+1405042136 metadata/md5-cache/media-libs/harfbuzz-9999
 1211091745 metadata/md5-cache/media-libs/libclastfm-0.5
 1404272351 metadata/md5-cache/media-libs/libmp3splt-0.8.1a
 1404272351 metadata/md5-cache/media-libs/waffle-1.3.0
@@ -52305,6 +52314,7 @@
 1404272351 metadata/md5-cache/media-libs/harfbuzz-0.9.12
 1404272351 metadata/md5-cache/media-libs/harfbuzz-0.9.23
 1405011808 metadata/md5-cache/media-libs/harfbuzz-0.9.26
+1405042136 metadata/md5-cache/media-libs/harfbuzz-0.9.28
 1405022036 metadata/md5-cache/media-libs/libsamplerate-0.1.8-r1
 1404272351 metadata/md5-cache/media-libs/libsvg-0.1.4-r1
 1405022036 metadata/md5-cache/media-libs/libvorbis-1.3.3-r1
@@ -52522,7 +52532,7 @@
 1404272351 metadata/md5-cache/media-libs/libpano13-2.9.18
 1404272351 metadata/md5-cache/media-libs/glu-9.0.0
 1404272351 metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r1
-1404272351 metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r3
+1405050806 metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r3
 1405031506 metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r4
 1404272351 metadata/md5-cache/media-libs/FusionSound-1.1.1-r1
 1404272351 metadata/md5-cache/media-libs/raptor-2.0.9
@@ -52703,8 +52713,8 @@
 1404272350 metadata/md5-cache/mail-filter/postgrey-1.34
 1404272350 metadata/md5-cache/mail-filter/exim-p0f-0.1
 1405012338 metadata/md5-cache/mail-filter/spamassassin-botnet-0.8-r1
-1404272350 metadata/md5-cache/mail-filter/libmilter-1.0.2
-1405021506 metadata/md5-cache/mail-filter/opendkim-2.9.2-r1
+1405042036 metadata/md5-cache/mail-filter/libmilter-1.0.2
+1405042036 metadata/md5-cache/mail-filter/opendkim-2.9.2-r1
 1404272355 metadata/md5-cache/rox-extra/edit-2.2
 1404272355 metadata/md5-cache/rox-extra/mp3ogg2wav-1.0
 1404272355 metadata/md5-cache/rox-extra/musicbox-027-r2
@@ -53997,6 +54007,7 @@
 1404272357 metadata/md5-cache/sys-auth/nss_ldap-265
 1404272357 metadata/md5-cache/sys-auth/pam_chroot-0.9.2
 1404272357 metadata/md5-cache/sys-auth/ykneo-ccid-tools-0.0.0
+1405042006 metadata/md5-cache/sys-auth/bioapi-1.2.4
 1404272357 metadata/md5-cache/sys-auth/pam_dotfile-0.7-r1
 1404272357 metadata/md5-cache/sys-auth/pam_dotfile-0.7-r2
 1404272357 metadata/md5-cache/sys-auth/pam-pgsql-0.7.3
@@ -55391,7 +55402,7 @@
 1404272353 metadata/md5-cache/net-im/prosody-0.9.1-r1
 1404272353 metadata/md5-cache/net-im/silc-server-1.1.14
 1404272353 metadata/md5-cache/net-im/silc-server-1.1.18
-1405011809 metadata/md5-cache/net-im/gajim-0.16_rc1
+1405042036 metadata/md5-cache/net-im/gajim-0.16_rc1
 1404272353 metadata/md5-cache/net-im/psi-0.14-r4
 1404272353 metadata/md5-cache/net-im/telepathy-logger-0.4.0-r1
 1404272353 metadata/md5-cache/net-im/psi-0.15
@@ -57101,8 +57112,7 @@
 1404272354 metadata/md5-cache/net-print/splix-2.0.0_p20111206
 1211091748 metadata/md5-cache/net-print/sshlpr-1
 1401171225 metadata/md5-cache/net-print/poster-20060221
-1405012338 metadata/md5-cache/net-print/cups-filters-1.0.52
-1405031836 metadata/md5-cache/net-print/cups-filters-1.0.53
+1405050006 metadata/md5-cache/net-print/cups-filters-1.0.53
 1404272354 metadata/md5-cache/net-print/pnm2ppa-1.13-r1
 1211091748 metadata/md5-cache/net-print/ink-0.5.1
 1401171225 metadata/md5-cache/net-print/cups-pdf-2.6.1
@@ -57182,7 +57192,7 @@
 1212291836 metadata/md5-cache/net-proxy/wwwoffle-2.9h
 1404272355 metadata/md5-cache/net-proxy/wwwoffle-2.9i
 1404272355 metadata/md5-cache/net-proxy/rejik-3.2.10
-1405021706 metadata/md5-cache/net-proxy/dante-1.4.0-r1
+1405042036 metadata/md5-cache/net-proxy/dante-1.4.0-r1
 1404272355 metadata/md5-cache/net-proxy/squirm-1.26-r1
 1404272354 metadata/md5-cache/net-proxy/dansguardian-2.10.0.3-r1
 1405011809 metadata/md5-cache/net-proxy/mitmproxy-0.8.1
@@ -57752,6 +57762,7 @@
 1404272340 metadata/md5-cache/dev-java/jcharts-0.7.5-r2
 1404272341 metadata/md5-cache/dev-java/testng-6.8-r2
 1404272340 metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.0
+1405050106 metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.5
 1404272341 metadata/md5-cache/dev-java/maven-bin-3.0.4-r1
 1404272340 metadata/md5-cache/dev-java/ant-antlr-1.8.0
 1404272340 metadata/md5-cache/dev-java/ant-antlr-1.8.1
@@ -57796,11 +57807,9 @@
 1404272340 metadata/md5-cache/dev-java/jnr-ffi-1.0.10
 1404272340 metadata/md5-cache/dev-java/jgraph-5.12.0.4
 1404272341 metadata/md5-cache/dev-java/miglayout-4.0
-1404272340 metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.40-r1
 1404272340 metadata/md5-cache/dev-java/jbitcollider-core-0.8
 1404272340 metadata/md5-cache/dev-java/caucho-services-3.0.8-r1
 1404272340 metadata/md5-cache/dev-java/caucho-services-3.0.8-r2
-1211091736 metadata/md5-cache/dev-java/java-sdk-docs-1.4.2
 1404272340 metadata/md5-cache/dev-java/ecj-gcj-3.6
 1404272341 metadata/md5-cache/dev-java/smack-2.2.1
 1404272340 metadata/md5-cache/dev-java/flyingsaucer-7-r2
@@ -58285,7 +58294,6 @@
 1404272341 metadata/md5-cache/dev-java/minlog-1.2
 1404272340 metadata/md5-cache/dev-java/jaxb-tools-2.1.2
 1404272340 metadata/md5-cache/dev-java/asm-2.2.3-r1
-1211091736 metadata/md5-cache/dev-java/java-sdk-docs-1.6.0.23
 1211091736 metadata/md5-cache/dev-java/java-sdk-docs-1.6.0.25
 1404272340 metadata/md5-cache/dev-java/java-sdk-docs-1.6.0.30
 1404272341 metadata/md5-cache/dev-java/webgraph-1.4.1-r1
@@ -58304,11 +58312,6 @@
 1404272341 metadata/md5-cache/dev-java/xmlc-2.3.1-r1
 1404272340 metadata/md5-cache/dev-java/jgoodies-animation-1.2.0
 1404272341 metadata/md5-cache/dev-java/jvmstat-3.0
-1302141736 metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.11
-1404272340 metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.17
-1404272340 metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.21
-1404272340 metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.25
-1404272340 metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.45
 1404272340 metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.51
 1405040336 metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.55
 1404272341 metadata/md5-cache/dev-java/yanfs-1.0
@@ -60032,9 +60035,10 @@
 1404301336 metadata/md5-cache/dev-libs/replicant-0.5.0
 1404272342 metadata/md5-cache/dev-libs/tinyxml2-1.0.9_p20121123
 1404272342 metadata/md5-cache/dev-libs/re2-0_p20130115
-1405011406 metadata/md5-cache/dev-libs/re2-0_p20130712
+1405042036 metadata/md5-cache/dev-libs/re2-0_p20130712
 1403232206 metadata/md5-cache/dev-libs/libisofs-1.3.4
 1403072106 metadata/md5-cache/dev-libs/libisofs-1.3.6
+1405042207 metadata/md5-cache/dev-libs/re2-0_p20140304
 1404272342 metadata/md5-cache/dev-libs/tntnet-1.6.3
 1404272342 metadata/md5-cache/dev-libs/tntnet-2.2.1
 1404272341 metadata/md5-cache/dev-libs/dbus-glib-0.100.2
@@ -61065,6 +61069,7 @@
 1405012337 metadata/md5-cache/dev-perl/google-api-adwords-perl-2.7.3
 1405012336 metadata/md5-cache/dev-perl/Daemon-Generic-0.820.0
 1405012337 metadata/md5-cache/dev-perl/Tie-LLHash-1.3.0
+1405042006 metadata/md5-cache/dev-perl/Daemon-Generic-0.840.0
 1405012337 metadata/md5-cache/dev-perl/Test-WWW-Mechanize-1.440.0
 1405012336 metadata/md5-cache/dev-perl/Data-URIEncode-0.110.0
 1405012337 metadata/md5-cache/dev-perl/UNIVERSAL-require-0.150.0
@@ -61512,7 +61517,7 @@
 1405012337 metadata/md5-cache/dev-perl/Mac-Pasteboard-0.3.0
 1405012336 metadata/md5-cache/dev-perl/Color-Calc-1.73.0
 1405012337 metadata/md5-cache/dev-perl/XML-DT-0.560.0
-1405012337 metadata/md5-cache/dev-perl/MediaWiki-API-0.390.0
+1405041936 metadata/md5-cache/dev-perl/MediaWiki-API-0.390.0
 1405012337 metadata/md5-cache/dev-perl/Parse-ErrorString-Perl-0.150.0
 1405012337 metadata/md5-cache/dev-perl/Parse-ErrorString-Perl-0.190.0
 1405012337 metadata/md5-cache/dev-perl/XML-DT-0.620.0
@@ -62483,7 +62488,7 @@
 1404272346 metadata/md5-cache/dev-ruby/pkg-config-1.1.5
 1404272346 metadata/md5-cache/dev-ruby/tzinfo-0.3.37
 1404272346 metadata/md5-cache/dev-ruby/tzinfo-0.3.38
-1404272345 metadata/md5-cache/dev-ruby/actionmailer-3.2.17
+1405042236 metadata/md5-cache/dev-ruby/actionmailer-3.2.17
 1404272345 metadata/md5-cache/dev-ruby/gruff-0.3.7
 1404272345 metadata/md5-cache/dev-ruby/gruff-0.4.0
 1404272345 metadata/md5-cache/dev-ruby/gruff-0.5.1
@@ -62495,7 +62500,7 @@
 1404272346 metadata/md5-cache/dev-ruby/shoulda-2.11.3-r1
 1404272346 metadata/md5-cache/dev-ruby/shoulda-2.11.3-r2
 1404272345 metadata/md5-cache/dev-ruby/heredoc_unindent-1.1.2-r3
-1404272345 metadata/md5-cache/dev-ruby/actionpack-3.2.17
+1405042236 metadata/md5-cache/dev-ruby/actionpack-3.2.17
 1404272346 metadata/md5-cache/dev-ruby/test-unit-1.2.3
 1404272346 metadata/md5-cache/dev-ruby/test-unit-2.5.3
 1404272346 metadata/md5-cache/dev-ruby/termcolor-1.2.1-r1
@@ -62628,7 +62633,7 @@
 1404272346 metadata/md5-cache/dev-ruby/ruby-gstreamer-2.0.2
 1404272346 metadata/md5-cache/dev-ruby/ruby-gstreamer-2.1.0
 1404272346 metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.0
-1404272345 metadata/md5-cache/dev-ruby/activerecord-3.2.17
+1405042236 metadata/md5-cache/dev-ruby/activerecord-3.2.17
 1404272345 metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r1
 1404272345 metadata/md5-cache/dev-ruby/color-1.5.1
 1404272345 metadata/md5-cache/dev-ruby/faraday-0.8.8
@@ -64247,7 +64252,7 @@
 1405011807 metadata/md5-cache/dev-python/jedi-0.7.0
 1405011807 metadata/md5-cache/dev-python/pyopenal-0.1.6-r1
 1405011808 metadata/md5-cache/dev-python/qscintilla-python-2.7.2
-1405011808 metadata/md5-cache/dev-python/sqlalchemy-migrate-0.9
+1405042036 metadata/md5-cache/dev-python/sqlalchemy-migrate-0.9
 1405011806 metadata/md5-cache/dev-python/CoverageTestRunner-1.9-r1
 1402061007 metadata/md5-cache/dev-python/sancho-2.4
 1402061007 metadata/md5-cache/dev-python/lupy-0.2.1-r1
@@ -64467,13 +64472,13 @@
 1402061007 metadata/md5-cache/dev-python/html2text-3.200.3
 1405011807 metadata/md5-cache/dev-python/futures-2.1.4
 1405011807 metadata/md5-cache/dev-python/futures-2.1.5
-1405011807 metadata/md5-cache/dev-python/futures-2.1.6
+1405050906 metadata/md5-cache/dev-python/futures-2.1.6
 1404272345 metadata/md5-cache/dev-python/thunarx-python-0.3.0
 1405011807 metadata/md5-cache/dev-python/hacking-0.7.2-r1
 1404272345 metadata/md5-cache/dev-python/pythonmagick-0.9.7-r1
 1405011807 metadata/md5-cache/dev-python/pyquery-1.2.1-r1
 1402061007 metadata/md5-cache/dev-python/html2text-3.02
-1405011808 metadata/md5-cache/dev-python/testrepository-0.0.18
+1405042036 metadata/md5-cache/dev-python/testrepository-0.0.18
 1405011808 metadata/md5-cache/dev-python/wtforms-1.0.3-r1
 1402061007 metadata/md5-cache/dev-python/kaa-display-0.1.0
 1405011807 metadata/md5-cache/dev-python/python-sqlparse-0.1.5-r1
@@ -64524,6 +64529,7 @@
 1405011806 metadata/md5-cache/dev-python/PyGithub-1.23.0
 1405011806 metadata/md5-cache/dev-python/PyGithub-1.24.0
 1405011806 metadata/md5-cache/dev-python/PyGithub-1.24.1
+1405050406 metadata/md5-cache/dev-python/PyGithub-1.25.0
 1404272344 metadata/md5-cache/dev-python/pymtp-0.0.4-r1
 1405011807 metadata/md5-cache/dev-python/mocker-1.1.1-r1
 1405011808 metadata/md5-cache/dev-python/yolk-portage-0.1-r1
@@ -64862,7 +64868,7 @@
 1402061007 metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.3
 1405011807 metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.4
 1404272344 metadata/md5-cache/dev-python/gnome-python-extras-base-2.25.3
-1405011807 metadata/md5-cache/dev-python/flake8-2.0
+1405042036 metadata/md5-cache/dev-python/flake8-2.0
 1405011807 metadata/md5-cache/dev-python/mygpoclient-1.7-r1
 1402061007 metadata/md5-cache/dev-python/rpy-2.2.6
 1404272344 metadata/md5-cache/dev-python/pygments-1.4
@@ -64966,7 +64972,7 @@
 1405011807 metadata/md5-cache/dev-python/icalendar-3.2-r1
 1405011808 metadata/md5-cache/dev-python/testscenarios-0.4-r2
 1405031836 metadata/md5-cache/dev-python/testscenarios-0.4-r4
-1405011808 metadata/md5-cache/dev-python/testresources-0.2.7-r1
+1405042036 metadata/md5-cache/dev-python/testresources-0.2.7-r1
 1405011807 metadata/md5-cache/dev-python/apsw-3.8.0_p2
 1405011807 metadata/md5-cache/dev-python/apsw-3.8.1_p1
 1405011807 metadata/md5-cache/dev-python/apsw-3.8.2_p1
@@ -65100,7 +65106,7 @@
 1405011807 metadata/md5-cache/dev-python/pyflakes-0.7.2
 1405011807 metadata/md5-cache/dev-python/pyflakes-0.7.3
 1405011807 metadata/md5-cache/dev-python/ets-4.3.0-r1
-1405011807 metadata/md5-cache/dev-python/pyflakes-0.8.1
+1405042036 metadata/md5-cache/dev-python/pyflakes-0.8.1
 1405011808 metadata/md5-cache/dev-python/south-0.7.5-r1
 1404272344 metadata/md5-cache/dev-python/py-xmlrpc-0.8.8.3-r1
 1404272344 metadata/md5-cache/dev-python/ipython-0.12-r1
@@ -65240,7 +65246,7 @@
 1405011807 metadata/md5-cache/dev-python/nosehtmloutput-0.0.4-r1
 1402061007 metadata/md5-cache/dev-python/progressbar-2.3
 1405011807 metadata/md5-cache/dev-python/fixtures-0.3.12-r1
-1405011807 metadata/md5-cache/dev-python/fixtures-0.3.14-r1
+1405042036 metadata/md5-cache/dev-python/fixtures-0.3.14-r1
 1405011807 metadata/md5-cache/dev-python/dbus-python-1.2.0
 1405011808 metadata/md5-cache/dev-python/simplejson-3.3.0
 1405011808 metadata/md5-cache/dev-python/simplejson-3.3.1
@@ -65278,7 +65284,7 @@
 1405011808 metadata/md5-cache/dev-python/routes-2.0
 1405011807 metadata/md5-cache/dev-python/cgkit-2.0.0
 1405011808 metadata/md5-cache/dev-python/whirlpool-0.3-r1
-1405011807 metadata/md5-cache/dev-python/mccabe-0.2.1
+1405042036 metadata/md5-cache/dev-python/mccabe-0.2.1
 1405011807 metadata/md5-cache/dev-python/http-parser-0.8.1-r1
 1404272344 metadata/md5-cache/dev-python/pyside-tools-0.2.14
 1404272344 metadata/md5-cache/dev-python/pyside-tools-0.2.15
@@ -65504,7 +65510,7 @@
 1405011807 metadata/md5-cache/dev-python/pip-1.4.1
 1405011807 metadata/md5-cache/dev-python/pip-1.5.2
 1405011807 metadata/md5-cache/dev-python/pip-1.5.4
-1405031206 metadata/md5-cache/dev-python/pip-1.5.5
+1405042036 metadata/md5-cache/dev-python/pip-1.5.5
 1405011807 metadata/md5-cache/dev-python/nose-exclude-0.1.9
 1405011807 metadata/md5-cache/dev-python/flask-mongoengine-0.7.0
 1402061007 metadata/md5-cache/dev-python/tweepy-1.12
@@ -65651,7 +65657,7 @@
 1405011808 metadata/md5-cache/dev-python/twisted-names-13.2.0
 1405011807 metadata/md5-cache/dev-python/py-bcrypt-0.4
 1405011808 metadata/md5-cache/dev-python/warlock-1.0.1
-1405011807 metadata/md5-cache/dev-python/pip-1.5.4-r1
+1405042036 metadata/md5-cache/dev-python/pip-1.5.4-r1
 1405011807 metadata/md5-cache/dev-python/pysrt-0.5.1
 1405011807 metadata/md5-cache/dev-python/pkginfo-1.0
 1402061007 metadata/md5-cache/dev-python/pyconstruct-2.0.0
@@ -65840,7 +65846,7 @@
 1405011807 metadata/md5-cache/dev-python/pylirc-0.0.5-r1
 1405011807 metadata/md5-cache/dev-python/pbr-0.5.23
 1405011807 metadata/md5-cache/dev-python/pbr-0.7.0
-1405011807 metadata/md5-cache/dev-python/pbr-0.8.0
+1405042036 metadata/md5-cache/dev-python/pbr-0.8.0
 1404272344 metadata/md5-cache/dev-python/codetools-4.1.0
 1405011807 metadata/md5-cache/dev-python/codetools-4.2.0
 1402061007 metadata/md5-cache/dev-python/pylons-1.0
@@ -66042,7 +66048,7 @@
 1405011807 metadata/md5-cache/dev-python/django-recaptcha-0.0.6-r2
 1402061007 metadata/md5-cache/dev-python/pep8-1.3.3
 1405011807 metadata/md5-cache/dev-python/pep8-1.4.5
-1405011807 metadata/md5-cache/dev-python/pep8-1.4.6
+1405042036 metadata/md5-cache/dev-python/pep8-1.4.6
 1405041236 metadata/md5-cache/dev-python/pep8-1.5.6
 1405011808 metadata/md5-cache/dev-python/smmap-0.8.2-r1
 1402061007 metadata/md5-cache/dev-python/odfpy-0.9.2
@@ -67191,7 +67197,7 @@
 1404272358 metadata/md5-cache/sys-fs/ocfs2-tools-1.6.4-r1
 1401171229 metadata/md5-cache/sys-fs/cramfs-1.1
 1404272358 metadata/md5-cache/sys-fs/lufs-0.9.7-r3
-1405022037 metadata/md5-cache/sys-fs/eudev-1.5.3-r1
+1405042036 metadata/md5-cache/sys-fs/eudev-1.5.3-r1
 1404272358 metadata/md5-cache/sys-fs/scan-ffs-1.2
 1404272358 metadata/md5-cache/sys-fs/atari-fdisk-0.7.1.5.1
 1404272358 metadata/md5-cache/sys-fs/atari-fdisk-0.7.1.5.4
@@ -67452,10 +67458,12 @@
 1404272346 metadata/md5-cache/dev-scheme/guile-lib-0.1.6
 1404272346 metadata/md5-cache/dev-scheme/guile-lib-0.1.9
 1405041907 metadata/md5-cache/mate-extra/mate-user-share-1.6.1
+1405050206 metadata/md5-cache/mate-extra/mate-user-share-1.8.0
 1405041906 metadata/md5-cache/mate-extra/mate-dialogs-1.6.2
 1404272350 metadata/md5-cache/mate-extra/mate-dialogs-1.8.0
 1405041906 metadata/md5-cache/mate-extra/mate-power-manager-1.6.3
 1404272350 metadata/md5-cache/mate-extra/mate-power-manager-1.8.0
+1405050206 metadata/md5-cache/mate-extra/caja-extensions-1.8.0
 1405041907 metadata/md5-cache/mate-extra/mate-utils-1.6.1
 1404272350 metadata/md5-cache/mate-extra/mate-utils-1.8.0
 1405041906 metadata/md5-cache/mate-extra/mate-sensors-applet-1.6.1
@@ -68377,7 +68385,7 @@
 1404272352 metadata/md5-cache/media-sound/qmidiarp-0.3.9
 1404272352 metadata/md5-cache/media-sound/jtagger-1.0-r1
 1401171222 metadata/md5-cache/media-sound/ttaenc-3.4.1-r1
-1404272352 metadata/md5-cache/media-sound/mpd-0.17.6
+1405050136 metadata/md5-cache/media-sound/mpd-0.17.6
 1404272352 metadata/md5-cache/media-sound/mpd-0.18.9
 1405041036 metadata/md5-cache/media-sound/xnoise-9999
 1404272352 metadata/md5-cache/media-sound/mp3splt-gtk-0.7
@@ -71331,6 +71339,7 @@
 1404272353 metadata/md5-cache/net-dialup/rp-l2tp-0.4-r1
 1404272353 metadata/md5-cache/net-dialup/rp-l2tp-0.4-r2
 1404272353 metadata/md5-cache/net-dialup/fcpci-0.1-r3
+1405050406 metadata/md5-cache/net-dialup/freeradius-3.0.2-r1
 1404272353 metadata/md5-cache/net-dialup/pptpclient-1.8.0
 1401171223 metadata/md5-cache/net-dialup/neocon-20110228
 1404272353 metadata/md5-cache/net-dialup/ppp-2.4.5-r3
@@ -71659,6 +71668,7 @@
 1404272347 metadata/md5-cache/games-emulation/tuxnes-0.75-r1
 1404272347 metadata/md5-cache/games-emulation/gxmame-0.35_beta2
 1404272347 metadata/md5-cache/games-emulation/zinc-1.1
+1405050206 metadata/md5-cache/games-emulation/dolphin-4.0.2
 1404272347 metadata/md5-cache/games-emulation/gens-2.15.5
 1404272347 metadata/md5-cache/games-emulation/vbam-9999
 1404272347 metadata/md5-cache/games-emulation/mamory-0.2.25
@@ -71701,7 +71711,7 @@
 1404272347 metadata/md5-cache/games-emulation/atari800-2.2.1
 1404272347 metadata/md5-cache/games-emulation/vbam-1.8.0.1149
 1404272347 metadata/md5-cache/games-emulation/vbam-1.8.0.1197
-1404272347 metadata/md5-cache/games-emulation/vbam-1.8.0.1228
+1405042036 metadata/md5-cache/games-emulation/vbam-1.8.0.1228
 1404272347 metadata/md5-cache/games-emulation/nestra-0.66-r2
 1404272347 metadata/md5-cache/games-emulation/boycott-advance-sdl-0.2.8
 1404272348 metadata/md5-cache/gpe-base/libgtkstylus-0.3
@@ -74314,8 +74324,8 @@
 1404272348 metadata/md5-cache/games-fps/ut2003-bonuspack-de-1
 1405012338 metadata/md5-cache/games-fps/rtcwsp-demo-1.1b
 1404272347 metadata/md5-cache/games-fps/duke3d-data-1.0
-1404272347 metadata/md5-cache/games-fps/quake1-ctf-4.0
-1404272347 metadata/md5-cache/games-fps/quake1-movies-0
+1405042206 metadata/md5-cache/games-fps/quake1-ctf-4.0
+1405042236 metadata/md5-cache/games-fps/quake1-movies-0
 1404272347 metadata/md5-cache/games-fps/quake3-alternatefire-2.0-r1
 1405012338 metadata/md5-cache/games-fps/enemy-territory-fortress-1.6-r3
 1405012338 metadata/md5-cache/games-fps/doom3-1.3.1304
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f7af62f04045..ab9460a6f3fe 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 04 May 2014 15:30:01 +0000
+Mon, 05 May 2014 05:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 25ba6449d341..4dae2b3cdf06 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1399215901 Sun 04 May 2014 03:05:01 PM UTC UTC
+1399266301 Mon 05 May 2014 05:05:01 AM UTC UTC
diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index 919110976895..bb27300f8401 100644
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dialup/freeradius
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.121 2014/05/04 08:20:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.123 2014/05/04 23:53:03 jer Exp $
+
+  04 May 2014; Jeroen Roovers <jer@gentoo.org> freeradius-3.0.2-r1.ebuild:
+  Fix run_dir sed script.
+
+*freeradius-3.0.2-r1 (04 May 2014)
+
+  04 May 2014; Jeroen Roovers <jer@gentoo.org> +freeradius-3.0.2-r1.ebuild:
+  Do not build or install static libraries.
 
   04 May 2014; Agostino Sarubbo <ago@gentoo.org> freeradius-2.2.5.ebuild:
   Stable for amd64, wrt bug #501754
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index d5a25a0ba89e..f3b347dae0cb 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -10,23 +10,14 @@ DIST freeradius-server-2.2.5.tar.gz 4415950 SHA256 8c4c2a0b600a8d85d2235589a5e80
 DIST freeradius-server-3.0.2.tar.gz 4233972 SHA256 687f6ca9870709bd433c044947225e365f5099499abba51419bf77134223713b SHA512 8d1168081929cd296e79a31fb3940535643c69c2f2012197e7730bf0886893bfdd49fce9b8c9495ecf6709f67a42b0bfe70c47bfda2e1519aa6baabc30dbfe30 WHIRLPOOL 7e8b326051356e9878db8e5599f5c7806e9c62d9c572ea9f3d07e1a6f359caf96d9d229f05b9b847f4fbb2a51567b30f5e1fe612eff9eaab966042d7fb372b00
 EBUILD freeradius-2.2.0.ebuild 5116 SHA256 d824195666cdf9b96e164cac85c323346ee975a4546f2dcaca6d350630adf00a SHA512 2ccebbf419d568523a9fac00e8b8187a1aa873802ffdb0c92d755a39bb3b94b5e4009f9167a1dca311743c15418ad5fed362375f0229e3f0501a639ce32aeac3 WHIRLPOOL 72f73106896f87d0756fb327d34b81aebcf74e3aef0e86242c6c5fa99b22a01779b72cc4a5b74d5bd50b4edd20cc1b479325819edb62dc50775e937b9b3f2fc4
 EBUILD freeradius-2.2.5.ebuild 5067 SHA256 055fca22ccb65b9118082f8c899aa7e39e592cd4834fd378e62311896d907212 SHA512 73b1fc93078ae144742032b6fd7cb071e8d545772b529dfa281dba517a3a9bfac2a0b5b90a7a41cd6973a6544f47997ae1c2eefdeb969edd5ed41efe710e4ff5 WHIRLPOOL fd65c81cdd1e361c8bdd96026f1cf2fc797f84763a1912eb3b643c135175a1c868a2e110d343ade7449dbbee1f629729ee03e8b1456fa242fd0baebcd4e3e53b
+EBUILD freeradius-3.0.2-r1.ebuild 5517 SHA256 48ee8db2949273cb4c5db82c2159a1863c969fcb965267a0cd0defbd3cee8d59 SHA512 5507489651602f86476b925c81b6eaa472caa4a3f8ec1b797215cf2fa4344ab21a80bec6807bc0bf56ab810164fbd9bbdc1c2bca7313e5a2bc60c41d5db412ea WHIRLPOOL b5a36aec2ed8878d45043b8669dbddf0df6d8e5f874bedc8eb2d643e443c43f1cd17000fa4238a9b60bdfd55b8b6e6b798697f3d1f043af7c0eedfd358d7e676
 EBUILD freeradius-3.0.2.ebuild 4983 SHA256 e541623a1773112e203547a1c88c88b984c15f0bdefcc6628454f18fe3aab638 SHA512 365b4213e6285db114007e6af9d5463f182b318a7ec19af0647a1cd9bc948b3947eb97a8a408f53e8b1978c5d099374bc3812f77b0533b47e366f18142ef5d30 WHIRLPOOL f130a305fe0a52a5a5cbb1977a164f32517e8b5131467f11092ee765bc592cbbd5a4521f8c6b5ca54cc8c12a1832ced1a344ea00391b9b9d1422ee094f10a86d
-MISC ChangeLog 26682 SHA256 e3188d453fbf37ad07ae131a5eaac5ed56fd341933fb33decaa45ed025338309 SHA512 80bec4e67cc5252d27f02ba4b03ba6a4fa624090f7cbbe6532396173c637c1d0fcc9a32d9350a9983273ad2ec5104a011cbc7653075f50f370273c9086b58197 WHIRLPOOL 04ec281f6a99f6b84e2d5d5aceb2ae8f199297d19879218b6f45290f7f9f61ee5987f5e309025c4dc084a9fc35da1132d98c81622ca0fe001bb8c3e0eb177d5d
+MISC ChangeLog 26941 SHA256 3d224ae0ff12b579c7bf8e038c62963dd8abe5c06efb4f72b3dd6f11ed846f67 SHA512 8b7592b74b350aa259bd7178b46c50c4d2014b7179c6b39888baaa09dccfb22f626defabd175e48cd139808288882e1f27f5461b3dae881e5eeca1f2c4dadfc6 WHIRLPOOL e976220a8b378f0c0f63de0016ad517c76b43de6af8e4647b843966a705a1066d3b08be14b8f2c6b9d6a838c58c79ca172bfe52a0f002a1a7c92f3641049d1fa
 MISC metadata.xml 435 SHA256 17d441afcfa0aac8ea4317f50436a55adad6b51dd407613df8e6a7341fc348a6 SHA512 17d166ec4154f6d9a85cfc7135f3b14641d0357d959b76af27067cf069f392f9fe7bbf44683f84a963552e0dd88c668f3c9c4f3a4e00ee98ab56de291d292b0a WHIRLPOOL 69f278ec8875ed0085e86db9373a04285c2452448f1220ed1c8c31e9f0283b8b80c720b108373ba9a0478a0118034faec7b91ab7f5d93adbff2bfca79b5460f1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTZfhIAAoJELp701BxlEWfA4IQAIdzrzQPIOVfA0Io0vYAVyFo
-ASmPKDmVJ2cGZ7o+3DmBZVGOyRBLa5n/bEl25h4jPO+jNxje8hqRkmUmyMMvAjEW
-wdXT6zLB/QHg7kRmFJcNUr+p0+8P3rsJREETZJD42PareqSdO32YrNUkMnhVsEy2
-G26QMm/aVanOJnxaQRotYVzAYtvWqSsVG0sf8wfsbKc8QiwRbrYRcPklg1rVjueL
-Hy8euYe/X59Av4BwguXO65ePwbqARgY2ScqVuglj6yDBokAxEz3Yut60hu9eEsHJ
-1MqptwbA0UbcgkuSiFDEvQTFRRFP7W8ZonkimHLw4iqe0d/PvMxYMkzkUw6L9Lg0
-SJ5Kybv64xsQVUFmkUxJcF0hFggGRarnigdzuftGQIVS6r8CvZyyC6ezz6dsamu9
-2Z6vyrbBVapDdzglmOfkVUVfeehXmAUhwbioBP2maiw38nfYZ18jLow+u+hIZusQ
-DwnbsWv62yeLkbyyT6CTIUAs1vAOJ5mrrMHI76uNN4J7Z+egS6uqXbhccvAYNVHz
-s71hT/xkeZkSc/z7ZOD6wwKSL5Q1O8nIj3O8r9SW5dZ1Ax8QqmnEamwUC8OFt9oW
-q9M12Mhv6gAIe8epmhDmWCkv0hh5etztjOY2i5+jjdwSAjgtD1DBiGj5pXpcVgut
-DkNKl30NvvqlNr/owm+m
-=hdny
+iEYEAREIAAYFAlNm0uAACgkQVWmRsqeSphPC6wCfe6wq/A1bLsnV0aEntSod1P+D
+6scAnRmboR8gt9nGyPABCgVQ3Pd/H6uy
+=tT9U
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/freeradius/freeradius-3.0.2-r1.ebuild b/net-dialup/freeradius/freeradius-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..d7c586e609a8
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-3.0.2-r1.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-3.0.2-r1.ebuild,v 1.2 2014/05/04 23:53:03 jer Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools eutils pam python-any-r1 user
+
+PATCHSET=4
+
+MY_P="${PN}-server-${PV}"
+
+DESCRIPTION="Highly configurable free RADIUS server"
+SRC_URI="
+	ftp://ftp.freeradius.org/pub/radius/${MY_P}.tar.gz
+	ftp://ftp.freeradius.org/pub/radius/old/${MY_P}.tar.gz
+"
+HOMEPAGE="http://www.freeradius.org/"
+
+KEYWORDS=""
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="
+	bindist debug firebird iodbc kerberos ldap mysql odbc oracle pam pcap
+	postgres python readline sqlite ssl
+"
+
+REQUIRED_USE="bindist? ( !firebird )"
+
+RDEPEND="!net-dialup/cistronradius
+	!net-dialup/gnuradius
+	sys-devel/libtool
+	dev-lang/perl
+	sys-libs/gdbm
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline )
+	pcap? ( net-libs/libpcap )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-base )
+	firebird? ( dev-db/firebird )
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl )
+	ldap? ( net-nds/openldap )
+	kerberos? ( virtual/krb5 )
+	sqlite? ( dev-db/sqlite:3 )
+	odbc? ( dev-db/unixODBC )
+	iodbc? ( dev-db/libiodbc )
+	oracle? ( dev-db/oracle-instantclient-basic )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup radius
+	enewuser radius -1 -1 /var/log/radius radius
+
+	python-any-r1_pkg_setup
+	export PYTHONBIN="${EPYTHON}"
+}
+
+src_prepare() {
+	# most of the configuration options do not appear as ./configure
+	# switches. Instead it identifies the directories that are available
+	# and run through them. These might check for the presence of
+	# various libraries, in which case they are not built.  To avoid
+	# automagic dependencies, we just remove all the modules that we're
+	# not interested in using.
+
+	use ssl || rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap}
+	use ldap || rm -r src/modules/rlm_ldap
+	use kerberos || rm -r src/modules/rlm_krb5
+	use pam || rm -r src/modules/rlm_pam
+	use python || rm -r src/modules/rlm_python
+	# Do not install ruby rlm module, bug #483108
+	rm -r src/modules/rlm_ruby
+
+	# these are all things we don't have in portage/I don't want to deal
+	# with myself
+	rm -r src/modules/rlm_eap/types/rlm_eap_tnc # requires TNCS library
+	rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 # requires libeap-ikev2
+	rm -r src/modules/rlm_opendirectory # requires some membership.h
+	rm -r src/modules/rlm_redis{,who} # requires redis
+	rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds}
+
+	# sql drivers that are not part of experimental are loaded from a
+	# file, so we have to remove them from the file itself when we
+	# remove them.
+	usesqldriver() {
+		local flag=$1
+		local driver=rlm_sql_${2:-${flag}}
+
+		if ! use ${flag}; then
+			rm -r src/modules/rlm_sql/drivers/${driver} || die
+			sed -i -e /${driver}/d src/modules/rlm_sql/stable || die
+		fi
+	}
+
+	sed -i \
+		-e 's:/var/run/radiusd:/run/radiusd:g' \
+		-e '/^run_dir/s:${localstatedir}::g' \
+		raddb/radiusd.conf.in || die
+
+	# verbosity
+	# build shared libraries using jlibtool --shared
+	sed -i \
+		-e '/$(LIBTOOL)/s|--quiet ||g' \
+		-e 's:--mode=\(compile\|link\):& --shared:g' \
+		Make.inc.in || die
+
+	sed -i \
+		-e 's|--silent ||g' \
+		-e 's:--mode=\(compile\|link\):& --shared:g' \
+		scripts/libtool.mk || die
+
+	# crude measure to stop jlibtool from running ranlib and ar
+	sed -i \
+		-e '/LIBRARIAN/s|".*"|"true"|g' \
+		-e '/RANLIB/s|".*"|"true"|g' \
+		scripts/jlibtool.c || die
+
+	usesqldriver mysql
+	usesqldriver postgres postgresql
+	usesqldriver firebird
+	usesqldriver iodbc
+	usesqldriver odbc unixodbc
+	usesqldriver oracle
+	usesqldriver sqlite
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	# fix bug #77613
+	if has_version app-crypt/heimdal; then
+		myconf="${myconf} --enable-heimdal-krb5"
+	fi
+
+	use readline || export ac_cv_lib_readline=no
+	use pcap || export ac_cv_lib_pcap_pcap_open_live=no
+
+	# do not try to enable static with static-libs; upstream is a
+	# massacre of libtool best practices so you also have to make sure
+	# to --enable-shared explicitly.
+	econf \
+		--enable-shared \
+		--disable-static \
+		--disable-ltdl-install \
+		--with-system-libtool \
+		--with-system-libltdl \
+		--with-ascend-binary \
+		--with-udpfromto \
+		--with-dhcp \
+		--with-iodbc-include-dir=/usr/include/iodbc \
+		--with-experimental-modules \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-logdir=/var/log/radius \
+		$(use_enable debug developer) \
+		$(use_with ldap edir) \
+		$(use_with ssl openssl) \
+		${myconf}
+}
+
+src_compile() {
+	# verbose, do not generate certificates
+	emake \
+		Q='' ECHO=true \
+		LOCAL_CERT_PRODUCTS=''
+}
+
+src_install() {
+	dodir /etc
+	diropts -m0750 -o root -g radius
+	dodir /etc/raddb
+	diropts -m0750 -o radius -g radius
+	dodir /var/log/radius
+	keepdir /var/log/radius/radacct
+	diropts
+
+	# verbose, do not install certificates
+	emake -j1 \
+		Q='' ECHO=true \
+		LOCAL_CERT_PRODUCTS='' \
+		R="${D}" \
+		install
+
+	fowners -R root:radius /etc/raddb
+
+	pamd_mimic_system radiusd auth account password session
+
+	dodoc CREDITS
+
+	rm "${D}/usr/sbin/rc.radiusd"
+
+	newinitd "${FILESDIR}/radius.init-r3" radiusd
+	newconfd "${FILESDIR}/radius.conf-r3" radiusd
+
+	prune_libtool_files
+}
+
+pkg_config() {
+	if use ssl; then
+		cd "${ROOT}"/etc/raddb/certs
+		./bootstrap
+	fi
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} && use ssl; then
+		elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
+		elog "to start the radiusd service."
+	fi
+}
diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index 5bbf1ec4ff3a..809a4ac24654 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.308 2014/05/02 12:57:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.309 2014/05/04 16:06:53 maekke Exp $
+
+  04 May 2014; Markus Meier <maekke@gentoo.org> iptables-1.4.21-r1.ebuild:
+  arm stable, bug #506798
 
   02 May 2014; Jeroen Roovers <jer@gentoo.org> iptables-1.4.21-r1.ebuild:
   Stable for HPPA (bug #506798).
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 846eb792bb9c..fc19d6dc2c47 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -53,15 +53,15 @@ EBUILD iptables-1.4.17.ebuild 2355 SHA256 c7656bc972eb6cf702aa10ba04682ae5457bf2
 EBUILD iptables-1.4.18.ebuild 2424 SHA256 14f273e0d6ac1d3df9d073f666a448d7db68b8fe64e3641dcda8ac28ca082cf6 SHA512 d835d34529a4e6609ac712de9a16eda946e4f35afe6fdbb2161f0c3c9c726f52167c142d0609510040d51273e13f984760f97f9ebdfb4db9ce03592915db01ee WHIRLPOOL 902e9678fe338d190d4a2f21a2b62d342ee322cfd15801bdd0f9d3ceac8c0edb2f34b46d23b9161b3ea4d187371fa4596eb6198fc97cf533171857afdca4a526
 EBUILD iptables-1.4.19.1.ebuild 2272 SHA256 09792d07161882524fcce8bfb58d1528b297209cf5b1882c3cf24d87c08345c3 SHA512 bb1794e7a5f0250e900f90a6f9b156573e86a90eb8cda0194e5cba8da91cea14d16c2e2a8c638fa6ee1ca84549514d2ac4d32c92b00a75c6409b15f92135cad9 WHIRLPOOL 98527eb9faafbe7c59f7578aae9112fb0f094baaf8baf4c842db35701cfc10f6a0b49b6c1daba754d0208388678c3f240f26a5799c07a663508df0aea2a13faa
 EBUILD iptables-1.4.20.ebuild 2259 SHA256 79abddb985d116c1c32176870c05df5e783cb61bc71ab471f3e7e54b2577318c SHA512 151eb7700969aa6a01788bc678d7fe27d20578028b33cfb8e76495b7b373e266642b4fd55f253d1254603d93cccd0bf9722f69fb0dd9a6bc66a06e1c23a27644 WHIRLPOOL e6380dbcf88ebcb91e3e8a7479b9d7e778d09219113480541d7156c47901080b3c44dc3903586524cbb078b904f6819be904007e5450a8cdc6e305bc849d2d7b
-EBUILD iptables-1.4.21-r1.ebuild 2446 SHA256 30f1fbc4f24e4c0b1fe1d22bbdbbfacd22012305c1255d4f424da3a5c1e37c64 SHA512 77cc52853e09e24cc21523618469852e0c74c3ee8efe08e8c0c2f70f881681e099c2b8f896671a59ae62bee6a7d18d3271ab6d12d55d89215a3c25229e9b34af WHIRLPOOL 50de9f9b847712952d93b54c36986cfa34063fb5530fd219ee1633899d7c488a173beb580ab2c114af631de6adc23a862f3dc28e46bf0cbeb933dd07ed0c13a4
+EBUILD iptables-1.4.21-r1.ebuild 2448 SHA256 61bbf437d1dc2e6b11b0f512d9b247e55eb09e7f93b5984d2521e5a31a036e45 SHA512 cc4888cb9f6f96ab784b2934ba3c8dd3a8874e68c9b44f0a7160c2d485a52bdb9a688b4783d7c83493ddf8659f3d2f5d1876c58cc85cf0e2cd7819071161e875 WHIRLPOOL af8285616f60ab93ec7ec3c102302358edfeb5bf54a4382a59eb257409f118f79280c9ba8ec611ff946157071025328259c59080ff7f8913cfda549e9ba84ca6
 EBUILD iptables-1.4.21.ebuild 2274 SHA256 a7c717d3dac16cced81dcb81639d8a4c4a393250e5af84604390f6e715178de1 SHA512 43a05cafd091c9f107f983608a7c63361c067a258c9e39959c622ea6b0a6008a24cf0ec4c0af93dd46151a79c534c60df39ac316bc8a9b1738464276c611597e WHIRLPOOL cb8110f1013c02c790cc02ca96583f41fe1bed85e24e3514f9d6ee53b2967e16471014a732316a40a6359b993efb6fe0214893c2d729e069ae25a7971cfd0785
 EBUILD iptables-1.4.6.ebuild 1443 SHA256 3ca97a6095af334fe9b734329ae8e2a58ac78dd1f7a52e0295b203eec4e5178c SHA512 a30301a6f28cc5b90c97b58f37f04005f01313b66f6cb2b5b65294d0612887147d99a7cc8a73940c48a5e4f7d504e643a1e3f0664383bbf7e2e24017944b4436 WHIRLPOOL 836783d6a1f9b733edb965742996cbcac2869a3f716b9b78af4ae912a051919c61c2beb1ea061262da9f80c647db6892e597981ed75d8d5a94cef813722727a4
-MISC ChangeLog 52493 SHA256 adc8c62856d3f161ea87dada7e7f6dcb5b51a2df56c678c40cc55235d0580c8f SHA512 1e71e20c5a971a9bf394f4f958bec666bec17a8ec3238c2ff2c5d4b96064dd4f3ac3a806a34983eaa7e146b4c8a41e7b28e3b809b6a5afc090ac17ee220af6b6 WHIRLPOOL 70ff1b0736e336810fa64c06535a7ea72ddab9256c2d118d4fe1f859a0e965eb5c793bf9efdfb3efe43d2f46ec8ff2a3ec62ba49365eee7353faf265e7ecd26a
+MISC ChangeLog 52598 SHA256 05ac76734d09d63a3b5b8cd8931b64f081180d72162c620bf4016bfeca84f4db SHA512 e3d634a647b52e815a972eac6016b5704954e58a002e4fe349eebdb87cbbdcb510c9f8f8e88d10a61ace2bb7e6aa7ba696aca857f882925bc6687f329d47af63 WHIRLPOOL 3679538963d98872f7d3eef2075585728418c0da75ff993c233ed957e80313560c71403cc4c10603ce3dd0ba35eca5eaec9df83a259384dba2d2dde2546336ea
 MISC metadata.xml 1069 SHA256 91c6679d742c254b368f9a18cb42a3d29f90a9b691dda61967152b629e2abaa2 SHA512 395b2b3b812cc99d31ea812ad2e42fe52e9fc3e5fcd17db18b95b1dba09495bb5124760308ba46a463b47cb089d587819600d5883a313314a865628fa00f6907 WHIRLPOOL 6e1e2717c19802d94f155c6841a0b7cef10ad38cd338e3e5ba8eab671b433c547fbe816a234f8e02ad1a0bfd6f69695ff643f3ca62a99a6d51be8108eb79e9ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNjliEACgkQVWmRsqeSphM9gACcDvsaaX93Jxlv5XhF/H3ly47H
-Bq0AmwWum1Z2eNecsUxLyVm/qwPZdfJt
-=hm9U
+iEYEAREIAAYFAlNmZ4QACgkQkKaRLQcq0GJP0gCgkRI2Otpx7PLGqXhWEQJHa1Mp
+ExcAnjIhKe9CI0Xk/4gQreB+cOwc/t5n
+=7det
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/iptables/iptables-1.4.21-r1.ebuild b/net-firewall/iptables/iptables-1.4.21-r1.ebuild
index cb4cccf00f51..8c11de9c039d 100644
--- a/net-firewall/iptables/iptables-1.4.21-r1.ebuild
+++ b/net-firewall/iptables/iptables-1.4.21-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.21-r1.ebuild,v 1.2 2014/05/02 12:57:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.21-r1.ebuild,v 1.3 2014/05/04 16:06:53 maekke Exp $
 
 EAPI="5"
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.netfilter.org/projects/iptables/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="ipv6 netlink static-libs"
 
 RDEPEND="
diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index b4408343fddf..94c5b745f996 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.201 2014/05/01 11:33:55 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.202 2014/05/04 16:14:04 maekke Exp $
+
+  04 May 2014; Markus Meier <maekke@gentoo.org> gajim-0.16_rc1.ebuild:
+  add ~arm, bug #503596
 
   01 May 2014; Mikle Kolyada <zlogene@gentoo.org> gajim-0.15.4.ebuild:
   ppc64 stable wrt bug #507032
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index c6d28f0892b5..a84220e2ea1b 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -23,15 +23,13 @@ EBUILD gajim-0.15.4.ebuild 2967 SHA256 43b5517f00ebb9eaa7663172586309cb7e0f0003e
 EBUILD gajim-0.16_beta1.ebuild 2931 SHA256 46c133f86a86d4fba4df1342f050017dae84fb255f3e676af3de45c28c861ebf SHA512 b569c7e8343316f04c0d5f03f9c710e10104a57d5c6d0675e20a75906f0fb6866d0d8e6315a07f2d55974c8a1c01da931be752fdae62afdb860c841a9adc6600 WHIRLPOOL 837d7ae86b949b088d595dce4c29e11d2c8d0814bc4307efd2913cc02b2417b5daeed4b5db2680b5e7e934dac73fd6d25b53436e4bdce83f1237df482108b489
 EBUILD gajim-0.16_beta2-r1.ebuild 3038 SHA256 7e6872881c0be6e76a1d6a95fadf72cce3f4e455b79c2ec8505395a5bb9349ce SHA512 5ce73ca9add14ae9e61d8391f353d542c17cb2d410ba3944c42ac7ecc6c9233aaa4a0004bee61935a389a54827c3902c0e0d953d0eab5eda1d784026bb9ce3ad WHIRLPOOL 1e42bc0971d4fb41d2712115c6b2f0449be3004894f476290e145e9f612c8ce6559b76a20d473925fd0d1f6cb84decc4677d0fa37b0c864a97d589de96be5e28
 EBUILD gajim-0.16_beta2.ebuild 2926 SHA256 019e0da84230d76fab1719cf531ba77e5cea77710d2d2ccafe0c108856b6ef28 SHA512 c657215ca8bfa95af84d70fc80c453e1a8713d5345bf89661e8cc0228120a9d352fde33c18dc5c654967cdb73f1689b755182ebda80318f5d0e309d4133af645 WHIRLPOOL a7a742e8fbd6f2611501876dfae3697a94a806cb5ce1ae6f81ef4e4d8b2f4557c2ccdedc6d12fd313520bcf1588834a6b5e5a59bdbe38b794f48bdcb7a8a84b2
-EBUILD gajim-0.16_rc1.ebuild 2926 SHA256 0040d90989fce8e4973d477d0ad18cfcd69363d677a4f1bbc9e1fc58298f6a13 SHA512 66f76816314f894ce1783eeca2792e6e239d9dc7902cce3360f847781624be723b3c7dde54209b09e971c2435dcef0fb06645a37c17e0fbb9e1c16721e85e30e WHIRLPOOL 67a792026cdb1d782bc1db60aa539a30f029f0f470e8712e3cc4b54113eb64654b933a8fe24aa0b7d93ef051434973a5eefee53c85a8d7df863d878fad41f746
-MISC ChangeLog 28963 SHA256 4ea4df185a18937ab6494d4d8d5a27260964800d23f0bbbe66177c38cec0635c SHA512 fb9edcc1de7dc97754ddedf72892cc1b206cdf02700b09859ecf0781ce49f346a6c80ec84256e62ee27a69e6ec149f30f0113326755f0ee86af41359f13bbf34 WHIRLPOOL 28ae12e03d3ec94dc25e43385e14b0c42c45d4a4e96a68b3fec3cadbc76a45f2c9d8f2f5558af48cdb2e898aaf10f2805b3c2b58032212f0cd13f2613d584fb3
+EBUILD gajim-0.16_rc1.ebuild 2933 SHA256 1ffb445d5127b272d039bc2740d0ce0e393197ea5cbfb938737c2aa78b7a5f7f SHA512 98cd2b46763fa37a17e8085b20e78fd1f6a8c66e03c605a6e88e8c6ba50cdce7b9467e79f2f10c1972ad653377cfaa8fcd4a957b7d6e443d708353aa10b0fdc7 WHIRLPOOL fc08d3a33e8bd14800707c4bca211c5688e72d6732fff75710e42cefcd124911b70ac814dd7ee00ec1d338f27004ea508eca9e3c5d94a21a5c800a23c1665c03
+MISC ChangeLog 29058 SHA256 1c2f1ee185b9e9af5e23fc4825f969886bfa75d07eccf9eb50c03d420232d1ed SHA512 d111886bcb92488794df758594d5df7f3ab94e0b685bad3b630323bd610ceec0830feaf1bfa0e2e2eedb2d9c200048b24555781f8077e3db9b299d72cd0602c4 WHIRLPOOL baa5b721ae663a2eeb206287230e90ddf41531d2d6574128390a99fcbae89bc42fc8755b8b646b2a604c0cdf34df1307f924771b09e95b3d406c528d7851a246
 MISC metadata.xml 503 SHA256 781012e83e7e3d1480ed6413a58f8a294e3a1b4c4968b1217c9bf7b41cca3ae5 SHA512 cfc7f159daf5007962ea035289002df56575042d567aa36c495b95dcf7ca7bb931be622599537e9ea67c25b7cb75014acf38a13bda349218af7a5eb576ebb0a4 WHIRLPOOL 3ff97b378ffe5c79d63ba206dec6c346480c42aa4988bed662066efbf5599e0986c83cd1ade54bded8bb2e2ad0ab6ad6f18c791b59f11215c2a52c4503721cbb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iJwEAQEIAAYFAlNiMnIACgkQG9wOWsQutdbwRQP7BSle4Ar6P/eW7rNH1ei8vT9n
-D/ecdLK5+pr+GVB47V85moINAwIbhY0F8wzwyRh/jn2zbTMahonKX6rxF+ZCZK0U
-DQQ6X/g+QiUJtUmntMYaIlphl837FvyxA4TfKzogC4b3ryXsLp//aSRjcBvevYrV
-KfpwkJJ0kGw5IKO1TTA=
-=X1sr
+iEYEAREIAAYFAlNmaTIACgkQkKaRLQcq0GJx6wCgi2K43cjUAXLUvQWB78p3Dipu
+GMwAniOsgMkdTTsj/OTPTx5mFWMY1nNz
+=Ik9T
 -----END PGP SIGNATURE-----
diff --git a/net-im/gajim/gajim-0.16_rc1.ebuild b/net-im/gajim/gajim-0.16_rc1.ebuild
index b46ee2eba2df..60234b2f6871 100644
--- a/net-im/gajim/gajim-0.16_rc1.ebuild
+++ b/net-im/gajim/gajim-0.16_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.16_rc1.ebuild,v 1.1 2014/03/18 13:30:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.16_rc1.ebuild,v 1.2 2014/05/04 16:14:04 maekke Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
 IUSE="avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
 
 REQUIRED_USE="
diff --git a/net-print/cups-filters/ChangeLog b/net-print/cups-filters/ChangeLog
index 0f4b6db69acf..657af0e08509 100644
--- a/net-print/cups-filters/ChangeLog
+++ b/net-print/cups-filters/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-print/cups-filters
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.118 2014/05/03 14:16:40 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.120 2014/05/04 19:44:26 dilfridge Exp $
+
+  04 May 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  -cups-filters-1.0.52.ebuild:
+  Remove old
+
+  04 May 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  cups-filters-1.0.53.ebuild:
+  Add parallel build workaround, bug 508994
 
   03 May 2014; Markus Meier <maekke@gentoo.org> cups-filters-1.0.53.ebuild:
   arm stable, bug #508844
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 7fb80f6a049d..8527cfa81859 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -4,18 +4,28 @@ Hash: SHA256
 AUX cups-browsed.init.d 399 SHA256 d4d27c920ab062532755b553544ff3ef4d561d03bda0728d21e71c83d0e904bd SHA512 3762f18e57e317e4e2b40b1f42da79e383de4f4a360cd7317ae1780edd44ffde007b0ced88bac6b24d082d0fab19425360eec891ba86fe46d9e201e1081a2beb WHIRLPOOL 38782d813df3be20f1d6a15c2aecc94a1409bd8e90b0a2f65f73f512b3ff37afc06c57dbd6be24abd1dead189ea1c75292bc45e68303de4141ef748e9ca58577
 AUX cups-browsed.service 225 SHA256 f4cd6ac0da207deb3b9991264fcb8d3468ae7c5c4fcd1957d296d344fd9e3d44 SHA512 16d7a8b0c95827582706764ca6f96720561e8c314929f6d53c98dccb68b6df21d5928949b0aaf7c2f738ab5c07ee2678d643b9acb6b581bb77a67db950082cdb WHIRLPOOL d1606f5ebfc84398502282e9c1e42bed6701f2d4e284f1214ef924aa94fe2be3e169d83f9d9fdd34a817514df35e680f38b3e91fb7e965510621e3fad8002f14
 DIST cups-filters-1.0.43.tar.xz 1098820 SHA256 026b29193ea4951eacbfda6e0e4d8f652166796d08599e7cf7004859676cf337 SHA512 79e33bd6deea147cb4c74806cadbcee4f080068e33673bdf88e0d3198fa86458a3147c8beb6f996e0f708f764e55cd5bd61ba29a142116e7e1dbe0a0e0ddd0e6 WHIRLPOOL d847ca5e8fdb8e7cca954e560a20343804c24b114beafcb5fcd0557fa7d015b9f28a6e8783d3a3f6f9e8dba951d783c0b625fc97dd2015a26d51e89cd760bd51
-DIST cups-filters-1.0.52.tar.xz 1311192 SHA256 32fc3647e7d610217d813cfe87dae861bb27a3df50a084578bc659722022fd13 SHA512 3f561d7aca54adbc90701edb5412e254236f2a6d2ef13270541223ee131004004a6a102ccd2abbf6746ed6b501e39e57a3b6bad3201e9aee7a580d0c80a2832a WHIRLPOOL 84ec572ee5e6ba52ee7a2cd692ba07f5fac5715588a45fca71ae2fead2a4b4f401fbc45789ad4865290cbfe51c4b53b5ae232b41803e7c0a03fad22f444282f6
 DIST cups-filters-1.0.53.tar.xz 1312476 SHA256 a25b55228cc13549d6989a9f6319e4e313ce42fe88d8b645e02b0c17d02dc2bf SHA512 dc46195211615cd91ce4bd8a616a8f89bcfd5e601195d6a0ab9761aee964c424929dc0d30347947d742138f7dad29ce9259bac6209945cc4a1d475614db59d0e WHIRLPOOL 95a758b29418939f3dcd6f49d52b750756dc01e43eeccf0a7833925052f42d919106346fa4a0503532ab1e7321247fdbef8547755b3c2288ad91789f26bbb5b7
 EBUILD cups-filters-1.0.43-r1.ebuild 3553 SHA256 3ac5d28c1a35a0e284ba88c3c836c264dc645524a4c44a1b9e68b0534bbe9325 SHA512 5cf964b2345ed2f85ec6cb4dbb4cac0e125d5229761c7b5ea0919d21e7c22069af2a959292d02e139cfb06243b4699380c8a1a8a817742f4eb2b255ebf626a6f WHIRLPOOL 582f84a72ae3c57e3b233acaef932bd143928424f90052da25b72b266bde024c009d91eb5cabb8bb318425a1b1848e0c3a2c4641306ff3c01888745091f5c668
-EBUILD cups-filters-1.0.52.ebuild 3566 SHA256 e18ba79574082b6f5d1b21c6c860b7efb0ec1efdde8c0f43f1961047a94c72e4 SHA512 f6663bb0f4f6eb0806fa009d3051eb9bb2e9f7e010538371025a53e87b74f2e2eee483048e7a977d89f0d3a74b355abbb7aef3f8024617c5bc83e2abb47b6496 WHIRLPOOL 99e2ebb474bd22796df411599cd2aa9726c1eccf336a58b245f7252e671d366f8101ef667e51dbe6edaaae553b1646181c26b598d331d09e0910119d0fa7a2da
-EBUILD cups-filters-1.0.53.ebuild 3575 SHA256 56cd10f64bd6bb66355f3630c7b0b609ee870bdadf4bed1b09db8e06b61e2513 SHA512 a1cc6ea0d4ef0decc5b2c9a0ebb06e036632b00c09c185c34bd177c3edffcf2caf6596835130e890355a0fc9dada67951f2c9fe57593c396d91bf6b919e9edc4 WHIRLPOOL 2e8b47f099c63f490e5f3640db78581bd1a14b0d0ddbf58a7abbb4ea13effa4c6c3b017cc61cc66a60104a788cdafa26bb30a1193244b8f5d0742992fc7d227a
+EBUILD cups-filters-1.0.53.ebuild 3591 SHA256 01a97413212d541f0a8d01c5b6801def0eeb90b5e11f7c5dadd6161998a94e31 SHA512 69116fc593c9c08b7a011bf4ae61992e9ee0f64b84e94d0368a8f21b1041a81c08f51eee5f85e0e3f5ae0fefc2d5896bf6ff7d6b72910ed3b04b6fa39d76f803 WHIRLPOOL 1fc79241d9bc72a13b3c3c6fc43b0c8bbb0e952aa05579967f4f4ef2b1720844d67686f822eae14466194e48ad12f9c4b921ba9c9f747c083f4fe3e7380b7b01
 EBUILD cups-filters-9999.ebuild 3563 SHA256 aff1098928dd281942ee3a31971686922a8b9e824f3dbe1dc84a0d10005b82fd SHA512 69b0f95c9aba135ad98d7b0b37cdca9574376b1ed700d880ba2f2b7fd08345d7cf354425a71bd2548017fd7d43b546888643ecaea5ee77ad8814de648eebfc28 WHIRLPOOL 6897012e9aff01a0f23c416ed18879125885244f1654551e79e89f18cddf0d7add69841495a2ad1a561d62f7208cd92f4b234dc0804c3ee91d95ee16879be214
-MISC ChangeLog 19256 SHA256 8b6cdb6534067ccb33a2679f13bf21522b2d863723f1dca59bf4c1eefd0a1b22 SHA512 dd56a977fa1ac378472a96f45880336d99891f837d3d21824f1a21701ce45351996fc0a505247d8e2eba3546d01ffda123195e8ccdf20ff6e98eb92ccf52662b WHIRLPOOL d1e80a23a69a9427391d428ad227b5bffb3bbce0ea644104d51454dae5dd7fa10bec27d65d7d5d0c24398107de1d4a97d808395a2a698461f921497bfd57bba1
+MISC ChangeLog 19493 SHA256 d5256b7d61c5aa0eec77994aa0e33c89d78bf3a43eed91388aca436b8d911151 SHA512 0643ab5b435614d4b69dca84c829ca1cf60945975bff7536900bce6364021f35885164f846ce7ef9314c349e6e6a58da2fdd63726074e159a26f105a150364f4 WHIRLPOOL bc4647b0862c406651ac462f9ec2db6f625f6a29272eca1bd7198030c041e08bf2a5e3f3b97732164d17ed3398f26c64cdbc36a096a404f4653d4014a052232a
 MISC metadata.xml 290 SHA256 07d21bc9b73af41131dc35b0b30829bb124443a931df199fad5720fd0c6ecb82 SHA512 8614acef9fc5a0d78a7c65ce34d79189c2496946a4bccb215b9404abdc0c821ee89f3a89892e2c320359063fc43750c9e9581b7fb732d9d710ff7bb2dd6229db WHIRLPOOL a0ef99c415a6e3dea7f7c0f2349ea67ce76e8361f36d1f8c828d136ebf01e4d3a5b1038aba6aea92843ab67bed68c38a0a841f3620e7d46aa205360694e682ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNk/C0ACgkQkKaRLQcq0GLQeACgnsiwR4Ipyh1TequaHgAPkgWl
-k6sAoISP/3pJCg5jFmyDBz/7gG6yEU60
-=Hs0h
+iQJ8BAEBCABmBQJTZpibXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcwosQAIsiXldLgDqA11zyGheDdSxf
+zBShxbq2aSnBRlSJwE/ySd+VdyNj8P4vaQYiJOAqM73oTgDhwUtWWd/XHBOb0t1X
+S+2Oup2MunGZZyaPg2fnCzfVCjXke6B8ITQ4hR3zA7CppOV3G5EjiVV3LQRWOLud
+ZQOweIcVDN/qk03mT3w2st98K0vmKt/E9zU/ayuOjDZa9TuPQ5iGmdqVPOVLcfJ0
+MYrk6Am2n8lytqKo1G1xqSYWuqKkrUnJuGqKA1wTiJcYqzCVGuBRdt/ydFNjHf0e
+IuEk6AStN/p6K/MC5L5mmEl4oz02xba+DmomxyX2IPmwy4UoESCVjUACIphJHds+
+/ZLxSN6Vdl/gpSVdkbdmS1hyYI5CO9ICr9t0Piece4m9cMu0ZM0MLtuaeC/eKYtV
+fF6+9EpuHwML3zF6qOqcDerhESYIJmbpDb/MaW1x2MG/egM8i5rY/OUeLRcXsTuD
+cj/MGDyMO6WVJdFMCrtD23d6JqHI0oGc6mIV4j2IDEPNll0hWY0eOYGDdCxjS0ba
+CeCSm5qMEJSu8CDuOHcgggNGSWhEwtQrmohnTsKqmvnTQ1rSusRVmljK6xSqC/s4
+iN2foAwu4+zeUbccXCmSj2frYpItKJ2k1Lq3kQjLQtxD939P6doUy/z7oGhDoFwT
+fnrtBMnRtTvdagAh93Af
+=Jgsm
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups-filters/cups-filters-1.0.52.ebuild b/net-print/cups-filters/cups-filters-1.0.52.ebuild
deleted file mode 100644
index 54f8fbe256ee..000000000000
--- a/net-print/cups-filters/cups-filters-1.0.52.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.52.ebuild,v 1.3 2014/04/26 09:09:09 ago Exp $
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit base eutils perl-module autotools systemd
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit bzr
-	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
-	KEYWORDS="amd64 hppa"
-else
-	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
-fi
-DESCRIPTION="Cups PDF filters"
-HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic jpeg perl png static-libs tiff zeroconf"
-
-RDEPEND="
-	>=app-text/ghostscript-gpl-9.09
-	app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
-	>=app-text/qpdf-3.0.2:=
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	>net-print/cups-1.5.9999
-	!<=net-print/cups-1.5.9999
-	sys-devel/bc
-	sys-libs/zlib
-	dbus? ( sys-apps/dbus )
-	foomatic? ( !net-print/foomatic-filters )
-	jpeg? ( virtual/jpeg:0 )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	base_src_prepare
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable dbus) \
-		$(use_enable zeroconf avahi) \
-		$(use_enable static-libs static) \
-		--with-fontdir="fonts/conf.avail" \
-		--with-pdftops=pdftops \
-		--enable-imagefilters \
-		$(use_with jpeg) \
-		$(use_with png) \
-		$(use_with tiff) \
-		--with-rcdir=no \
- 		--with-browseremoteprotocols=DNSSD,CUPS \
-		--without-php
-}
-
-src_compile() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_prep
-		perl-module_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_install
-		fixlocalpod
-		popd > /dev/null
-	fi
-
-	# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
-	dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster
-	dosym /usr/libexec/cups/filter/gstopxl /usr/libexec/cups/filter/pstopxl
-
-	prune_libtool_files --all
-
-	cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || die
-
-	if ! use zeroconf ; then
-		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
-		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
-	fi
-
-	if ! use foomatic ; then
-		# this needs an upstream solution / configure switch
-		rm -v "${ED}/usr/libexec/cups/filter/foomatic-rip" || die
-		rm -v "${ED}/usr/share/man/man1/foomatic-rip.1" || die
-	fi
-
-	doinitd "${T}"/cups-browsed
-	systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-pkg_postinst() {
-	perl-module_pkg_postinst
-
-	elog "This version of cups-filters includes cups-browsed, a daemon that autodiscovers"
-	elog "remote queues via avahi or cups-1.5 browsing protocol and adds them to your cups"
-	elog "configuration. You may want to add it to your default runlevel."
-
-	if ! use foomatic ; then
-		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
-		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
-	fi
-}
diff --git a/net-print/cups-filters/cups-filters-1.0.53.ebuild b/net-print/cups-filters/cups-filters-1.0.53.ebuild
index 6a17100f1ed2..38a87a30a41c 100644
--- a/net-print/cups-filters/cups-filters-1.0.53.ebuild
+++ b/net-print/cups-filters/cups-filters-1.0.53.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.53.ebuild,v 1.5 2014/05/03 14:16:40 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.53.ebuild,v 1.6 2014/05/04 19:41:04 dilfridge Exp $
 
 EAPI=5
 
@@ -68,7 +68,7 @@ src_configure() {
 }
 
 src_compile() {
-	default
+	MAKEOPTS=-j1 default
 
 	if use perl; then
 		pushd "${S}/scripting/perl" > /dev/null
diff --git a/net-proxy/dante/ChangeLog b/net-proxy/dante/ChangeLog
index f30cad485f6c..91346cee8e7c 100644
--- a/net-proxy/dante/ChangeLog
+++ b/net-proxy/dante/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-proxy/dante
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.72 2014/05/02 12:53:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.73 2014/05/04 16:03:52 maekke Exp $
+
+  04 May 2014; Markus Meier <maekke@gentoo.org> dante-1.4.0-r1.ebuild:
+  arm stable, bug #506794
 
   02 May 2014; Jeroen Roovers <jer@gentoo.org> dante-1.4.0-r1.ebuild:
   Stable for HPPA (bug #506794).
diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest
index 84081ff806be..0f85730bba10 100644
--- a/net-proxy/dante/Manifest
+++ b/net-proxy/dante/Manifest
@@ -24,16 +24,16 @@ DIST dante-1.4.0.tar.gz 1253458 SHA256 55d448f2d523e69b5637ef12c05556f39201a2c39
 EBUILD dante-1.1.19-r4.ebuild 2390 SHA256 1d7bdb749a5438caa8d310a1b49f0487c003fd6e536fb40b693e740e4ae7eeed SHA512 d13ecf3caaed975873518f0edf073d7b5169c4357c6424af77b0b6403ffa94fc8042158a5020a1a958eb4fe4e7a1a70209801f03a042ed9d3a3993bf6ded2898 WHIRLPOOL 5b39a50139fcdcb8feb94cbe2e2a8b0fe802299abef06ee21a56049d9061a0ea922de6182d1fbdb2cbf3b807539f95d841f8da921f01945c0f1929e97bfb6c0b
 EBUILD dante-1.3.2-r1.ebuild 2208 SHA256 b49ea55b9931e114c715263fdf01ce16ca6a1a7d74ddbf158a65f908cf42e9b8 SHA512 0f0e9aba173eefba1a4bd157efbc0b60a0ffbb7665b9875b315267af44c92c6970c04724c5b70b45c653d106ac14c79d83c92c2ee30d1d4fba7591613f75d241 WHIRLPOOL 062500ccf1bf9fc522f135489425ff9c228d4515e6da9745c3f7e9f89de2d4daf6b27258ca852c51c9a94ee92527c194f965b6ea94d94216a91554646ea15e99
 EBUILD dante-1.3.2.ebuild 2206 SHA256 a2d6afa8cf11f3f7beda7ac789e4be0b81e785f1ef6b693b61abcc35ed8ad71c SHA512 900dc2c3d4ae6d4d59ce0e8cc45bc9c39a4dbc805bf250b8f25e55eb8e984100d6a040732af01ea615534b4c751be9c5f894ee18092d4d856f397d0fb0a92815 WHIRLPOOL 90c9d56507b934668de2f21a29f125dc5ed985b27a4700f6f5618d4314b8673b352d160c2e6e4cefcd1a22bc0cdd7ebc858cd8cf0693eb574294cc1b00617128
-EBUILD dante-1.4.0-r1.ebuild 2678 SHA256 9b4353ffb55d383a098db177ecda1d559a85fedbcbda250c4f447e372f438a81 SHA512 5318b4d112b61bba59928f35c3402c81b67b7e7460af4618f207e160743245f70c4659a4fe775e4bf27c19fef2365e59a5149483b48b8cf006000beecf53bc47 WHIRLPOOL 7cf376dca2dd95894b7151b4dd5d661f54f989cb3f5253d2bb25d3fb02e5e8f320a03e244a2881870961a296701b9b3e58836f08d23dfc2ef52c851bfd375ac3
+EBUILD dante-1.4.0-r1.ebuild 2680 SHA256 76eb1eaaa60fe87cb922e936a2446596355ca9816da83c6135243e12c790ba59 SHA512 88acbb094a5bbc0704de8de24e2a9927f884f0458af774eca2c0dc3c64fe018b3edd838e106c3511c3557853e73ea31d7d02b95872b125f2804a90241b2056a7 WHIRLPOOL 3151ee811933cb6ba1676b756a266b085f42036ca88d1ea34df3fac62b13360f28b63f6456791d995ac33d6a1d4a7558c9a442bb3606d6cab182ac5b957be133
 EBUILD dante-1.4.0.ebuild 2620 SHA256 63c1726d39830347f472857deb2fa2d57e4b53a0f3c1eb9d8e185f2ff4355486 SHA512 ed970158ab70acc120d19e064afc2d4330b7c35106c1b5bea8d2a7dcff2851802d437c8da5727fd6c3529eacdccaac1472575ad02385fd71f0edcb6ba5117354 WHIRLPOOL 17bf96cc1ca58a329ba25fc5e8181e31bed9ba783f5c8b4331b4747f86f7aa0648bcf94c9a18656996748350dc25e2eb1ab9b78eb8fbdd9a316a7e99ea29c374
 EBUILD dante-1.4.0_pre1-r1.ebuild 2277 SHA256 3824190c643244fc7ef27fdcdd965eb7e5a7d210ce7f2a9d9c14925d0efe8354 SHA512 90a3bc74ed93191494d4d9a0e3506003970083b4baebe35e8b71aba4651baa763514a00b29b260178604dcf43d024fbf8e4a81ffbefb70b11ae6e05dcb4e906b WHIRLPOOL 3c856829755fd3e0949e979a3129d57cc8c5b5d5d9f66fbfc19ae307bc77beee318c829c754735c15df852870cde10f72df1c1635b949e3fb85af17316274b61
 EBUILD dante-1.4.0_pre1.ebuild 2268 SHA256 41feb54e177142e8305fab8f6e2dcdf3397eefc86b12b23ffb35f2e5453ec364 SHA512 08f6bd423d644430ea19e0563738ba932ec48d996daa1a54cbc6bf5ed000054b6779e42e19e95f84266da98dd1ea8677e464807ed90c4da7457bd8453537e519 WHIRLPOOL ac6793acd2b41ccf4dc64ff70a947dfe830844aa48f57b99bae4e45a0c7a88b36c9532d93a209b9e66ace394185316b664037140b5c3bce4a9e0dc8e5dc697fb
-MISC ChangeLog 18234 SHA256 3ac0a077721e6b22059a2b6167bbcc86a46ffb381f64fa1161bf99a74d2e4b07 SHA512 9ac6f5a0ca3ce24bc2fe07d7beee3ffa3b75ef4492d0261c1f92650c3cd869a7246cd0b39bcc69350a0b5f947a71db1239ae79fd78343250d16086f82bf1b4bd WHIRLPOOL 5e5c2d8860a4d4518026f0688705fe33293db23d983316d66b5cc030b337605ca815e8483ffac23b89f3eb5d3538eef1e6f6221fa3931e5369fdc178ae221e87
+MISC ChangeLog 18335 SHA256 b0f38dfd7d4b234f0dd89ca70af52c3779ccc3a27fb7c9d98cae36fe346f7550 SHA512 b2fb32e6bf7728d906c84feb8aa4994d2569d0fb056f57c724f60b1663b9d9f4cfeb33fb356be5143bfe90f1368d1bb80790bc35d1a1e68347a47e47e0589163 WHIRLPOOL f52f0e550a74371b7edf7de9bd21d65a203694bfc4b3ea7c2cf12595b84326bc3df78ed1e82933de76f71f605b3f139409129befb5a708c78094249a2bb40287
 MISC metadata.xml 246 SHA256 7302ea59a7112d51c6936fa5aa83204412d7391441c729a54de3651b81c35add SHA512 da5edb1cbf3b7e72b1bf22120bcc2efcc794e1e2f032e57426286de9817dba3ef39d95313dbee4cba51c0198f8b4297ac8f1d412335ee00d32e470799d05b7c4 WHIRLPOOL f5a9fd6f048d1732243da133861886c7a8ff3bd024ca831c98496d3150441512929c86bb263a8d89ff96ee5720dcc06c423227cdcc840a9062d9f8bcaf7197e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNjlWEACgkQVWmRsqeSphN07wCfS/9yqb3JOp8VYq0ILP+jBAer
-H1sAnA2zODsf9fxRx57vAyMIvPau9eub
-=irgp
+iEYEAREIAAYFAlNmZtoACgkQkKaRLQcq0GLvXQCgsOMqATFHngwWPq+WUFrVuLQn
+IlIAn1Bx499dlEHS4u4KVZv7NciZ8LQB
+=Z7BB
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/dante/dante-1.4.0-r1.ebuild b/net-proxy/dante/dante-1.4.0-r1.ebuild
index f851d9cde339..b746e3b692a1 100644
--- a/net-proxy/dante/dante-1.4.0-r1.ebuild
+++ b/net-proxy/dante/dante-1.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.4.0-r1.ebuild,v 1.2 2014/05/02 12:53:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.4.0-r1.ebuild,v 1.3 2014/05/04 16:03:52 maekke Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.inet.no/pub/socks/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug kerberos pam selinux static-libs tcpd upnp"
 
 RDEPEND="pam? ( virtual/pam )
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 866062880dae..a50dc3d1928e 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,28 @@
 # ChangeLog for profile directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8921 2014/05/03 18:21:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8925 2014/05/04 22:08:34 tetromino Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  04 May 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  targets/desktop/package.use:
+  typo
+
+  04 May 2014; Tom Wijsman <TomWij@gentoo.org> package.mask:
+  caja-extensions was in wrong category, also removed the packages that it
+  replaces from the mask.
+
+  04 May 2014; Tom Wijsman <TomWij@gentoo.org> package.mask:
+  Added mate-base/caja-extensions to MATE 1.8 mask. media-gfx/mate-image-viewer
+  has been named media-gfx/eom in MATE 1.8, x11-misc/mate-menu-editor has been
+  named x11-misc/mozo in MATE 1.8.
+
+  04 May 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  targets/desktop/package.use:
+  Enable cairo LTO by default only for desktop profiles, bug #509552
+
   03 May 2014; Markos Chandras <hwoarang@gentoo.org> package.mask:
   Mask app-emulation/lxc-1.X.X releases
 
diff --git a/profiles/arch/amd64/ChangeLog b/profiles/arch/amd64/ChangeLog
index 56f2214d6d63..d91d0eb0dfa9 100644
--- a/profiles/arch/amd64/ChangeLog
+++ b/profiles/arch/amd64/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for Gentoo/AMD64 profile directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.254 2014/04/08 23:40:34 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.255 2014/05/05 02:39:04 tetromino Exp $
+
+  05 May 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  package.use.stable.mask:
+  Add harfbuzz and deps to abi_x86_32 mask in preparation for stabilization
 
   08 Apr 2014; Mike Gilbert <floppym@gentoo.org> package.use.stable.mask,
   use.mask, use.stable.mask:
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index b057c4552791..174989a449a5 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.stable.mask,v 1.6 2014/04/08 23:40:34 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.stable.mask,v 1.7 2014/05/05 02:39:04 tetromino Exp $
 
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -74,6 +74,7 @@ dev-libs/expat abi_x86_32
 dev-libs/fribidi abi_x86_32
 dev-libs/glib abi_x86_32
 dev-libs/gmp abi_x86_32
+dev-libs/icu abi_x86_32
 dev-libs/json-c abi_x86_32
 dev-libs/libcdio abi_x86_32
 dev-libs/libcdio-paranoia abi_x86_32
@@ -125,6 +126,7 @@ gnome-base/gconf abi_x86_32
 gnome-base/gnome-vfs abi_x86_32
 gnome-base/libglade abi_x86_32
 gnome-base/orbit abi_x86_32
+media-gfx/graphite2 abi_x86_32
 media-gfx/sane-backends abi_x86_32
 media-libs/a52dec abi_x86_32
 media-libs/allegro abi_x86_32
@@ -151,6 +153,7 @@ media-libs/gst-plugins-base abi_x86_32
 media-libs/gst-plugins-good abi_x86_32
 media-libs/gst-plugins-ugly abi_x86_32
 media-libs/gstreamer abi_x86_32
+media-libs/harfbuzz abi_x86_32
 media-libs/ilmbase abi_x86_32
 media-libs/imlib abi_x86_32
 media-libs/jbigkit abi_x86_32
diff --git a/profiles/arch/arm/ChangeLog b/profiles/arch/arm/ChangeLog
index 3d3db236d604..b365ad8953b7 100644
--- a/profiles/arch/arm/ChangeLog
+++ b/profiles/arch/arm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo/ARM profile directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/ChangeLog,v 1.302 2014/05/04 12:14:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/ChangeLog,v 1.303 2014/05/04 16:11:01 maekke Exp $
+
+  04 May 2014; Markus Meier <maekke@gentoo.org> package.use.mask:
+  package.use.mask mail-filter/opendkim[opendbx], bug #509082
 
   04 May 2014; Markus Meier <maekke@gentoo.org> package.use.mask:
   package.use.mask dev-qt/qt-mobility[messaging], bug #507896
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 2ebb7e5b9b3b..3f7a2fde0261 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2014 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.204 2014/05/04 12:14:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.use.mask,v 1.205 2014/05/04 16:11:01 maekke Exp $
+
+# Markus Meier <maekke@gentoo.org> (04 May 2014)
+# Unkeyworded deps, bug #509082
+mail-filter/opendkim opendbx
 
 # Markus Meier <maekke@gentoo.org> (04 May 2014)
 # Unkeyworded deps, bug #507896
diff --git a/profiles/package.mask b/profiles/package.mask
index e9c5688f8384..76755b6a1710 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15651 2014/05/03 18:21:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15653 2014/05/04 21:35:08 tomwij Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -562,13 +562,10 @@ lxde-base/lxpolkit
 >=mate-base/mate-session-manager-1.7
 >=mate-base/mate-settings-daemon-1.7
 >=mate-extra/caja-dropbox-0.7.2
+>=mate-extra/caja-extensions-1.7
 >=mate-extra/mate-calc-1.7
 >=mate-extra/mate-character-map-1.7
 >=mate-extra/mate-dialogs-1.7
->=mate-extra/mate-file-manager-image-converter-1.7
->=mate-extra/mate-file-manager-open-terminal-1.7
->=mate-extra/mate-file-manager-sendto-1.7
->=mate-extra/mate-file-manager-share-1.7
 >=mate-extra/mate-media-1.7
 >=mate-extra/mate-polkit-1.7
 >=mate-extra/mate-power-manager-1.7
@@ -577,11 +574,11 @@ lxde-base/lxpolkit
 >=mate-extra/mate-system-monitor-1.7
 >=mate-extra/mate-user-share-1.7
 >=mate-extra/mate-utils-1.7
->=media-gfx/mate-image-viewer-1.7
+>=media-gfx/eom-1.7
 >=net-analyzer/mate-netspeed-1.7
 >=net-wireless/mate-bluetooth-1.7
 >=x11-libs/libmatewnck-1.7
->=x11-misc/mate-menu-editor-1.7
+>=x11-misc/mozo-1.7
 >=x11-misc/mate-notification-daemon-1.7
 >=x11-terms/mate-terminal-1.7
 >=x11-themes/mate-backgrounds-1.7
diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use
index c3b3ad7c7cc5..44794a3305cf 100644
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -1,6 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/package.use,v 1.33 2014/04/19 14:40:51 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/package.use,v 1.35 2014/05/04 22:08:34 tetromino Exp $
+
+# Alexandre Rostovtsev <tetromino@gentoo.org> (04 May 2014)
+# Enable cairo LTO by default only for desktop profiles, where cairo's
+# performance really matters, bug #509552
+x11-libs/cairo lto
 
 # Julian Ospald <hasufell@gentoo.org> (19 Apr 2014)
 # Overwrite default +sdl from desktop profile, since
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index f12b3912fd5d..f60e6f4fb510 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3076,6 +3076,12 @@ mate-base/mate-file-manager:unique - Enable single instance support using dev-li
 mate-base/mate-keyring:gpg-agent - Include GPG agent in mate-keyring.
 mate-base/mate-keyring:ssh-agent - Include SSH agent in mate-keyring.
 mate-base/mate-session-manager:upower - Suspend and hibernate using sys-power/upower.
+mate-extra/caja-extensions:gajim - Add an extension to support net-im/gajim.
+mate-extra/caja-extensions:image-converter - Add image conversion support.
+mate-extra/caja-extensions:mail - Add an extension to support e-mail functionality.
+mate-extra/caja-extensions:open-terminal - Add an extension to support an open terminal.
+mate-extra/caja-extensions:pidgin - Add an extension to support net-im/pidgin
+mate-extra/caja-extensions:share - Add an extension to support sharing files.
 mate-extra/mate-file-manager-sendto:gajim - Enables support for net-im/gajim
 mate-extra/mate-file-manager-sendto:mail - Enables support for mailto using gnome-extra/evolution-data-server
 mate-extra/mate-file-manager-sendto:pidgin - Enables support for net-im/pidgin
diff --git a/sys-auth/bioapi/ChangeLog b/sys-auth/bioapi/ChangeLog
index 012b5de15c26..122da5de23c9 100644
--- a/sys-auth/bioapi/ChangeLog
+++ b/sys-auth/bioapi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/bioapi
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/bioapi/ChangeLog,v 1.15 2012/05/24 05:03:44 vapier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/bioapi/ChangeLog,v 1.16 2014/05/04 15:51:25 vapier Exp $
+
+*bioapi-1.2.4 (04 May 2014)
+
+  04 May 2014; Mike Frysinger <vapier@gentoo.org> +bioapi-1.2.4.ebuild,
+  +files/bioapi-1.2.4-build.patch:
+  Version bump #450640 by Agostino Sarubbo.
 
   24 May 2012; Mike Frysinger <vapier@gentoo.org> bioapi-1.2.3-r2.ebuild:
   Inherit user for enewuser/etc...
@@ -63,4 +69,3 @@
   +bioapi-1.2.2.ebuild:
   Initial import. Ebuild by Jochen Maes <jochen.maes@sejo.be> who will be
   maintaining this package. I will be his proxy maintainer.
-
diff --git a/sys-auth/bioapi/Manifest b/sys-auth/bioapi/Manifest
index f8ac52c5b4d7..13d12f8c8bc5 100644
--- a/sys-auth/bioapi/Manifest
+++ b/sys-auth/bioapi/Manifest
@@ -1,28 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX bioapi-1.2.3-build.patch 1310 RMD160 10daa54d1e4e13020eb61c133ebfa89e39fb837f SHA1 0f821c8a081cf23f9783e8e013cf3f56d34a6930 SHA256 e1718e55a99ee8ba27b8807ead8ffe5cf7ddda9766a62f83542bf7f9f8b43509
-AUX bioapi-1.2.3-enroll-ret.patch 278 RMD160 d07ae277ec29877f43f2cec7cddc14ecc8b1e159 SHA1 a8c408afc7ea6d8b3cd9faa1710a49ced84b9f19 SHA256 b98227cef30d4573728985758b9cd548b5fb1ac66cdb07b5c415ec7aadee7460
-AUX bioapi-1.2.3-gcc44.patch 545 RMD160 e2bf6427e6f2b15ceaab8444e02e00f8a38b71c5 SHA1 b5ef0bc4ded9379869542801bca1fa124ebc1fa2 SHA256 b5bb84aa1c4e62df9a81a044fa12841941ae7a7697f38e77cfa73be559db7814
-AUX bioapi-1.2.3-no-delete.patch 504 RMD160 c3f082d78ca36d073f2a88c775bcef210b6a4718 SHA1 55da967033cb1d95a19ee73fb2b1ec6c1b292b61 SHA256 344304ebf2cd13e2cfff8d9ed526419e1adb6edb7da80007f9c05b5fea128a3d
-DIST bioapi_1.2.3.tar.gz 1634237 RMD160 5a5e93e7ffd7136527e713185d10857f8eda5e5c SHA1 6873e090c2ace1e3835837895b9cf172b9ef50ff SHA256 c780c0d2e0c676be50de8ff537653580dd5b27fe1478846d22a017e52c6b6c2e
-EBUILD bioapi-1.2.3-r2.ebuild 2007 RMD160 9427d512371ec8ee01f56785199b49bcbcc5e173 SHA1 8c00bdf82557bcf158e472ab9d4ca2d912987f44 SHA256 0ec4fcfd6cedbfec23bcb8fb49d27336e20cfa9b8a6a139af1114039cda8d924
-MISC ChangeLog 2552 RMD160 f3f66a2a73b995aa727395fdaacc0055b48240ec SHA1 22aecbf254212755a539abfa62ee5cde77128111 SHA256 6a049a40a6e73e851679791dbec6ccbbc9b991d789a0a9d1b494896fd2f25a67
-MISC metadata.xml 315 RMD160 1f516c9d502e1346ae8c1607a59be0a3350eab88 SHA1 129ecf59610a93bc70db362641d5b88521cb69ad SHA256 464725cb27dfbe3e145f4df36d0a711e17e3458e7bade029649e35265545783c
+AUX bioapi-1.2.3-build.patch 1310 SHA256 e1718e55a99ee8ba27b8807ead8ffe5cf7ddda9766a62f83542bf7f9f8b43509 SHA512 5cb3b656ff472ff648473dc04e89a7df0ac034642653d87e416f631260a4afbb8888b0de5b9c25cc1b0e4807e194ef462ba8ecb5ea1b5b3f9a4505a3778ab6d4 WHIRLPOOL 0bcc6f9209c8f316ebc2ab2b4ef8cdb5047e0097f40d511b680d713281e7e34b2a730cdfd72b4dc3651a836a396be998ca0e7c0bd5d53347411512189346574a
+AUX bioapi-1.2.3-enroll-ret.patch 278 SHA256 b98227cef30d4573728985758b9cd548b5fb1ac66cdb07b5c415ec7aadee7460 SHA512 adb60b540800d750ddfbee7932dd8ca5646b37853e692ed851abd010bf0c195b4cbf07e7c710073c30fc7a581c9f733914cd633d1628d8c7ddccdaeec6065710 WHIRLPOOL 643a6f8bb096902f6d0ca739ab44992cfc03983e03fd15ef7af5b86611b002a89fc4f4d3fcf01eaeccb4d0476894b31437f4ac0468b2fbe81f35d38466f90d71
+AUX bioapi-1.2.3-gcc44.patch 545 SHA256 b5bb84aa1c4e62df9a81a044fa12841941ae7a7697f38e77cfa73be559db7814 SHA512 88a0b0849c5ec3d028eb96f23f64218b9b794edfc929e2e163fb675709e29f0a46e2fdfec9e4e97a83033422468ec27c1fd937a5d3d690e75dd2684eb2a35dff WHIRLPOOL 74778ecf27f6028539e19ce75e46a4c98f27005cb0c106c3d12e915540a0420facc940d418e7c57024b18c09c7d3c5c6b17aa141eb6a9c7a9551b5f849ace25e
+AUX bioapi-1.2.3-no-delete.patch 504 SHA256 344304ebf2cd13e2cfff8d9ed526419e1adb6edb7da80007f9c05b5fea128a3d SHA512 790b9c674b3d42f4a03d3e0a4545932d29f45be29f1a66a83226639067a26efdce4b40279ee6178da850f01cf1747b89e37798bb45555e6644508bb0b86817d4 WHIRLPOOL d72f3be8e201cedf481f64486ad3ad4ad57b662861c49f69f41bfa27f0c3910ee0d82f67f7137929ce77807534f643107c9d3b8075c9c8868762d43c8d17b279
+AUX bioapi-1.2.4-build.patch 1258 SHA256 8b997c49188aed4640f768af07e2b68bfaa8985b09bfad602bca4b4d287aec0f SHA512 1211812ab6d78a863d9bb4497f29a83fbdb7bd74428c34a4499d0e453dbb3a27ff15f3e436b0dd4b12e0d39bfffbefd40e2a55d27c0123975f450c112a163043 WHIRLPOOL 404117787212c3d61e160463985dfffef6d532b3e3cb4180f8c0fcbea289bf391d4fbf7e4397071093b2dc0a1e4a1ee866b6440e0a9e1a50389a263a253bdc99
+DIST bioapi_1.2.3.tar.gz 1634237 SHA256 c780c0d2e0c676be50de8ff537653580dd5b27fe1478846d22a017e52c6b6c2e SHA512 683da884a5cf6d72b577f7c1f642930c152c43c7acad3c678a3571acf3f66e0a7e112fccde06d9a7535a186bcb56a96acfb5e1c405b1d931be9f252be1b01649 WHIRLPOOL 9162097a90ce089ab9864034dae434fc55c593c33f8d618c6f1e62f3202a7e3294680df992b684df507705c26e7fb897e85a95552c12fc545ab6ba06df445970
+DIST bioapi_1.2.4.tar.gz 953136 SHA256 ec39d82deaacdd3dea676bdfcce69d34cbb745580735b59b44c542a6de35008d SHA512 99c67fea34b73291dcaeb1590fac88b3196d3ca65f788b92d0afd6ba85036b2d85397e3faa66b872a68bffaeb7c2bf5c731306bf02a25a435ef06cea18da746f WHIRLPOOL 08526484cb6240f45e48ca894602c4706319d4ac7297592740836e48ff4794a2f12fee165eb358732b0d31d1619d7f3743aa55d32ba6d79b405a553e0992b517
+EBUILD bioapi-1.2.3-r2.ebuild 2007 SHA256 0ec4fcfd6cedbfec23bcb8fb49d27336e20cfa9b8a6a139af1114039cda8d924 SHA512 e333574135341e4661b0641684df884f22898507fe61a5028029a1cce3befb4a06a3ad9956aae7f95957064bcf829df8f7f8eaadbc5b2a970ce95c395d3748c9 WHIRLPOOL f992eaf387af846cc742c7a8a3aab8739f58dd8bb978f8f61ba92751bbb24a6e6ad88125f6b844cb5091bb046f84acd028dafd920962aafbb5eefd5ee2a3acee
+EBUILD bioapi-1.2.4.ebuild 1938 SHA256 6751292e4a542b0c04dfb0d60639f39d849f31cdebe22a9a15c5e629ac28cfeb SHA512 6348eac3a103c7b26edce0b25c700538103bab06b63c6efb8b1e3a51fa5c895f06fd309743420b730bdc93d6cf547aac4336bfd86fc39c14653038188f80c1cb WHIRLPOOL ab2b80001d231b48d1b9e4066bf88d7d5901e5e2de3e15931fc26307890b0ef23d749bdbfda5164f54da2a21a2d6eb11e4ec068188f26f16342615d36f1b7ae7
+MISC ChangeLog 2732 SHA256 4e6305305d8c68b8905a44d5a82e54ab6eb32447c200dbcb5d666f948caa9dba SHA512 4f5e38a65b8c17c9e6b7bd669ae5f70bac8cf46f43b2182759530c27aa3ba664c589799d7bf4359fbdb67e4e31c34bc99212b6f034e516d9a795024d549e5e15 WHIRLPOOL f3876bb4c43a19f3881a655d7e87b4428ef64fd0cd6dc2b33d55336ed0c1049ea54bcd83d99f56191ae8a7a5b984b36f18496716dc3d6f12e4578f11fe054f67
+MISC metadata.xml 315 SHA256 464725cb27dfbe3e145f4df36d0a711e17e3458e7bade029649e35265545783c SHA512 e5b07f7497af00d5b87db64721c26cf399bad8609af1de2fa5e6bbb367ada438d64af8eebbc9d039febf16301956ea58c63a9f69737da1dcf061183642f5511a WHIRLPOOL ff932a40180bbe695c35afc36a474f60a1d4e88a4d7a01bc5972e3b181673870492c19636e4ef273655f7b784eba1cdf17454a0b680ab5338732304eafce7dfa
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPvcGCAAoJELEHsLL7fEFWiPEQAJ61cRpp9VR54zYbvmd7kMy2
-mi2iO9OZSRvUFD9gSNFlaPKwpGkwkNOtT23PCP8Bw/0NEeM0XXetx0fbQkmgIfjd
-sbgti4MlU6DnZg9xzy7xCRqcrntmthzocA3jVDyGn1JJ8sGJ067kjjlPJ2brYWyR
-Cd5L8vH+5Fpj/C2Q5cYiLf5+xCneo/z7IeBu8cic/mx5KhKT7mUI2r5owmV779QA
-YzmWDGV2FSd4VRBGeyKwCjqfIG8zPc5Xtt9AG7IHM4itukJpi7ne8JU+Ei4ES4+c
-Ynk2kQItrTCTMR+VQQTiPTV00IcN3gfuLlWIfOZkqWlcbqpNiPHL1gq3FybzjkYx
-eppeE2NrDnuviVo32jQEacw/K1WK+sdJZgP3Co14PiyA9pTbXwhOwnJF3W/6BGZo
-vyryllGZJaBZaDevpuNGF5/Qz99TJ/jzG0aJiWgfJ4lr83gttvAqU2mBgOlBmijQ
-29QT4DcB9rjj8S2MAmYPO5zAsf9SlWZ7ODmUQY23G8mb6Ja0WCvlHNGc6yFpv2FH
-MDHxURH+gvQfkiaIFdMYcikbvNSlkE5uH0pbStZGQ3pUxhIddJAmZIcAmD20D7oO
-VbZDfNpmOmGXt0sBgPDF+6JFbcL5JfDmDJdRqvKCvuRKUkwouaDGn7d3+pNah0/l
-2M8BQ3VlDkTg9JbXca7n
-=T+ME
+iQIcBAEBCAAGBQJTZmIBAAoJEPGu1DbS6WIAkEQP/igTl3DaXR+n6z9fswF+nXZp
+khEmqOh41gF9SsQUnIv6Nh+l87NvJCvZiwsmjwHJ03QH1lyfJbZ4zpIkZXfG6M0P
+3k/+YTWQmWps6nXU5EJrEfG+tLkdwprMu1iNuU9lQB59KNRAqRWGblFHbMT/czT5
+K5Jv536CvnJvfBmDVY4ZbjztvxybBon2XvaqpxsTGVI/chy2oHO8gDw32IOaMtBq
+erAndVi7QRJaQqofqJoRB4EXI84ZiOXXhTMHo6+7yJJ/JMkUz097EfIGDQ9nSFU1
+/HdbBKesXeyGxcYKvwzUXAY+EHAoSOCeJbR321MTjmCCVtyhVpPyNLsoBaGznJXj
+wWeMdHYxk1yMJnp6zAgl4Gx6X5XEaRIwnxSNZslWLQB2SVgCMvXxmx4vE0DkDgmH
+VI/b+mypsaCvOKxseTGL7HaBRbIQuvHvrrxh3LE9/1EOMAMccVo1G1GNGo/iShmf
+nAph8JgZaZgutvWJCK4VI5TmMdYK6JOcqegK7iDj0HD1OWWj2qYcHgUuFoxnWsZZ
+ByCeNQej9UjRJrznDt11BS3v2XwxDJAtpjUp9dFJ2zul4P/hA49DEVcfKUJAs9FN
+/jd6ZqCO1VMp6riHc1fKwpb6+evNIX+JvWtoSl3U/4Vi+HzWNfyS0runi6yQjFA1
+NRkKwIlw5XENxdr3iLLN
+=CW+z
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/bioapi/bioapi-1.2.4.ebuild b/sys-auth/bioapi/bioapi-1.2.4.ebuild
new file mode 100644
index 000000000000..21010e447e06
--- /dev/null
+++ b/sys-auth/bioapi/bioapi-1.2.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/bioapi/bioapi-1.2.4.ebuild,v 1.1 2014/05/04 15:51:25 vapier Exp $
+
+EAPI="4"
+
+inherit eutils multilib user
+
+DESCRIPTION="Framework for biometric-based authentication"
+HOMEPAGE="http://code.google.com/p/bioapi-linux/"
+SRC_URI="http://bioapi-linux.googlecode.com/files/${PN}_${PV}.tar.gz"
+
+LICENSE="bioapi"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+S=${WORKDIR}/bioapi-linux
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.2.3-no-delete.patch
+	epatch "${FILESDIR}"/${PN}-1.2.4-build.patch #336107
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--without-Qt-dir
+}
+
+src_install() {
+	SKIPCONFIG=true default
+	use static-libs || find "${ED}" -name '*.la' -delete
+	dohtml *.htm
+
+	# rename generic binaries
+	mv "${D}"/usr/bin/{,BioAPI}Sample || die
+}
+
+pkg_config() {
+	mds_install -s /usr/$(get_libdir)
+	mod_install -fi /usr/$(get_libdir)/libbioapi100.so
+	mod_install -fi /usr/$(get_libdir)/libbioapi_dummy100.so
+	mod_install -fi /usr/$(get_libdir)/libpwbsp.so
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/var/bioapi ]] && [[ ! -e ${EROOT}/var/lib/bioapi ]] ; then
+		einfo "Moving /var/bioapi to /var/lib/bioapi"
+		dodir /var/lib
+		mv "${ROOT}"/var/bioapi "${ROOT}"/var/lib/bioapi
+	fi
+}
+
+pkg_postinst() {
+	einfo "Some generic-named programs have been renamed:"
+	einfo "  Sample -> BioAPISample"
+
+	if [[ ${EROOT} == "/" ]] ; then
+		pkg_config
+	else
+		ewarn "You will need to run 'emerge --config bioapi' before"
+		ewarn " you can use bioapi properly."
+	fi
+
+	# XXX: this can't be correct ...
+	enewgroup bioapi
+	chgrp bioapi "${EROOT}"/var/lib/bioapi -R
+	chmod g+w,o= "${EROOT}"/var/lib/bioapi -R
+	einfo "Note: users using bioapi must be in group bioapi."
+}
+
+pkg_prerm() {
+	mod_install -fu libbioapi100.so
+	mod_install -fu libbioapi_dummy100.so
+	mod_install -fu libpwbsp.so
+}
diff --git a/sys-auth/bioapi/files/bioapi-1.2.4-build.patch b/sys-auth/bioapi/files/bioapi-1.2.4-build.patch
new file mode 100644
index 000000000000..d7a70afd4d0d
--- /dev/null
+++ b/sys-auth/bioapi/files/bioapi-1.2.4-build.patch
@@ -0,0 +1,42 @@
+http://code.google.com/p/bioapi-linux/issues/detail?id=4
+
+--- a/addins/pwbsp/Makefile.in
++++ b/addins/pwbsp/Makefile.in
+@@ -87,7 +87,7 @@ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CPP = @CPP@
+-CPPFLAGS = -I${top_srcdir}/include/ \
++AM_CPPFLAGS = -I${top_srcdir}/include/ \
+ 		-I${top_srcdir}/imports/cdsa/v2_0/inc/
+ 
+ CXX = @CXX@
+@@ -111,7 +111,7 @@ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LD = @LD@
+-LDFLAGS = -Wl,--version-script=${srcdir}/libpwbsp.ver
++AM_LDFLAGS = -Wl,--version-script=${srcdir}/libpwbsp.ver
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+--- a/addins/qtpwbsp/Makefile.in
++++ b/addins/qtpwbsp/Makefile.in
+@@ -96,7 +96,7 @@ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CPP = @CPP@
+-CPPFLAGS = -I${top_srcdir}/include \
++AM_CPPFLAGS = -I${top_srcdir}/include \
+ 		-I${top_srcdir}/imports/cdsa/v2_0/inc \
+ 		${QT_CXXFLAGS}
+ 
+@@ -121,7 +121,7 @@ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LD = @LD@
+-LDFLAGS = -Wl,--version-script=${srcdir}/libqtpwbsp.ver \
++AM_LDFLAGS = -Wl,--version-script=${srcdir}/libqtpwbsp.ver \
+ 		${QT_LIBS}
+ 
+ LEX = @LEX@
diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog
index 3af06ff55b46..cb80d203bb27 100644
--- a/sys-fs/eudev/ChangeLog
+++ b/sys-fs/eudev/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-fs/eudev
 # Copyright 1999- Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.103 2014/04/28 17:53:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.106 2014/05/04 16:24:56 zlogene Exp $
+
+  04 May 2014; Mikle Kolyada <zlogene@gentoo.org> eudev-1.5.3-r1.ebuild:
+  arm stable wrt bug #506078
+
+  04 May 2014; Mikle Kolyada <zlogene@gentoo.org> eudev-1.5.3-r1.ebuild:
+  x86 stable wrt bug #506078
+
+  04 May 2014; Mikle Kolyada <zlogene@gentoo.org> eudev-1.5.3-r1.ebuild:
+  amd64 stable wrt bug #506078
 
   28 Apr 2014; Michał Górny <mgorny@gentoo.org> eudev-1.3.ebuild,
   eudev-1.4-r1.ebuild, eudev-1.5.3-r1.ebuild, eudev-1.5.3.ebuild,
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 6106fcbddd68..f84e3d040eeb 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -12,28 +12,18 @@ DIST eudev-1.5.3.tar.gz 1724415 SHA256 8e4362979572719562f600bfd7decd42d4e21506d
 DIST eudev-1.6.tar.gz 1729499 SHA256 9d00d6925ccc7763be89472c5058012bd45ce13f14297e40e4cf3a02244a6a47 SHA512 036cb1f43447fd938f0ee93b03cb4cf2ff1e1e5adab6aeb042ef99b791d887165d15206fdb3a11f3b71ce0e3affaa446193da1574c3fc3d3495f6bc057c37927 WHIRLPOOL 31a106e57060987a1f67aebb35a459ef103743365265e973f306868b72f7a7ff024b0ab6af684e2495a90e41e87147b2a0ccfaa12a09e9e21d0aefa6068e0a63
 EBUILD eudev-1.3.ebuild 7910 SHA256 c859ec0746f5dcd792ec12a0c9403ea04450b775c210f2c9f57d7d350f094fcc SHA512 3017a5fa2e1af8f242aee15989615f8f50bf88060353092ccef02d2b3135d5848c8efc89dc9a89914e801a3442d06b0e0a3219be5407623e39073c81571f1d4c WHIRLPOOL 4ec4ba4da39a55e4c59085b69278bdba395c46044ca3dd6cd618f8f07bbb047d41dc72f20c459a95625dbd8a6811985bed248c6dfa76a9d1825ecd133d4f7799
 EBUILD eudev-1.4-r1.ebuild 7922 SHA256 ec3bbb695fc2fa5f776eba5d1fc1e68d5e3267794d9503fd7a54511eeb36eb1e SHA512 460d4ff06f996b129e5007401edd3a97fb47ca7cb02741127b724bcafc97ab7c9eb7833e9c75cafbeb3fd785e333f74bd311295a945e13fde78cc5c0e9ee5703 WHIRLPOOL 333d1b3cd1d5e18c9828327362d2578462019010f039fc7c8655647dd1f1b9c3b16464661c55d16f8023f29e0dd123c12ecacf9cca6a718ef744848e3686a3a2
-EBUILD eudev-1.5.3-r1.ebuild 8115 SHA256 cc6f739fe1f86383528fd0411f0e4c3bc7193299dc76984402459ab9f61a7c6e SHA512 6f882fd98419914c4878cd85e35ab0af038dc9fb9393d8142b0fa2970df968cc7cb9939851e243a50e5f8478447f9bb72a4974c2d33fbc7730426a8ee817b99b WHIRLPOOL 43f34f4b65feac8690efa06ada02596a2386daafc280b2f1635f91fba37c60bb7f7c2017bd2b371adfa5471676637437d6d4fa0e97d9049825194a2b5aa59a6e
+EBUILD eudev-1.5.3-r1.ebuild 8113 SHA256 cf15c4e78a181760dd11d05effaf4371c0ed8a782f251d36664fca0b16f889b8 SHA512 eecd1459d3203919a895854567d82674c1c4e5603e551aea122ca20c84ee0d2fd86d596750320654efcb4397f102da37ea69d72b516093dcae99f4689e9cfb01 WHIRLPOOL 82487c9da557f27d01f63b6e7d1a47d6af0d0d67e0a8afb56a44670d50766534c5d730b660669ae7752359be14ce78a99765e33fc9c4c3d73887bbb228eab482
 EBUILD eudev-1.5.3.ebuild 7921 SHA256 87fec8fcabc597df1f31f1373521c4c08704ca0d33cc1aa93cf1377dfd04909d SHA512 13522474dcc411dd7281d219d870065f327bff0ba78b480dce06e99820789960898c2a06610059c405fbd991b97d28a35d400e8d6a0e5ca10b216524555f63bc WHIRLPOOL 47bacb467bcede11b25fed728357fd3bbc1fb9d1eb2fcd2ffd97b6ebe403639e571be99d33e23d06d4eae037e925287a377b046f292a8fcf3d7e18ff0550a7e7
 EBUILD eudev-1.6.ebuild 8255 SHA256 b18db6bdbab339260de7804f266ea1c2a292c6b986a90987ed7d4237efcdc9fe SHA512 34b17ee4b7fdf1fbe630b13b0f9ffec2c35570c34b98bb420f51ab471aba2a84695e8a72480c688c4e6d6551a3f0919f970be31092a9975c9ce33511d5633930 WHIRLPOOL ccda5efe84d89edc11e1d8045d424700f91311dcccd1e2e862bfc873727eeec403e5ec55350d053bf8ed1a6dd8fd6781113ea27335ae3ef1a9c4d6ec595c9684
 EBUILD eudev-9999.ebuild 8257 SHA256 2e7203b96f457ab74e9b16664386376e30f36479bad3eb707032b2a6baf525c0 SHA512 17b4610c392e13de7a1cf5da7e2a59b9deb798cc8dad9cfa9847bb509a54d1eeca323368960d6f462c63025f94fe582bb06e9f1de0dd74e3ca00a3647e7cfc0e WHIRLPOOL 96ed28de290e8b2ae12f86b73e54e0748525a24ab1740dddfa8c53c64564a7a5ef54005b5c7080f60339dba9743a9845f985fb791be06ddb1b9578ac68d0fc64
-MISC ChangeLog 15970 SHA256 c5090aa6b04480e1eb648afd0ae969d6e0723d8ec72d80dbaffc82d981cc4559 SHA512 ddc5b0125a324efaa46cc2f391b32b9197ebfc8526b07bd8a5d79554573497c38eb9a4f4ec1c4e7f581d3bd872b699d2bf9497b3db9967507863ebe854f23bb1 WHIRLPOOL 5d9883734ccc3c70d4f9f7b0d2557da9e911f888b96f3cda1efe6bb35354135119f230ca1d607f80275e319c4046b52b32b5b4e212a0762a1f3e5912a9d486d5
+MISC ChangeLog 16282 SHA256 c5acfd3118422bb7a2325e23f7981498b52bf99bebf102ac5ef39b1f099e54af SHA512 3614139541e96c5949083e023dcf8eceac2bf93e4feaefaab28db1441aef1a32fcff4471c76b23a1197cae6c765475a04fb69378e388b8d79ed88d36b84b63fb WHIRLPOOL a7488ece102393d8be130b90f107126bd03787d9245cd122501bb38f7ed7f4efd20047df3769259da06449129cecd28b8228de41819d78cfdc09afe1acc4ef0e
 MISC metadata.xml 978 SHA256 273446e57cfba7f612e72c3dcc2e1b93ac0003f878c504aa72daa762f2cdbba5 SHA512 244dc230cf7123afef2c4c0f0caa418bbc621f3da0e6303f7cecfb4f3cc53290fcf0adddf2d176ff208991a5bb27801c5c9f6ad5ea3bada513f7ebb22d02d06a WHIRLPOOL e39a5caec32bcd404eb2fdb54e3abff5631f7115786d039a6f2f04a8503e445f971a993dedd0564022e148133e2f15c4579b3cc664ffd393003a858ac77166c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTXpWQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOzLEP/1KUMH+RYAFQEsJuqC9/FlI3
-BqXCyDNkmyI6IE8KiwN0UIWka1jRqjH9bA3W+C+sYIEEvu7DRGqSyjdZED7j62Xq
-oy7UOdFFYWmpylEHvA0Zl4iIyzzNz5Gea8bQMkh2OGzfIPWkFMA0ROK24HWnjF4F
-UynP71Hjb7a3n5YFlUOAkcFjFwbWS+yS/AYHu8FkNdF0Em7hZA8Hs4Nr6uKxHabH
-+wyAxE1Hj+r4gsr9aoAftMxIRJg6Pb5ePhCT1qqu677SbAy+eFuzb4wwPZkFb1Iw
-9VEXPoHrnn0mhJ4q1PfRJqqAnWiHkrHDh2y9plD0NB8SkNO+q/9c3l4GailJRPgx
-kZqhEUlyaGunEXwRcfH1sx1MMnTUrUy0kBvnIsDbuENI/bt3t0tT6d8jEEliz9DY
-oVS9tqbfa2VZpFiJy58Xm4JwPPSIJcJHV/1BjXKxhliEXBnDihnUAhcfSAyRryYK
-1qC7y/vIbfoZIgK1I2hCv41iQq11q/7AmQgEy73C30ylI47tC1vU8gRpg5jEa9jw
-kMyPzgbegila9/LmCL4ssmR6bK0hCO2Lrbd78cpAOn5i1W6RkXlMd91Gls+OU84t
-xDJ3EHBFcfqyMQ2aIXbUvhwpZVSvUoiaYnYmLs/nSPui4a9CFgs1LvOcUBVujsl3
-HUox1ZCwZEjQ3KR0PCRJ
-=SjpF
+iJwEAQEIAAYFAlNmayYACgkQG9wOWsQutda1rwP/Q1x/fQFtL02Nu7aAp1XIq1rF
+z6Ea0ztuR5enBeJY7S3sTGBau9M00QTuJcaaVx8qQ0ICuRJlSfc6Yz3nPxw28cJK
+HLftHArKRnxIYTUrz3hy1n/GaO0K6AS2e+LyxRe0qGjJBsTacF8lrrpKz5+U6dkB
+rVTzdEiHSJXIDDRdqwY=
+=JN+0
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/eudev/eudev-1.5.3-r1.ebuild b/sys-fs/eudev/eudev-1.5.3-r1.ebuild
index 2c997903de0f..089c7d582fa5 100644
--- a/sys-fs/eudev/eudev-1.5.3-r1.ebuild
+++ b/sys-fs/eudev/eudev-1.5.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.5.3-r1.ebuild,v 1.6 2014/04/28 17:53:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.5.3-r1.ebuild,v 1.9 2014/05/04 16:24:56 zlogene Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ then
 	inherit git-2
 else
 	SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm hppa ~mips ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm hppa ~mips ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index d2d356ce03e6..97d329065169 100644
--- a/www-apache/passenger/ChangeLog
+++ b/www-apache/passenger/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/passenger
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.90 2014/04/24 15:36:26 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.91 2014/05/04 18:30:08 flameeyes Exp $
+
+  04 May 2014; Diego E. Pettenò <flameeyes@gentoo.org>
+  passenger-3.0.21-r1.ebuild, passenger-4.0.41.ebuild:
+  Add a dependency on mod_unixd for Apache 2.4.
 
   24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> passenger-3.0.21-r1.ebuild:
   Remove ruby18 support.
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 7451f3b2c030..f8f96b263d9a 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 2.2.15-gentoo-multilib-strict.patch 1278 SHA256 dced348f25d2bb41dff59f51c1dd7a8b6771c81dd699a54170e3627bef12ddea SHA512 19bdd5fd1fe2d9ff0c6797acde965cddf0e997aac87a9572a0516143eeb1ae858b3fd298c186e611df9f6dc1380d3f4d85c7d5bb0141e82fc91e10072ef43c90 WHIRLPOOL 9368f5591cc3a9e6b69eaf0566747cda936fa447d75159dcef88b4869d17ff3568adc04a698f3cb74b8a2216e5c9fd982262b03e4ea2096f8596e4ebff91251b
 AUX 2.2.4-gentoo.patch 1617 SHA256 d90394f0742131f32dc42a9619305b2712bed3967b78d56480447500d190b8ea SHA512 5a80b36b0b62e2a450584f7a7c25f574ad0ae5b9be813ea94069a68583db4bc944e7624a53ac0b1c00eb56329b97f2f37027d530731633fdb4ff4461843a102c WHIRLPOOL 147dddd7762a6a914962283c6e6737e10575da03954e10ea5b70dc80c7e975461f61c21db0fc555ab442689ca3f8d812a252fba6b1a7ae0c95def409bc03e9e9
 AUX 30_mod_passenger-2.0.1.conf 2695 SHA256 65095dd4e633c81d6283faa7f6cd91324b0a964ce73a79f7330c177eaf0d2bff SHA512 251648009a9dac7e87efcb42481c222497a6609e0c72b0ae36adbae75d982c5732549379b0b169c79fd7267609f6f397926dd091a53643055f5540fa1b268d4d WHIRLPOOL d73cf3df89a7147a626bfad9a2ecef304e2dd931b6c6de066842a8930bfdd7451c223f3da881ee38498298f51030ce6b86e22d9443f263d69c2e67cd56488ae3
@@ -13,7 +16,18 @@ AUX passenger-4.0.21-gentoo.patch 1759 SHA256 86070ab8259af80eee024162340fbf53a2
 AUX passenger-4.0.33-gentoo.patch 1066 SHA256 f1eb0799b3b1dfbc35985aed4b4f972d7ab92b354d8f77d9fd6d9e1a7397603a SHA512 d2060b54e10ca75bf4876b6d6076e64fb182f6d07f3609893a71bc62f564d37016edffc6d5eab684864ecb15717c7e18116c94c763cf105203c76031df5b2a70 WHIRLPOOL 3f8db66d1d408dcd552ea7657058050676f6d430a7a07fef012cd28e272dfaf5f4d6f612033958d4904489f7a0bfebb9fee2f2de1a6dcd7ae335cc08b4026991
 DIST passenger-3.0.21.tar.gz 2657475 SHA256 82a79a2ff6803e1669ebf806ab320180990ddc096e3d30977ad1c86081b594a5 SHA512 4e92fe8cc679776531a73525ac0dd99612096c1370b4019dcda54aa928cbf6ba17c024124286342209a2b9d1ec9cb22d3783fc6bedc85cb9a0d0fb7561995eec WHIRLPOOL 11f9a5655e7ebcfd9f4a03a63d077126a0766ed7ad92e24494c3515202603782d3a8c999b4662004577d3463de68c040d783d9f93c01f95aa935289c0628780d
 DIST passenger-4.0.41.tar.gz 4060645 SHA256 7b1857e02280066d4be9123a1c13ead1eba280e60e3eba7b4f0e16279fd71259 SHA512 a65c1a2b3ef14d9ea03f0dab0588f96dc3edcc9752cc00d7ea9f8b5839d000e9a993dc9ce93cf9f3a94a7565aae338835041efbaf5272506e4adabf393078fd0 WHIRLPOOL def6f3ac303895f9d807a5a559f6debe682a5a7e661abaac4fc5cfaf5d56d968b9059e47e1966f56039a91c47230b1fdda98df2fb36f4cdad3627f2edb5fc1fe
-EBUILD passenger-3.0.21-r1.ebuild 3071 SHA256 85613845c6c48745ed5b09cab992e134e9eb591c4492729b789a91b383241e61 SHA512 797046dd6f399b8d323f52baeafa53b3369790cc5e0d2e3f4c9639fcd156b77075a9c5a17916027a8c748f35848651dfd0c5b83b00bd9aad743250e96e405543 WHIRLPOOL db5d90350c7992d8ada6a0785a58d88b84996e9f058ddd19cbc46033faa33d273d916ec1748a1e20118082771f13c80fd41e9443555e98884554ca33a432f5f0
-EBUILD passenger-4.0.41.ebuild 3628 SHA256 2ca87cf4e4e2f5fc313691b5b4bc1295fd9865dbc3b275ba258c17099a0c59aa SHA512 62d7b6334e77d20d98cd4e48522fc61f01f61e6dd504ffdb44577169628ec1c4e7309c90f218a08a8603c5763a38efe6ecfa75449678de8666fa704129734e5c WHIRLPOOL f537cda016bd9e2da42e58a9d7c7a7fc3c6ce3b9ec532fcb67539b81e673f381cb672738bd628f6ea4b63f307d7e09eca28eb29b433e9bdb73a06fad8891fe3d
-MISC ChangeLog 14048 SHA256 fb5933a211f5d857c40c725ab5c281f4bff816122d1be080a06ec4c175dc8f16 SHA512 faafa3a8375653afb30876e5ee7903af2896a1572df0bdd3caae9f1f151dd77522052cd679af93c40fb5aa1f75881dd7e23c78d21f46a0a357a9d6a68f986995 WHIRLPOOL 164437dfeb61622d19d69c8a360bde6d9debcd7106f52f593dfa474ba8e7847f79ce9e77bdf9a4513090d1ab8c3cbff7b8154ccafb960f6170ba354c6ab72bda
+EBUILD passenger-3.0.21-r1.ebuild 3121 SHA256 62925e40e503fb4dc786bad538b7d241e8b3a4067bb06dd08a699e1e48c081ca SHA512 6678ea9b714c80c622074edd3f63d40cc5e57e7f68a479f9615b81271c1aaa33dc20bdcb047b0f122397effb68e1ea22b5fd2288bd47b69fc1e6006c753fe9cf WHIRLPOOL 29a97b40041cdc4cea999c0cc1f49debd0a41fb7be4322eabfb456df455b9ca8c5ca9b55c496b4efd771544432cda82811c73fe86036f68ecd7668f298b94cda
+EBUILD passenger-4.0.41.ebuild 3677 SHA256 53a499c9d41e7a94427836a1c128e183325b8d232a3fa2fc0befc0ad701c6b40 SHA512 3bde934d4049b0d2f8af67ab59c247bd415911cf86a600389fb2fcb115c2e440ae39995e363b0b65ab2c981c0da68fa4ded326a555d221ef39f729ee0d7be47c WHIRLPOOL 4a1c2486e3c37a6b341dfb3b2138dba77604571073d0033dca66b3021aa9caf66c105ca196d7ea9dac80db9317922d41018214078f901f3982623fbdb4bc49fd
+MISC ChangeLog 14212 SHA256 ac4e6bbb0f5de4d7c4f02cbb9712930c469c4a8a4fbd9b16f77f554eed299459 SHA512 d4e9a5905ec3ca9817ad7bfdd28c3b4fbf59572d9fd066df5373f2048ac50a96b04308e8eebf9ecab4cbc308f40ddff19c4cc401468b7d9d5a6779c182f6e4be WHIRLPOOL 5c3337460946139c1480ef39fd7960aa935f170e7518b78b64521b39be427da2be0ea733b54b956d0678f4d6bc057d66f847176cbcc90a5cf3b6c38ed6c7ac44
 MISC metadata.xml 300 SHA256 587c979e6c7d5d5755ee3b7861a7b35038abf4c64633526eef338db1f6477c94 SHA512 fda4f74b7e039c72a54389253a980fcda052d25efe2d43f6cf3d54c67bcfaa20adf9fe74c292bf4774ce2621dd321c2e9f282c7c081e0145cc633de263cf6f4d WHIRLPOOL 8137bbdf332c5394440f888334cd32c0d2a23b12d6c46ae38c7bf74eebad100a25d5000f137a41baf449b607e5ea03688f311268982480ef5d3fe5ac757f76aa
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJTZoc8AAoJEBzRPIrUMBNCnM8H/3bWV9rZYEexYh5nb3tAJiCT
+cQPiyQfk6O0fDkP9gdgDscAnhLBdRxvugTA+BUjiw0CZ6A1t4mKInno+SgXZzuzJ
+dTLCzxPDpeurXMddu9zqeeSxZaKtq3CtkNnfwcPjU9AtUXV+2WsDmSz+fWwQckV2
+HH7gbFNMbDRHmIMoz+DWRGK8PsT75OM9r6GG08XZq2EDzNcj5QDjh/wjUy6yzdIa
+ze3m+lR1unRuGyljoHFclQ82rY2y4dgkLx2Twi7ua4KUjRHxs4sl3qrs5zOjOkJ9
+/jUvINhwfZOwk/vNNc+eaKlftaEpoWWi0Iocfii/CUaUz4MCVqeB2N/RII4z8aY=
+=/m78
+-----END PGP SIGNATURE-----
diff --git a/www-apache/passenger/passenger-3.0.21-r1.ebuild b/www-apache/passenger/passenger-3.0.21-r1.ebuild
index f45c5178b8bb..c19bdf4b03de 100644
--- a/www-apache/passenger/passenger-3.0.21-r1.ebuild
+++ b/www-apache/passenger/passenger-3.0.21-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-3.0.21-r1.ebuild,v 1.4 2014/04/24 15:36:26 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-3.0.21-r1.ebuild,v 1.5 2014/05/04 18:30:08 flameeyes Exp $
 
 EAPI=5
 USE_RUBY="ruby19"
@@ -22,7 +22,8 @@ ruby_add_rdepend "
 	>=dev-ruby/daemon_controller-1.0.0
 	>=dev-ruby/rack-1.0.0"
 
-CDEPEND=">=dev-libs/libev-3.90 net-misc/curl[ssl]"
+CDEPEND=">=dev-libs/libev-3.90 net-misc/curl[ssl]
+	www-servers/apache[apache2_modules_unixd(+)]"
 
 RDEPEND="${RDEPEND} ${CDEPEND}"
 DEPEND="${DEPEND} ${CDEPEND}
diff --git a/www-apache/passenger/passenger-4.0.41.ebuild b/www-apache/passenger/passenger-4.0.41.ebuild
index 40ae89ec9c21..9203af998c2c 100644
--- a/www-apache/passenger/passenger-4.0.41.ebuild
+++ b/www-apache/passenger/passenger-4.0.41.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-4.0.41.ebuild,v 1.1 2014/04/09 05:53:31 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-4.0.41.ebuild,v 1.2 2014/05/04 18:30:08 flameeyes Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -22,7 +22,8 @@ ruby_add_rdepend "
 	>=dev-ruby/daemon_controller-1.1.0
 	>=dev-ruby/rack-1.0.0"
 
-CDEPEND=">=dev-libs/libev-4.11 net-misc/curl[ssl]"
+CDEPEND=">=dev-libs/libev-4.11 net-misc/curl[ssl]
+	www-servers/apache[apache2_modules_unixd(+)]"
 
 RDEPEND="${RDEPEND} ${CDEPEND}"
 DEPEND="${DEPEND} ${CDEPEND}"
diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 82be0a4926af..8e38df845cc5 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.376 2014/05/02 21:51:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.377 2014/05/04 17:51:45 tetromino Exp $
+
+  04 May 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  cairo-1.12.16-r3.ebuild, cairo-9999.ebuild:
+  Do not enable LTO by default everywhere (bug #509552); it will be enabled by
+  default in profiles where needed.
 
 *cairo-1.12.16-r3 (02 May 2014)
 
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 9c9e8026e294..c38befb8ff7c 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -22,19 +22,19 @@ DIST cairo-1.12.16.tar.xz 35889824 SHA256 2505959eb3f1de3e1841023b61585bfd35684b
 EBUILD cairo-1.10.2-r3.ebuild 4381 SHA256 1780bb903d52e084bde89324d1ddf65b3484ff3697be976af0ca69e5159ed01c SHA512 a5867da983f05a785200d6b092df79a63440d31a2221d33647e148237f688ecf0a450442d29c4d28f40859a5e384acac8144cb2fb3b1afd8daa39e65f87a0bb1 WHIRLPOOL 2d0f5b20d09d17948f1ef3f963654372a0c9e8d4a248274f11e8d5d09c4f9cb34aa82b3fb2b3ccf30a733c17bb70530438b372d470d022f7cfa0bc4f198645ad
 EBUILD cairo-1.12.14-r4.ebuild 4232 SHA256 f83317c97cd971a6f2fa4901072dc7636463147731224dae79a883b2c3f44e03 SHA512 412b4a5faf0a6b4afdda3693352c38d922e764ff3dd75db1df5ebfd44647f213b4010f21586fbe2296dd382a152bb98dd4353a97b5f19d87c94aa2144bd058d0 WHIRLPOOL f47d638f92bb6647951ac21eebca5c3e576f2906ee35fc2d70242bbd91d35748c672ce3b7274723819eeaef1a2ba35e41078e14ca9aa980b56149373df052871
 EBUILD cairo-1.12.16-r2.ebuild 5350 SHA256 aafcb0076362cfb0965ba7af00416a9fa8f26e0f726d30ca71ada880e5107f2e SHA512 db2a73feec5b1de6d1e1ce33292718a4b9bbf422c38c2c1a04d36de87363e4fffcc297137b70cb1085a772d1f39733c2a870ee00701c6b62ff17c1e170279a05 WHIRLPOOL 640dc668c3793a0385118de4cfe61b9559741cd208766a28ce65711b7407044a815333bd03ff8d0a89db75dbe6a81a00e889080cee7fa21687ca9cc161fc5901
-EBUILD cairo-1.12.16-r3.ebuild 6164 SHA256 a7aee52c41632f17bd8ea1329c4c5d9b5b175eafd1a3889022335fd1bfca45ff SHA512 2c172d72c3afe3358663b1805af1c3803e81b3ef72f782e5854682530ef8a465482ada2333980769096fa3f4298f87eccb9ee69cd391c643ed4165145b2f708f WHIRLPOOL 5f700b6b886af716e252d39f4bfa08d841a92fdf2421524015d7a7731dc5b93bb4a8ca960a3ecc1003233e837a62f14b35133548d10077461bfd38e7667f3a36
+EBUILD cairo-1.12.16-r3.ebuild 6163 SHA256 9b6a4dd56b016db707c316f66ab46d779081535a2f1327e3e7442d5f5e450d20 SHA512 c65111e45d9706e9b044bebcff2f511ceac73241e62a5719240d2d3647c69d8eaa9a2b25608b3de8b4629a38fa5c0ea66ddd35af6b911625c7377f04302b60ad WHIRLPOOL 646c5c85cdc628b612ce076adcf1bd2ad637b6b33560b17b84c7cc4377c1442150bac0ccbeb4f2b5703fc8681ae5174398dbddeb9a9a58dcbf0cb473c760b33d
 EBUILD cairo-1.12.16.ebuild 4156 SHA256 2467f8b13e26d0287226a2d6866fb48abfb4f8c44e6395155e6d62387d7d5a04 SHA512 edf6c4ce8dab8d226fb8fbba851edb38e53bbfe70b775c050f2a91f02a2c4c17fffae1491319c6e43066e05b9918b0565d66af9067851eba497388c312c724c8 WHIRLPOOL 3d2d8ddfa28adce55f0e177f5c6c18b455a95f335a6b817a48b8efef67186910d9306092ef703ac37a2105fea0c15af5b6faebb074f68ec354ac327e69736412
-EBUILD cairo-9999.ebuild 6065 SHA256 bc6d1073210aa82910a83e134eb49a45e37fe429e4e1f6a746d3f9fdbb31176f SHA512 898cce9d4d4551103cb55ff826a9eca306cd94fdf12589bd8887bb2d3fddafff6ea45434962b10f8e908f3464aadd9fd547155b45155d4c200f0b810152f07fa WHIRLPOOL a516519b585565745e51452810d8f7656eb50f5f05c32b27afa67984eba0fd43cddb1cbf698d4e7415f15be6c0564d326bbb432b5cc6feb83675d9461908b4ff
-MISC ChangeLog 55898 SHA256 675b39e07bd4a1be5d6dba384d27a10d5c4738a7603a012d218d91ee6eb058a4 SHA512 e7c9abb179a19d5dbb02380600319e13f62932fa8e26e20516acaff4629eb21c9afe9ca67a7b16f6b6f6d95c94cd4305f923e0f83e9091127b285d791687c650 WHIRLPOOL 249c952c82deff2a1d839d231b2ce147bcd3a2365e3db85eb018458da4b386a63ba773a5e10f8f29770a5e7fadec4cb16aafef9fcec439bdf95a886a21bbf12b
+EBUILD cairo-9999.ebuild 6064 SHA256 b87bbd80d047534330ba02f6c331fd9fc5ab7338a0145676504fef0547341780 SHA512 cc135acf2c192a0aa01621b3bbbee5494b6e313013ca669e62d10f10bb3f0d9345837379c8a0114e330e1a871dff72eddfc13c85b28696b196c553bce8d1427e WHIRLPOOL 000529ae0170127c803d08adb00dbf9d3023cab35dd5f8666f6204a092d1fa4dfcd1f987e8ee1235ef476f9b7756fc90d71d0d06c2959303f5d20bc1e1524b27
+MISC ChangeLog 56119 SHA256 7d9e46c87cf0cf51cf9fcb7c4d3c0a31c52216c2654981b2f99138edd876d5a0 SHA512 46477f62d2558fd261f0912d4e51df1737e8b8a8c9c6d07a401109a793e0cc9a09cbb6d09847dcc825ef5c33067127a633cf05edf2cc8503799881f4490f6912 WHIRLPOOL 979afae38daafcad3608b842a3ca1e38ab6b2f7194a915b25d9b9360af720c0e84c7de4a5acba0570d3bcfa35ba90aae193c211622ee1cc421000dd2dcf0aa41
 MISC metadata.xml 1512 SHA256 e608340ec4a70a7ed36558825b916661bc659e8e8b588a89c2b94f57fb62822e SHA512 616bfa3ee0b43f91d9104f19e756e97a2e68edc65b2eb293864d15a099068e3f5359f0edaf91fff5a2470b82d303d37e4227a7df65b3f3601362f1268501f94f WHIRLPOOL 8e279a5124dd7073add02094a5363046d47e435b4e274a765cb936d33599cf13e16758fe3f57ef316a8137dd574681a99d4b5bf8074554606d7d36afadaa3f91
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTZBMdAAoJEJ0WA1zPCt1hFeAH/A5NtEbgHyvdqSVT8Ep30UnY
-FzLYHX9GQXsgkq1VpFKKeO2/8R6ngrSQo8dFfflwmLKqKf7qzRIT3kwmjeHZzVbP
-g0sYykT3sY2i+czNdIsx7Uw28CBTGE7FQzsndpBoPqtPlqlMk9VGssNi1VXd89Gn
-uhCO6mdrqtrQ+4DxVwUQ7r8l8gv9egYO1izw20+z55bTSsGIKoY+T7V/Jmre7kmA
-BIhhf5sT5P4St/BORDBJayybiB1P3SQo6VMjxcVW1ryF68T56x8MJzXRwYyYbOm7
-ZpqJtpUk7tbT9pdZPxszwVV3kWc1oU+2QQgsSUxF+0ashIFn/VupyImszg9ClQY=
-=tTs/
+iQEcBAEBCAAGBQJTZn3+AAoJEJ0WA1zPCt1hn1UH/RCxoutSiwYM2SsAUHpNZk9r
+dJPGplx76LhcBCy/XzpKSljzkuR9Sxps5XFLFmBGOWPyb2qRhx8NcOFrbzy4jp3K
+z0f5Dt613fICJhTCCUKs9LCmgRdQKb+bmwvOsJZqIlOs+ECmjZ8tIXwSYjFDdIEO
+vVFckHldyI0/+KjNU13tTwBktMG55i/z34a4ZqMJBwOom9zEKNgqm9PWp/uRwvw/
+d0vvs3YY6ktUc5frVqsURgQuNMvjRb4C2H/dQaozL5bcPpmvcwOPAWmJj0DK3ibp
+Z6FXI/i7kWQemiNmNe/oEcLDnuhqm3bHSIq5hc6BAuH7HBQhelfTMasPzasUf0Q=
+=BIOY
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.12.16-r3.ebuild b/x11-libs/cairo/cairo-1.12.16-r3.ebuild
index 9f439daf4a99..825d25ab8333 100644
--- a/x11-libs/cairo/cairo-1.12.16-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.12.16-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r3.ebuild,v 1.1 2014/05/02 21:51:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r3.ebuild,v 1.2 2014/05/04 17:51:45 tetromino Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ DESCRIPTION="A vector graphics library with cross-device output support"
 HOMEPAGE="http://cairographics.org/"
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-IUSE="X aqua debug directfb drm gallium gles2 +glib legacy-drivers +lto opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb"
+IUSE="X aqua debug directfb drm gallium gles2 +glib legacy-drivers lto opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb"
 # gtk-doc regeneration doesn't seem to work with out-of-source builds
 #[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
 
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index e5017b4c06ab..216ccce6b777 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.42 2014/05/02 21:51:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.43 2014/05/04 17:51:45 tetromino Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ DESCRIPTION="A vector graphics library with cross-device output support"
 HOMEPAGE="http://cairographics.org/"
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-IUSE="X aqua debug directfb drm gallium gles2 +glib legacy-drivers +lto opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb"
+IUSE="X aqua debug directfb drm gallium gles2 +glib legacy-drivers lto opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb"
 # gtk-doc regeneration doesn't seem to work with out-of-source builds
 #[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
 
diff --git a/x11-misc/gxmessage/ChangeLog b/x11-misc/gxmessage/ChangeLog
index 18168d6512bc..7cd3e17396a0 100644
--- a/x11-misc/gxmessage/ChangeLog
+++ b/x11-misc/gxmessage/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/gxmessage
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gxmessage/ChangeLog,v 1.43 2014/04/13 16:29:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gxmessage/ChangeLog,v 1.44 2014/05/04 23:58:29 jer Exp $
+
+*gxmessage-3.4.0 (04 May 2014)
+
+  04 May 2014; Jeroen Roovers <jer@gentoo.org> +gxmessage-3.4.0.ebuild:
+  Version bump.
 
   13 Apr 2014; Agostino Sarubbo <ago@gentoo.org> gxmessage-2.20.1.ebuild:
   Stable for ppc, wrt bug #505398
diff --git a/x11-misc/gxmessage/Manifest b/x11-misc/gxmessage/Manifest
index dc32c20ee88a..a0fe46ce3e38 100644
--- a/x11-misc/gxmessage/Manifest
+++ b/x11-misc/gxmessage/Manifest
@@ -3,24 +3,16 @@ Hash: SHA256
 
 DIST gxmessage-2.12.4.tar.gz 248034 SHA256 ebfaefd01483c43eadda004b75d493bc8dcc016076f6a48f97774364bbe30c87
 DIST gxmessage-2.20.1.tar.gz 270198 SHA256 a189874ae7dcf6efdea34c706be246b61bbe8b158bdbee3ac087a531bac4e5ac SHA512 4b743e4aab423eb0053f5bb0a35ca1e351f51d0789fa6e2f134bcf5cca691595e15e80868610e23d99792343f174f1f1dbd41b823b6b44c1a9327235cf9c1cd2 WHIRLPOOL 3b31bddfa4a893cf1a19022a73bab2929ee2acf960ef8d842fecdbe92187e2faa8c92e7cd111dad941ba9a4d63893189cf7fa957fbba25a247be245e00bf2c6f
+DIST gxmessage-3.4.0.tar.gz 270414 SHA256 c10a83a89b6f9313042dcdc4ad0724b97941f245d79799edbc464921eed25e24 SHA512 56defeeed35ff38c9d8e176fa397a6b82059d0b35f501ef33ab3f5e9a2d02b5a571573a52af1c9dcfedc9fbaa40f1ef2d0ab142e01c570fc05bcfb56b6aa857d WHIRLPOOL d132827c3c06cee20e5f61112001e480cf3fb086a1e1ad9ca5bbf4a08693508cf5233efaedcbd0e43f5862e7a24bb971b71cf9ce8abcdf83b29c7869bf1fbaf6
 EBUILD gxmessage-2.12.4.ebuild 888 SHA256 1b99d862ab6ad92888aa406e93d8fb8976efdd48515760f5f38f0b6e42041647 SHA512 2a64652677d875cf4c77e3e280dceb1c73d41667193274af6748ce6a6ad2df78c85fdf9e837c40c6d5ae59e54e5e30023170e4ce0409dc3baa240ee7212ece92 WHIRLPOOL 988d0de05f8bf1772eebba87e6fce01d296a14bacb35498e51ae6595bf05806fff4df9e6e99c76e25c367faf2ecbc02da0643a5511b5e13f9d43fcca0a2ab53b
 EBUILD gxmessage-2.20.1.ebuild 965 SHA256 593eed436aed89ac2684af5fea821eaa6385312f3f4461f14378f0cb942b633a SHA512 741f5448d9999b3bc4f07bab9a69059f6145b44aa44a1c88473a3e1bf3380d9fd68b75f6ad37bee40dffc8936902b4cfd55f58973011525a5f0130a3f66711e1 WHIRLPOOL c5388cdd2823bc673fa6e9163e071fe9bc497a2dee3dce94a7214b972ba4f671d66c04cb0e9c6dc8046da87aec00fc9c82f4ae3c36c5d9f8089339c7d3ca8b86
-MISC ChangeLog 5185 SHA256 ce38a47fb12561664755b6dc4fc7bd1eb82bdc22134ff9a259d3573e544df6ba SHA512 8a369656a85fba28b7a4ee949859cb96d2954483524498b8babf4cffab850b982cb167183dce0f17faa7a093216db71259cfe49c94f3086537a7028a3ab47886 WHIRLPOOL 7bfa5623a6bf4f9ce2181593431fbc0fad399024443a66c510448c7a3bbba50d8238193dc48b4b1164981925160bced8e66bbbb68d2a2e917a94a626be8a985b
+EBUILD gxmessage-3.4.0.ebuild 996 SHA256 1061c3b2da170b06a1f1d1f07495435441a82ea96ecf062ba71d38a440e4db38 SHA512 9b527e2d4b85fb081b6810a06682a59ede0df946b97332bd19326dea0bbebdeb8fceb59fce1ec5df02deba433d0fa686a4e4ff5ce7fe86b002a58bbf6b8db9a3 WHIRLPOOL 8668673e34953ad3ca10a837b82de337de3fcd69013220e1d4e04e513698ac4ccc16441c6005d77fd02488c35069e55d2e9409c3b40b11c3fa343501c78380ca
+MISC ChangeLog 5306 SHA256 25923f873cff6a4a8b9a604a824ac827d8c6fdd31da034722819477c678f77b2 SHA512 6d3c0d64984ec27ee7653fd33a5cc35b909f63c6a338a240663e28ab7600839e153c67ebd086839686f31fd2cdb555e770fc594074ca38a83c086e29beeb45eb WHIRLPOOL 506e74097415821273b84816a6cfd49b7c6cc76d227df4590a22a85efbdd62899fa40e15c47da4a717e09a940e6d69d2d36197db91d8f7115ff7115320703830
 MISC metadata.xml 166 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 SHA512 23980b683f9a89f988407b1dcc27a4465a18912f6e6cf8e1fed46182f00c4023d4802434f36b9482121ba9ffe9bc5d6e91b5d3a4ba9067fcfd8e57799c128fe3 WHIRLPOOL 96d79ff499e108ad89b80507c2e94a09af1e8031e5e2a7f9cecb2dddbf517872361436bdb983dc580660064a62663ad63aa1fad8f49dd3758253f4e378bfd297
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTSrtkAAoJELp701BxlEWfU2IP/R7lMJUaDYR0pXQ2aW5iOw2Y
-0OWPXZHs32h2Of1gpIDfTgg9viVggDVg255wjdjkZXVyQbbz+JYaayixwDhO1+4Z
-cFuXlXYc7tpEpz0FVMfibe8JL3Jo4jO9d1c4sN/aJ3N5eOwdYGbAHY81pbRHw99H
-tgvLyEDO2U5E5/W3zrIKTgsMUAI6QbAxH9UxLvKVqaiyVf11O19O7UhsaN5xhDfS
-9QonulxdUQBiaRp8hxdKWLfBFN4HUbtdhZ/SlTb1D0roktIxuSzjmljP0rJr0FBH
-2o2WE7j+woVsWaVQdzshtpHei8oHw8no0RvCjcbCuAgX+yQMfd9VUSmNB8f43+tR
-WSReU3gsK5QFHbgt8e4MvKWBEwAb9LaUdFxCWQy+mE9zaPUEhmAw+SpOzIe/6tEi
-hyaIWi4EEV2i4wSYSslKUtyv85Xi/Jc+QOpPW/4WQPqRIDQSfddo/KcNDcF8RQU6
-WrQVjIN43pxzdZssOkOpaA//iTOE8NNJZ6HldLUJuH4NqnlvHSrUb0QOxggvDRNs
-3jgwbQdep/31NcKwsaojNczMpmo40OxgSOUr4Vo0tUjna7ZXvtkiGo0wq7syVIgw
-zyGdR/SeAgt8VZtgtEUypPYaGp7eI306f+xGedvZydky0v1pzUIqiuoMPMT2tFH8
-jtt/PhUgDfljrU8+VBCm
-=gNkq
+iEYEAREIAAYFAlNm1CcACgkQVWmRsqeSphOTwgCfazIzNe+uFtUAX1gpQqhwxRtS
+VsEAmwYTugmW9bml9NURATnh007XOwHX
+=nwsG
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/gxmessage/gxmessage-3.4.0.ebuild b/x11-misc/gxmessage/gxmessage-3.4.0.ebuild
new file mode 100644
index 000000000000..85e51d3aa388
--- /dev/null
+++ b/x11-misc/gxmessage/gxmessage-3.4.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gxmessage/gxmessage-3.4.0.ebuild,v 1.1 2014/05/04 23:58:29 jer Exp $
+
+EAPI=5
+inherit gnome2-utils
+
+DESCRIPTION="A GTK+ based xmessage clone"
+HOMEPAGE="http://savannah.gnu.org/projects/gxmessage/ http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+	http://homepages.ihug.co.nz/~trmusson/stuff/${P}.tar.gz"
+
+LICENSE="GPL-3 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:3
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README TODO )
+
+src_install() {
+	default
+
+	docinto examples
+	dodoc examples/*
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-misc/mozo/ChangeLog b/x11-misc/mozo/ChangeLog
new file mode 100644
index 000000000000..67e4cef65e38
--- /dev/null
+++ b/x11-misc/mozo/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for x11-misc/mozo
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/mozo/ChangeLog,v 1.1 2014/05/04 22:40:28 tomwij Exp $
+
+*mozo-1.8.0 (04 May 2014)
+
+  04 May 2014; Tom Wijsman <TomWij@gentoo.org> +metadata.xml,
+  +mozo-1.8.0.ebuild:
+  Version bump to 1.8.0, continuation of x11-misc/mate-menu-editor.
diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest
new file mode 100644
index 000000000000..72704ccdcbc5
--- /dev/null
+++ b/x11-misc/mozo/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST mozo-1.8.0.tar.xz 162484 SHA256 326f0a6c30c07381b113b243ccdcc46269b2cab1e998ea6e1f9e79f520f015cb SHA512 4d5a0f8881b65c7ebf82686735f42183853c0c3687b5e15e594a0d9c88b6eb0d19201105773c3f3a539e93f045732a2c4e6d4718073283c4d518e505fed7e4ab WHIRLPOOL f47637cf8a6cb0ea2f805a3acf72df391e4c3dfb0f65af433be591a30e24f64ee3cf233b821dd4b790efecad468e66d23ca175b83ea309a3ac436b5d6d13cc00
+EBUILD mozo-1.8.0.ebuild 1731 SHA256 6cf96207f20a3f41c2174d04816cc14a23c62d69a2c76a16d92fa9f01e81ee9d SHA512 b48025f72b10c9cc6af04824c9cfeef4485c1c1317c87b74e81a4ebd09bf186428bd6e01513f9a407827bde9b3909824e6214685760152680962829d629265c8 WHIRLPOOL 5c5f95a2a8e90c3f1330057e44ceac1c1f22ffec0218c2a89d82ee4612098463a272ea4dbbf793b2451202eef65c67a6c88c2d0a0332dbe60930b4364492e181
+MISC ChangeLog 378 SHA256 28211d065618b5db33f7c3a405a86ce8cc65885b02a54d2d9e07def22fc947e7 SHA512 9fd2e883417a28ba8a7269b7ca134a21368ad382f6e78925cd9cfbbbed782db8a606f1472661f0e4d3474d99bae3cb71bcffb71728931931683664e97fc19ac3 WHIRLPOOL 075fcc06091dd321d15283a99d213060125f339524ffeb0b3361ad5c20744f376b8daaa8d1b77d1359fedb09dbfac395ada6fadf9c3e2591da27cd6d53edc94a
+MISC metadata.xml 230 SHA256 c188c403bd41d5dfe348e4809c2350a5a2fca98d46f8adae83a36d89af439ecd SHA512 17d13ca08cb96bf73a2c821019fd00677f17579c54b5543c1653c9f6106d7c52ad14b4a7ff72000ab7f59b7031e4471756b96864ca2fedef2e3a047fa0eb71eb WHIRLPOOL 39073c2fd817e3c41775408adf7271656a744ccd967e74770c673506c8c78cd11356b0cd28eeb16fe7350e8708141ad25037c45066263f2ed1b85d5270743986
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJTZsHgAAoJEJWyH81tNOV9WBAIAMVh//4q+e9IiV7iKYwb6SX/
+31V8NEDsIKMw/TLza+zuZoZposrPhUiRXjoyCqX65kBHuvfyIqWkhiP8zYUk9JLj
+rlCG17tAtk2KY3x7sJVK8PO9H3tGDDY0UGrYM++MQzi5Vg+Gb0HAJMWl1T8bVGdZ
+Vd4Cvj54VVWQCUI13uPXRceCkZQcTtZIJxPgftRHycCcsnyr3E7WzrqCvTFvBXEq
+hOMg/BpWlIPiDyDg4NtUnN/jjtcSSOYCr949kLuwcNYmCzLw3ljkY/gI8a5KJbQO
+isap3bX5AcjtvMweHs2He5KYzVVA1+XBXi/rQxnA80UxVxs5buM6Z5vhtcJyw0Y=
+=Zd1X
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/mozo/metadata.xml b/x11-misc/mozo/metadata.xml
new file mode 100644
index 000000000000..dca1781cb290
--- /dev/null
+++ b/x11-misc/mozo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>TomWij@gentoo.org</email>
+		<name>Tom Wijsman</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/mozo/mozo-1.8.0.ebuild b/x11-misc/mozo/mozo-1.8.0.ebuild
new file mode 100644
index 000000000000..d7464adf6650
--- /dev/null
+++ b/x11-misc/mozo/mozo-1.8.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/mozo/mozo-1.8.0.ebuild,v 1.1 2014/05/04 22:40:28 tomwij Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="xml"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit gnome2 python-r1 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Mozo menu editor for MATE"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND=">=dev-python/pygobject-2.15.1:2[${PYTHON_USEDEP}]
+	>=dev-python/pygtk-2.13:2[${PYTHON_USEDEP}]
+	>=mate-base/mate-menus-1.6:0[introspection,python]"
+
+RDEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	>=mate-base/mate-panel-1.6:0
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/gtk+:2[introspection]
+	virtual/libintl:0
+	!!x11-misc/mate-menu-editor"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_prepare() {
+	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure \
+		--disable-icon-update
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir emake check
+}
+
+DOCS="AUTHORS NEWS README"
+
+src_install() {
+	installing() {
+		gnome2_src_install
+
+		# Massage shebang to make python_doscript happy
+		sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \
+			-i mozo || die
+
+		python_doscript mozo
+	}
+
+	python_foreach_impl run_in_build_dir installing
+}
+
+run_in_build_dir() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	"$@"
+	popd > /dev/null
+}
diff --git a/x11-misc/piedock/ChangeLog b/x11-misc/piedock/ChangeLog
index 07af0d49f656..6c6be2de07b0 100644
--- a/x11-misc/piedock/ChangeLog
+++ b/x11-misc/piedock/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/piedock
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/piedock/ChangeLog,v 1.23 2013/10/20 23:16:29 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/piedock/ChangeLog,v 1.24 2014/05/05 00:46:21 jer Exp $
+
+*piedock-1.6.4 (05 May 2014)
+
+  05 May 2014; Jeroen Roovers <jer@gentoo.org> -piedock-1.6.2.ebuild,
+  +piedock-1.6.4.ebuild, -files/piedock-1.6.1-gcc47.patch,
+  -files/piedock-1.6.1-mem.patch:
+  Version bump.
 
 *piedock-1.6.3 (20 Oct 2013)
 
diff --git a/x11-misc/piedock/Manifest b/x11-misc/piedock/Manifest
index 7844edc6c0da..687027276818 100644
--- a/x11-misc/piedock/Manifest
+++ b/x11-misc/piedock/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX piedock-1.6.1-gcc47.patch 583 SHA256 39f2bac09a0d245c237a8f4ecb355d2a6723915d0142db65a13e824344fd139a SHA512 8233efb13cfa974e596b0ea3d4d3c2c2dbe6b1023c789e1a3714cfd6a04b28780cd1629e634f6b82ed93cdb654a0b1e23aa6110f0f5d8d1a87a5b0536ec23dea WHIRLPOOL 846ecc1f9c8d9beb8390f9e644ca65281c19e8a436197d7a050484f28bd7c9eb372f358160c7182a7f5a33ec0f0b46021082d5364d70247bc4674ac5886999a0
-AUX piedock-1.6.1-mem.patch 388 SHA256 43e8ceb3cb6dc9926369bcb37c0dabfd74dd6050622a227ae2414e7c5c3a3c7d SHA512 2eee85779d55a6834ef4b582d2ce65ce582414dcf9603387fe49c36c98a1c072c90b2d06c1503b2f22ecc9c982d9f9c02a7e6668ba5d2ae4d47e2d56b677faf6 WHIRLPOOL 4456c88bb27f7acb00585e4295c0de28c8fdfc3d822d7fdf425c12df4da5400b8ff6b0d960be09dc05329da2c7182f75239d50bcf843da966eafab63e78c96c3
 AUX piedock-1.6.1-signals.patch 173 SHA256 9b06e34119ed255c7ab5bfcfafb2d4f0408de5c71b88143b4ee7484c29682f47 SHA512 c98aa7e22ce78fc60d778861e5bef12545553723c28bfa599b6a2d8b30c572b8d480f167b8730d84dad9c06c16cfb45f9e69665187f3e5c66053a0d4b35684fe WHIRLPOOL 8929c8410edc4e38d9a17e310996232c8691811cdd48c3582342f3803fc0004ef4144eb6d4ce65eee972ef8f5faec0d11760a75481e71d9bf525d87e0c540adc
 AUX piedock-1.6.2-mem.patch 377 SHA256 e7eb7a98208b4ee435606a0691f3ce2fd05f2362db9586b1c1ffe542bb5c5ec4 SHA512 3767898d4066c882426d51dd5d330594f090d670f09a070914adaa4c585f87a793f8ea91fea45a63e1589f9e841a02774b3ede2dedaabb2a2da5a4009a16bd3c WHIRLPOOL 03e35b839ba6d521ac6ab3549fd8abafb0565800d31876fea40e8e5c369bf3cfbb898c5e71bf6bdc243177d8332c24cf53ea6ceada41208780c6ab958847b81b
-DIST piedock-1.6.2.tar.bz2 254056 SHA256 5ac40425e0f7e32924fe6d9ca59aa87f1be19f7e533bfb8b611a59498c85fe57 SHA512 e5ffd64ad84a69b6b0924647bd28235ef4e0dbfb28334b5f8fc243093e695d26128946812180be6ea96162a853272f33958c50458c1d9e82cad4f8ba10ee97d8 WHIRLPOOL fb587a48dd2698ae1f89fafb02c4cc078aaadb32724429e67a4b659e977d7657c7d3631044d9c9ca6d6d86e256b0b8b066762466d06ad3a79bfc4b75bb61d957
 DIST piedock-1.6.3.tar.bz2 254272 SHA256 252e58bb36122e09aafbd9297b2d17054e60d548d21fb548e53317ca03180be9 SHA512 a6c176df809290f222b0c026331370ffa5fbbf58d94929b2291f9377ce04fffa97750f02af15dde4793d9d5855192327ed88c6cdd7fe66fc03b17b0fc333e555 WHIRLPOOL 0232ce7bb51f6874a82c1bfb73f7bb42ba01a6236e8a9333a4e1a231ff59bf5cd238bc5a679a1fddb268c1d2e3471af0357bd4b3bf60ff51a1596cf91ffb47fa
-EBUILD piedock-1.6.2.ebuild 1075 SHA256 d5cbad726a1997124682c9019bdab692d9ac577bb38e617b42194ec730ff094b SHA512 87280b32064c1b55b4332cd864d1726b8a6ef5a55c5d9b0736d65628ea6291327ee93deb0abe2add33d21e72ac5bdeaa389e70d93ffba944ae2882e8b9819e4a WHIRLPOOL 01858a57f3d85ab8ac95a47b3130f63bf68bed4b5b775ad9deec0985f6443c2d22866a02f3ab5da12e3c371a0da1a4a25ead619ddbcfe1e2dab594167e3b5eda
+DIST piedock-1.6.4.tar.bz2 254108 SHA256 3afaaf9fa917cc6c91f9dc69d501bb18e890bc00759acc81647f92ef6aa1181e SHA512 517ecb4637bf34bb79f1eea5671719b58de69c95e4ba311816139ac0fad95f973e9ae602e42459c8c62571a66119696a9c1f4e0c679f4ea7423136f7ae6d5a43 WHIRLPOOL cdc99478938d9093c2670909a9997fb6d3b12e6ec6329ed97f0ae00b21c27833599579c1dd5ad9ef7d7b6b0e9dd3dd9424d6c1b8640aea1bae3723d62341fef3
 EBUILD piedock-1.6.3.ebuild 1075 SHA256 a6787a6d51bd6221c4f75b7ca378454acad89b0806c4d3c1b96434b0da7df81b SHA512 6f70985fecc606e39b0c363050ce7b9894b67be4810f82f8e839da4245146251d3b4a755b4e4da204a40d09c0995df37e65e8bdc31d5c6f1d22f54afc1a64700 WHIRLPOOL 7ef68766752f5d9b4c675515d6e122f7eba2dd27cf4f817e2d7e1157da683dab5b6dd003aa694e0058f875688d71ffa6ef8ebd3db6a54e41afa8788f1edd25f1
-MISC ChangeLog 3717 SHA256 3d4970ec0a02707ee9b392285a0d730232ecc0e261e2fb92810c66fcaea344e3 SHA512 5204592883e947950a0737ac7019064a51e0fe9f93b5c583874c6d52f9019122fd87348be4af67eec8a80294d66f751992fd5ac188200eea9e0efbc814700241 WHIRLPOOL ddc873cb02814d903416a0d8805cd3c1688faa7a4a649be381dea520373ac2f014fb7db3f64488b5991581c15c8cc4c95dc374bc22fa52858449ca2ae417841e
+EBUILD piedock-1.6.4.ebuild 1031 SHA256 448fb8e02cd1e73192e2e69189b3218e2583024ee5075164c57d6b58288cf7f9 SHA512 91498896e63dc0aa4036155790c72c7c3b4b0fd74d7176cdd4e4678f402268e416c95955b3772e67a56ce6ff74f67f84315d4a81c603ce56a5e97fdff34f08d8 WHIRLPOOL 8c505d05ac0e4bed55eaad6a241faf78a0e27439014fa2bf9ef2a262ca17e4be49ee0c7a082fd2079fc81a1791bdbecf4c4e6e11cb3dcec08ab73925bfcf0fa9
+MISC ChangeLog 3927 SHA256 0120b483237d0a26f4ae60969ee146dd332a9825f6eafc03b981463e9b746743 SHA512 501709f8387002d1f9295029735df3e5787457be05ec1177cd755fb6b53a6d49556c3d43e55ad854b94fbd99e3641a0e9f7a998cf43874a0b935df7c9fadcaf6 WHIRLPOOL 5b03d7df565b247db956a8df008848e439f2bbb3cf41370daa8b6b13d08baf47ed06cda71e60cea6b358b2181159354ba7a766dc130ffb847511d19f5f9bea09
 MISC metadata.xml 167 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241 SHA512 381c3c70deed443ca617d0535541542579acffb8dde5f577acf789380f0cdec6d395fa6a45483978648fa2d4e9dab13a441ebdc95664f5f414efbcc812705754 WHIRLPOOL f4a9e5a69adee7e8ee1e5e7ba1b4b860c5060a80db845e0c7f12c96ab44a86dc81adb6aff76c5130b4ab2ffe5ea18f0a5afc9d87a61177d99a8fc9f49d7e9d6f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJkZF0ACgkQVWmRsqeSphOHDwCfXge/5UYGJoCTr56xRROWC9tm
-IOkAn3ymxIBL4FWmwQTBwMPMkOmfcGOS
-=MZzM
+iEYEAREIAAYFAlNm314ACgkQVWmRsqeSphOfbQCffgtG17AMuafc1idDy6hsy2Sz
+uOkAn3BCUEsJJqUBpU8ktaRqL/GlS4Xk
+=YgMy
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/piedock/files/piedock-1.6.1-gcc47.patch b/x11-misc/piedock/files/piedock-1.6.1-gcc47.patch
deleted file mode 100644
index b2c2b691f387..000000000000
--- a/x11-misc/piedock/files/piedock-1.6.1-gcc47.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4476dcbaece4a1160304b4ea64656e36eaa870df Mon Sep 17 00:00:00 2001
-From: Markus Fisch <mf@markusfisch.de>
-Date: Tue, 3 Jul 2012 11:09:55 +0200
-Subject: [PATCH] included unistd.h because of compilation problems with GCC
- 4.7.1 on Gentoo
-
----
- src/Application.cpp |    1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/Application.cpp b/src/Application.cpp
-index de6299d..9d819cc 100644
---- a/src/Application.cpp
-+++ b/src/Application.cpp
-@@ -21,6 +21,7 @@
- #include <sys/un.h>
- #include <libgen.h>
- #include <stdlib.h>
-+#include <unistd.h>
- 
- #include <sstream>
- 
--- 
-1.7.10
-
diff --git a/x11-misc/piedock/files/piedock-1.6.1-mem.patch b/x11-misc/piedock/files/piedock-1.6.1-mem.patch
deleted file mode 100644
index 7d0c92ac0dcd..000000000000
--- a/x11-misc/piedock/files/piedock-1.6.1-mem.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://bugs.gentoo.org/471460
-
---- src/IconMap.cpp
-+++ src/IconMap.cpp
-@@ -15,6 +15,7 @@
- #include "WildcardCompare.h"
- #include "Png.h"
- 
-+#include <string.h> /* memset */
- #include <algorithm>
- #include <sstream>
- #include <fstream>
---- src/Png.cpp
-+++ src/Png.cpp
-@@ -13,6 +13,7 @@
-  */
- #include "Png.h"
- 
-+#include <string.h> /* memcpy */
- #include <fstream>
- #include <stdexcept>
- 
diff --git a/x11-misc/piedock/piedock-1.6.2.ebuild b/x11-misc/piedock/piedock-1.6.4.ebuild
similarity index 87%
rename from x11-misc/piedock/piedock-1.6.2.ebuild
rename to x11-misc/piedock/piedock-1.6.4.ebuild
index f268bf220f7c..62b3435bbb3c 100644
--- a/x11-misc/piedock/piedock-1.6.2.ebuild
+++ b/x11-misc/piedock/piedock-1.6.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/piedock/piedock-1.6.2.ebuild,v 1.2 2013/06/06 15:47:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/piedock/piedock-1.6.4.ebuild,v 1.1 2014/05/05 00:46:21 jer Exp $
 
-EAPI=4
+EAPI=5
 inherit eutils
 
 DESCRIPTION="A little bit like the famous OS X dock but in shape of a pie menu"
@@ -38,7 +38,6 @@ DOCS=( res/${PN}rc.sample AUTHORS ChangeLog NEWS )
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.6.1-signals.patch
-	epatch "${FILESDIR}"/${PN}-1.6.2-mem.patch
 }
 
 src_configure() {
diff --git a/x11-misc/vym/ChangeLog b/x11-misc/vym/ChangeLog
index c461d1e3a075..6c161bdd7de4 100644
--- a/x11-misc/vym/ChangeLog
+++ b/x11-misc/vym/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/vym
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/ChangeLog,v 1.34 2013/10/20 23:35:37 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/ChangeLog,v 1.35 2014/05/04 23:51:48 jer Exp $
+
+*vym-2.3.22 (04 May 2014)
+
+  04 May 2014; Jeroen Roovers <jer@gentoo.org> -vym-2.2.4.ebuild,
+  -vym-2.3.8.ebuild, -vym-2.3.11.ebuild, -vym-2.3.18.ebuild,
+  -vym-2.3.20.ebuild, +vym-2.3.22.ebuild, +files/vym-2.3.22-arrowobj.patch:
+  Version bump.
 
 *vym-2.3.20 (20 Oct 2013)
 
diff --git a/x11-misc/vym/Manifest b/x11-misc/vym/Manifest
index 6a280d614b0f..1551b287b3e8 100644
--- a/x11-misc/vym/Manifest
+++ b/x11-misc/vym/Manifest
@@ -1,22 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST vym-2.2.4.tar.bz2 6420100 SHA256 fa6d088327feae80c4c6760454fba64fe253a7de6e7e46f45a4c7f7db9b998f4 SHA512 b82d2100a3f26f6e19167066ec512e23c8f50ab7ef41ff130dd775964e189fb345e1e9877c96ceffe3db5c7ff6c361330f12a3eba554523f0c2dcf7c4877a712 WHIRLPOOL d1c7b63da56549e181fea25d45bd6b1ac17580e45e15e475601b81ef0de8d4f8299f0752554b6f69fa34e3c709d30971b4973a6ba29a89c0542d7ccfaf007342
-DIST vym-2.3.11.tar.bz2 6725346 SHA256 fd0be4f05bfe56063d742dea3610de7904f3831f8490f100514c63e8e3fad7bc SHA512 e9b0a665fff4649cdefb380efe9884e7a1b633d05109d1a546cbc2503fd1439787add094b22d769dd2d2f8c8dfac1cff7e95d4b91f6da0c1b673f1158fa7a2a1 WHIRLPOOL b0727dd5843b8d1e46df545f6ebd786c49f261d43daa447f25179732c82d2f4068ee83a7b5b6901b665bd61113c30f90b6393c4425c74ee42651207b2829410e
-DIST vym-2.3.18.tar.bz2 6729450 SHA256 bf2d74b992c0986e8ee1e595f1c1587d3e849ce4272d14e8f3bc71b3c6c41630 SHA512 183e869d5596e366b13da39af6fa1d7228df705eda413ab0f8150b442a1f6ee26d9f6ee18480f537dcf09fb0b028282d5b2d393f7f36b08a6ffe084be1ae25e8 WHIRLPOOL 60ea8430921072cfd998c0a22d8d3dd125c6198f6c668ef8a639e69d81f325b6ab846b39543e582443946340c48c3cfd75e51a28547616b126cd06524e41ad49
-DIST vym-2.3.20.tar.bz2 6727364 SHA256 24b1e874fbe2fb8909e9571132f2fb246efddc990d09515da41e50cecf84fb0d SHA512 9e759bab9e801fc8a3079b76873f1a61d03e2cc85dba7b5c39ed9944318d13ab1d76438db87025990da198bbeeeed426e0b5ede7e3945248c28568121e54ff48 WHIRLPOOL 22b27a9a0e278640e09ce4cb16f6308e993a95519a3c2b24d86f494131adb8e9b551a5d15650dbb67ab34f979f24892e99d3c816dfa7fcb87be9b38cfcc1d8e1
-DIST vym-2.3.8.tar.bz2 6722413 SHA256 54c99da68a41e256701e5bbc35b98477baa509e6729856012ea873a8475ede83 SHA512 33b6021afeb8ffed4da47c546d06c4f552e9ea9f30ae95fac0ce5e46d35a2c58e5af05a553cbbee02abaf42010abc562e8c66caaed1277a9ba49bc029bc9177b WHIRLPOOL 11d8421130232a572687b8af574b8d6cc7573f44f6e274dfc2c993fa5dc0eba32ceb89b660df86fc4004317b31f85fd3c56643fc70c5ab1e15d38028be0c7cbc
-EBUILD vym-2.2.4.ebuild 756 SHA256 7ce050a93890cacce49c8ca01995ad64034234af0766f2f9f75ce9d0a9139e43 SHA512 67ddc77426e34820accf17a640044e7cfc446f1891f09f4f49b5f99ff248acdb427fb297d9bcd2810b703a0a48423220902cb37867add51cc8affd84b32f3532 WHIRLPOOL bb6feb53265aa4173b433c9ab4f0d45bb3f38937f42a0d7aeac92272b58043822832722b7f9ea5998d2c425070189b92f03f4617531bbc6e572c99775cb41fce
-EBUILD vym-2.3.11.ebuild 1175 SHA256 092aac02e2b94ed6a959b16533b09951fe6eb2423ab0c54195a5e4216b8f64e2 SHA512 fbb75bb3189e065377d1d4ad1bb7863f103726613961237923ccc16a44efdc63a14c536358e0599a53eac504a392deb5ec9f7b67c94bf5e648067d2f9f6db51c WHIRLPOOL f02a3c39b4b76a80473adf087e2f832f9fa4e025bc09a4321341ffebc97faddc284ed92c2ab8b6013371a9ea3429edd66959d4bf4570b582605b973be0e76b96
-EBUILD vym-2.3.18.ebuild 1362 SHA256 00d5cc5dd7ddb7274af85f57b72554e551814349533c764fdc1645e7622b3430 SHA512 51c875b1957523d873f54e5104147b31ac039fccc5093dd427a79c62729762accb93b90d0f939d55b24f4005e2690bb8df7d50370c63c0be7d960b2c56ada1d5 WHIRLPOOL c666d8531a96f06126af6b1421ad0fb21d5d44de8f82074f2403566f76ae0a12f42fd6904a25b24fd1f6634f7619c2ac995cd5f2f08a924645782d8350b6285a
-EBUILD vym-2.3.20.ebuild 1357 SHA256 de75a379e591092d25bdbff1527872bc81b5a5793fc439158ab174e914f1c1a8 SHA512 5677ecc53a106477b8719e794d412f8c11c0263eea1be9f4ef153b1bfb472037ec331e0f6034bcb2c744778268276b8dcc8fb7498d4e507c970e1e043a71176e WHIRLPOOL 845e9565c011efefc6d30bff0219419f99becea053b95c6e0f1031798e0c83e96288ffdc26aba2e820ef5b810cc149b7fa882f9c8d3a29fcc3bc7b22bebf8565
-EBUILD vym-2.3.8.ebuild 762 SHA256 60e86a2836124de351c00a8412418218995d0efc8ddb3163afea4d604bd68ddc SHA512 fcb81ff515ec4bc740ba4e10f39d823681962493b5cd9cc6b3c56cda4cdae19f49243a53cca21d42e50e1de82847128563792ff2be153cf9534229efc2cb5d11 WHIRLPOOL c0f27bfba03552184001c42e8d19d2bc60054fff6068005ba6e568b58d7723beba51edf4c10fcbdc82632a992d9477345f4bb1ad7f188136a1435f7d8a482f79
-MISC ChangeLog 5129 SHA256 db0f49500e278ae46808cce3aee5d1494f8e99106b4739b4706091da17fc18ad SHA512 46a98ffcfe53505096675cd020e166fa43f98cd03a5dcca5cde5552bf07806453a74c83c4785f37a82a84d91be89b2a1637d30ff70ef4cbfc0132dfe2cb164ac WHIRLPOOL 4c1f1f9627f45776962e78831016729da706ae5525bd3459ce05a0190b7b491863828591f51fb4c029db3df45199d08d2de508bdca88fbb59d929d2c8d7db688
+AUX vym-2.3.22-arrowobj.patch 406 SHA256 2083f777f6ff77dd9e2701ac2be22eee032f346a260b1449cbb1ed813309b9c0 SHA512 927978444b0aca3ea0fc83eb84cc92a658f62d327259959c0ea3cad80626275015a6ed9817b6505ac20eb66c1fb412b9bc3434a7fb0ddb0bf08a1628612382df WHIRLPOOL ef9055eec18133e44e6a3b9bd3cd1de98b53513aa39347579a5dbb045ebbe8b2e81a3f9e9dddacde6f9bfae5d762e9fb5c7aa90ae5485d42db370f1546e19eb5
+DIST vym-2.3.22.tar.bz2 6737848 SHA256 92bd267fc2aa404e0f0887e780bae422be922c20d8037d743f32b16a4f8a16df SHA512 c6b15da272190e877d519153865e60f967a67cbdd4a0f56519f9c5a330605b97ea822f162ccf9fd57d1a4ec540d46e82c3004fa8e26c31786691b037ecb1c63e WHIRLPOOL e452abb36902e34afbe5b637c769a2bf17a9bb0d940ff72b46d55b19a821b26bce6ebad9bf125edb088a4e3d922a2fa2ab8dc096c378d1bee4efcb133519bb7b
+EBUILD vym-2.3.22.ebuild 1391 SHA256 abf375aef2af633d60161b8d8d1012d7be75a19eb8d570230cac1fa0ee57bfa6 SHA512 5e4497e08797bd2670fc68d55ef0e2d04be35d903a68bc587c0c6c3fdd0b70e8cbe5aff87752b154f6732eccff430db1a344c5b912f7de8690d857ce50c32d71 WHIRLPOOL a35237df2ac376240563d4b142b69c58deb04bcdbc1ec8c6305308754ecff21c98b1adeb84905c0d44933daf111ef424262e013881ef20f4e87e8e8d3c1a8d58
+MISC ChangeLog 5376 SHA256 fc4e1b3000197098ed03cd4b2e63a79923b8d6df07c4b9a7b03d7ac84591bdef SHA512 9b36f05f51d5b697e9b73c811263672b5335cf089d7d595fa41e430777708d58ed3d43e2863e38ecb3845ca371ed1402a9c46de7331d7c98f8e81cfc0da1e681 WHIRLPOOL 1c77f5ca486ccd0591a22a6d13200d582b1048cddbb222be7cbedea348c45074c000a8ae4fb6eb1f8d071f3d869f2c4ddb3176a28f27838fb774cd8bd39e6e5b
 MISC metadata.xml 165 SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec SHA512 243d1391ff105563c9bf0f75b1eab39434cfb69e084e81cebf6e4eb3aa391cd7e36210b2c3808895bf876dd761eb72330144af2a81e467453c60b37ccdf0e63c WHIRLPOOL f63c52b91f14d86972c7de46b5a50b2d47822a1347d627e05845027ff75299dc79a135988141e1dec933925c4e0213287ef6933ed76ed2fd3fcdff3757c1766b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJkaMoACgkQVWmRsqeSphMpPgCfQgb+fYhpWmrNVz5cHutoBORW
-ISQAn0Dkpo9B2ZjNNOKgzvdT5P5O/Vd3
-=voBe
+iEYEAREIAAYFAlNm0pYACgkQVWmRsqeSphO9RwCdHuHCg4SCPFaMe335lAKJtfl6
+8isAnA2rM2m4D4Sf6JzNG/oTYS1P33iU
+=Zm8d
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/vym/files/vym-2.3.22-arrowobj.patch b/x11-misc/vym/files/vym-2.3.22-arrowobj.patch
new file mode 100644
index 000000000000..5c1cd6fc57c0
--- /dev/null
+++ b/x11-misc/vym/files/vym-2.3.22-arrowobj.patch
@@ -0,0 +1,18 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -69,6 +69,7 @@
+       aboutdialog.h
+       taskfiltermodel.h
+       animpoint.h
++      arrowobj.h
+       attribute.h
+       attributeitem.h
+       #   attributedelegate.h
+@@ -156,6 +157,7 @@
+       aboutdialog.cpp
+       taskfiltermodel.cpp
+       animpoint.cpp
++      arrowobj.cpp
+       attribute.cpp
+       attributeitem.cpp
+       #   attributedelegate.cpp
diff --git a/x11-misc/vym/vym-2.2.4.ebuild b/x11-misc/vym/vym-2.2.4.ebuild
deleted file mode 100644
index 823a8b394e3a..000000000000
--- a/x11-misc/vym/vym-2.2.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/vym-2.2.4.ebuild,v 1.2 2013/03/02 23:54:15 hwoarang Exp $
-
-EAPI=4
-inherit eutils qt4-r2
-
-DESCRIPTION="View Your Mind, a mindmap tool"
-HOMEPAGE="http://www.insilmaril.de/vym/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtdbus:4
-	dev-qt/qtgui:4[qt3support]
-	dev-qt/qtsvg:4"
-RDEPEND="${DEPEND}
-	app-arch/zip"
-
-DOCS="README.txt"
-
-src_configure() {
-	eqmake4 PREFIX=/usr DOCDIR=/usr/share/doc/${PF}
-}
-
-src_install() {
-	qt4-r2_src_install
-	doman doc/vym.1.gz
-	make_desktop_entry vym vym /usr/share/vym/icons/vym.png Education
-}
diff --git a/x11-misc/vym/vym-2.3.11.ebuild b/x11-misc/vym/vym-2.3.11.ebuild
deleted file mode 100644
index a7a6081e8b54..000000000000
--- a/x11-misc/vym/vym-2.3.11.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/vym-2.3.11.ebuild,v 1.4 2013/03/02 23:54:15 hwoarang Exp $
-
-EAPI=5
-inherit eutils qt4-r2
-
-DESCRIPTION="View Your Mind, a mindmap tool"
-HOMEPAGE="http://www.insilmaril.de/vym/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-VYM_LINGUAS=( cs_CZ de_DE es fr ia it pt_BR ru sv zh_CN zh_TW )
-IUSE+=" ${VYM_LINGUAS[@]/#/linguas_}"
-
-DEPEND="
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4[qt3support]
-	dev-qt/qtsvg:4
-"
-RDEPEND="
-	${DEPEND}
-	app-arch/zip
-"
-
-DOCS="README.txt"
-
-src_prepare() {
-	local lingua
-	for lingua in ${VYM_LINGUAS[@]}; do
-		if ! use linguas_${lingua}; then
-			sed -i \
-				"/lang\/vym_${lingua}.ts/d" \
-				CMakeLists.txt || die
-			rm -r lang/vym_${lingua}.ts || die
-		fi
-	done
-	sed -i \
-		-e '/lang\/vym_en.ts/d' \
-		CMakeLists.txt || die
-	rm -r lang/vym_en.ts || die
-}
-
-src_configure() {
-	eqmake4 PREFIX=/usr DOCDIR=/usr/share/doc/${PF}
-}
-
-src_install() {
-	qt4-r2_src_install
-	doman doc/vym.1.gz
-	make_desktop_entry vym vym /usr/share/vym/icons/vym.png Education
-}
diff --git a/x11-misc/vym/vym-2.3.20.ebuild b/x11-misc/vym/vym-2.3.20.ebuild
deleted file mode 100644
index 83083eb3c354..000000000000
--- a/x11-misc/vym/vym-2.3.20.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/vym-2.3.20.ebuild,v 1.1 2013/10/20 23:35:37 jer Exp $
-
-EAPI=5
-inherit eutils cmake-utils
-
-DESCRIPTION="View Your Mind, a mindmap tool"
-HOMEPAGE="http://www.insilmaril.de/vym/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus"
-
-VYM_LINGUAS=( cs_CZ de_DE es fr ia it pt_BR ru sv zh_CN zh_TW )
-IUSE+=" ${VYM_LINGUAS[@]/#/linguas_}"
-
-DEPEND="
-	dev-qt/qtgui:4[qt3support]
-	dev-qt/qtsvg:4
-	dbus? ( dev-qt/qtdbus:4 )
-"
-RDEPEND="
-	${DEPEND}
-	app-arch/zip
-"
-
-DOCS=( README.txt doc/vym.pdf )
-
-src_prepare() {
-	local lingua
-	for lingua in ${VYM_LINGUAS[@]}; do
-		if ! use linguas_${lingua}; then
-			sed -i \
-				"/lang\/vym_${lingua}.ts/d" \
-				CMakeLists.txt || die
-			rm -r lang/vym_${lingua}.ts || die
-		fi
-	done
-	sed -i \
-		-e '/lang\/vym_en.ts/d' \
-		CMakeLists.txt || die
-	rm -r lang/vym_en.ts || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use !dbus NO_DBUS)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	doman doc/vym.1.gz
-	if use linguas_es ; then
-		dodoc doc/vym_es.pdf
-	elif use linguas_fr ; then
-		dodoc doc/vym_fr.pdf
-	fi
-	make_desktop_entry vym vym /usr/share/vym/icons/vym.png Education
-}
diff --git a/x11-misc/vym/vym-2.3.18.ebuild b/x11-misc/vym/vym-2.3.22.ebuild
similarity index 82%
rename from x11-misc/vym/vym-2.3.18.ebuild
rename to x11-misc/vym/vym-2.3.22.ebuild
index 8a835b5adfa8..00bc6f32e81d 100644
--- a/x11-misc/vym/vym-2.3.18.ebuild
+++ b/x11-misc/vym/vym-2.3.22.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/vym-2.3.18.ebuild,v 1.1 2013/07/09 11:38:38 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/vym-2.3.22.ebuild,v 1.1 2014/05/04 23:51:48 jer Exp $
 
 EAPI=5
 inherit eutils cmake-utils
@@ -30,12 +30,12 @@ RDEPEND="
 DOCS=( README.txt doc/vym.pdf )
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-arrowobj.patch
+
 	local lingua
 	for lingua in ${VYM_LINGUAS[@]}; do
 		if ! use linguas_${lingua}; then
-			sed -i \
-				"/lang\/vym_${lingua}.ts/d" \
-				CMakeLists.txt || die
+			sed -i -e "/lang\/vym_${lingua}.ts/d" CMakeLists.txt || die
 			rm -r lang/vym_${lingua}.ts || die
 		fi
 	done
diff --git a/x11-misc/vym/vym-2.3.8.ebuild b/x11-misc/vym/vym-2.3.8.ebuild
deleted file mode 100644
index 0a618f65ba48..000000000000
--- a/x11-misc/vym/vym-2.3.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/vym-2.3.8.ebuild,v 1.2 2013/03/02 23:54:15 hwoarang Exp $
-
-EAPI=4
-inherit eutils qt4-r2
-
-DESCRIPTION="View Your Mind, a mindmap tool"
-HOMEPAGE="http://www.insilmaril.de/vym/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4[qt3support]
-	dev-qt/qtsvg:4
-"
-RDEPEND="
-	${DEPEND}
-	app-arch/zip
-"
-
-DOCS="README.txt"
-
-src_configure() {
-	eqmake4 PREFIX=/usr DOCDIR=/usr/share/doc/${PF}
-}
-
-src_install() {
-	qt4-r2_src_install
-	doman doc/vym.1.gz
-	make_desktop_entry vym vym /usr/share/vym/icons/vym.png Education
-}
diff --git a/x11-themes/gnome-themes-standard/ChangeLog b/x11-themes/gnome-themes-standard/ChangeLog
index d13d07b0fc66..f60fb7f4e0bd 100644
--- a/x11-themes/gnome-themes-standard/ChangeLog
+++ b/x11-themes/gnome-themes-standard/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-themes/gnome-themes-standard
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-standard/ChangeLog,v 1.62 2014/04/27 22:02:15 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-standard/ChangeLog,v 1.63 2014/05/05 02:11:13 tetromino Exp $
+
+  05 May 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-themes-standard-3.10.0.ebuild, gnome-themes-standard-3.12.0.ebuild:
+  gtk-engines hasn't been needed since 3.5.90 (bug #509560, thanks to Jura).
 
 *gnome-themes-standard-3.12.0 (27 Apr 2014)
 
diff --git a/x11-themes/gnome-themes-standard/Manifest b/x11-themes/gnome-themes-standard/Manifest
index 23f0a88c1ee4..d0746d6d0012 100644
--- a/x11-themes/gnome-themes-standard/Manifest
+++ b/x11-themes/gnome-themes-standard/Manifest
@@ -4,14 +4,18 @@ Hash: SHA256
 AUX gnome-themes-standard-3.8.4-menu-borders.patch 754 SHA256 08182602edf2ee8e82f62059a78eee9889d1f7c3ff2e4643b9da45fb165fda72 SHA512 deb1247fabefc99c59a398332aad19ec198ec9adb092b50bd48ee19bd6ea1d06588d98d60c16e0ff05fbd2689523549fc528baa3da3b391820b02ede7436eafc WHIRLPOOL 295fa387b15f5e1c17fbff9c16ca09907011d622d699f6cef5e74b5bed4e9606a43d854f3ff7fbe5fa29d3f5fef91f1969e90bb50b0cc28c6d1517af735ff660
 DIST gnome-themes-standard-3.10.0.tar.xz 4797944 SHA256 812c6cfc534fced921dc327b436e70020d8979529284bb59d72d6f37af1f4b38 SHA512 0176db4d746f511b901ef5244d7efba28e461d0abdca276698b6a4b8bce3d6255fdac97f7149ffc0d3f9d04f4c323290312ff2911b9dab7625b3366452c72834 WHIRLPOOL 18578d26a44cb9d78b9e578f4c344c6a6c6555a6122c28c3f55c3ab4c35193ad77089861fb40168758eaca82c6011ef6f41204404c5e1caf6b1812859b3ee353
 DIST gnome-themes-standard-3.12.0.tar.xz 5911004 SHA256 a05d1b7ca872b944a69d0c0cc2369408ece32ff4355e37f8594a1b70d13c3217 SHA512 670ca40d0c8e79cc4aebd584ea44ef7adad3251116d1f2f26b402e52fbeac69069b10d0c262ceda01b6a455a0f4c86f7121fdc4cb611cf8b0d9813aae6ceb4b7 WHIRLPOOL 1b5eafad6306db1854830daa72b0e20293d9eb86fa9cdb8da902575d0fed73d497c71be096108b5545d60c8b03c051fc3ef74af1e3999570af0e7e4353b7033a
-EBUILD gnome-themes-standard-3.10.0.ebuild 1794 SHA256 f4c99591e27ab1e0431c3b4289691b453b3d3d4b8f864b00530db5dd4493965f SHA512 7fcbf69d36dccf2839a3dd564bb18f4b65752f836283980aa00fde09aa2e0e4339642f54f0dd55a895f2b2527c06a77cbd59f75c0e811aac67d0fbeb3346efcf WHIRLPOOL 2a797f08d55a500d1ccf3800d99dc80e5380fd12854f225fc65a5f598532447c69d4bbf629f21f24db204849bb432160cb5852ae1723c5f7846e94d6137f3b39
-EBUILD gnome-themes-standard-3.12.0.ebuild 1799 SHA256 cb9838d300ad9acb34d3588a63ab259d6876ed20df7c1512684760f2b6dbf53d SHA512 50f770cd2973ca53fa71748bba5cfc60946c2339a974c8cf3b34cb65d53e402326638ed12a7339b64b9f1e3c160e7c7534025cc36307a7657ad503e62125004c WHIRLPOOL 990a837b4c9ef8696c9503f0b7fb3dcafbcfc80c91264c858a40468dc320eb6caf41b944cb720d985f9add599a8d99578a5e08de311a61f4c79757f8a6042f18
-MISC ChangeLog 10259 SHA256 1340df92ea895018ee6821d2c7273b83f48e8e1c0448e878d88a94232e0250d3 SHA512 7e7b6c9bb6777e7202926f3a9aa04921e88ff6299bc5dc88a039cb2956df99b922d731adff33a9a5d60edf38bd9fe3b80008f76cc8dcba35cb46538546a3745d WHIRLPOOL 92aa282bac8a8a06a2b35fe1cbe1640a6e654c086bfdcf35c1528f0f96c95d8f2994f04be14b08da53413a45fcb4a3eda43fd29c2e9d319e9075847d31ebfa3c
+EBUILD gnome-themes-standard-3.10.0.ebuild 1765 SHA256 1ecad70992761dc6ac6d912f279df2788c17bb0d40b3836575870b40dd62d0c2 SHA512 adb7d949fa0a9acd877c20223b08cd91f10bd2ba2995c63cc9651f654cf67ddf6a04e5c19b2a0b2bb8fe025b5da76434a89ddc54225d62a6fe654e51fd250b4c WHIRLPOOL 7d31d9177c3a307c62d17d479f2235bff40c7c1d66979c1dbc9091b494041c23dc2efc93b70248a9ffa8b36818c5ab08b81ee685a9f2aeb9d13bca3c01a0640e
+EBUILD gnome-themes-standard-3.12.0.ebuild 1770 SHA256 7297474338225e91e98ac5861456598c087efcdd4f2d3dd885e8bef65571f36b SHA512 7962b228dd584ce3ed1063d1ca40a499b5aa78115c62373a24466be0d977f0eddd30a5535782494957ed61235a9743d4d9653cb1b8e0028a8c5e382a27172d2c WHIRLPOOL 9418d9e9823fef873c6a678211ed0d4cc8d672ebf63ea7d17fcb075f3242194f81ac05f3167a392d20c3d2db98f3be7d2212421e37fb1e46604e6d57ea7d3b21
+MISC ChangeLog 10478 SHA256 134c0efe588247c9d06b68b13c51e07c69cbb2a8a1cbcffad9066d5ac87d699e SHA512 f86848a47a45e3f155f28b71283578b0d4e7d0b0c7561fa6857026a0b60bb2c7be2e92209876ef5d8b8eaa44a59a8510df38b13d88d1e7eeb61fdb2276e365ab WHIRLPOOL c34cf0d8214e9828f4b1a2af02332f126824898b45f1868a96c80bfd91988cc672c874f1c272ae46970125ca3074ce49fda234f5c70044afdcb08b7f37946f27
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNdfmoACgkQ1fmVwcYIWAaRdgCfUqwM2B7dpzcrtlzg77J3n3kG
-WyUAoLfhKt0tadamf/6bnDL47ErbYna3
-=In5h
+iQEcBAEBCAAGBQJTZvMOAAoJEJ0WA1zPCt1hCIkH/RY1mgfdoIX0qwskpif/mXQh
+Nbffuz62hoB8GplDHRw7O6hHB5rFIk6/Z5+ne9yZPCW3SpWEcvum88+6ZUgtnSJV
+OFKhAAq4ICWGF2fsZh+WvW9hmx4/nciUchjQX+LTmP2KY+ge4mmvVBgt2OAHueRM
+MdhqbxzBnsmtUf6idHi1WObrl1fuhSpBsjB/agx9mM5X2IPqUfHPwJIdCUsEp1AW
+K1Pzqx1OdB7dtDfYAJwaF6DxIsn/9GVgczJoquIqDmzkOtERkCFsN0Zvrf/59Iwj
+E+6pVL9sdpyB5Hnbtd5hmstm+PBbWeRZeMnh9vDE6OXMK3JTRCZG8owzQ4OIauk=
+=86k4
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.10.0.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.10.0.ebuild
index 9b7329ff0700..35ff3e7a7cff 100644
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.10.0.ebuild
+++ b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-standard/gnome-themes-standard-3.10.0.ebuild,v 1.11 2014/04/21 10:30:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-standard/gnome-themes-standard-3.10.0.ebuild,v 1.12 2014/05/05 02:11:13 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -19,7 +19,6 @@ KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fb
 COMMON_DEPEND="
 	gnome-base/librsvg:2
 	x11-libs/cairo
-	>=x11-themes/gtk-engines-2.15.3:2
 	gtk? (
 		>=x11-libs/gtk+-2.24.15:2
 		>=x11-libs/gtk+-3.9.12:3 )
diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.12.0.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.12.0.ebuild
index ca850f9dd8a1..9079c224f8f0 100644
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.12.0.ebuild
+++ b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-standard/gnome-themes-standard-3.12.0.ebuild,v 1.1 2014/04/27 22:02:15 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-standard/gnome-themes-standard-3.12.0.ebuild,v 1.2 2014/05/05 02:11:13 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -19,7 +19,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd
 COMMON_DEPEND="
 	gnome-base/librsvg:2
 	x11-libs/cairo
-	>=x11-themes/gtk-engines-2.15.3:2
 	gtk? (
 		>=x11-libs/gtk+-2.24.15:2
 		>=x11-libs/gtk+-3.12:3 )