diff --git a/app-admin/eselect-opengl/ChangeLog b/app-admin/eselect-opengl/ChangeLog
index ef687edb21b1..bc4d006e46ca 100644
--- a/app-admin/eselect-opengl/ChangeLog
+++ b/app-admin/eselect-opengl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/eselect-opengl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.136 2015/01/03 23:34:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.137 2015/01/21 08:32:51 mgorny Exp $
+
+*eselect-opengl-1.3.1-r2 (21 Jan 2015)
+
+  21 Jan 2015; Michał Górny <mgorny@gentoo.org> +eselect-opengl-1.3.1-r2.ebuild,
+  -eselect-opengl-1.3.1-r1.ebuild:
+  Clean up broken symlinks and empty directories. Complain about custom
+  xorg.conf.d files as well.
 
   03 Jan 2015; Michał Górny <mgorny@gentoo.org> eselect-opengl-1.3.1-r1.ebuild:
   Complain about Files section until we find a more permanent solution.
diff --git a/app-admin/eselect-opengl/Manifest b/app-admin/eselect-opengl/Manifest
index 5ffc716331ca..61b26b5b03d3 100644
--- a/app-admin/eselect-opengl/Manifest
+++ b/app-admin/eselect-opengl/Manifest
@@ -6,25 +6,25 @@ DIST glext.h.85.xz 66344 SHA256 f9db24b274581782726b7ece26825bc6dacc10871f24e712
 DIST glxext.h.34.xz 7368 SHA256 cb22353fbd8f87ffea19b4758194af3a38796c41f93058eeb0fa237cce9a77b7 SHA512 525fe3e7d654ddc38dbbcf1b26c2e84099b502d993a176352386b10229fabf1a9ee60686c41d1486f77bcf08424119658b26ebd90d2260a66bc21bdc55340279 WHIRLPOOL 92901129f724e90a53ee602c3a7fb633ba190ad48bd098f5784eb1069e79c8fec4227fae1c59afee728e5e11776c6ff33fee6b5c5eb97b819b082de0713140d8
 DIST opengl.eselect-1.3.1.xz 2588 SHA256 40d805b89a07b85c60a3f7f3461c699f728a83246344950356ce2840bc34bf9e SHA512 052a804e96d8e8afe8b588fdc8996aad21675ea05e3e668c33293df4b9523dde8be083e4a7909a22ec83260c9735694fe4e8aa7e5d8a3736a8e243f29368e532 WHIRLPOOL 3989715d15b4da9ef8162c605a015571bf88dc4526c2fd309222706de0ce918574192263b1a68c4a1ffea9803b3bd0ea43aa3c75d344d0b3a32015f28e5ce533
 EBUILD eselect-opengl-1.2.7.ebuild 1741 SHA256 abf94132d991a53adac42284456b8225dc69a5da639bfb80aa2b846cb7a17eff SHA512 1c52b5c51559d75bf666cb50f01678c4adceeed7f75b63a4849928164b85956393bda4b0a86066fbd801ca3c99f1d5c0247eaf5ef9752922fa6a9f5e71e2969c WHIRLPOOL 3549df8d269f81a2fa926a75038e6139297f45a7426f08f7632c10c6e5517a1422c135625244273a00aea7d213b9dc248c22a6be692392a7d6fbade1298caffa
-EBUILD eselect-opengl-1.3.1-r1.ebuild 2252 SHA256 7c57721c21e76da554b8b20ed205873399bc160ac901d61d47f72699a891d397 SHA512 13e77445264eff5c4d01b581db3e984137bbc11015c2a83e4d4eacc54594289858a4ef86f34c46c6e70a2d9fb43e593df39076cca68623755e16dc5c60b7042b WHIRLPOOL 4f4e2de37c073de9d822562f430bc247f36c3321e6e9413fcd69be7278b7db97e484168750049d131f93e3cda4b2ae01aa0e96e98af928b519bbecaaf74c2fd3
-MISC ChangeLog 20114 SHA256 8b1ef914fa56489d7c989550029e49030d26a1f293313b3000487a76359bc553 SHA512 81654cdbefc0a3a23ea56c51ee2fbab5bf798b746c0241a92b296ef3fd7b8a707c261effa190ad36db9e0ab153ddd47188aef55a31d89d67fc7263ef2165a5a7 WHIRLPOOL 5cc9f9fd010cf0314c14eeb2dbcae22c34eea33587deec4ff58c92b3eb3b063325f371642741b54c9aec517ab9f6f5ab9964a098393007d122d5884e58dc055f
+EBUILD eselect-opengl-1.3.1-r2.ebuild 2556 SHA256 c00635cf3523b6147a22ec066a1cfe6b2273aa5d7d32944110927d95cab2a588 SHA512 8085547d4a6ce4871e2a7082be820a8d2aeaaf54f5ef4dba830a2e7393e340b0c2560565d56553903644636591bfc23f404eac20a10423023749e59c0ad4fdf6 WHIRLPOOL 35785f7369bea2628bc3e12d19917c67ce5b7db4a1cc032878e04e2fda86e2401bfa1218d4b0782800ecc236fa51467977e5e5bbb08591d5892bda87fd808eca
+MISC ChangeLog 20374 SHA256 225876b117da292b407c0563d033bebb4d2f2f486bc3d2dbf15233b68e9c7099 SHA512 8c948563345f4e61c0f41ed8634e984e4148ca51851f9c0851d2a518cd370c7dc37438e6ecad8b2d274c2c7edd22f43a6f9f339dee86f0ca23422a573e0f0afe WHIRLPOOL 772a39cd5c616c64ddf13f2445aa4e417e5987d037b2bbddf0dab05c8aa7a6110fb45376c1a5831ffc34faf6edeaa5b281bf3b1519a308ecf3b68968ea23562c
 MISC metadata.xml 259 SHA256 1f2cf0891ca37f4268a47e2eaa69108868aaef98f78c06d56f4ec9cdecad4dd5 SHA512 c7fe3f4a41209e3816dbe12206254ed37ade121f56e0385f4b3cb5d0b463f15b86e3e92ed09e41675b74200014a521d949c3e20c0046c7d6d357aea39235a229 WHIRLPOOL c4e8c2b7ae4e244b02891fac60eb137a84809578c76a1c05d25d8287bf8a2e7e5dfb6248e6b3b207cdcfc9744b4b460a6f8c7763c0a9da2fc8c8efdcb5530840
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUqHykXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUv2Q3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOvXoP/jGyzi9qYs352/bfB0uNq7bt
-5mohxbY/CgjH8a83vjRhQAr8DPrYb7OzI7c1pIw5npys+cbPfC60F5QVFZZBRIRE
-2mjMusRlRVjE1rgBTGpw21sWaH8KW+IiEkWD2JNbxvLI+xp3Nvas0s5ts21mREBA
-elDLG1oNz1WkjhAzpXeCRuJ9avXqi6+3AH2rhOmOMl+echywS3WawwUG+N5JZeL5
-LJaWOvBLAQtD7oqbOs6t2Vw3mNpd2Up5XAna9To0MTQTi2LfuWEgPSYP/ZxJnU69
-HF6He22pkzp9K5bpBwQYwXJxhp2UXulGJ7Rztd6+HJ4FUz5jkxF+8OViWNYzPw9V
-LmJ9Tg5zNV+iVsRcz3tM1j7UVzAjmD4cc2BaUs+Bw5bNDCAfgCLXTSpYGTCI18Ze
-hdsZGdkDsXkUzMO2eKoixB1G9c/Xwv4q4ruL3PhIjzYEQBUl85IuL8JMyR9iz/ei
-xojt59c4oR7wQHsPRJoTQyQ1koM0QVWPjzvXXUXzaW8y+CVoe+oVa9JbH7JpwUbD
-OHgOHfgeCV93VI+QoIxIH98g8QeFGKgnz0qXIs5ZeQbQgB57XamWkLwJQ7ho+foq
-hbL3waOamiTE3oT7qizX4fsHMlkfJ1PKex5fa39Z7K4MNU0ghX7jAoKKS18190Dv
-5EgbuVFAAlxyrTSg+NhC
-=n3sr
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOakAQANY5Hpk0U5no1I8X9VZoiArj
+mkkuGZObd7beS0hleCHNlvJNb1gePfr7vVT91d4boFEizBximeM440WyZOjLQV8P
+GLHgNQG7XEVItVfHng7Z0Y+JoCUAsp8+etbgJTSHrUGlo6C1rZ/nRpu49b2WqtvY
+Zx4FZfNGdn19lFSNSBNWLNtomn04A5QpNdfx3k+k65IXqj7wkMaRKU+P4fOXDSHk
+o9mxyYAiTxqcBFCens2xmO+VKsjJQUL8LN8CLod0Lf8EUgggwb4VH70V3IA7g8Qj
+uwOhHo0vZpw8WilPdhHrRjTRXK/4AWlpr5lughRtKuahxuHSRDSqez2mZDvgL8lt
+pCGWAP3KDH+od2oR74vwg0K/3E/Mokcb0nUApViEuvSMj+AbtCPGc7A3LTcCK9uQ
+UUanbqTHVl0uSRZHLbI43Cyx6RbXrcc7/kws1phzny6aa4UxGJ37n95W5DD7ICBG
+vUH4evl71hi3gm+lniJxIG7ny3/zfyNG/QVBcO7XnKCb/7s21i1AipoRrMDyomya
+vAbonTMRAW3WzolgfwuDEFFwkICX4jxlY6T3R5veJKNgZH3TMEmw/NGPDD3vGcU5
+F16/wS6YV18v5k8G0xMQUPzX/LcLkmLxVg6fA4j5v5DV24FNOCKGTJSw8pJd035n
+IvI8KqbWhC9XSquUIYRr
+=XoGw
 -----END PGP SIGNATURE-----
diff --git a/app-admin/eselect-opengl/eselect-opengl-1.3.1-r1.ebuild b/app-admin/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild
similarity index 71%
rename from app-admin/eselect-opengl/eselect-opengl-1.3.1-r1.ebuild
rename to app-admin/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild
index 7deb62e3dce6..e4ba889a02cf 100644
--- a/app-admin/eselect-opengl/eselect-opengl-1.3.1-r1.ebuild
+++ b/app-admin/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.3.1-r1.ebuild,v 1.2 2015/01/03 23:34:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild,v 1.1 2015/01/21 08:32:51 mgorny Exp $
 
 EAPI=5
 
@@ -37,14 +37,18 @@ RDEPEND=">=app-admin/eselect-1.2.4
 S=${WORKDIR}
 
 pkg_pretend() {
-	if grep -q -s "Section.*Files" \
-		"${EROOT%/}"/etc/X11/xorg.conf
-	then
-		ewarn 'Your /etc/X11/xorg.conf seems to contain Section "Files". This is'
-		ewarn 'known to break eselect-opengl-1.3*. If you need a custom Files setup,'
-		ewarn 'please downgrade to <eselect-opengl-1.3. We are sorry for the issues,'
-		ewarn 'we are working on a more permanent solution.'
-	fi
+	local f
+	for f in "${EROOT%/}"/etc/X11/xorg.conf{,.d/*}; do
+		if [[ ${f} != *20opengl.conf ]]; then
+			if grep -q -r -s "Section.*Files" "${f}"
+			then
+				ewarn "Your ${f} file seems to contain Section 'Files'. This is known to break"
+				ewarn 'eselect-opengl-1.3*. If you need a custom Files setup, please downgrade'
+				ewarn 'to <eselect-opengl-1.3. We are sorry for the issues, we are working'
+				ewarn 'on a more permanent solution.'
+			fi
+		fi
+	done
 }
 
 pkg_preinst() {
@@ -53,6 +57,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	# delete broken symlinks
+	find "${EROOT}"/usr/lib*/opengl -xtype l -delete
+	# delete empty leftover directories (they confuse eselect)
+	find "${EROOT}"/usr/lib*/opengl -depth -type d -empty -exec rmdir -v {} +
+
 	if [[ -n "${OLD_IMPL}" && "${OLD_IMPL}" != '(none)' ]] ; then
 		eselect opengl set "${OLD_IMPL}"
 	fi
diff --git a/app-admin/logrotate/ChangeLog b/app-admin/logrotate/ChangeLog
index 3f75c1547515..8293c24be039 100644
--- a/app-admin/logrotate/ChangeLog
+++ b/app-admin/logrotate/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/logrotate
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.186 2014/12/29 17:27:50 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.187 2015/01/21 13:03:14 armin76 Exp $
+
+  21 Jan 2015; Raúl Porcel <armin76@gentoo.org> logrotate-3.8.8.ebuild:
+  alpha/arm64/ia64/s390/sh/sparc stable wrt #531744
 
   29 Dec 2014; Jeroen Roovers <jer@gentoo.org> logrotate-3.8.8.ebuild,
   +files/logrotate-3.8.8-Werror.patch:
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index ddcc4de55ebf..7f902ce84c36 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -15,13 +15,13 @@ AUX logrotate.conf 858 SHA256 9f01dc19ce200abcf53bae2e69003b3b33a33c5e00be651f5c
 DIST logrotate-3.8.7.tar.gz 58898 SHA256 f6ba691f40e30e640efa2752c1f9499a3f9738257660994de70a45fe00d12b64 SHA512 6c0dc106e2a9e9d2cd7ac12af869bc152db7d046a1c6d1b75810fb2fc7a7f382b3c3f1dc54b9fb9a9eee248c1c66a9f5ce86804f15b49ac0210313c231b49e7f WHIRLPOOL 6ba7fd7eca8435575c96a5534fe9dbe098235ee2319f2ab8e279d94fa6de3ea0e53cd78eeabd643e4da049f585df9a901681b61d0d339131f45fe580aa0eb198
 DIST logrotate-3.8.8.tar.gz 72014 SHA256 46a1510ef4a1f4359edd5f361112cfd1523942e85ff28e6cbb0c81bad1829d0f SHA512 2b7b5fe587b3a5cbe98b8035a541b5e272e6e4c40669f65ff6c43d1524b686eca9abc0b93bc00c8eb6da4d189f14a9b79905fcc0fadb914276d884ad7493bb4b WHIRLPOOL b145d51cdcf0214e4f4b6a97aed7b9e1375c2848efecbc16181eaa6e1105ac8892c57248c89b92eb080d6cd6b23958085f39a894df7f5dce0bea6516e2d583c4
 EBUILD logrotate-3.8.7.ebuild 1849 SHA256 116d9d98db5e808f4a15a85f80843bb322534f2b09aad38e700b49e9a205dc95 SHA512 ee3d564aee262200c1ed35f8cec1d7817d6f8e1baaf7c4f68744f16bdd36b1183950958b203383987aac2ecb2ccf914c40c7c15f9242d0f6169b8c3520f0a90f WHIRLPOOL 7588c0fb1b9bfed3460b2af1363325180945fd7a56ef1086ca956068854b69ef443b7a9c890f4925d7f30b77ed72cef2f417d7507faf7ecaef3e1f48ad21e799
-EBUILD logrotate-3.8.8.ebuild 1877 SHA256 eb1c091b70667174d08e6c99b6c3d26d8776e3a31b66240c8986d2f2ee397ca7 SHA512 c85c4d98c4f25a9f5290de2a7bf8daf87a329288e0190dd9c2ce79f96919406245ed1fd3b58820235b7fa58f98646e02b4ade85cafa038e65ee4b2558c429124 WHIRLPOOL f86b6226007038e1ad1b3a5a88ddf9355e4a521acbb1f9ddd57d52a952d6ee2466e931318af0151f9e1d867a62d3a2a3e4201702cc052243ff3a39d87d8117e7
-MISC ChangeLog 27700 SHA256 3e821001c13b52bb30b7436637ee304890ddde631ce4e0ad179862744cf0ce73 SHA512 5df60471c5ff6b9668a657f3ba6e8df6915bef83357a27a9dde7e9c601f586d8a65a364fa33a16357832b085c674fb9e64ec4647333a786c8b34ca833612521e WHIRLPOOL 26af4299fe45d68ed89abc830b1a5a45cf0131272d4947893aaa3fe83ba632ade28a06693c2127fa918a6bb3e0a458227c71f2a8ce0ff3c86549b096d971071e
+EBUILD logrotate-3.8.8.ebuild 1874 SHA256 8c0107e2e5c1bba2fc70dfb474d2116af472678ff29df28df526efc233430c14 SHA512 62fe44fac9a1b93b3751208ecd053121fe3598e6283a22bd321369a59101b5a571e9f5e0c7a51fb1bdeb330dc39c0a7c53e88a724f3247a64125d895491b7584 WHIRLPOOL e7480e4240903aeb4a49bb61f671c728fb5665a379cda4484200f4a8f5fee41d9e4fcb1357f31b06f4f8a785266f6a21356f75c069376c0a302df0d1be778a66
+MISC ChangeLog 27830 SHA256 5a750ff491821ace03f4bd120d1c9c8e7575bcd1c191fec1c925bc8b82d66cb8 SHA512 71517dbdc3aa1241347271a1b972a9ce6b0de4bf9340a7fcf810b20b03f9a188909ebae7e56cb76d56d10d4f33abca18e1a027ff701f4129aaa9ddd36a3a4f4d WHIRLPOOL dcb2fd6abe4c5e351c335fb31968db710eba156e8a86a870406539a697e0a627fa8321709e01c75ac729d84bda0d0aa818f38ba289512c1221a5c2352dfdaf85
 MISC metadata.xml 975 SHA256 a329700a1e76593184907198fff2f678e429294226461ac1a913fe58cbb28c8d SHA512 c7736be8ad13e6e31c6561ff0fdbc2e3df7f59069eafdc5b655f780d96d277795201b9db747bc3da24c932aaaad16d40aebf18b8fc679f7ae8fa528088828d4f WHIRLPOOL 931ab959ebfb43aaac9c8926f26e17750c38f155ed15905117e2c8ca3374db427db763c6b724db9eb7f05fcf600dac54ed8008c222410073d82e17e38b0a45be
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlShjxgACgkQVWmRsqeSphM1wACeOa40v6JESmf8IpD9gmPcWQ1g
-C3sAn1u7qDlKnwFRSuTZ6Oj3yZHYphdr
-=Q3ed
+iEYEAREIAAYFAlS/o5UACgkQuQc30/atMkD2bACglpsHddYJYdQACofELILmC1n4
+egkAniOUVuxYs8NtVQ4XCOXc2IPKd+mw
+=3fPA
 -----END PGP SIGNATURE-----
diff --git a/app-admin/logrotate/logrotate-3.8.8.ebuild b/app-admin/logrotate/logrotate-3.8.8.ebuild
index 524331d354a7..3482ee2d4eb5 100644
--- a/app-admin/logrotate/logrotate-3.8.8.ebuild
+++ b/app-admin/logrotate/logrotate-3.8.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.8.ebuild,v 1.6 2014/12/29 17:27:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.8.ebuild,v 1.7 2015/01/21 13:03:14 armin76 Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="https://fedorahosted.org/releases/l/o/logrotate/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acl selinux"
 
 CDEPEND="
diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index fd6d7d51f0cc..1f3c888ce384 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-doc/doxygen
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.278 2014/12/26 10:19:07 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.280 2015/01/21 15:29:06 tamiko Exp $
+
+  21 Jan 2015; Matthias Maier <tamiko@gentoo.org> -doxygen-1.7.6.1.ebuild:
+  drop old
+
+*doxygen-1.8.9.1 (21 Jan 2015)
+
+  21 Jan 2015; Matthias Maier <tamiko@gentoo.org> +doxygen-1.8.9.1.ebuild,
+  +files/doxygen-1.8.9.1-empty-line-sigsegv.patch:
+  version bump, bug #536584
 
   26 Dec 2014; Jeroen Roovers <jer@gentoo.org> doxygen-1.8.8.ebuild:
   Marked ~hppa (bug #533458).
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index ca3f26c0fcfd..d138884b61e2 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -13,23 +13,34 @@ AUX doxygen-1.8.1-prefix-misc-alt.patch 2119 SHA256 3e888815a63ff804053711cf31f2
 AUX doxygen-1.8.3.1-empty-line-sigsegv.patch 483 SHA256 d0d3e2f1e1d450b8b31fb9553fcf38d74816c36673ffe455959dacc7f9c01384 SHA512 777e26fe365226d8640eac89c3f11883f7cdca17cf667b32c8f7ed50b2160794620a312c4098e6e53a1af6c799fc9bd067d4846014381189de23bc84210cc752 WHIRLPOOL 072d65e3f619994bfaf170904f3699e40682f2d45a7ad3a600ba871f52ceb2ea1273b3919e008d7070a37f8beed198cf87c81a83babbdf0265e0105ff6a2940e
 AUX doxygen-1.8.4-infinite_loop.patch 570 SHA256 189af23ec4580b84de7227dd91ae9fccb5645bd94fca43f401eb8d9a02d59e67 SHA512 5a5df6399098683c0f507e3120c4d1f8379707b0f24eafa836b7874adb73de65cd12d41f6d635e9dbcfa428ea4da684dbd2428a679529eee0e93c37db73380ad WHIRLPOOL 28667004d6b923981ef03eaba9a5a1913445fe8a13a24fde7f555dd8d7dd7f4fa7cac9162063b7aca87d518e39954fe0a39dc6fbf4d764e11c7cb26e0d1dd04f
 AUX doxygen-1.8.4-libreoffice.patch 1362 SHA256 c73bd1e543b333f2fad202459c3b2bb71d7ebab6aae56d2828696ceda2331840 SHA512 d05d3f7e5dea817e42f45d9c82497877792efe8e09b8579afcaedaf2ccc36649470ed8eb40768ed65dbf625da33128ef512df5ff64ac439bc88a008019b8411e WHIRLPOOL a0593826c5c651912f87347ccb5f4e602efe976613c664ee59739ffee07d548896c80d6d4c8fb52bd756ca63155d099e855baa09dab3cfd94488fef82f973a81
-DIST doxygen-1.7.6.1.src.tar.gz 4791654 SHA256 0e60e794fb172d3fa4a9a9535f0b8e0eeb04e8366153f6b417569af0bcd61fcd SHA512 614e8b52b32c4ff0a37cabfa2fbd6ea2d79567fdd903eb3e5031e61cd106bb3bfa42ccfdbc6636e5da08bd7a7fa226fb8d9c104b344d16098e9aedc3a601127a WHIRLPOOL f70aa1d0f93746871c5b24538231fac775e849ac88eeff9d1afc0919464bc9c7a27b1391d1aa50624ca11c48f3e2e953a4c41ed7ec5be3ad7972f03510576c5c
+AUX doxygen-1.8.9.1-empty-line-sigsegv.patch 489 SHA256 5195bc11afe48641de38f8e5a3574ce93654cb854be97f38bc6322fcaaaddfc3 SHA512 8b9d70fda66eae1fd871fbf29b7587d8f3872810f4b6b7b570d8fd8711a0a0fd84257798261db2c6a7aa7efd8874cf18e1056e67f53d6ec2bd3720cfd0f572ef WHIRLPOOL f048801c198d65dff3d2a16eed895c2d9f266034c082b60cdf50f9476e3d79103d3a29d005480a0b7c4b3f6a341e7c5fadca6893d7b817cfd0db09e394c7468f
 DIST doxygen-1.8.3.1.src.tar.gz 6196887 SHA256 0c749f68101b6c04ccb0d9696dd37836a6ba62cd8002add275058a975ee72b55 SHA512 365e553364ad61950a29477d8e751e98f4af9ce4a999c788cd25ce5a58ebbd931960689c4faddabd71cda60174777e41ed814ba633c19287c9f9696e0d7fa169 WHIRLPOOL cab6bbad971b794e07e95bee548ed9b9233b7b420dd96db8d4cb7b68a1b1232546c3976556b043e9a31c2e32e8619a57a0a7a58aa846a4806b9cc08aa1a9bc80
 DIST doxygen-1.8.4.src.tar.gz 6456090 SHA256 526442fb70bea79a4086cc98c22692cc05edc2f4cf231feb7993b5d188ef584e SHA512 984b4aa88afd3edb067e054b08de624f8afe927d31a45466349e83aa125e061c1ecac2d5f021e0d345fddf3ed7d5211509a445433af54d629a09bbb24b27e026 WHIRLPOOL d5137d0c2cbda8d1d768b1a92b6778312862d3cb4113c9be59489f061d0ad80c5162417d8bf9efef54852b23f985390791049c843a45be5eafcd586628f96d9c
 DIST doxygen-1.8.5.src.tar.gz 6511944 SHA256 243a8b67db12ad68d6ea5b51c6f60dc2cc3a34fa47abf1b5b4499196c3d7cc25 SHA512 56d2b262feae41fe9acf3c0c8ad3dd1d8868a52c17e2d9882a553570311482ec73548c0a70ae0ad7ccd7d1011a69968f284031beb93f915bab3a4c740b943f47 WHIRLPOOL 934cb01d7898cbdf04d2f293534ade1b8ce1c48a378fb141e063a83455ccf94c733aec525e6e6740e6b92fb473a6bc2b31dca09b0324de78801c7a2d19638182
 DIST doxygen-1.8.8.src.tar.gz 4955485 SHA256 158e7834f05e0aeea5794b23c1e775ddfebafc709543e47f6fff9d81b190ade1 SHA512 f9cdc7b5ce18321449f29ec86d0824f34d22bf41e2007224d266e68520141e8e21553dab2add361795dc23c56845f7e118b11298ecbed061b25ffabf638a79c1 WHIRLPOOL 26497b9ed9d4236d3937ac98f61593747fe1608d41dbec7649524d060adce104355f08d1a8cab19f4c93594034d2245380b3c927e3995515b4bbdcb5614a5f52
+DIST doxygen-1.8.9.1.src.tar.gz 5007458 SHA256 d4ab6e28d4d45d8956cad17470aade3fbe2356e8f64b92167e738c1887feccec SHA512 b76d06fc6e22d5e8e2b73814bc99cc0cf75ddf4e5a6ad1bd79832f12ccce5ccc2681777862b9ad0dbfdf1791fd1ce1f0f5ce669a78c7d38f91b0e8d5ebda8ade WHIRLPOOL 3971ceb79619282dbf1409b71d457dbdf8cd67b7d57dc106215442237e16fed8530e637d2d712d1be2dc2d186b29e75a23522b06387913fe2584eebf8b52b44e
 DIST doxywizard.png 4231 SHA256 eb648ebd3a194a56d9ed6e47cc8dbf1af2e124d83c2c42af9bf86bd837984209 SHA512 5e2d26e7427b86866ebe75ec2c66c0f1100d230f3f3e4d66bac424a8dd0d42f0831d936ff03318dfa1bf73cbd9fb53717636d0c91ae3eea0f4e24641479d25d5 WHIRLPOOL bb0c13b382c4069ca310ff53a03b36499a2bf6e0e8c0647efc032530f429f483b5d6f2925b7e996d4f84c8f2b77eb883533f4b7abc88745a2cfa596d3dd4f3fb
-EBUILD doxygen-1.7.6.1.ebuild 6359 SHA256 77b1ba5a9d5967f48c9cb950a25d50e71d43bb251905f9501afd6a3368104f42 SHA512 72f838a959854006c22da313f22011c1d4b59ad5ad4d6b3687b8158936bd03386f2b6b6b5ba8ef31eee85eea76f4c75807c2c3cdebd49d494da3554936e11741 WHIRLPOOL 97021fac09340346e7ddec900f192d24b27fb90e8818979f10527c78dce26c738eda979f1d7ffc8525d1ab37933198fbf5090d02bf284c1352f8ae6dda87164a
 EBUILD doxygen-1.8.3.1.ebuild 6806 SHA256 7b9af6316fabcb62b9a3de3c16004a679d99dabf5a2280194da5f7bf7de65acd SHA512 72eca9669d8c58b8e6b59d31fcfee232eac25ad8eb75e68703993dd5131619a415d02ceb5ef0a87ff975bab741331f3f0e0cf0fbc56e2790ae8c452b07a7a114 WHIRLPOOL 0acdfa9e8d5370e34dd93810229ec9e54086bcd0f05eeaf1350ff97a620e9f3c91cb0c00aa296260f6c88916051384ce893157b4da141c8c64bb02e18ad71028
 EBUILD doxygen-1.8.4-r2.ebuild 6900 SHA256 0b73c23bbc4c79ae68a7cd9517112a714b55e27451692dd15db508a55bad7cba SHA512 a285500d5533e6303187d02d010bfc5fe2fe280fe3edcad1af2c7c9b59ae159d75fc051b0e449f84a8cb6ce415192378d2f833d9cd4e1e255947967ae13dbfba WHIRLPOOL 78f5992636f127577aecf40c2087e9a88976dacb5ebf9023a595580e377d108a74abab012da70eaf467073ba387d5ebb706a9b0a3cc4ce404ab4f08c1b14501e
 EBUILD doxygen-1.8.5.ebuild 6746 SHA256 02e3189216f81689362700fc4a8186f42e88edea589eb58fe44e2c60f90b7421 SHA512 913807cd43147e6ade50be875edff207b7deed13e395d9eca4dcb6eaf7d304c2f0113be342593740229d0b02b133be9bf2b292379fcd18acd71993084f9d0b47 WHIRLPOOL da9d0538a785bfe8ee46a18c33a595a007ed6e05f7a474442e8ff6f8e9e44dbb76d69c54ce3afcbf82d71d217a900d727009c0e8109aa48a6128764902c11eec
 EBUILD doxygen-1.8.8.ebuild 6930 SHA256 e8a0f6066b4c0da4fd37a6205a020cd961a5b0f6069270211ca413704143a0a5 SHA512 9da2589e6cf777e59e08b328124d039fe2d5ed570883c43c80cf47240927519a0854e6c9ffa0de15a2de1b11a6b4fd573544f7a77e1e4e0656db791c150047ce WHIRLPOOL 003fa69ddd3ca8d05bd30dbb993815923922690b35e71069002d43d47af3e9ee012022fe6d08626804b600e4cfb83bf0a6b1757aaa1b066dec14bf71d354360c
-MISC ChangeLog 45823 SHA256 5703a73c2bcc422a51acc520a9e980fb7b747041cd8a698c2c96ec01704c73e9 SHA512 3cbce27d016f43ccbc5150014a0b5cf49c8a7bde3ea4249ca302e7828cf97142f6fe72ae2dcd4e62994caa5adc351b90f4040758100a6e3516153b0188af1f09 WHIRLPOOL 28c486c19746a6a8735aaa58db734578af37086112f9ead0a80afb4ce893e0f3a873009394203a53e7730e7e0e49e975e4700ef1d49e8854b6002dafb0f0ec2f
+EBUILD doxygen-1.8.9.1.ebuild 6926 SHA256 e0848fa11e3d5ebb30af341a987b61adf0b3e5d36b83308145b82d086fd6b201 SHA512 a86428a43be784c56a0c8fa3d5bb466f6c4b4a45dcb2f1c0dfd4a82664d081e1a7bfe573b63076fd606a7e82df4981536c811688102fe69d8c19de0f16f56a26 WHIRLPOOL 2787743727338e7dd73dccea4bb44deb664ed5adc7c9a3fcd52ae53f24159bd38791aac2aebd3a4999edb3c1b9aa5fda0ff51ce970bd9570edda492dc07307ce
+MISC ChangeLog 46100 SHA256 a67e70a748dc4a6d6da374bac8423cee63982e853845edeeb61b0fb2cb6dcd46 SHA512 f3da3a86571d0232a99ba39d6ab9b5f03d9eb8eeaef5164bed70113c756fb293646395b3304f39ee18dcdf5f1ecfe77644746448f45c2a68c42cfc5284d6fd8d WHIRLPOOL a4e61225f166ecc6962ae8efe2d3c76c1f8fe692c467c5dabca6fb50b436081a36a0688d88be4d1c1dc7a8b3825c0907f840194b38a128551d3abef924a2b511
 MISC metadata.xml 807 SHA256 4772ca52089969311afc870c8399b2548df564a6eec5360bb1d4a9bd74625941 SHA512 c1eb3c2271ea8bd83d12e20341c88633d32ce7ac1702537e2ac0c256301bc9e54f2a7625c2776a9af5d3a48e1e06c7dfc5fbb343e2a0fc904100bb1ec6961156 WHIRLPOOL ec05818b69f223ce6bf218f44c3401d1f92e1b294eb9bc5527e0b0f3ef9f178166352e97aacda22d4325690eae814ead2db4c7b9b992bfc432d46d90bac52cf8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlSdNhwACgkQVWmRsqeSphPyeACfctmh5tsy5D2sAhv4EGm6HtDB
-rdEAnR314sj/WKUU4o0gTTRYuVsRt2wQ
-=uk4u
+iQIcBAEBCAAGBQJUv8XDAAoJELhOzYlK7nn/g2IP/2LsiRmltYDFHhz+IOHyqyaq
+kdRldRKROT7+LRFiTsuf9VNwul25Eew3xHwMZvjdEhGd76Z8JKhWgQ5Tsv3Bmtpr
+8E4ZXogb+o1vDxWowzrJORmvM5W+RtMGy4bDtAjOJoo/MnAVAMMgdDbTXZz/hhuV
+0hbjuJZj9sMt24gcW3b68//droIe1aS1KAEGB+IrlJWz7hBaA6atJ6kHFKNBT/Mj
+3tzF+F1GB0WmVieeg96KoN5sfKRLhU3vXKOGXuj9NUobiEV5Bgiql7CGWy9uxK7l
+/T/vg+BrA9Onf1fT5mqSG9Cpr+npSFY5dCjcp1Hn62pZVXk35y8EgLU7Qp3hHppp
+ZqUJQKYRsBiLDnu+HlBuffbqLuMZsQRuqZPsl8pNFVO8xtPQ1Jbxa88nmB5wFVNH
+mm1jNdeETn38VTlCPjwz++lViugw7AeDvPRLln6YeyHq61Xhwu4DyebKW7PjvPd9
+n70/c3UXhq2V9IE6linEhi+uA+dJZUS7reweu5ChCtDVTUL24fXCX9k1bBmjnBc8
+HLSpSgd14+kG34+fPDDfdJC6RiM6GxtI7mWHFe1+AWdZDf+bJstIE1AR1C0GVnXo
+3x1cnWGgbbFFg18GQ4uUZScDOcEw7mSVLKQtUP6Av4uVRuOMYoR6OMVOGVpz6eVm
+DCGwWcn7Z5YkrehYqWzo
+=ZyBp
 -----END PGP SIGNATURE-----
diff --git a/app-doc/doxygen/doxygen-1.7.6.1.ebuild b/app-doc/doxygen/doxygen-1.8.9.1.ebuild
similarity index 78%
rename from app-doc/doxygen/doxygen-1.7.6.1.ebuild
rename to app-doc/doxygen/doxygen-1.8.9.1.ebuild
index a275d5e9d93d..14b4102c3f1c 100644
--- a/app-doc/doxygen/doxygen-1.7.6.1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.9.1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.7.6.1.ebuild,v 1.18 2013/08/10 20:12:57 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.9.1.ebuild,v 1.1 2015/01/21 15:25:13 tamiko Exp $
 
 EAPI=4
+PYTHON_COMPAT=( python{2_6,2_7,3_3,3_4} )
 
-inherit eutils fdo-mime flag-o-matic python qt4-r2 toolchain-funcs
+inherit eutils fdo-mime flag-o-matic python-any-r1 qt4-r2 toolchain-funcs
 
 DESCRIPTION="Documentation system for most programming languages"
 HOMEPAGE="http://www.doxygen.org/"
@@ -13,8 +14,8 @@ SRC_URI="http://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="debug doc dot qt4 latex elibc_FreeBSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="clang debug doc dot doxysearch qt4 latex sqlite"
 
 #missing SerbianCyrilic, JapaneseEn, KoreanEn, Chinesetraditional
 
@@ -24,24 +25,29 @@ for X in "${LANGS[@]}" ; do
 	IUSE="${IUSE} linguas_${X}"
 done
 
-RDEPEND="qt4? ( dev-qt/qtgui:4 )
-	latex? ( app-text/texlive[extra] )
+RDEPEND="app-text/ghostscript-gpl
 	dev-lang/perl
-	virtual/libiconv
 	media-libs/libpng
-	app-text/ghostscript-gpl
+	virtual/libiconv
+	clang? ( sys-devel/clang )
 	dot? (
 		media-gfx/graphviz
 		media-libs/freetype
-	)"
+	)
+	doxysearch? ( =dev-libs/xapian-1.2* )
+	latex? ( app-text/texlive[extra] )
+	qt4? ( dev-qt/qtgui:4 )
+	sqlite? ( dev-db/sqlite:3 )
+	"
 
 DEPEND="sys-apps/sed
 	sys-devel/flex
 	sys-devel/bison
-	doc? ( =dev-lang/python-2* )
+	doc? ( ${PYTHON_DEPS} )
 	${RDEPEND}"
 
-RESTRICT="mirror"
+# src_test() defaults to make -C testing but there is no such directory (bug #504448)
+RESTRICT="mirror test"
 EPATCH_SUFFIX="patch"
 
 get_langs() {
@@ -74,10 +80,7 @@ get_langs() {
 
 pkg_setup() {
 	tc-export CC CXX
-	if use doc; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
+	use doc && python-any-r1_pkg_setup
 }
 
 src_prepare() {
@@ -96,7 +99,7 @@ src_prepare() {
 		|| die
 
 	# Ensure we link to -liconv
-	if use elibc_FreeBSD; then
+	if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
 		for pro in */*.pro.in */*/*.pro.in; do
 		echo "unix:LIBS += -liconv" >> "${pro}"
 		done
@@ -106,12 +109,8 @@ src_prepare() {
 	sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
 
 	# prefix search tools patch, plus OSX fixes
-	epatch "${FILESDIR}"/${PN}-1.5.6-prefix-misc-alt.patch
-
-	# fix final DESTDIR issue
-	sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \
-		-e "s/all: Makefile.doxywizard/all:/g" \
-		addon/doxywizard/Makefile.in || die
+	epatch "${FILESDIR}"/${PN}-1.8.1-prefix-misc-alt.patch
+	epatch "${FILESDIR}"/${P}-empty-line-sigsegv.patch #454348
 
 	# fix pdf doc
 	sed -i.orig -e "s:g_kowal:g kowal:" \
@@ -142,19 +141,29 @@ src_configure() {
 		my_conf="${my_conf} --release "
 	fi
 
+	use clang && my_conf="${my_conf} --with-libclang"
+
+	use doxysearch  && my_conf="${my_conf} --with-doxysearch"
+
 	use qt4 && my_conf="${my_conf} --with-doxywizard"
 
+	use sqlite && my_conf="${my_conf} --with-sqlite3"
+
+	# On non GNU userland (e.g. BSD), configure script picks up make and bails
+	# out because it is not GNU make, so we force the right value.
+	use userland_GNU || my_conf="${my_conf} --make ${MAKE} --install install"
+
 	export LINK="${QMAKE_LINK}"
 	export LINK_SHLIB="${QMAKE_CXX}"
 
+	./configure --prefix "${EPREFIX}/usr" ${my_conf} \
+			|| die
+
 	if use qt4 ; then
 		pushd addon/doxywizard &> /dev/null
 		eqmake4 doxywizard.pro -o Makefile.doxywizard
 		popd &> /dev/null
 	fi
-
-	./configure --prefix "${EPREFIX}/usr" ${my_conf} \
-			|| die
 }
 
 src_compile() {
@@ -201,7 +210,7 @@ src_install() {
 			"Development"
 	fi
 
-	dodoc INSTALL LANGUAGE.HOWTO README
+	dodoc LANGUAGE.HOWTO README.md
 
 	# pdf and html manuals
 	if use doc; then
diff --git a/app-doc/doxygen/files/doxygen-1.8.9.1-empty-line-sigsegv.patch b/app-doc/doxygen/files/doxygen-1.8.9.1-empty-line-sigsegv.patch
new file mode 100644
index 000000000000..cfa56174c5eb
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.8.9.1-empty-line-sigsegv.patch
@@ -0,0 +1,20 @@
+removeEmptyLines() segfaults on empty string
+
+https://bugs.gentoo.org/show_bug.cgi?id=454348
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676423
+
+Patch written by Thibaut Paumard <paumard@users.sourceforge.net>
+--- a/src/htmlgen.cpp
++++ b/src/htmlgen.cpp
+@@ -1022,6 +1022,11 @@
+ static QCString removeEmptyLines(const QCString &s)
+ {
+   BufStr out(s.length()+1);
++  if (s.length()==0)
++  {
++    out.addChar('\0');
++    return out.data();
++  }
+   const char *p=s.data();
+   if (p)
+   {
diff --git a/app-misc/wcd/ChangeLog b/app-misc/wcd/ChangeLog
index 7ba2da869cab..d4c206e285b3 100644
--- a/app-misc/wcd/ChangeLog
+++ b/app-misc/wcd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/wcd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/wcd/ChangeLog,v 1.23 2015/01/09 13:46:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/wcd/ChangeLog,v 1.24 2015/01/21 08:21:39 jlec Exp $
+
+*wcd-5.2.6 (21 Jan 2015)
+
+  21 Jan 2015; Justin Lecher <jlec@gentoo.org> +wcd-5.2.6.ebuild,
+  +files/wcd-5.2.6-wchar.patch:
+  Version Bump
 
   09 Jan 2015; Agostino Sarubbo <ago@gentoo.org> wcd-5.2.5.ebuild:
   Stable for amd64, wrt bug #534884
diff --git a/app-misc/wcd/Manifest b/app-misc/wcd/Manifest
index cd15105675bb..11abe2f204fa 100644
--- a/app-misc/wcd/Manifest
+++ b/app-misc/wcd/Manifest
@@ -1,28 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX wcd-5.2.4-gentoo.patch 1356 SHA256 099bef9f499d1a27df6319fb10b977eea5175cecc14a67b0e9a06ef51fa8c526 SHA512 e1a019d3e089775e2ecfa28cadf5dcbee1ceebb12cde216587f62ec6ed043dad7a61c98b2b826dd550cf011508b2ada37f75e8b85b7e19eb659d7fe9171cbd6d WHIRLPOOL ef4c3096f3668b6357fc858d04123b9a1df5b0f7966e2295e4f143d53c8300d4efd5c752a665d11e59798f9e735fc7795a73af5bd8051ac5b0ed7d3dec84060d
 AUX wcd-5.2.5-gentoo.patch 1468 SHA256 9921cc3e90e0bf7a31120dea46b416bf6bd6b715a8a538cb6797a9726a40463c SHA512 427befe8be99ca4dc633f4c0e3cb130924027e452d87f3d9463d4edd7418f0864d6b5bd1cd3526734a55e28745db3e93a101c45255bc285c9abd324a6bd27108 WHIRLPOOL 760d43c83a33f20e10cd66ade8befa34929d4838883cacdd4578b47af7e55f75e645374355f112c8260b5ebe05bcd41fdf7986cb7d6b8f0b6078bc31bd213600
+AUX wcd-5.2.6-wchar.patch 322 SHA256 4e0a8aa0f519cd5135bac858a46dd0bd6ddf3c01d6454383f44095fd86baded0 SHA512 1eef490f94410bae1d2b142f32432e5f3572a41e9d9b9e917bd888fd0e5ce8c4e110946de321d3ba056300cb46d2efa9d26a29c4bbf58c897de046bdabe814b5 WHIRLPOOL 985a4782f4e2b8f45a07ea8519751b128858216eefca2d99adb3ccc1b797aa799d2e5279f7647d8d52c179eb2136abb466f9647fac6ecf5a11450aa34d37f4da
 DIST wcd-5.2.4-src.tar.gz 192124 SHA256 e0e99e8300bb32163a89eafebe75f3f66658113ea4e50391c5f5c16ac5b945b5 SHA512 b4beba3c285fbc0cafe8a145da1e42bf4764e6b5c8e153f34453a1d31578b06ce3db1bb2461c003538999b6b089cca587013d82a30be78a6a5cd1c49b59a9bb4 WHIRLPOOL bf2a7d27db56db6fedfe7f715512ca6a9e5a12e24a2d8df90db688740477c3d9854d912301a0c9b7874610f695fd96ead0121ac486c160a89aa4cd50b485568b
 DIST wcd-5.2.5.tar.gz 622544 SHA256 e2b32766c100355b6b31c61a1ebf480b7d5785928cf4bc915b626b0f9a611648 SHA512 c77955a6e6cc04b4cadb063c99c49023884dc046717ffd0b2873622731bd2acb6381b0ce24a9980221030215cab2eb2f9ab7cb28e4e768c0675d9782930834c6 WHIRLPOOL 5384890d51c7547c42260b45ad70e621ebd35f6fb3447edd1373d0941515b0dbb60631b2776b68a11d0ec95c270c78b8ec355783fa7feebdb77424252fdea80a
+DIST wcd-5.2.6.tar.gz 624904 SHA256 e23939e9d8aa7ad98d74bc6def1d6eaf405dd442b498984ab0c35b83efb9cfc7 SHA512 f223130a9878d9d62767a2a86dd3ec227f8349eecd149d5a86ff7c5b5cd8a2cf14e3752186ec4617ac25b9c3df6662ccb309cf96dcb9d4ede291dc4a12a33a82 WHIRLPOOL 0d63dbe663fef83c84cc3ca3c284f76d84913986533155a6cb4a1765ed4291886c4a1885b89dc9660d8f0102c74369a97e41ef4375627f843dfef99d3ba72f35
 EBUILD wcd-5.2.4.ebuild 1031 SHA256 87e51a680cf1c65a60c398b1e7b14f09dda16cf55b71b4934dc4c9fde8b7889b SHA512 f0ea08dfe433326665819fa4a047e9b6caca573cd2c76f73e3620e25d0b0073a8fd3b1c728bc9b8a6cfda0ec947fd043c2b35cbbc32fc97352dde3cb517f0a06 WHIRLPOOL 0b8391f164e59aba5965f8ab28b4948685d70293ea247686523c5ab398bf56ce2fd715f60bc254b3d6166ed36412e398d9466a9288869aabaafe36480c96f182
 EBUILD wcd-5.2.5.ebuild 1028 SHA256 6e78d42d0bbfb14f5ab47d5bd3d468efab4f301df3883a99f9aee1c63b474c2e SHA512 d8c75ae179ecffa199e8aa8e642383aa0a49d14618579712acb05a662e48612b91d69f9c2d574131e135c3e934c3eca9ab4a27a0f9ce478af69d467149325a1a WHIRLPOOL 9860cac91a145d17aaccfc967db332ecfecd1e603a58c42a38c2388b057eb454e9bf6c7441464095a2ff45fa88b02aacf23cbddf8e1b5419f46880aa8179331b
-MISC ChangeLog 3022 SHA256 c2337f474ef8779ce5557bbbee3b7a68dd73381228d5540e125f035a152e2e9c SHA512 43db873def80daa299e5e5df936aa238aa910d05ce10196557aa73856d756c7b0638244c15bbee95c4e7a7793120aaf7b01fbf2b893bfc4592b5a0cc8030df04 WHIRLPOOL 78fa8507d20736d835d55e627ec03f154156dfc56dc70597f42dcd5ac9050909c36fd1cd8aa6220ea979c1bb07599d223ee79bff94dbbee1bb1323012cd7393c
+EBUILD wcd-5.2.6.ebuild 1082 SHA256 ea879600b5b3f92a4646c06a8ddcca80bf0d58563b6afa5615a9d12fe0e5ff10 SHA512 cb56f6a3fee0b46834b0c523e41a15cdf96fcab7826184358150c6ce569f20b24c63c85d861e49b9715d10d5b8e3152e301c973e281a5a56464f73d80f871c89 WHIRLPOOL b06eeefbe68a909e14784e02beb4d4684d1a1437dd2c909d925ab47bfc02d619338211d8af68fdf05256eede965ec1bf8ad33c979b1927b7c9a39f193a4c4127
+MISC ChangeLog 3163 SHA256 c5df1d7ada58743b6ec8f0d057849c21b44385b3d18491b7db3ba28170f64402 SHA512 cf7fa5d48ba1eb4e0c743187046a88b381a065ad8dc7760bb53d530241370fd526a80556dfc5999cfe1b071ca196c649b987d2a27881b211a9679b8dc4a482c2 WHIRLPOOL 11fb7cd0c8440a2ad198e31785c1f77ee77f8cca42873d5f96e9aa90703a82e4c454c3b8c43cd2cf4009d92f32870cd1d0ca0e465d221e9502f03225fc5666ea
 MISC metadata.xml 232 SHA256 6f45c1eba43862805c2a76535213dd0e23d5cfc0725ab5ac775409515adbb3b9 SHA512 23d7724bdbc23902f2379e2d1ccb223d80d0ff30bf50e5c5b10a9c2e626a7d7560d768b2365542c5a895590a73c443691637f269ae6cbd63d60035952df89957 WHIRLPOOL 413742721e1712959ed7fa91332d869851260d62ec8e6fb63d981e343022b2911a714da187b8a259ec71e4ff10f8772ee67e76a7f39126b6f64b9d6209887efc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUr9vCAAoJELp701BxlEWfl1gP/i7jBiYslMV2eiT74QBs0peH
-y9iauM0xWPgRZ3dqo0QhBFxEyZnmglwmBzfXOuKbGl1Yd3WEST2lldXUvwDWtbbh
-JyOu9QQwz6NXl/gFksMrR8tlG4Ce325vAuGAYoGPOa8j3iMhmyg4zyWuiiQunLNn
-qZG5NfUZ0B1MQUhAyPojl6wK7i6xB4wwPiiUfu343zeLLIQiCLwMtXR53wE4/D/f
-pbYc+6Lw82/lT1IpxVyKp+VYExGVshwAzaxRHnSILe1gnXCkrtT4adRayEG3Qitz
-CloL0pctZxX9m8SVx25eq7iJfxefsBS0yg2KD3TOhmlgW3VPxi/mVUSKpx/lSDlv
-A6mso4Paxa2YaH+3BRC+nmwXnWCTSs02BKPHfUckBYm09oY2isZ7/+n4uWxM1KLJ
-lE1g2/oA3RPJrIB3H7+blkeG9Hbf3VMPXn6W//vjoS7OwM+1lu3mcbf85O+yLL22
-CEUCNS61KYBgyML8n42gImc9NVb7aq4L2eErSVTx5FC65IYY3D5dFwcItGzdOJ+p
-MmCtoRxVQ5fHx/QNuSXzxOBZRuKerh7GM4aKBeYmyQRZWhRQhLqj6rS2fRuM21n2
-nCb50RfMRbmJyJZS0auR3iETSRVwppL/ch3rGvtWmuKrxL5vU5qRmjaPoupuOiDW
-OqZyFCbAnoJQFGDalMCP
-=kVUZ
+iQJ8BAEBCgBmBQJUv2GUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirTngP/0R5m64XCZvyFsWedYWzxDYT
+SBtrxDpz/+nyygovWxMtl1Cl2fjXpOShAyxGhbyS1b6OqlHdCjVlQcLvOODWd22M
+ipfq1NVjXhWLEAhEKYMHUweJJEpuvWGVdkUgV9y3YwtDEu8PFGBdEH2csnEJjnDR
+tH8Epx4DNs7FAfZKIydY77TOhH8G8Xf6WEJydzHqIbzLfHpXwXLVfoHaN+tURTWh
+OizLAXIPgZC/0RCjJWWVL62tyxeqmeqLUbeqwVnC6uxcZGHoqoKD/He+VKWXjyHi
+jB5Ka2E6+EgzDWQCupL4Tz0tKBkFNJE687AeI7sFNeOVbOyIR9mcrBXp6HGQXLGB
+y9JXXn7B0Z0KHRWtJOF0E8zYje6okJeCzBHgqlpMAfI3p6yPLFc9zQ0wQBiX2FMi
+SpTFzYPV2Up70wsYAm276gKq+i8Bv2M1gWw0EhIkE3TfAz7OHGyRmBcq5xirszYZ
+7W3uSqd/5X3aKJ/JBdAnf+eKwgaFIyweCbXeIZSmcy13VV6SPDT5d18w7Y0LRUve
+qwoirBczRV6JwsleA0ySmzpHKyyk/C5qrFJLn5+VcxcWL9EAWbHNrmulmc0U6DFB
+r7R0Spxd977eNc0s3gfeOiRx8IuFye7jNEBmSowYwN+WAW+z4B7+STBa7b29k4IP
+jidfBtWtrnq0NCiK1yhy
+=uj10
 -----END PGP SIGNATURE-----
diff --git a/app-misc/wcd/files/wcd-5.2.6-wchar.patch b/app-misc/wcd/files/wcd-5.2.6-wchar.patch
new file mode 100644
index 000000000000..e6a5980e5ce6
--- /dev/null
+++ b/app-misc/wcd/files/wcd-5.2.6-wchar.patch
@@ -0,0 +1,15 @@
+Index: src/c3po/structur.h
+===================================================================
+--- src/c3po/structur.h	(revision 835)
++++ src/c3po/structur.h	(working copy)
+@@ -20,6 +20,10 @@
+ 
+ */
+ 
++#ifdef WCD_UNICODE
++#include <wchar.h>
++#endif
++
+ #ifndef C3PO_BASIC_TYPES_INCLUDED
+ #define C3PO_BASIC_TYPES_INCLUDED
+ 
diff --git a/app-misc/wcd/wcd-5.2.6.ebuild b/app-misc/wcd/wcd-5.2.6.ebuild
new file mode 100644
index 000000000000..c673dafe45c2
--- /dev/null
+++ b/app-misc/wcd/wcd-5.2.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/wcd/wcd-5.2.6.ebuild,v 1.1 2015/01/21 08:21:39 jlec Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Wherever Change Directory"
+HOMEPAGE="http://waterlan.home.xs4all.nl/#WCD_ANCHOR"
+SRC_URI="http://waterlan.home.xs4all.nl/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls unicode"
+
+CDEPEND="
+	sys-libs/ncurses[unicode?]
+	unicode? ( dev-libs/libunistring )"
+DEPEND="${CDEPEND}
+	app-text/ghostscript-gpl"
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}"/${P}/src
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-5.2.5-gentoo.patch \
+		"${FILESDIR}"/${P}-wchar.patch
+	tc-export CC
+}
+
+src_compile() {
+	local mycompile="LFS=1"
+	use nls || mycompile="${mycompile} ENABLE_NLS="
+	use unicode && mycompile="${mycompile} UCS=1 UNINORM=1"
+	emake \
+		${mycompile}
+}
+
+src_install() {
+	local DOCS="../README.txt"
+	default
+	emake DESTDIR="${D}" DOTWCD=1 install-profile sysconfdir="/etc"
+}
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 25c27f0f331c..5512fb582ca5 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.427 2015/01/01 07:27:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.428 2015/01/21 11:54:51 polynomial-c Exp $
+
+*bash-4.3_p33-r1 (21 Jan 2015)
+
+  21 Jan 2015; Lars Wendler <polynomial-c@gentoo.org> -bash-4.3_p30.ebuild,
+  -bash-4.3_p30-r1.ebuild, +bash-4.3_p33-r1.ebuild,
+  +files/bash-4.3-arrayfunc.patch,
+  +files/bash-4.3-mapfile-improper-array-name-validation.patch,
+  -files/bash-4.3-term-cleanup.patch:
+  Added fixes from upstream. Removed old.
 
 *bash-4.3_p33 (01 Jan 2015)
 
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 34de5ab8d258..c21d1fd9cb3d 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -53,9 +53,10 @@ AUX bash-4.2-parallel-build.patch 4448 SHA256 1c5f7fb5c324d6f2b786ad259cc35bfdd3
 AUX bash-4.2-read-retry.patch 932 SHA256 37d60b456efd563960a9f1f3f40f0e7f6ef2f9aeb63d8dafabf13853f3d41987 SHA512 b8c9524a1385f8a66b964bc629ed62a1c825415e3388ac4204709440d3feedd5ffa92dd0fb54eab85283b0de49ce24a76836512b737612c0a4c45eb4ab40f8cb WHIRLPOOL b88a33ea5dd903f6049f79d96bd5975074e9b43bf21e5491cd8ccffc1649f4afcf48456b80bb99c3bc576c553c9bb99ca8ca831a85e936e82aef4aa39509a652
 AUX bash-4.2-speed-up-read-N.patch 2858 SHA256 8547d32535ed4e2fe5cb7b3503e6044c3f5df3772079509bd02cec4177059dcf SHA512 6b7f611ac35746c5ce8caad49def25d060397d81844c0dda2ba7c73f4b0318a28b3fb89f356695c8a7799b70ab0591d9612619403b7d4ade8aba1e60a933fdae WHIRLPOOL da9647b199f090b358b8186187d9ceff6cc5dd7cb20885f7963c1a1b445bf833093c2db931763a9c05f2e4b87e9e1c201bd34a441c49a39703eca7f3c61b2d49
 AUX bash-4.3-append-process-segfault.patch 675 SHA256 cadbc77924ce5e2ba3984263f1e5d5c877214f4b78bd7597c637aec059ee9592 SHA512 2c243f7ca4f689decb0171ae2f5b5babf6b37f8f0988ecfbcb952a8df22dde9a543719d48b64ce45d2308340e9c601c9bd2f14f3f11bd9b9374c0f6fccaf0c7a WHIRLPOOL e614268546796cafd1acc076c3b1212b3f047b809d62480392b0e41283be8decbf32f5db96f4b62fe8d21a61aa95b16b39b93be41e946311490ba198a222feb6
+AUX bash-4.3-arrayfunc.patch 439 SHA256 9407d53d357166464c7c4e3341a72027faba295f416e73f7b5919e10ea15577a SHA512 9db458ea34495e8632d68c072db0c30be103d31ad0535d5327e2ba8db62d9464b2e4427fb0a06c6272dbaa399a2ba939666f4574929d0f53940234a78ca67867 WHIRLPOOL 038eb157225aadf2c7d57aa63b1ca7871986ceea982ae91d319b55551377e79b6023a1844c752586083056ae377813366f032e8c51df0f42e35bef0c037ed803
 AUX bash-4.3-compat-lvl.patch 628 SHA256 3303c12a499c5fb3f3c9ac7b11b020c83d4d4e3d672cc2df734709b22a6d92d7 SHA512 c552e1c7154d69201329f26e039c06a61e1bbaf5eaf16b7eea4f89d56aef0f710ebdfb115a1c00f07bd94893e51f9cbceee12bb57e51f6009c0e2327d53d7286 WHIRLPOOL 066fbb358f4fb9e32a58b4c4edd10d9c47c50f6aa202e0197c6b6d86a0836d48677561b834e5642b9052e64077efe240cb27144e5032c3e5f4bd9cb62201736e
+AUX bash-4.3-mapfile-improper-array-name-validation.patch 407 SHA256 0302e96630afc5106ea446defd6890fb0b4c96bb27b375e8fbfd96b09eb10335 SHA512 214935a751c3275593654c36b471cbb47ca4f5bb6f2a19e0a7ff73b646e5318a861538bf923ebb5f84abafa6d0d6eeece7b2f36ef77ab8c582223e098b4eb356 WHIRLPOOL 3bf136afd45fe614e3429079b6f41102dda55390d4a3d190f4584aa189f8e623439c13f9efe623644d3990e0f5d2d1b90a8b61eee322f22050b3d5e63d8f5eda
 AUX bash-4.3-parse-time-keyword.patch 790 SHA256 44c83641d4f8e7357b0b63b1a5095e751643c30f84fdf5dbc868c9d4a200c15d SHA512 070ab4a46adec60434ef45e04ca0d453fd02c40da8db7051800160c8fa8d3846a6e6bf57db02c583fd699eab69fa03b268107dc58e3332d2f7ed66f00432d6cd WHIRLPOOL ab37acf37bf497bc7c041f341b44dbd755d6e0170d8b74436d79aa63aac1c3cf35c13bd0c56a4eae071639bac27ea81a194c691c42fd4089de8df859745caf5c
-AUX bash-4.3-term-cleanup.patch 2152 SHA256 9f2d0faac988273dd1d838e8904325d524c996c1560e805c184c5387e31ed28d SHA512 3c13505e292532f10f4ac98ffd0044438b4d77f76d199018f1ff914ed1eb454c2ca12c6ef6996746c6300e37a78a4a0d111ac65f1c8d6897cfbc70bea457adf3 WHIRLPOOL 1db7ca7f51f3ed040a25f24d24221f024baf3a786dbb0477ba62e94f8c64b12d7266045df76ca316e63c0af62232cdd8b77028a86708fe4877b3ff52bec40fe3
 AUX bash-4.x-deferred-heredocs.patch 1255 SHA256 845ffcd7035eef5dc029747f211a737e0260b53b16086a37fb3c8ab3609a7d36 SHA512 9016203189d0b601f0441daec19f902de7387b599a2196c475d76c596dcf9a9c22765a58e7fc5a3117522ec2722475bd166bea271ff3048f31674e8bed2901a0 WHIRLPOOL f3a2ef5245c446b7e90917e987d80efba5e6437dbe86fc27bbd7768bc5f1e5f6e7663b350ca8a81a3f21a29af6e1594c14061be0d818fce6a4a63aed7efcb6fe
 AUX bash_logout 205 SHA256 15aaded954389c05d7de5d36c4887db61975ad52c87ad78baf1062ec8997289d SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d WHIRLPOOL 16242c8796af44f550f2935b37c770c022754c63db75b57fbe49d1a313b8651235619ead571cd70ae37f890c694d1c6b2e4871ec51345743eff8649782d0523b
 AUX bashrc 2879 SHA256 72a0b0bf010e72667c229475961f56b3684e02bcf1ccb22da63564ea16c08b54 SHA512 cb89537d4f7bc03c0e05d339f0c6c63cbd61f7963d97d0af13fe3cc2e9ac74755573d8acb28f3c6133a7cbd8f9f6c6c745e0bc215702456b2892a9438876c8a2 WHIRLPOOL 2e6ca7bcb3c2fe0923320f43094f6a11729c128a2f78ba2d51adbb07eb477d3e0573a2af844939fbc8dc1aba52eaf9dce043592a8ceb893148ec855a852e7674
@@ -340,25 +341,24 @@ EBUILD bash-3.2_p57.ebuild 4591 SHA256 bdb294f5741c71afa3543643a4a45110fb236b91a
 EBUILD bash-4.0_p44.ebuild 4465 SHA256 27dbd1c269c97b40cd829cfc3e9050acbfe5960c16f51739ea75421c4d9c1e3d SHA512 431771ab2d4d8f6281e65f7bdc91f14474244bd0bfbac4d200a89cef4b032a18df626ab85e19490ba47ae830a50b8d6621738cc06f299fd3f980727c797fbac2 WHIRLPOOL de45d0a3917de3e5879750a70a5be36351f21ace5086923ac36ff73b23fb34845fd577fb3b6e575a217eb30f7a6e2bdcfe9dd60df94752636baa852b2ed5bef9
 EBUILD bash-4.1_p17.ebuild 4200 SHA256 51ef8ecaf92d851c4949c91456a5c0325a328ca3b32afcb2f42a09fde87a025e SHA512 2f55461af1796f5c4dd759b46b9d42cf8cda8fb3d912887460e2d4d36198dd58fbd04b6b60aefc25970442607012bbfa972a43911bba938ef7806e4ce93fc708 WHIRLPOOL 51af146187f894f65f68d8de3e9dd03970817bafe5fa4f9d4efed7da81024af19ff1e78717f7a144091955613818385ee08ed0a5c7e8bbacd523788edbeacd50
 EBUILD bash-4.2_p53.ebuild 6629 SHA256 c6f50d54aebaede7c66c5090b4bd5d8b7ebb8e5a1064dfbd34d0d8b3cc00ccd5 SHA512 87a7b0b0afc63bb7bc60bf1a594368df6db7f0c5451ca9c04e558da5e4d28e673afbbb2186026d51e671ff958a421731af141a75f18a8714067df5eced79b716 WHIRLPOOL b8e488e8bbba07cf0de70720d0d0186eb133fe3ee1325901000cf7900aa8d0531b466cfb4d4c76789d1ee8156c0b14be6e4c60534e435303a361569416809602
-EBUILD bash-4.3_p30-r1.ebuild 7206 SHA256 e056cb8254f804c08c144121e4455f1e3db73029223023b82b807f6f2aa7810f SHA512 8741ebe078a4b0f5b9dfdd5df52d4b1f590e33155f6ac7dcc4a5fbbf0556e4d546a60b2f437fefc446ccfdb4275ec5b9cb2246f3d023f5c58af19d31a68119df WHIRLPOOL 828d503e5b444837fd49b64970738ac2491230661818816ff4123e003a885039cb6da7b83920a78ce9cb261c3cfefc08d71b94effedecfe0e0332e0c60863725
-EBUILD bash-4.3_p30.ebuild 7145 SHA256 8feca632295298ec93314ce158427e9e5a0c699334dacd2f0017bd378703c071 SHA512 10a359f9b798ed4e6aa6396226ac2f64fd618c06156318dc3fe62f59988b36003f8dad36c12749431cb1f18d9479c8d6babede3e50ee2570fa8ce7c0705b6772 WHIRLPOOL 9fe6042dbb71b21e47cddbc21e5515a4e9a16acf86b2da89d1c8e0c2ee903905eda57014f930fe3af4b6431c8bbedbfa78b623a85f3b7d57cc76e18862c0269a
+EBUILD bash-4.3_p33-r1.ebuild 7286 SHA256 dbeb216603a012f6b95fbea1092143c58687810aab66fff85e0bd61187f34608 SHA512 2767b5d63ba637f45a89c4308f65e45ab8c15e8ab922608b93f8bc5d6685d584eff13a3462ef05ce28620653701af5130df8368f81cb4f6d86277a54d49d92bc WHIRLPOOL cd912f960d5c80a1a762ef1fa8b09b242b65da9d92558c87807ab0a9936fc4bd790e22858eb26e4f0019d578747f263fa16e255017323cd377e5cf62f3a9b0b9
 EBUILD bash-4.3_p33.ebuild 7152 SHA256 4144c3a9c6ada95ede64af25633bd697aaf52701e887dc2a7361d2b02e840b8e SHA512 09d9844e29c195bc56649f75910118eec36eadd3e032d54893c0586066acfcc33436f81c9140f9ccb902b18f9fc594d4a3857d89093562d82c578a2a2bdeb9b3 WHIRLPOOL c193bcfff32b370aeeb4a8c87c28beb829d30001b0b534e49570b95f9f6181b1cd48f6f544b99dc4e6a0eee2de16156304057e72369de7372f679a68fcbd17e2
-MISC ChangeLog 72817 SHA256 cafc715014c9a0abd0f8be6f53f86d1e556d5708b6be403797e6ba8a4ff9509c SHA512 39302667ea328148d639a49424d9451c8e69d1b3261b75c66581242082b6c0f00ea9a6d8095786c78bc800587f72b60cc4637b119c380035b6ecfc6289c249d6 WHIRLPOOL 34a194bf62b79d6f414a858f5ea7bb68d6cf1e2463c01c14bcd5883342d53e40dd3048ab14079de04bda440774a2d2fcc7fffd59e2f0d46702cb21e3ab1753a7
+MISC ChangeLog 73163 SHA256 746e3d96960872749cd105cd3bd1769dfee4a7d2ceb9b265708d1462e12f180b SHA512 5645d1fb4a920de8aae686714959d920dbf311133ec9a149f6c8d47a1512d12825b5e04342ba8175b09a1d1fbddf4b7525ed5bf364e2c739b6bed9ff32f48d4f WHIRLPOOL 03ae7abf58bf190b5fa0250ba4a2b3c9bbe373fd7ea4f408fd8e70ffa16adb61cb710fe02925f288c8467d6baf8227ada7d6a440a9c47c74466df0bfc4f8fddd
 MISC metadata.xml 643 SHA256 928c1ec952dec872f913d5e121725431435f651a87e48e784617c49f9dcf806a SHA512 3eb4baf0efbee2606a1e56d0359c3489887fb3f2e0dfe9ba25b6143b9d5e02b8df06a8065019201184b1fca12b8a86d781a68131810b80784c678765d55df679 WHIRLPOOL 52aeb839d294d5f43af735698afb6ee8f99e388c86260e1a1cc0d8fa57671bb8bef36f09d3f7e84cb70bc5fba0d645b427033c13b6ebbc66f5520acb1985b8b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUpPbYAAoJEPGu1DbS6WIA0MEP/RP/M/3lX3bxGsuxI1//gm3X
-VDMXFPgrjuGuUyaLbp+pwOgrbgv0UAFj2dVzAZUYECKHoFD4KStEI5ohhRRTERNj
-CcyT5yGnA5kzNUbzv6uEgj+PcNnLsTlFiVIZmcGdZIUBV7gyM/harFs4n+XJn808
-vftaY2P5cWUYvd00wrsHbiwSgNh+vb7rHb7UU7cq7a1qluqpiMadGT6HLZ5fZ+bl
-E1DdBOhqaSQrrGnmKxCZfgsEbZK44whBNRz7biV1ZWhPjQBrsqZa0+LcWxBpBoAk
-Qp0Z6l9HrD7cQwf/+rQ44jn1pg51r8h7Nhnsu21imAan8B4dZmumot8bLK4Z/+is
-3dVYRkQLMHWnbnVaIyG15g7hxNWA8pWXIzDRPzhNEGLyKxBsN/f3MwZOwo8aMy69
-Zy8S/5hVkDWJqHF4UQndBoVMggAKiMdB9GVh3a8dptUU/gvIq0c2N7tGtD8MaVce
-n1irCzZ3d5A9tdAlBlowwsp3sMtYh6qeZgyuyzmvUWMkfk9nn55vD7eT1PaeAEcb
-0F5cIJ6UPKuRbFq7M8gIgzrhXKsZeJcaEerXk+dGPOMCTqU81o8NuCMU+fUchXmB
-DyK4fAiYdeSNhBRsSaFS0pOSifa5WsDmhOg/HqtNdF+oJuBNN4aM8uDTmHkgziM/
-y83FRzIvnTQ4hDqSNAk5
-=3fid
+iQIcBAEBCAAGBQJUv5OMAAoJEPiazRVxLXTF0eEQAIr3evivXnVnpPL62wLFVK9q
++/xiWiFRSm8m5BQnABEntInDYiKmpzKi8WymrZd8iSIQliq2xOxDd7gVKo5G+bAa
+3iusmMmaejmh38c8lVp/xpefbhNriop8oR3PV7ncFQ6/UsuueAG0Fcs4dI/rj44V
+zv7t5ESPPgn5/piUIqPYgISNm2oo1FWBdFjjtQpxNOtOgtzxQmatGMP3usEn/0nY
+Bmwgs7pa7hOcHgpF54xMFBUmiU64gfwZjORs3z34/AZvp2N3rbrDLWcYGZ7fFBOh
+tTDiN5Fdsk/gmcrvh+dYqp4hJ2F2G+M+WdU52l3Jlwy73VWqFUIvV7HLqWfjkLwu
+YM05OodnTp6fnfajKfDdc2cMaEzJtwVJXJqxbU29q93wIBYPljKr8j/J7Cm/l6fP
+1eaziIF0kc7zw30n2pwX/4w3QRImzRMzeLlcJ0uyp26DAgq6vOwqthOSduo0oZSA
+AF34kQPg5jZ4WtktU8HQLpU/TNxZAc5eXtrP2yrNFuS6q1/Zvij15Tng2/68jsF7
+nUonQmrnpxXCF/nVyRi3PC1/1SqhkCuIjCNnJHSj9ggs6hJJcMWR1CeZt4Ht15AR
+8qjxZchN2z2lteH2E7jBzd+4Ap9UJovicIh5Is4bMBL5fn7U5+ylEi0wN+Zgef4x
+SwEkw4SNyp2NGAxl64ej
+=jPc7
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-4.3_p30.ebuild b/app-shells/bash/bash-4.3_p30.ebuild
deleted file mode 100644
index e0e41d0330ba..000000000000
--- a/app-shells/bash/bash-4.3_p30.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.3_p30.ebuild,v 1.3 2014/10/20 05:14:35 vapier Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
-	[[ ${plevel} -eq 0 ]] && return 1
-	eval set -- {1..${plevel}}
-	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
-			printf "${u}/${pn}-${pv}-patches/%s " "$@"
-		done
-	fi
-}
-
-# The version of readline this bash normally ships with.
-READLINE_VER="6.3"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
-[[ ${PV} == *_rc* ]] && SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2
-	readline? ( >=sys-libs/readline-${READLINE_VER} )
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	!<sys-apps/portage-2.1.6.7_p1
-	!<sys-apps/paludis-0.26.0_alpha5"
-# we only need yacc when the .y files get patched (bash42-005)
-DEPEND+=" virtual/yacc"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if is-flag -malign-double ; then #7332
-		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
-		eerror "as it breaks LFS (struct stat64) on x86."
-		die "remove -malign-double from your CFLAGS mr ricer"
-	fi
-	if use bashlogger ; then
-		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
-		ewarn "This will log ALL output you enter into the shell, you have been warned."
-	fi
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-
-	# Clean out local libs so we know we use system ones w/releases.
-	if [[ ${PV} != *_rc* ]] ; then
-		rm -rf lib/{readline,termcap}/*
-		touch lib/{readline,termcap}/Makefile.in # for config.status
-		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
-	fi
-
-	# Avoid regenerating docs after patches #407985
-	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
-	touch -r . doc/*
-
-	epatch "${FILESDIR}"/${PN}-4.3-compat-lvl.patch
-	epatch "${FILESDIR}"/${PN}-4.3-parse-time-keyword.patch
-	epatch "${FILESDIR}"/${PN}-4.3-append-process-segfault.patch
-	epatch "${FILESDIR}"/${PN}-4.3-term-cleanup.patch
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# For descriptions of these, see config-top.h
-	# bashrc/#26952 bash_logout/#90488 ssh/#24762
-	append-cppflags \
-		-DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
-		-DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \
-		-DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \
-		-DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \
-		-DNON_INTERACTIVE_LOGIN_SHELLS \
-		-DSSH_SOURCE_BASHRC \
-		$(use bashlogger && echo -DSYSLOG_HISTORY)
-
-	# Don't even think about building this statically without
-	# reading Bug 7714 first.  If you still build it statically,
-	# don't come crying to us with bugs ;).
-	#use static && export LDFLAGS="${LDFLAGS} -static"
-	use nls || myconf+=( --disable-nls )
-
-	# Historically, we always used the builtin readline, but since
-	# our handling of SONAME upgrades has gotten much more stable
-	# in the PM (and the readline ebuild itself preserves the old
-	# libs during upgrades), linking against the system copy should
-	# be safe.
-	# Exact cached version here doesn't really matter as long as it
-	# is at least what's in the DEPEND up above.
-	export ac_cv_rl_version=${READLINE_VER}
-
-	# Force linking with system curses ... the bundled termcap lib
-	# sucks bad compared to ncurses.  For the most part, ncurses
-	# is here because readline needs it.  But bash itself calls
-	# ncurses in one or two small places :(.
-
-	if [[ ${PV} != *_rc* ]] ; then
-		# Use system readline only with released versions.
-		myconf+=( --with-installed-readline=. )
-	fi
-
-	if use plugins; then
-		append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
-	else
-		# Disable the plugins logic by hand since bash doesn't
-		# provide a way of doing it.
-		export ac_cv_func_dl{close,open,sym}=no \
-			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
-		sed -i \
-			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
-			configure || die
-	fi
-	tc-export AR #444070
-	econf \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		--htmldir='$(docdir)/html' \
-		--with-curses \
-		$(use_with afs) \
-		$(use_enable net net-redirections) \
-		--disable-profiling \
-		$(use_enable mem-scramble) \
-		$(use_with mem-scramble bash-malloc) \
-		$(use_enable readline) \
-		$(use_enable readline history) \
-		$(use_enable readline bang-history) \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	emake
-
-	if use plugins ; then
-		emake -C examples/loadables all others
-	fi
-}
-
-src_install() {
-	local d f
-
-	default
-
-	dodir /bin
-	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
-	dosym bash /bin/rbash
-
-	insinto /etc/bash
-	doins "${FILESDIR}"/{bashrc,bash_logout}
-	insinto /etc/skel
-	for f in bash{_logout,_profile,rc} ; do
-		newins "${FILESDIR}"/dot-${f} .${f}
-	done
-
-	local sed_args=(
-		-e "s:#${USERLAND}#@::"
-		-e '/#@/d'
-	)
-	if ! use readline ; then
-		sed_args+=( #432338
-			-e '/^shopt -s histappend/s:^:#:'
-			-e 's:use_color=true:use_color=false:'
-		)
-	fi
-	sed -i \
-		"${sed_args[@]}" \
-		"${ED}"/etc/skel/.bashrc \
-		"${ED}"/etc/bash/bashrc || die
-
-	if use plugins ; then
-		exeinto /usr/$(get_libdir)/bash
-		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
-		insinto /usr/include/bash-plugins
-		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
-	fi
-
-	if use examples ; then
-		for d in examples/{functions,misc,scripts,startup-files} ; do
-			exeinto /usr/share/doc/${PF}/${d}
-			insinto /usr/share/doc/${PF}/${d}
-			for f in ${d}/* ; do
-				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
-					doexe ${f}
-				else
-					doins ${f}
-				fi
-			done
-		done
-	fi
-
-	doman doc/*.1
-	newdoc CWRU/changelog ChangeLog
-	dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
-	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
-		mkdir -p "${EROOT}"/etc/bash
-		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
-	fi
-
-	if [[ -L ${EROOT}/bin/sh ]] ; then
-		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
-		# missing even temporarily causes a fatal error with paludis.
-		local target=$(readlink "${EROOT}"/bin/sh)
-		local tmp=$(emktemp "${EROOT}"/bin)
-		ln -sf "${target}" "${tmp}"
-		mv -f "${tmp}" "${EROOT}"/bin/sh
-	fi
-}
-
-pkg_postinst() {
-	# If /bin/sh does not exist, provide it
-	if [[ ! -e ${EROOT}/bin/sh ]] ; then
-		ln -sf bash "${EROOT}"/bin/sh
-	fi
-}
diff --git a/app-shells/bash/bash-4.3_p30-r1.ebuild b/app-shells/bash/bash-4.3_p33-r1.ebuild
similarity index 96%
rename from app-shells/bash/bash-4.3_p30-r1.ebuild
rename to app-shells/bash/bash-4.3_p33-r1.ebuild
index 6b18603f3447..e59aca4a2602 100644
--- a/app-shells/bash/bash-4.3_p30-r1.ebuild
+++ b/app-shells/bash/bash-4.3_p33-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.3_p30-r1.ebuild,v 1.1 2014/11/09 20:41:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.3_p33-r1.ebuild,v 1.1 2015/01/21 11:54:51 polynomial-c Exp $
 
 EAPI="4"
 
@@ -86,7 +86,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-4.3-compat-lvl.patch
 	epatch "${FILESDIR}"/${PN}-4.3-parse-time-keyword.patch
 	epatch "${FILESDIR}"/${PN}-4.3-append-process-segfault.patch
-	epatch "${FILESDIR}"/${PN}-4.3-term-cleanup.patch
+	epatch "${FILESDIR}"/${PN}-4.3-mapfile-improper-array-name-validation.patch
+	epatch "${FILESDIR}"/${PN}-4.3-arrayfunc.patch
 
 	epatch_user
 }
diff --git a/app-shells/bash/files/bash-4.3-arrayfunc.patch b/app-shells/bash/files/bash-4.3-arrayfunc.patch
new file mode 100644
index 000000000000..f44d18478454
--- /dev/null
+++ b/app-shells/bash/files/bash-4.3-arrayfunc.patch
@@ -0,0 +1,15 @@
+http://lists.gnu.org/archive/html/bug-bash/2014-11/msg00178.html
+
+diff --git a/arrayfunc.c b/arrayfunc.c
+index 804e6da..0f900aa 100644
+--- a/arrayfunc.c
++++ b/arrayfunc.c
+@@ -498,7 +498,7 @@ assign_compound_array_list (var, nlist, flags)
+ 
+   for (list = nlist; list; list = list->next)
+     {
+-      iflags = flags;
++      iflags = (flags & ~ASS_APPEND);
+       w = list->word->word;
+ 
+       /* We have a word of the form [ind]=value */
diff --git a/app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch b/app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch
new file mode 100644
index 000000000000..20bf340fdbd3
--- /dev/null
+++ b/app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch
@@ -0,0 +1,13 @@
+http://lists.gnu.org/archive/html/bug-bash/2014-11/msg00097.html
+
+--- bash-4.3/builtins/mapfile.def
++++ bash-4.3/builtins/mapfile.def
+@@ -339,7 +339,7 @@
+   else
+     array_name = list->word->word;
+   
+-  if (legal_identifier (array_name) == 0 && valid_array_reference (array_name) == 0)
++  if (legal_identifier (array_name) == 0)
+     {
+       sh_invalidid (array_name);
+       return (EXECUTION_FAILURE);
diff --git a/app-shells/bash/files/bash-4.3-term-cleanup.patch b/app-shells/bash/files/bash-4.3-term-cleanup.patch
deleted file mode 100644
index be7a5def76d5..000000000000
--- a/app-shells/bash/files/bash-4.3-term-cleanup.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-http://lists.gnu.org/archive/html/bug-bash/2014-09/msg00031.html
-
-*** ../bash-4.3-patched/bashline.c	2014-05-14 09:22:39.000000000 -0400
---- bashline.c	2014-09-08 11:28:56.000000000 -0400
-***************
-*** 203,206 ****
---- 203,207 ----
-  extern int array_needs_making;
-  extern int posixly_correct, no_symbolic_links;
-+ extern int sigalrm_seen;
-  extern char *current_prompt_string, *ps1_prompt;
-  extern STRING_INT_ALIST word_token_alist[];
-***************
-*** 4209,4214 ****
-    /* If we're going to longjmp to top_level, make sure we clean up readline.
-       check_signals will call QUIT, which will eventually longjmp to top_level,
-!      calling run_interrupt_trap along the way. */
-!   if (interrupt_state)
-      rl_cleanup_after_signal ();
-    bashline_reset_event_hook ();
---- 4262,4268 ----
-    /* If we're going to longjmp to top_level, make sure we clean up readline.
-       check_signals will call QUIT, which will eventually longjmp to top_level,
-!      calling run_interrupt_trap along the way.  The check for sigalrm_seen is
-!      to clean up the read builtin's state. */
-!   if (terminating_signal || interrupt_state || sigalrm_seen)
-      rl_cleanup_after_signal ();
-    bashline_reset_event_hook ();
-*** ../bash-4.3-patched/sig.c	2014-01-10 15:06:06.000000000 -0500
---- sig.c	2014-09-08 11:26:33.000000000 -0400
-***************
-*** 533,538 ****
-    /* Set the event hook so readline will call it after the signal handlers
-       finish executing, so if this interrupted character input we can get
-!      quick response. */
-!   if (interactive_shell && interactive && no_line_editing == 0)
-      bashline_set_event_hook ();
-  #endif
---- 533,540 ----
-    /* Set the event hook so readline will call it after the signal handlers
-       finish executing, so if this interrupted character input we can get
-!      quick response.  If readline is active or has modified the terminal we
-!      need to set this no matter what the signal is, though the check for
-!      RL_STATE_TERMPREPPED is possibly redundant. */
-!   if (RL_ISSTATE (RL_STATE_SIGHANDLER) || RL_ISSTATE (RL_STATE_TERMPREPPED))
-      bashline_set_event_hook ();
-  #endif
diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 2ceaec7a35ad..a8bb43dc3c73 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.543 2015/01/16 21:05:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.544 2015/01/21 10:32:17 ago Exp $
+
+  21 Jan 2015; Agostino Sarubbo <ago@gentoo.org> phpmyadmin-4.1.14.8.ebuild,
+  phpmyadmin-4.2.13.1.ebuild:
+  Stable for amd64, wrt bug #531684
 
   16 Jan 2015; Jeroen Roovers <jer@gentoo.org> phpmyadmin-4.1.14.8.ebuild,
   phpmyadmin-4.2.13.1.ebuild:
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 3fb8b5b0b04c..9a640bf8fb59 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -10,16 +10,26 @@ DIST phpMyAdmin-4.2.13.1-all-languages.tar.xz 5205324 SHA256 bc179dd35f6aa6d01b5
 DIST phpMyAdmin-4.3.5-all-languages.tar.xz 5397680 SHA256 d499fb0c6178dcb488cf522124f84fc5babfcd6ce336706978f4020daf667df8 SHA512 dd8f29e96392a362718b793c3f649ab13f29d443f456a38d2b84c1eebba6bad194609d35329c51449c242fcdb0c5c085e25b6bb75ef8ae01f9b8e6029a616dbb WHIRLPOOL ef796804c4f14f5ddc931414fd9e6f82d4eedcee3e0537ca9cc7580faa9f1c3769387b319e548569f7609d2c9c597fc182d2300dc36abc8ef9ab5aefb6d4a669
 EBUILD phpmyadmin-4.0.10.8.ebuild 1661 SHA256 11d0eba0983d8903914b67d55c264bbc2c44155a1cadfbe358dc71baace32c47 SHA512 42717ef5d7dd2ab757c01058e3cacf65e819c2a3351d011351ac21090041002324fb70a82b17fbbc63885b4dd540d8ead5c675ec54fb5b433c40c904f965ab97 WHIRLPOOL 11cf348fb46ab1b737240eee19d0a2f95d7402e37d1c5acfcf3a5cb0e6a0a207debc8c81a910212d648bca1fc6a56c0ea932cee1f2f3d8ba6ae928d6c19dcb3b
 EBUILD phpmyadmin-4.1.14.7.ebuild 1646 SHA256 a21034e57951065a95baf81340d05195e0ab99738a3008c8caf6ec07b6453733 SHA512 491a8e6500a6d88255015c32ed08621d000c812551539b3e18ab78d8baa195aea84d81d4af5a493da93dc3dbc4f5e11c8a9826035374eaf40504681e8bee4938 WHIRLPOOL 3d796e14d9241f009c804e70bb0856b5ec555b95d7699b0d99b75cd5181652ea10b34567ed636c8ebbf0ef06a52db2e3f209d4c47c751c37c6cc89b28231fff1
-EBUILD phpmyadmin-4.1.14.8.ebuild 1651 SHA256 87d698113343b60c4d522893b400ea6abd16fa9d7bdba8110eb5aa6af9871d01 SHA512 511e14c0da6ee978bab50ce04e00bacfd5874bd97c5b510fef63d3397cec691e25e21b0efd5df2323aa30d23e79682ab1139d17fe9fd8a500d7219c17ad08110 WHIRLPOOL 3546a839048a63f669943826a707d0b49a028f1ce6ab4faae4a3a04ad260f78e949dc4c7ba9d08ff6746da6c67ca9d0ee03dc2ebfe108357cbd01cfec20a74d8
-EBUILD phpmyadmin-4.2.13.1.ebuild 1651 SHA256 624269ecf409e0d941a8d69d1531fb0b240a5df537679e05b7b47333e85e52e1 SHA512 64439e7998f916767b32752ea7098a598dd1cce52321ac6792a6081871d7e88e2554f4acb3a218092ff687ecb4140207ddc6f163da6080e20d5621d2a26b0567 WHIRLPOOL 6dc3ed8cc8733ea558f73bce18ed479bdca4fc567fee793ef5a41a816bafd875045ce738410545ddcd0d57b8cb10c22142e85fa38c41a6da996734386936514f
+EBUILD phpmyadmin-4.1.14.8.ebuild 1650 SHA256 33fb31a2ad2dd7c383313029e9d8201cc44a437dd32c1267eb0d1026572ea91b SHA512 38373be013e2dba362bc6b7b5ff07ef21c680e1e183ee0d81bbba8eff05144aefc591f4f8dd986fe672884118b7ce3411eb54cb2a132b3c4e7e633952fb819cf WHIRLPOOL 3a04adee4b6982825049f218427caba63e8d2e0e770cae3964732c2d5f2e968ba037324dcb39c61d97cb6e4ae8e2ffde388d09a8eec8d04f1f7c0ae740aca6e8
+EBUILD phpmyadmin-4.2.13.1.ebuild 1650 SHA256 379d818ccb48ab60408359b14d1a9df0c34ba14c84c90af55e2e4f5040cb50a2 SHA512 af0d57d4d359152420203075243875f4613abc8dcf3e31872470d6e86f50a1ed30b3af9e415bb0c8059840f763c57364e3640aa13b61fd3f4fcaa67b478ec232 WHIRLPOOL b14d45f899ff42dc9d0c7d8275409cf4bae9a26173b7204842fdd0fda2b49357cc0298e55f8c2cc0ee542ef10eb372089ebb8c0d7f1791167e8df9cf2bf7ed77
 EBUILD phpmyadmin-4.2.13.ebuild 1644 SHA256 ce68ce62547108c983cb0ae192b561cb1cfc240ca2150163db9c3cdb7ae8e19b SHA512 9dc204c712b74e441963c8108c5c6033eee850fa74deb045df34145aff5e387b9584712c7a237d8b17dd765f840a04afcc0f93205aab79e95ad19b5618541aa6 WHIRLPOOL 2045f81cb7a539e215de5392b43fa3a26a05a991f345e4d51eb029c5ce44b9f8be97b4bdb6a8765ddbf86ee1326f83bc361fcd29db264b2e5aa392c50a045267
 EBUILD phpmyadmin-4.3.5.ebuild 1658 SHA256 9e4982afd8c8f1e5496ad04655e610aa2741da872a5ebbd4053eab5ae156374d SHA512 23e20474ac6181fb1940016978f0e9e99149d5031036590c185294517c0a562cc0ddbc75b67a1fbecb0d0ac9d6ed1c209fc9bc4fae15676e1b145d6e9d0fae04 WHIRLPOOL 12d133681a703950a1d797ed09fd46835220036d3f7385bfae55d3b0cc4ddc91ba3c70332ffa892dae0b44f668c74da234e5c03adb364641a9e642da756b6f4b
-MISC ChangeLog 75526 SHA256 c960439742e14b0536d1e73079d900d2b5aed9a5d6e4c91f6fd013cff513d447 SHA512 a2c822cf96cf335a2b6c3394f462af7e56872094a23e233b2bb142df444de9a2e0af21342b7ba7e6e29b4664c42e12c27ac8327e9c238c4db7e12bd8beac72a4 WHIRLPOOL 18bcc6a2404c35b64e62b30abcbb59179e64135aaf628ab0cbf7bf5d1f6ee2fe054d12f2addcb04aa8f614870f64b27d1fe4eb2913e3c6101ab1af6decd143dd
+MISC ChangeLog 75670 SHA256 6739149b3d34428f8456666ea6b27dd838777568a9a4e4f555708edb0edaf85b SHA512 414d3570dd57f80caf93d89a88f7c06554aaa338571284ecae52751a5a4156df2d5ee91d9fe7772b7849d5bc890c24e7e981349e9da8b2d5c49dabfa779e8496 WHIRLPOOL 5ef6eacbac52d307e5fcc7e1fcaf013838f643d10f115c886b127a81b0c14cc913fe71217d73cd6d58b2d2bbf4af0540dfafb6f6eed505a23f46ca200fa66904
 MISC metadata.xml 519 SHA256 01d144b9a9bd96948c642f54fcad77c03644f4c19c6af44fb145713f01b1d6f5 SHA512 7ae636517f5937c91d0dbcf51b198d8860afdc1669033fbcb16583853976e534d16f4d2a7b8d9a33e4ba942869c788c5649019611fa4d4393f0b1726f6d01ce1 WHIRLPOOL 4318fba7507a02a52d396f32573c0d4e377141c169bd22f323f5006ad4e0cf69b70c1285de81e1ac8cbdeca0ef31fa3f797f21d97037fcc304d1c3c3a818e7a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlS5fQMACgkQVWmRsqeSphPs2wCfVdz7TGPj0xbYwmgUISq2mYKv
-uMkAnA168XT6kcNNGnTY1/uXUZgU+ydG
-=JPzo
+iQIcBAEBCAAGBQJUv4AyAAoJELp701BxlEWfmqsP/j/kT44X6G0kk7710DB9dAlt
+RZ/iPzBkJ0UPwQW8zNVdnxYp+0Pr94VoGjk4mF8vJEYxqyx/MxcXreenftkPBYri
+ogdDy+M3eKEsp+7tYkJW8ePBmWVYB8/8f5012YjfP4upahQUEJ9Nk7nivjaiahBs
+Hr3lYTMzkgg7fOycvnNnV+LpCTCfzx1XCXzATssBLQOhjdgUDbIe9qMAox7u1Hz0
+D1BhmKku70gYI+3GeUKYMUJeN9uf8JCQ2lJsAl2S0Ey+87WJuBafmH1CIxtpb3Mo
+u4uryv5DI7v6QwbPngCeoCURHGAfN/5ssr8bk1GU+h2xq37g2Vvcl/JGo+YqZfJu
+4DVdoNCJ3Lc8v0xECYRUDppXhwVEBUDEVp9SMaf0RW2pt1bz4U+ZuRMF5o32pzdp
+PDZtumd78bVkTLffGnHLH7WcOsfBxf6oZRwvM4db3oQMOk7pp//XcIUb0UOzgCuf
+28IXZb+d/yuNpgVEs02tlx2r/LdDJn1PQPYVl32gTy6NwlQG7zpddiO6OZRIJFpu
+MZzUbuPiHFEwKATF3VszgpkFtw6sP0MOmuX7+l3WbkcWvtcPjuIGDDqw//ieT3KA
+YaBBcvTX5jP2uzQmG28cSLz0vw46E8xzvbBR/3F+UhUVR+xhGp7MDukDweBtMPww
+uJQUk3mSDeFtMuFSbzU8
+=vGDZ
 -----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.1.14.8.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.1.14.8.ebuild
index ab0103a70aeb..8d459e52a6bf 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.1.14.8.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.1.14.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.1.14.8.ebuild,v 1.3 2015/01/16 21:05:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.1.14.8.ebuild,v 1.4 2015/01/21 10:32:17 ago Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.phpmyadmin.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"
 
 RDEPEND="
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.2.13.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.2.13.1.ebuild
index 466cee834e58..5ec07ee5fdce 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.2.13.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.2.13.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.2.13.1.ebuild,v 1.3 2015/01/16 21:05:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.2.13.1.ebuild,v 1.4 2015/01/21 10:32:17 ago Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.phpmyadmin.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"
 
 RDEPEND="
diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog
index 865db1b0de8a..6b3da1f75d9c 100644
--- a/dev-lang/swi-prolog/ChangeLog
+++ b/dev-lang/swi-prolog/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/swi-prolog
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.460 2015/01/09 13:26:39 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.462 2015/01/21 10:09:46 keri Exp $
+
+  21 Jan 2015; <keri@gentoo.org> -swi-prolog-7.1.26.ebuild,
+  -swi-prolog-7.1.27.ebuild:
+  Remove old development versions
+
+*swi-prolog-7.1.29 (21 Jan 2015)
+
+  21 Jan 2015; <keri@gentoo.org> +swi-prolog-7.1.29.ebuild:
+  Bump -7.1 development version
 
   09 Jan 2015; <keri@gentoo.org> swi-prolog-6.6.6.ebuild:
   Stable on amd64/x86 wrt bug #536130
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 78ecdf254472..53742445dcf7 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -4,27 +4,24 @@ Hash: SHA256
 DIST pl-6.6.4.tar.gz 14830255 SHA256 663977959979e389df0f87c2eb426ab71105c12206605ec40925893b91733cef SHA512 fea012ce97b62940618ce2e137fbeed39c7698544ece22da8c4d13f98d9cf809d990f912e406a939868471ef5517552a2ccf842be4b7e849aeaa6c1d38331b4a WHIRLPOOL 10e4243fa473c168a50268e7d2240976626cf20ae1440e94c496a6d93a1d1c5631ac7523695174baa8423396d4af57d84c6f0be59775cf7bff0aebf7be135d5d
 DIST pl-6.6.5.tar.gz 14837423 SHA256 79ee4526ce8a70d55cfeecbb1acfd737db0ddbe45585faba41a24ddb34484a53 SHA512 8bdf7678c51192185bbd20f008212de7401ca2f497fea02e7b652aa51fca0c1e961fa10efcd256325a6fb0b7ea956b26c8d8def2f11b2f45551f3a82591d6c7c WHIRLPOOL f7bc7236801a6c13402426f95e971d2de41b98dd596e2f13344f4ad56619a81ef587fe626ae1c797255739511d09fad49d21787df9fbefa034278c3a1824f949
 DIST pl-6.6.6.tar.gz 14838653 SHA256 9f80bb274e2f31fd68b0acbe35982c012d5f8311dbe44ec1d8d04351a776996d SHA512 a850b0f6b283d34aa77d5e9d8a0053161fa534fa6d8935c7472362ff7b59ea6035de0658d9e38c317e2d92ed810370f2adc3e92b6346fc0ff392d18f1c8012a6 WHIRLPOOL 448d844fe45aee97ad2e37bea3f81dd5eb388e1dcb9f1c4dc54c18991aa91d481bff5b70174fb06edb06c1361759621a570a083fe36d62bffdf6028c49244b2a
-DIST pl-7.1.26.tar.gz 16176826 SHA256 5c8e08a7cd8046e0c48cb42a2a68080b8a71bc92dddbd9e5d8d488286811e805 SHA512 034e9e9be10e3508d97da7a9a910fc9de236702d1a231f0c9d1d70b695487e2662152dab1b3cda52c15a6a03f3b4c964e6a7f80f337e3979dbd4349527ab7cdc WHIRLPOOL 826e31ea37c39ffa5ff2b450e26b0b52c041cb0a416c379f784ef62c820ba8437bb9f6ee190768d631b9033882f6e690ff787e0653efce80d6766126d6555d1f
-DIST pl-7.1.27.tar.gz 16188474 SHA256 6edca72ee445f2b924fe8959fd484b38eba5b04a782e9832bfd6922839e8fdde SHA512 00eda64db0bad0ca1962dd2a41ea7f1cf32e042fa953ebe14af3ef5a01e5b8d937420aa7b93018529f5d87035e1327d58962a2e6114ad2c4110bd812b0eeb287 WHIRLPOOL 17ebee9a5da83c744bccc0f89615372f2fc20d7f8fe96e441b868c4c02a4dd254e286f7c5e2006d29ed77963331ac29bad76766ca9a5f9aa155dfa6570315b10
 DIST pl-7.1.28.tar.gz 16194807 SHA256 b23a6ee236586083fbe20732bf7a7891b1ed5be69529c85f24bb93c5af9700c1 SHA512 76ee1b74962cb4a45f9fdfd18bf0c658a17728dc046dd98c30e5e166f310077f939c76b66a476d8242957a9ac5010a56673c20d416a68734cabdd966700190a2 WHIRLPOOL 229233064d780e63b028bf158e285a51a2edf9ebed1edc9e0362815094ce0554920434c1d7413b26b2107b387d57380f541c4c79d5fec7cb37266f1b6460052e
+DIST pl-7.1.29.tar.gz 16195241 SHA256 336b1840609329026214716a85d57e7e47ea3c730ea2f51f1d8e418b6dd10652 SHA512 3aeb23de6db9c42931517ef8818d500df373891719a4befa038d0501b95ee93fcb03b1711ab04aac8c7fcc11b1a9292dbc120202c0c837b368789229446f0180 WHIRLPOOL 4ce33264c9a02770457e33040078c744f06d48529fa9c86c845cc1b7c5be4232cfd017f026d43616c83239616607240f695eca62f98cbb723945c727c27c4b71
 DIST swi-prolog-6.6.4-gentoo-patchset-0.tar.gz 1596 SHA256 727a9ed67cdd8a23bc5d0bd5b2463353071370e58667a73c4ae403ef8a94671f SHA512 98d42047ec54155f7d34928bce3050edd65259b552ea82b763f15391f0283f5229a9a513e5f31c441294c5a7f2f2c4e6f133ff031eccfeaaf7c1037665240be9 WHIRLPOOL 3b4c0b6888e450176483bb5371c5f023864390852b9cf0d6f12b356a8460189e5e6cb85399b378c4b6bda314ce690e9a7ede1f79c74d78f033d7caff3a2fc408
 DIST swi-prolog-6.6.5-gentoo-patchset-0.tar.gz 1595 SHA256 baf043ea3a145d8600ecb9c16722e8578b818b3018d50345e951084a26b018e9 SHA512 62f7a73af4d34b8a13378fb65302b01d2445b3e4f7198e293c4fd9b50948feaf632bd5de0af10aaf2cab9d5fcc214fe04d86e6e969e60b23d9bae4a277214041 WHIRLPOOL 95c6449b2248a0277af1cad70ebc16b46fd6b15d540822f1f9e5370760de94171bcdbb98df9915ce85e2ddda55eaf457eacb26b29f3ed4f61b1f69388454b0a5
 DIST swi-prolog-6.6.6-gentoo-patchset-0.tar.gz 1590 SHA256 2b240d15562603120e0314bb69bde50089326c11876b7a62106c05f9d48ace71 SHA512 807c7e897dd5b9eef14e063ea53c03047f3acb23174a70a613258adf7f85dc1f7637158fde70aab2e0f40de4bc6ac5e3548dd09dbe3745d916a388f43eb832eb WHIRLPOOL 0a0dbc361cfbe343c8b3562a2c0535905eb1443eea0783b14f96bda43c04e8db6264f476c07da766c6936dc6088e34059f799a3244717390644bf0f5ae83018e
-DIST swi-prolog-7.1.26-gentoo-patchset-0.tar.gz 1640 SHA256 5c7072fe31667c617225cfd40d3eae492a6e73299bb9d4cc1acebb95387ca440 SHA512 f025a6d02e2a65da9d0c30c8787fe0f2448eda24a1147442bb781afef1553ad1b530815dcdf2e1275c5291c3268d8336baa91cd595566e8055b4f487872d717c WHIRLPOOL a6cb4698ff6fd8d86dadd59862fac4a0863025c6041c056c07d762f72fefc334b1a08f376a8980193306ac33ad4021d5c0501fa74f26f50ab3655a8048e7ec74
-DIST swi-prolog-7.1.27-gentoo-patchset-0.tar.gz 2097 SHA256 097391453c430820014d312d21bc5cecb1d4d0a1e0502ef50e61dda4c62506e7 SHA512 23ed2c7638c4a59586956b770afce797d321268d7931b4af38b327742c402770c3b3ae4c09c2bb07f336531beb88db7fc6cef17298b1faba87fb2a968a335998 WHIRLPOOL da942a05e229f580ed7cabdf9e4f1517e26468c12701f62243fbe2ea57b4e3a47e9673e5b5a0412a398b536c61a11807c6b321c73e10e32106be21d1ffe2aad3
 DIST swi-prolog-7.1.28-gentoo-patchset-0.tar.gz 1643 SHA256 243867b59e10e7fa3bff7e7c40136fdb6ab0d53f1c9fd8a9b017addaf7c562a0 SHA512 c27a2b53d687e3beba03fe397a8b169b51ec9b67a0354091954620e08df2baa6ba0850c9acb7a4cdc4a47d55a33f28eea14d934e09e90c712805dc054e1376f4 WHIRLPOOL 1be7a288c90c1a2fbe39d5c95d3613246aba978ba37757bd1b503f3c5e066c3b046f42fb27433e060ae16efc376a0a0373d451ec12e72905781a9b8dea56d2da
+DIST swi-prolog-7.1.29-gentoo-patchset-0.tar.gz 1638 SHA256 6bbf9e2a46547034b4a26a74bd7c1383eecd3f8066d04f9688d037bc46223446 SHA512 854f2e447e04052b4e3d11aa6d0fdc72ded854f5888870391ac69e1b39896ee47f0a37c947582fb44198481cafd7ca8d61610ccbdbb2f86c90ee338f0eac01b6 WHIRLPOOL 8f5972460d20f802ba1289f994b2cd9efa0b9ee4ff1270c89f3f5a96e990109a37bc3f24fc865904b3cfc237b431ccd4351c0ffa6703b73d68f140f1dcde063e
 EBUILD swi-prolog-6.6.4.ebuild 2902 SHA256 9df591c63932dec2b0685219c390b0c2c0b19f3bf5873b665e16514e9210d72e SHA512 272a217baf21156871f859242ae94c53846b1beaea152e1eaeb34d65f62f01cc99ce60b1c59c855645197954fa2593f8302eba702423c6f885500a54839bf9da WHIRLPOOL bb824ac614fa9ea2dce825eee441de4975c8e9f114db0e342fefe50ed3cde446dedd92ca7f532b5eccfe599778358242f5078d550c47c26f0aa48982f06b651b
 EBUILD swi-prolog-6.6.5.ebuild 2906 SHA256 fecefea51c16786882b7ee765adc29c858e85e0b94c94c95e3b5140f5092fd0e SHA512 2303eb774dd0cfee6e60490bfa4c3df59930ec6b7bca9b026d204241b7c9d2c9e51dcc42dbb3cc0967058e1b93c616e9190f177678249dfdd41106163f587915 WHIRLPOOL 362ba4675479f0ff0025a24418019eba29c8943bfdb152211637b3fc0ee53b91dd1bcf87c8ea1f8766b11289e813a3cd20b89c1eab602c8883df98bf0acd5d91
 EBUILD swi-prolog-6.6.6.ebuild 2904 SHA256 ef6766be7934ed24325239714075514c5cacf1d4a911b5303eb15c42f127af1f SHA512 981569ad56cc08ded14965bc27313a5f1aeb4c189ca5685a43f6b8c08f096613b7643469791d4df80ce2b0dd114659f9bf45a751a5fc201dd43d8d5bfe7a99f5 WHIRLPOOL 2490e6bcc50f4f7c0c7d20c03986920a47bbf3906ac476188f258c784c4e1b6efd52f7b4f3c0caf3531343c173a27dde481e3afbe24a6a3908ad5cf4dd4f771f
-EBUILD swi-prolog-7.1.26.ebuild 3086 SHA256 1fe77a3f2f53059002a16f46aa6afca77f5235810e5fc5ea75a467ea9d02e35f SHA512 83bb790a7ff13a5558421574101e7a8511a402fc37f79dc27307ce827b93ec6462a086237a9cdc68b9dc75d51429f208e2df98ac08db4bdfc44deeadf206c14c WHIRLPOOL 732b7214906ec4a9b571d021128fac0026b33207c20a3641d7fee696bc156e4d1acfac488d9b3e1b1c7672925ede65865a2eeeb9b11043db044cc399d1facb1e
-EBUILD swi-prolog-7.1.27.ebuild 3086 SHA256 53dc09de9121d1d3e22a49e2fd4db61b743640796f6de05c45bd36a021e742c0 SHA512 c5244b3013528747fe5e78aa8f12a22e1d7a36bb0f889a0e94e2878900e4abea4a8cc004a913a066d8121bcc75ae6886c8acc1805b34ed2dfa03c5a2cfe6227a WHIRLPOOL 0efafc59d067edd877769b3e9935cba64d7b561d525b8774b9baba288d437ea9074f1563d6cae897c8651e922d5ba514d6453f98ee3eca209e65004991c70e5c
 EBUILD swi-prolog-7.1.28.ebuild 3086 SHA256 687e9ae7c1bd1ece810c9634b94bccca5c1e28e31c5c1a3dafe0c493a9324d8d SHA512 e49cf5aa5f8139f361ff5866ce698cda7687e16a9eab0ff3341591b0b01027e4300aef41b85d3b5e00f77411280e0c241802d2bebe5ecdf630c3c322c40be1be WHIRLPOOL 2bfc85fe11f03fe15aa74c0fd130d76906188e4c9564be9c1cbf83be6757fff19e2c4595e53d9068b5be95fec2a8b7e8071db08672e33d3aa5a26347271d4a6d
-MISC ChangeLog 67188 SHA256 701cd085db08d0482e3a9753ef137bec4a2b4c450e9cf017eec02305fc41f2ab SHA512 b6c40c861b8778efb0197dd92b887660e508248391f366a5656c6814cf9dd4c336b80c6ea4baaa28047fb7244efd607728d366eac46e86f53ffdf7fa75e4a640 WHIRLPOOL e889d16b84edb2abdc5b1fab6ec6042bafb22f113652b72ee2269ea85ca8a63ed69b69d811e2b34fce51809c1e266bd49631bb493f6cc55590a3d7f19e604ade
+EBUILD swi-prolog-7.1.29.ebuild 3086 SHA256 e31e58ff732a11cb95462ef017ea18e6a7699d7b71ce2c3a1621e74ece7bce19 SHA512 963041a586330b357cb0da34690b5661fddd168d09059c553eae133702ec0fc83fb2551059be4f2b9587bc052d0d4e45b51ac1b77fb280f45f4623710d7a6ffb WHIRLPOOL 6780f6342eb4aeac0fd98ee01dc75a4bd510a64591653e45e225f14b6e2738b594d3eb4448ef4cf32c1f5872a54ced13ad287b008afbe38ab40b27c546b1fdbe
+MISC ChangeLog 67439 SHA256 441200276f986e43205ff792056da382d4ddad3d1bf4f4f47fa847466ec6f556 SHA512 de6a29717cee1f52a7f329a79b218716eb8c7f6675c8f6aa7a818c5f219b274151e46b29cffaa4ca98b4429fcbea4828e8d55e01568beeca6971a7fbdedbc3f7 WHIRLPOOL bfd2fb4322bc6823326c370cbfd9e14f2ca40aa224133c2c6b8c01dd0aab74f1ba42687eab7b938d7bd1bc8788330546a309bd603d206c57df5a23a2afdc54f0
 MISC metadata.xml 236 SHA256 cfc0f56c64161129f17e853433bcc92a212ae64ffe70f627ae6e24fd8cc3520a SHA512 c542f8fdc8c524ba187f02788407dd31a87a37255166c6ef184409e1469288736420df4dd39f42bf57bf367532ba9607484a6228790f5e71c1ca7bfb56525194 WHIRLPOOL 472c63b815161c5e04903d12cc2b5f8d7edf56ebdbd5407581534f728b95dc063cdcf227579f75c7ff819d29bb2ba02ee3b79480f46d60aa4de17199163e1242
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSv1psACgkQrwS/tqE49e3nRgCfRudwCkOUCswRPy7KcjgvxFHU
-4okAn2VkUSELNxTrw/gyos24FSQoHY3y
-=zQIz
+iEYEAREIAAYFAlS/emIACgkQrwS/tqE49e0etQCfURoSNkcpvNK5bjXNZUpPFBen
+Lv0AoIKFydd51mHcZaQS2uq62CshyKqa
+=be4n
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/swi-prolog/swi-prolog-7.1.27.ebuild b/dev-lang/swi-prolog/swi-prolog-7.1.27.ebuild
deleted file mode 100644
index 33c7f409eaf9..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-7.1.27.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-7.1.27.ebuild,v 1.1 2014/12/18 14:31:57 keri Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/pl-${PV}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X"
-
-RDEPEND="sys-libs/ncurses
-	archive? ( app-arch/libarchive )
-	zlib? ( sys-libs/zlib )
-	odbc? ( dev-db/unixODBC )
-	readline? ( sys-libs/readline )
-	gmp? ( dev-libs/gmp )
-	ssl? ( dev-libs/openssl )
-	java? ( >=virtual/jdk-1.4 )
-	X? (
-		virtual/jpeg
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/pl-${PV}"
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	# OSX/Intel ld doesn't like an archive without table of contents
-	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use ppc && append-flags -mno-altivec
-	use hardened && append-flags -fno-unit-at-a-time
-	use debug && append-flags -DO_DEBUG
-
-	# ARCH is used in the configure script to figure out host and target
-	# specific stuff
-	export ARCH=${CHOST}
-
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
-	cd "${S}"/src || die
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp) \
-		$(use_enable readline) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--enable-custom-flags COFLAGS="${CFLAGS}"
-
-	if ! use minimal ; then
-		local jpltestconf
-		if use java && use test ; then
-			jpltestconf="--with-junit=$(java-config --classpath junit)"
-		fi
-
-		cd "${S}/packages" || die
-		econf \
-			--libdir="${EPREFIX}"/usr/$(get_libdir) \
-			$(use_with archive) \
-			$(use_with java jpl) \
-			${jpltestconf} \
-			$(use_with odbc) \
-			$(use_with ssl) \
-			$(use_with X xpce) \
-			$(use_with zlib) \
-			COFLAGS='"${CFLAGS}"'
-	fi
-}
-
-src_compile() {
-	cd "${S}"/src || die
-	emake
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_test() {
-	cd "${S}/src" || die
-	emake check
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake check
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	if ! use minimal ; then
-		emake -C packages DESTDIR="${D}" install
-		if use doc ; then
-			emake -C packages DESTDIR="${D}" html-install
-		fi
-		./packages/report-failed || die "Cannot report failed packages"
-	fi
-
-	dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.1.26.ebuild b/dev-lang/swi-prolog/swi-prolog-7.1.29.ebuild
similarity index 96%
rename from dev-lang/swi-prolog/swi-prolog-7.1.26.ebuild
rename to dev-lang/swi-prolog/swi-prolog-7.1.29.ebuild
index c5c079dc2614..76e53337cff8 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.1.26.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.1.29.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-7.1.26.ebuild,v 1.1 2014/11/09 14:55:05 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-7.1.29.ebuild,v 1.1 2015/01/21 10:07:48 keri Exp $
 
 EAPI=4
 
diff --git a/dev-libs/folks/ChangeLog b/dev-libs/folks/ChangeLog
index a667c10945be..d3dde64c6982 100644
--- a/dev-libs/folks/ChangeLog
+++ b/dev-libs/folks/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/folks
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/folks/ChangeLog,v 1.49 2014/12/19 13:34:59 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/folks/ChangeLog,v 1.50 2015/01/21 10:13:35 pacho Exp $
+
+*folks-0.10.1 (21 Jan 2015)
+
+  21 Jan 2015; Pacho Ramos <pacho@gentoo.org> +folks-0.10.1.ebuild,
+  -folks-0.9.7.1.ebuild:
+  Version bump, drop old
 
   19 Dec 2014; Pacho Ramos <pacho@gentoo.org> folks-0.10.0.ebuild:
   amd64 stable, bug 529964
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index bec67fca92c4..efedd432a9f7 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -2,15 +2,15 @@
 Hash: SHA256
 
 DIST folks-0.10.0.tar.xz 1868128 SHA256 66e76bb9d095b6c0ba41e37e791e11762c67fd36498511a65085d7a39b771cc2 SHA512 b5a812502a73b0f404fd5068e769f73dc4d7f5b17c34c655c4f042a764ea7438ee2406f05b113a1cf61a3613734ea7f766fccce490639ee58911662a119b7342 WHIRLPOOL 573d2f3eb320da953cd51e36e3db75ab57988ee12e3ca97bf8f0f3cf298ff3065299824b6c3c6ea87b387eaa86ef2e11baa9465798b7652c0d57721781b7fbbb
-DIST folks-0.9.7.1.tar.xz 1860208 SHA256 8d53cf9f6ccb7d9499a352c7367170b103b14a7d59da0bd06dda8c57b689276a SHA512 26926d7eb284322618ac6fd654bc5e0f600b7e6ee5feaf9e7f5216f33eac9dd0a58549a0fd9715a273c5feafd6f5f83e21aa4a60595a252aa6a872a07e38e9cd WHIRLPOOL 216ab08a4053eee22cd52612d4c37751f1bfc533940ae86fb354c4ca08e42dea3ec200871d1cae7d26fb153999f90afba7c80820a4c811b13db94b3b26e8ca28
+DIST folks-0.10.1.tar.xz 1879032 SHA256 0d53a6197a5734cc03477d8fa83c1d9ee510f3dc0c6f3aa7b8bb734d6027caa9 SHA512 12ef1ea9220a3a0936c4846e5d7b756a0d6edc3c4ae66e419d8483df71eb83d639e4b9d8068c527546fdb3d9c2a51b300bb940acf35c1f123e9d7369a130109b WHIRLPOOL 412d657027de277c32eb2f389cf1e134448b5504f908a852b9a3a879f9d6abaec559b4aec2bc69056542ca66a473aed20c42b7b6fea4274dd82394abae3469c0
 EBUILD folks-0.10.0.ebuild 2609 SHA256 713f7e0f21922b38abda11a116a84ac0a314a1507c36109ceb54ce52e82aa80d SHA512 2b165d8672752fdc797c32ba04bc8c69eb7d06047e5c3c96dfc9b14c1540f7aabd973df01865c7db2143c451a025e0f53e28b3a616f062b86ddbf652480f1925 WHIRLPOOL 26109290b5136e4612c712a7799a6e83047af238ce8bf16d04abf9f73d4001f3223b1c8d240d82587e08849e6d93d8e853e44ac475b9a040f51810ca9ad39f7d
-EBUILD folks-0.9.7.1.ebuild 2726 SHA256 2588f8ba6942eb39b5b9d5d15d333510058e932ff228042dd7776aafda5d3922 SHA512 2687afe34920baef9d53ffb0d93cdbf5070e10f55460cb9495b5736890d81b436381fc24e1f14d5e42ee17d2fbee9e1c6fb56af04e509507a3c2747dfff1b666 WHIRLPOOL b87e082c6ff591726095fa80735f493b320a4f8d407e738ac0dd944517684b6784cf9698608927115c758ec2f3759b9928ab6dc3d8dba66cc79bf05420ded728
-MISC ChangeLog 7134 SHA256 95ca8938244391a8ed9ec52cee9e1207304d48b46eca82e0cf6d09f42244707f SHA512 30fed798a98befb72fe53c8d2cb18f714a7c4b82eb45985e5a380b1f27a1b255dcc9b94e4c70c2ce17ee57b44d883af63b5e27118da2b827c3486dc94d217bef WHIRLPOOL 041d38e14854a88f5eda96fee326f868f7aaf9efd6440fe21c83e5df00aaead05078ada2502e68aba52953d915b5f3e472773a1c09e508bf1f68c2133108177e
+EBUILD folks-0.10.1.ebuild 2634 SHA256 09161c7ed2411fffde4b4ceadf8c47487bbbabb2d60f0642ca23b630f5db04da SHA512 754f888a46aac634ad85ada4d8144db0701184b7f30b47e9f402939182a3dd405b9e89427e417f359e8a5f6187a929f2d24fb3c8d58bbe5efaadc8b23c6c48bc WHIRLPOOL 387ea8dd8e76c3ac320393cae3612a7c4174f70b8ccbbc685f44f8c8a7433c9d1540ca57c85b24e4d0625cf0c6c99e99761b6384a34ae025c9e9815996d4aaa9
+MISC ChangeLog 7282 SHA256 46c072cd59f931d271eeb5d75245316302ab393da2af505bc1bdbb4e05741c98 SHA512 55b4b813c37a5b05e1ac5a88fddcc0b445a0fcb5df287ce9e6681566014b6afaeed846a65562467bc5047b56e1b4e5b5155f4f6e70fd95ff033875db8ab0d308 WHIRLPOOL e26bea454be754a2e09e76a2d2245f058740bdca05a13c0058392d5ea6ec58bf33c93d4be20f2ed2db57f5a979cbe64f2cb1360320eb0ac4302cf3defb1bee73
 MISC metadata.xml 561 SHA256 c39078a098dc01eb77baa80485700f14a684a9379f256efa7143f79144b189bc SHA512 a2b01fd5035b0f290b1e066d2b1577ebcd604f1cdb318958c5684ca38ea5ad73b0384141b7ed7ff9ed86779b26a1d9d09365586cc21166a03e5c5406ecdc8d89 WHIRLPOOL 8e1eebfa1ed4e915886bd472203f48ab78f2f7d6eab9ee6ce29cb0f8f600013699beb38970eab2f64b8660b8005c2c48b81d00592c73ab1c81e550c6bf2f899a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSUKYQACgkQCaWpQKGI+9SVNgCfbOxcfttR/ueQArqNsKMyYIrK
-zmsAnjlTiIvt0C/XB0wBowz4xFUAx36W
-=Yof2
+iEYEAREIAAYFAlS/e9AACgkQCaWpQKGI+9QYBgCeJt8FRuI6LbiFyOWNQBTra9Lh
+GggAnidRezy1r70zxpJGbOJZOuTcoDtC
+=gvqc
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/folks/folks-0.9.7.1.ebuild b/dev-libs/folks/folks-0.10.1.ebuild
similarity index 86%
rename from dev-libs/folks/folks-0.9.7.1.ebuild
rename to dev-libs/folks/folks-0.10.1.ebuild
index 22acf24d4dcc..b6f9b3e7b9ac 100644
--- a/dev-libs/folks/folks-0.9.7.1.ebuild
+++ b/dev-libs/folks/folks-0.10.1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/folks/folks-0.9.7.1.ebuild,v 1.3 2014/07/23 15:14:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/folks/folks-0.10.1.ebuild,v 1.1 2015/01/21 10:13:35 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 VALA_MIN_API_VERSION="0.22"
 VALA_USE_DEPEND="vapigen"
 
@@ -14,7 +15,8 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Folks"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/25" # subslot = libfolks soname version
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+
 # TODO: --enable-profiling
 # Vala isn't really optional, https://bugzilla.gnome.org/show_bug.cgi?id=701099
 IUSE="bluetooth eds socialweb +telepathy test tracker utils zeitgeist"
@@ -56,15 +58,11 @@ DEPEND="${COMMON_DEPEND}
 	test? ( sys-apps/dbus
 		bluetooth? (
 			>=gnome-extra/evolution-data-server-3.9.1
-			>=dev-libs/glib-2.39.2 ) )
+			>=dev-libs/glib-2.39.2:2 ) )
 	!<dev-lang/vala-0.22.1:0.22
 "
 
 src_prepare() {
-	# Allow building against tracker-1.0
-	sed -e 's/\(TRACKER_SPARQL_MAJOR\)=0.16/\1=1.0/' \
-		-i configure{.ac,} || die
-
 	vala_src_prepare
 	gnome2_src_prepare
 }
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 0636c14ef17a..f796cbd103cf 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.635 2015/01/02 12:08:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.636 2015/01/21 09:44:49 pacho Exp $
+
+  21 Jan 2015; Pacho Ramos <pacho@gentoo.org> -files/glib-2.12.12-fbsd.patch,
+  -files/glib-2.36.4-znodelete.patch,
+  -files/glib-2.37.x-external-gdbus-codegen.patch,
+  -files/glib-2.38.2-configure.patch, -files/glib-2.38.2-sigaction.patch,
+  -glib-2.38.2-r1.ebuild, -glib-2.40.0-r1.ebuild, glib-2.42.1.ebuild:
+  Ensure dconf is present (#498436, #498474#c6), drop old
 
   02 Jan 2015; Agostino Sarubbo <ago@gentoo.org> glib-2.40.2.ebuild:
   Stable for alpha, wrt bug #529964
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 8c8aa51b769e..f69ffe85c82d 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -6,41 +6,22 @@ AUX glib-1.2.10-automake.patch 827 SHA256 db6d22caf4054c09467b50b6d85566eec7479a
 AUX glib-1.2.10-configure-LANG.patch 1464 SHA256 32377819896297caf9628f382c7bba09ee0a049bd977e9ea927314c0c2e669b4 SHA512 a83e3d51775ee696dd4f862eef9d973e62bb157562c4ba5d6e25708f4140af35e4473b92e61541c0efea175223b64575fd23e08f666980ad8063ba1acb19b002 WHIRLPOOL a46a8f5e3574feeba640262823705584da98f3bfbb4699378a746d66290edf65804add1f59ec244c04d78492dcb2b4a7a9981ab9633ec0b3b373fd105b5175f6
 AUX glib-1.2.10-gcc34-fix.patch 2008 SHA256 848620bc200c2a42d726744fe6c36e20a396624e82b0c742b726dd72287e6cdd SHA512 2f8bec2a10828c57da507d73a308ffec6b1069cdd7704e3128aeabe9f031952c71c900062de782bd464bec101bbf925586f88336bb0f8ac05dda00b1a269158a WHIRLPOOL 602ce9ff26da42417be8f8c03e2cad33e31a3a8fea0b1392fb95253fb7c3f8424b28a2c910cd532b1932a37c9b334d0150d273c43d1389bd7107c897b3923c9a
 AUX glib-1.2.10-m4.patch 225 SHA256 c470b3ecc3b8fd6a2d52df816a1c4ccb3ad2d6048e37894f415c8ea9c7925b68 SHA512 b754a680cff0fdbaade899152e597cfc4351cbbf6adf931a5f4f856823e1e6e68b54aa5f318f33476d497a8ae39b0d2dbb2a32792aec1727d196a014315cac12 WHIRLPOOL fbd2fd7b06a7fd0617f1b0ea4746d59a68977a9133e7eb37a64fad5f825e58b64a42c920f2435b61deeb075fe6e5401a361b30d3cdd175007f5ab5f2453b182b
-AUX glib-2.12.12-fbsd.patch 850 SHA256 1af80d3f26d44715bdbf597e5d37f6547dd1adb993852c12db614b579b02f001 SHA512 43a78da1ffbae15d920f58b0c5e987bf8e563f13b6e50668d3b2146472b3ec64938f36daeca88f08edf197134976d1ea328502337fa25e0a1d8a8dc52732d6ad WHIRLPOOL c3936bb66de72ef4efbcaffb42f9a9458b03a01e588398b90f5c3fb338e8376e0092a8068302c84370e3ba3fc7d38bb7af6d056d6b6ae4767b433dc32f2bf16e
 AUX glib-2.34.0-testsuite-skip-thread4.patch 1296 SHA256 91cc22f43c04599826e9e15efffb3a668f73208391b047f321c993e27c3a9dd9 SHA512 e7e12c40d3da03c3420c1d0e161d5583e30a3185300a660408ddf78ffe0bbf2d812eb9180b6e7e013370a880d5f5e020cbdf45bebaa8fa8d74f6f4af8822c5aa WHIRLPOOL 876a1740f520d0e9f4cc26b55a20e6f6b0d979de801edeb8262b53a68130e35c0a968081658ea89ae47e4a9a7e273ee6ef2c74dfe011e103c69cfb9bfc4d6c0f
-AUX glib-2.36.4-znodelete.patch 2199 SHA256 4195ca98519b842520d9b11d7cd01f1f6f6ed1843735e2fb50c217fc6c33fe43 SHA512 77284716ff8f4f7482765cc5724e325169fd49b205e19cad19e755a4cceeb57037bdd78fcde6265586770b95fd9481afc69d797a4a521401a2704f4eab644d47 WHIRLPOOL 9941b5aa7f1fdb1fa6cdf39f4f94a52bfd6093f55f31a6466ecc0996eaa22901ac26cff42fdd64af9dac13004fe47d054991cc27e6450ab4b6810e0f421157f4
-AUX glib-2.37.x-external-gdbus-codegen.patch 4573 SHA256 7094ff73cef6add5bf1727f2d01f6f45ac6ae82d725a47b83d0280064d006ee2 SHA512 dc8e0460c549a5d65cc9ba575d0f1eb2bd7a487d382970922e454ceb4efe46a096da82abfe5ba50bf37f56e1c24570ed391a5474f22f9f97d678baad003893ed WHIRLPOOL 86f0da69db6c0c9c8f22869155ce679c75db755c78bd7add7401e7e73c454fd9704dcb0a050b67d99a4bbbb161c26325ff120ef0bb7d76341ebc528015169b20
-AUX glib-2.38.2-configure.patch 985 SHA256 4a3d9bf2b84f966ad2792ed7a356cf9e4f23e95efbe950bd6d5df544d45fff97 SHA512 ebdcc5775b4ada3f464a791ac0bffe0cd7a4441c9f21af327c9a99638157bbb8d72bb01aa70190c4e757481c5832763a0b569b7de6f452b4a2d05ea5b4a3e63d WHIRLPOOL 99d02f68ad97dbeb9de6dfdef5a76b19b94da9ff66ace3657bd772fdc181067c19225926ff5bd0bc7006a4abc5b4ed3a5523769fb8e488bed74b1cacbeab9448
-AUX glib-2.38.2-sigaction.patch 707 SHA256 72476721ee93a0587a89b48f35944d8b1e317bc240ef79363f82ad7ed71c2e55 SHA512 f97c30585c06a6a4d937ee8f27574d60580893e29372a282d1310f6702a7b003233c64e2d56d2ae91af53eee6465d9acb68b76027ec9428f1615bd7c25af45db WHIRLPOOL 5a478f80558bca17508e6d2b342e2204bb419818c7382f17e2c01ba6e0addc9190fc12a7817c728e35b3f7c304575551d43a529b0aa3e2fa2432b823d69f6467
 AUX glib-2.40.0-external-gdbus-codegen.patch 3901 SHA256 d06d2775c3632212c11eceb715f0da6a3b1ab6d8d901bb2fcb7c1fc3ca6b004a SHA512 2f960a53cf51f809af6788664e2cd6d67a29eb58dfe34156f665e2d5ae1fd53a3c792714672fc82dcbfae38e1c793a3eef07116484511ef21d96536559339b00 WHIRLPOOL 39dc4d38e6a3450cbba3a1843096da330b6b2bc8954b9cce4a890454e5546d3e6440ddd237772407bd4ffec05b78eb6ddddb5c4cb6c86a86e01a5ad4c96fe8b0
 DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 SHA256 3bb8c45706f97b526da851061c89618bc258fa61f9100802c1340548e4bb2731 SHA512 e65c7f66254eae22deaa67bf621ebd1d7af897b93d93ba6cffaa4ce9894cf14c140e6888d877b6b36fcea8be1b8d1ef4fcc7ec1719bd23b1cc6fd662876c70ae WHIRLPOOL 20254678a86595353058ee8dc81a02e4ae7bb16ba9ba34e036fe2e99d3fffa25c825f8961bdeb5fa50c49582ce37e65684e414631c74653c4523c2baee34c341
 DIST glib-1.2.10.tar.gz 421480 SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f SHA512 4452b741382194d4ca425f084fa60e1a9e30040ac2e839c9136047d0461cf4b1ebcc16aac4e65998d1b9329ead8f617966b3d09317a83634f14d556a7e14b7a8 WHIRLPOOL 478957ce8e49228d022bae50b042cdfc6d522d0d4880a0328b5695471295450c81c5e186e1760e56e317a4c4c95aabc5f2010d7a9b912fc451d04e14610e7dca
-DIST glib-2.38.2.tar.xz 6718296 SHA256 056a9854c0966a0945e16146b3345b7a82562a5ba4d5516fd10398732aea5734 SHA512 f31531060d898dbe05e71ffc4d057f5a703106674e68c28ad2346d227304ef9454736beaf653f27553ed5397caac8baf3d76d3b31b062898762e5cf4e24ff0e0 WHIRLPOOL 4b126073d673f1cda9af4b1bfa0b6621e2cb883dfffe911d264bfc4c317a063579fc764ef94f7fe22b64a6fc8f0ed5f16de1015f1aa265dcaa85ec0d7392fa7b
-DIST glib-2.40.0.tar.xz 7016228 SHA256 0d27f195966ecb1995dcce0754129fd66ebe820c7cd29200d264b02af1aa28b5 SHA512 346a32f2d1447d3398ac2400047f0556517b914788cf9c8c9f28de5f395ef3993231f9a58fc103e08013fa2e7136a097de46aabdf4c035a46f883ca3971408a4 WHIRLPOOL d3e7ccfa3ac4270ccc5f950771238addabcbf025ebaf85a1586c7757493c6cdc3dc447f6ab92af1ed87f1c68c79d7b1bb6417b1894f8c0304fd87e04b1eb9b3b
 DIST glib-2.40.2.tar.xz 7001344 SHA256 e8ff8af2950897e805408480c454c415d1eade4e670ec5fb507f5e5853726c7a SHA512 6d4c254a033a2e558574fb1aa95f6f3215a24d49d69cdb353f0186cac186eb1301563ab271ac86d82734dd1586d88fdd9d53f1c0e2b43f103aae53223884c153 WHIRLPOOL 2b5bfb3647cd802264716cc69ea0e7e26385b9b0db0610ea7078ba99a0a90dadc9197c49fa122cc8082a8edb166ad8f2d6be76e5b7491e786c74ce4aac91d472
 DIST glib-2.42.1.tar.xz 6985120 SHA256 8f3f0865280e45b8ce840e176ef83bcfd511148918cc8d39df2ee89b67dcf89a SHA512 0d273e3e24f164f16f6663f88866ae412714eab7d15c1901fdef61f13649a08f9962e49f9d52e8a1683100f9c2dcc468b9a5bf8a9b3d6ca7b0d9488bc58f3f1e WHIRLPOOL 5cf0dbce9890a61210f0c1c0b43a6147bfff107ee8d37de959fc533b56fa9e253d74996ed3ad05b2d756aecf65c1bd8cb1faaaa50096304df2b2f09d05b28804
 DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
 EBUILD glib-1.2.10-r5.ebuild 1802 SHA256 b8561be2cdbe967604c39b6316bee46016e62131e9858d26fb26d8f1699c2029 SHA512 d2c84ba968f81bc851f53fbf1bad01f62de58f16dc49565e341bf7e9396b5f8870501de2027d5b49c5dcd2a8416dca6f530a34491c63ccb26ab94aeafea442ba WHIRLPOOL 1fd9b784429c287fa5dbb4e20db42dd9e1f67cc03ac60c7d47fb751878ed827f2791a2bd6622d84773a4a4607c190a671cef6a6d9b7a61943bf12b7b0e1d6b45
-EBUILD glib-2.38.2-r1.ebuild 10136 SHA256 e276186ee74001eb75dd8b300a04395446034279ea30f81d4a9c3c60a3938b1d SHA512 30edcf3a44987b941451b0f0e24bb3d08aa2a233315a4bb02135c109aa334c9db8420a0739bc92aeecbe8d90478caff24deea3d30ceb661189dad6f20406afbc WHIRLPOOL 44f83bb6b1581a64c4037528c3c26e86661efbd07843ca887174c70de76c3a0ffc9ad5091a5604a30df86000da09808ce80bfbfa8c420c17cfe5fdd2e41f413a
-EBUILD glib-2.40.0-r1.ebuild 10046 SHA256 dffa65f057a95a6fabf9330e7ae025fd4b0d84b2e6b889547c9d7370b9d030fd SHA512 74d9ee1e22b2dad5442f143c91e2310f20dcb0d0e1e20571331e9b63287de64b64ceb7b47aaeaa7e8ad98059ed93187b56ee67f893ff40af5ec193483d3bdc94 WHIRLPOOL 1f8656d4ab290a4b40c892ddd17bfd4f36e9e6de0d1fc6d6d6c04c69f38f92db2395ef6cf1ef66ddcfaceeddcfa2419f661cd04786afdac1b39cc76ce15d5bba
 EBUILD glib-2.40.2.ebuild 9623 SHA256 481a4b75daadc594a1dba58f77c8f8e80768f625689b900a42306f3b1278395f SHA512 b9f66e3f5fddb5a8100686354bf8e4e19c89219ccb442fcddae330a900a0c619cd0dd1f6f7ce429fbce3624583495b1e2487f68e71818e57a56d91f428bb8bcc WHIRLPOOL bab325a28046a288a6218d14e341c0918497f615659d08ca48bad22467fd1ba8025f526ca69a87a89622d7ea7f09fed0f03f1982390213a452a34e4e2b2505c9
-EBUILD glib-2.42.1.ebuild 9586 SHA256 7755e45404e62a40ffd8baa73acca26d791d3f9504b3539c4a8c2867ef0276e9 SHA512 84704160193d3302bf9d40a85dfae731865664d2563c0118756aa1d60f2b70830e3230e4067df2ff77ca3a32acf1e25fcc744773231a45406d6e365d7c51698e WHIRLPOOL 5bc2b06a633e77296bc537b349331a67c92b660d1919c49689233b3aa8ed8e7508fb3f13d732d01c8f6d7ebced45012273cc79384515be517ca8dcfb9ec3c999
-MISC ChangeLog 88941 SHA256 c2352a11d5222002cacfebf03bf623358a202ddbe8d2c64b6ff24b9f261e066b SHA512 469fb4030a2cc29b3cf3698bfe88ad444cd6ec25dedc6f7de56250eba2e2f370224d60740bc9e051fe9a1e89d32168867e5805253c69d4669fb319e0162a93f4 WHIRLPOOL 2e26d4990869baa3a1a3dc01345c258ac0a8812701b63d7d1a27d93a661434e7146bea3aff30d09c841a23474b3f535879530519ae722cb007789f54f3922c48
+EBUILD glib-2.42.1.ebuild 9424 SHA256 7cf0421af9e1e197ce3509183b7a9400779fc45638ac5fd78f02e19a7260e841 SHA512 2f208a0de1d97ef3051eb4d7d508338fc830bc056b08d6b6b01a7466785fc1a4efe2842a2d06517d48271d0a1af5acdca0fc9153bce68f9724fc5705c868cd89 WHIRLPOOL fe69fa42319d1f6574a9cb13bf171b1d419e4a6b4aec6364fdfb97ba1b2fb7326cac646a84f81d8928f182e91e8fb71dbbe5d0a3e740131e686e3729731903b6
+MISC ChangeLog 89313 SHA256 b40ef341a26c8ab795fce6d9df6c9f35a8092dbc8a93a6ed83e7a103a8685d97 SHA512 9e75979beba6dfe1871c15a3fd9f4491402dca854e59d870854fc69a550061f9843aa7a27dfa1ac159872a4e7e26982d7e44c894b53b2604ee3bc29781e75c22 WHIRLPOOL 5b99c387e999b894bdb89e5c1087a3d31abadf04d3f47e79830d836cab29301f9e6a0513069d5ba6eb220cc0f8965e5c90121dbb7c2de9d6ef8afca5f473a3f7
 MISC metadata.xml 692 SHA256 d46beb748667144ea36ba0b32f8f7c27ca0e10faec80809852cb81fb3b798e5f SHA512 db21e2d66d280757c98065433ebb66720db113ee70807c1e69c21b782dc8c9832981098ffedd962839089f174c8b0545de717d5cd2969b8e7ae4640a382a3de1 WHIRLPOOL 7fc05ab8e50cfe9904f3f97123a16fa7e6f051d45e7c6c2616b0254529864cb7b029a329bda8102bf01bfeef287215f6536caca9090e22e7b0c7c59af8994951
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUpopTAAoJELp701BxlEWfCO0P/idLVoHUEjHXmL+FgcpaXlXu
-14+Yuxp/GmBTkeJB4EVbaLoHe7OdgXKukbaI9tqcafpPUUVQa+boAwS2Dy6ZRA/y
-NNmhofeWdWj0CZM6TDBqrFyWI+CMLQ72eviUxyYlBfINFR83TLdVKn7Do81x9d6/
-26a6CSDuGbU4B45tgnE6O0TZBxCCa4vRV2AiKitRBpCPp/Sw9ZxsdsUssYtqspjc
-tXzNCn5D1fwsXzKAr4VLK0ogfm1V2XwfMWbVw0BxhIU6zIG/TH7UKTwMjL+0QWFl
-40tzSvoK3mg2YNQi4UMiF4OPfwdoXa3yEZOoQ4Y9OHuDhNqHLzltdafj13AgbidP
-Yw7tNuEUY+tdw89t86u145RIfJ+DUNZXNhvr7E5vOCGwVvf8cCA/sqC29kQze3hO
-1z5z1Phze1uJwbbwm1y9RztZ3ALrG3uD9+0/2+bQINQfz2T8F1L6SdaBZkAOEQhA
-PCmX9upJFaaI6JyDLmCkeVaFG/Jgdonm1zGaygYmo9coh+G8HuqX3G23fguZY8A0
-Lr+GSqkG15CFPRRo+xrz1kPgQbgJNB+2FaGiHiWL2dm5Ew7xcE+LjqIKV+3c4/PS
-I2fNj6e47LmSgL4elmvjhHtGHEb4x8z341kNSXQlTjphY94WBkzoVhI/+Ksiy1LV
-pKd9jPzGKph89hvTvfBS
-=fNs3
+iEYEAREIAAYFAlS/dRIACgkQCaWpQKGI+9RH3gCfWdYO8Q0nnd2lhVpuF8AuBEXy
+W0IAn2QUaCrT8NhJ2lMRBwi0Owh/B+1X
+=KeXM
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/files/glib-2.12.12-fbsd.patch b/dev-libs/glib/files/glib-2.12.12-fbsd.patch
deleted file mode 100644
index 5aca6950a256..000000000000
--- a/dev-libs/glib/files/glib-2.12.12-fbsd.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From deeb71226d4ab465d48805d899ec88eb836a6966 Mon Sep 17 00:00:00 2001
-From: Daniel Gryniewicz <dang@gentoo.org>
-Date: Sun, 24 Nov 2013 19:46:13 +0100
-Subject: [PATCH 1/4] Fix gmodule issue on FreeBSD
-
-Gentoo bug #184301, Gnome bug #107626.
----
- gmodule/gmodule-dl.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/gmodule/gmodule-dl.c b/gmodule/gmodule-dl.c
-index a606f17..57fc41b 100644
---- a/gmodule/gmodule-dl.c
-+++ b/gmodule/gmodule-dl.c
-@@ -107,6 +107,7 @@ _g_module_open (const gchar *file_name,
- static gpointer
- _g_module_self (void)
- {
-+#ifndef __FreeBSD__
-   gpointer handle;
-   
-   /* to query symbols from the program itself, special link options
-@@ -122,6 +123,9 @@ _g_module_self (void)
-     g_module_set_error (fetch_dlerror (TRUE));
-   
-   return handle;
-+#else
-+  return RTLD_DEFAULT;
-+#endif
- }
- 
- static void
--- 
-1.8.3.2
-
diff --git a/dev-libs/glib/files/glib-2.36.4-znodelete.patch b/dev-libs/glib/files/glib-2.36.4-znodelete.patch
deleted file mode 100644
index b936fbd8de81..000000000000
--- a/dev-libs/glib/files/glib-2.36.4-znodelete.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 196ea5ab614e5357da48acf73a373f103e61ee0b Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 2 Sep 2013 13:59:18 -0400
-Subject: [PATCH 4/4] gobject: try to link with -Wl,-z,nodelete
-
-Since the type system does not support reloading its data and assumes
-that libgobject remains loaded for the lifetime of the process, we
-should link libgobject with a flag indicating that it can't be unloaded.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=707298
----
- configure.ac        | 24 ++++++++++++++++++++++++
- gobject/Makefile.am |  1 +
- 2 files changed, 25 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 907c534..266c45d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3669,6 +3669,30 @@ fi
- AC_SUBST(GLIB_LINK_FLAGS)
- 
- dnl
-+dnl Check for -z,nodelete linker flag: the type system assumes that
-+dnl libgobject stays loaded for the lifetime of the process
-+dnl
-+
-+AC_ARG_ENABLE([znodelete],
-+              [AS_HELP_STRING([--disable-znodelete],
-+                              [avoid linking with -z,nodelete])],,
-+              [SAVED_LDFLAGS="${LDFLAGS}"
-+               AC_MSG_CHECKING([for -z,nodelete linker flag])
-+               LDFLAGS=-Wl,-z,nodelete
-+               AC_TRY_LINK([], [int main (void) { return 0; }],
-+                           AC_MSG_RESULT(yes)
-+                           enable_znodelete=yes,
-+                           AC_MSG_RESULT(no)
-+                           enable_znodelete=no)
-+               LDFLAGS="${SAVED_LDFLAGS}"])
-+
-+if test "x${enable_znodelete}" = "xyes"; then
-+  GOBJECT_LINK_FLAGS=-Wl,-z,nodelete
-+fi
-+
-+AC_SUBST(GOBJECT_LINK_FLAGS)
-+
-+dnl
- dnl Check for -fvisibility=hidden to determine if we can do GNU-style
- dnl visibility attributes for symbol export control
- dnl
-diff --git a/gobject/Makefile.am b/gobject/Makefile.am
-index 1509616..181ad7d 100644
---- a/gobject/Makefile.am
-+++ b/gobject/Makefile.am
-@@ -45,6 +45,7 @@ endif
- 
- libgobjectincludedir = $(includedir)/glib-2.0/gobject
- libgobject_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
-+  $(GOBJECT_LINK_FLAGS) \
-   $(gobject_win32_res_ldflag) \
-   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-   -export-dynamic $(no_undefined)
--- 
-1.8.3.2
-
diff --git a/dev-libs/glib/files/glib-2.37.x-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.37.x-external-gdbus-codegen.patch
deleted file mode 100644
index f87c146570a9..000000000000
--- a/dev-libs/glib/files/glib-2.37.x-external-gdbus-codegen.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 81f037771e2992834961cb5db08aece53a02b8ae Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Thu, 28 Feb 2013 08:28:01 +0200
-Subject: [PATCH 3/4] Split out gdbus codegen
-
----
- configure.ac                                       | 17 ++++++++---------
- docs/reference/gio/Makefile.am                     |  3 +--
- gio/Makefile.am                                    |  2 +-
- gio/tests/Makefile.am                              |  6 ++----
- gio/tests/gdbus-object-manager-example/Makefile.am |  6 ++----
- 5 files changed, 14 insertions(+), 20 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 797cb92..907c534 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -378,14 +378,14 @@ AC_SUBST(PERL_PATH)
- # option to specify python interpreter to use; this just sets $PYTHON, so that
- # we will fallback to reading $PYTHON if --with-python is not given, and
- # python.m4 will get the expected input
--AC_ARG_WITH(python,
--            AS_HELP_STRING([--with-python=PATH],
--                           [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]),
--            [PYTHON="$withval"], [])
--if test x"$PYTHON" = xyes; then
--  AC_MSG_ERROR([--with-python option requires a path or program argument])
--fi
--AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
-+# AC_ARG_WITH(python,
-+#             AS_HELP_STRING([--with-python=PATH],
-+#                            [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]),
-+#             [PYTHON="$withval"], [])
-+# if test x"$PYTHON" = xyes; then
-+#   AC_MSG_ERROR([--with-python option requires a path or program argument])
-+# fi
-+# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
- 
- 
- dnl ***********************
-@@ -3784,7 +3784,6 @@ gobject/glib-mkenums
- gobject/tests/Makefile
- gthread/Makefile
- gio/Makefile
--gio/gdbus-2.0/codegen/Makefile
- gio/gdbus-2.0/codegen/config.py
- gio/gnetworking.h
- gio/xdgmime/Makefile
-diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
-index 112626b..8ddcdbc 100644
---- a/docs/reference/gio/Makefile.am
-+++ b/docs/reference/gio/Makefile.am
-@@ -151,8 +151,7 @@ man_MANS +=			\
- 	glib-compile-resources.1	\
- 	gsettings.1		\
- 	gresource.1		\
--	gdbus.1			\
--	gdbus-codegen.1
-+	gdbus.1
- 
- XSLTPROC_FLAGS = \
-         --nonet \
-diff --git a/gio/Makefile.am b/gio/Makefile.am
-index 717419f..808b5dd 100644
---- a/gio/Makefile.am
-+++ b/gio/Makefile.am
-@@ -1,6 +1,6 @@
- include $(top_srcdir)/glib.mk
- 
--SUBDIRS = gdbus-2.0/codegen
-+SUBDIRS =
- 
- if OS_UNIX
- SUBDIRS += xdgmime
-diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index 7224124..5c8baaa 100644
---- a/gio/tests/Makefile.am
-+++ b/gio/tests/Makefile.am
-@@ -359,10 +359,8 @@ gmenumodel_SOURCES                       = $(gdbus_sessionbus_sources) gmenumode
- nodist_gdbus_test_codegen_SOURCES        = gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
- 
- gdbus-test-codegen.o: gdbus-test-codegen-generated.h
--gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
--	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
--		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
--		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c: test-codegen.xml Makefile
-+	$(AM_V_GEN) gdbus-codegen \
- 		--interface-prefix org.project. \
- 		--generate-c-code gdbus-test-codegen-generated \
- 		--c-generate-object-manager \
-diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
-index d6d1412..62ef706 100644
---- a/gio/tests/gdbus-object-manager-example/Makefile.am
-+++ b/gio/tests/gdbus-object-manager-example/Makefile.am
-@@ -11,10 +11,8 @@ GDBUS_GENERATED = \
- 	gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml	\
- 	$(NULL)
- 
--$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
--	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
--		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
--		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile
-+	$(AM_V_GEN) gdbus-codegen \
- 		--interface-prefix org.gtk.GDBus.Example.ObjectManager. \
- 		--c-namespace Example \
- 		--c-generate-object-manager \
--- 
-1.8.3.2
-
diff --git a/dev-libs/glib/files/glib-2.38.2-configure.patch b/dev-libs/glib/files/glib-2.38.2-configure.patch
deleted file mode 100644
index 8f08ca0fafe3..000000000000
--- a/dev-libs/glib/files/glib-2.38.2-configure.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 838b49ead77c35d94fa16d48a6d7271bab082a71 Mon Sep 17 00:00:00 2001
-From: Patrick Welche <prlw1@cam.ac.uk>
-Date: Thu, 07 Nov 2013 10:58:46 +0000
-Subject: configure: test(1) uses = to test for string equality
-
-https://bugzilla.gnome.org/show_bug.cgi?id=711600
----
-(limited to 'm4macros/glibtests.m4')
-
-diff --git a/m4macros/glibtests.m4 b/m4macros/glibtests.m4
-index 27e9024..7d5920a 100644
---- a/m4macros/glibtests.m4
-+++ b/m4macros/glibtests.m4
-@@ -21,7 +21,7 @@ AC_DEFUN([GLIB_TESTS],
-                   *) AC_MSG_ERROR([bad value ${enableval} for --enable-always-build-tests]) ;;
-                  esac])
-   AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS], test "$ENABLE_ALWAYS_BUILD_TESTS" = "1")
--  if test "$ENABLE_INSTALLED_TESTS" == "1"; then
-+  if test "$ENABLE_INSTALLED_TESTS" = "1"; then
-     AC_SUBST(installed_test_metadir, [${datadir}/installed-tests/]AC_PACKAGE_NAME)
-     AC_SUBST(installed_testdir, [${libexecdir}/installed-tests/]AC_PACKAGE_NAME)
-   fi
---
-cgit v0.9.2
diff --git a/dev-libs/glib/files/glib-2.38.2-sigaction.patch b/dev-libs/glib/files/glib-2.38.2-sigaction.patch
deleted file mode 100644
index f87e224ce799..000000000000
--- a/dev-libs/glib/files/glib-2.38.2-sigaction.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 81d0ebe29ccd852e969acda7394969e3f13eb136 Mon Sep 17 00:00:00 2001
-From: Stef Walter <stefw@gnome.org>
-Date: Thu, 31 Oct 2013 11:43:14 +0100
-Subject: [PATCH] gmain: Fix use of uninitialized memory in sigaction structure
-
-https://bugzilla.gnome.org/show_bug.cgi?id=711754
-
-
-diff --git a/glib/gmain.c b/glib/gmain.c
-index 9c37bb2..608c1a5 100644
---- a/glib/gmain.c
-+++ b/glib/gmain.c
-@@ -4978,6 +4978,7 @@ unref_unix_signal_handler_unlocked (int signum)
-   if (unix_signal_refcount[signum] == 0)
-     {
-       struct sigaction action;
-+      memset (&action, 0, sizeof (action));
-       action.sa_handler = SIG_DFL;
-       sigemptyset (&action.sa_mask);
-       sigaction (signum, &action, NULL);
---
-Gitg
-
diff --git a/dev-libs/glib/glib-2.38.2-r1.ebuild b/dev-libs/glib/glib-2.38.2-r1.ebuild
deleted file mode 100644
index 49cb2378c702..000000000000
--- a/dev-libs/glib/glib-2.38.2-r1.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.38.2-r1.ebuild,v 1.15 2014/07/17 15:12:26 ssuominen Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_{6,7} )
-# Avoid runtime dependency on python when USE=test
-
-inherit autotools bash-completion-r1 gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="${SRC_URI}
-	http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-# FIXME: want >=libselinux-2.2.2-r4[${MULTILIB_USEDEP}] - bug #480960
-RDEPEND="
-	!<dev-util/gdbus-codegen-${PV}
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	|| (
-		>=dev-libs/elfutils-0.142
-		>=dev-libs/libelf-0.8.12
-		>=sys-freebsd/freebsd-lib-9.2_rc1
-		)
-	selinux? ( sys-libs/libselinux )
-	xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
-	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-	utils? (
-		${PYTHON_DEPS}
-		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-libs/libxslt-1.0
-	>=sys-devel/gettext-0.11
-	>=dev-util/gtk-doc-am-1.15
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	test? (
-		sys-devel/gdb
-		${PYTHON_DEPS}
-		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
-		>=sys-apps/dbus-1.2.14 )
-	!<dev-libs/gobject-introspection-1.$(get_version_component_range 2)
-	!<dev-util/gtk-doc-1.15-r2
-"
-# gobject-introspection blocker to ensure people don't mix
-# different g-i and glib major versions
-
-PDEPEND="!<gnome-base/gvfs-1.6.4-r990
-	mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# Earlier versions of gvfs do not work with glib
-
-DOCS="AUTHORS ChangeLog* NEWS* README"
-
-pkg_setup() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		if use test; then
-			CONFIG_CHECK="~IPV6"
-			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
-			export IPV6_DISABLED="yes"
-		fi
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
-	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
-
-	# Fix gmodule issues on fbsd; bug #184301, upstream bug #107626
-	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
-
-	if use test; then
-		# Do not try to remove files on live filesystem, upstream bug #619274
-		sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
-			-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
-
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die
-			sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
-			sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
-		fi
-
-		# gdesktopappinfo requires existing terminal (gnome-terminal or any
-		# other), falling back to xterm if one doesn't exist
-		if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
-			ewarn "Some tests will be skipped due to missing terminal program"
-			sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
-		fi
-
-		# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
-		if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:3' ; then
-			ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3"
-			ewarn "not being present on your system, think on installing them to get these tests run."
-			sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
-			sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
-			sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
-			sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
-			sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die
-			sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
-			# needed to prevent gdbus-threading from asserting
-			ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
-		fi
-
-		# Some tests need ipv6, upstream bug #667468
-		if [[ -n "${IPV6_DISABLED}" ]]; then
-			sed -i -e "/socket\/ipv6_sync/d" gio/tests/socket.c || die
-			sed -i -e "/socket\/ipv6_async/d" gio/tests/socket.c || die
-			sed -i -e "/socket\/ipv6_v4mapped/d" gio/tests/socket.c || die
-		fi
-
-		# Test relies on /usr/bin/true, but we have /bin/true, upstream bug #698655
-		sed -i -e "s:/usr/bin/true:/bin/true:" gio/tests/desktop-app-info.c || die
-	fi
-
-	# thread test fails, upstream bug #679306
-	epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
-
-	# gdbus-codegen is a separate package
-	epatch "${FILESDIR}/${PN}-2.37.x-external-gdbus-codegen.patch"
-
-	# do not allow libgobject to unload; bug #405173, https://bugzilla.gnome.org/show_bug.cgi?id=707298
-	epatch "${FILESDIR}/${PN}-2.36.4-znodelete.patch"
-
-	# patches from 2.39.x / 2.40.x
-	epatch "${FILESDIR}/${PN}-2.38.2-sigaction.patch" #501330
-
-	# leave python shebang alone
-	sed -e '/${PYTHON}/d' \
-		-i glib/Makefile.{am,in} || die
-
-	# Gentoo handles completions in a different directory
-	sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
-		gio/Makefile.am || die
-
-	# Support compilation in clang until upstream solves this, upstream bug #691608
-	append-flags -Wno-format-nonliteral
-
-	epatch "${FILESDIR}"/${P}-configure.patch #500996
-
-	epatch_user
-
-	# Needed for the punt-python-check patch, disabling timeout test
-	# Also needed to prevent cross-compile failures, see bug #267603
-	# Also needed for the no-gdbus-codegen patch
-	eautoreconf
-
-	# FIXME: Really needed when running eautoreconf before? bug#????
-	#[[ ${CHOST} == *-freebsd* ]] && elibtoolize
-
-	epunt_cxx
-}
-
-multilib_src_configure() {
-	# Avoid circular depend with dev-util/pkgconfig and
-	# native builds (cross-compiles won't need pkg-config
-	# in the target ROOT to work here)
-	if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
-		if has_version sys-apps/dbus; then
-			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
-			export DBUS1_LIBS="-ldbus-1"
-		fi
-		export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
-		export LIBFFI_LIBS="-lffi"
-	fi
-
-	local myconf
-
-	case "${CHOST}" in
-		*-mingw*) myconf="${myconf} --with-threads=win32" ;;
-		*)        myconf="${myconf} --with-threads=posix" ;;
-	esac
-
-	# Building with --disable-debug highly unrecommended.  It will build glib in
-	# an unusable form as it disables some commonly used API.  Please do not
-	# convert this to the use_enable form, as it results in a broken build.
-	use debug && myconf="--enable-debug"
-
-	# Only used by the gresource bin
-	multilib_is_native_abi || myconf="${myconf} --disable-libelf"
-
-	# FIXME: change to "$(use_enable selinux)" when libselinux is multilibbed, bug #480960
-	if multilib_is_native_abi; then
-		myconf="${myconf} $(use_enable selinux)"
-	else
-		myconf="${myconf} --disable-selinux"
-	fi
-
-	# Always use internal libpcre, bug #254659
-	ECONF_SOURCE="${S}" econf ${myconf} \
-		$(use_enable xattr) \
-		$(use_enable fam) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable systemtap systemtap) \
-		--disable-compile-warnings \
-		--enable-man \
-		--with-pcre=internal \
-		--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
-
-	if multilib_is_native_abi; then
-		local d
-		for d in glib gio gobject; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use utils ; then
-		python_replicate_script "${ED}"/usr/bin/gtester-report
-	else
-		rm "${ED}usr/bin/gtester-report"
-		rm "${ED}usr/share/man/man1/gtester-report.1"
-	fi
-
-	# Do not install charset.alias even if generated, leave it to libiconv
-	rm -f "${ED}/usr/lib/charset.alias"
-
-	# Don't install gdb python macros, bug 291328
-	rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
-
-	# Completely useless with or without USE static-libs, people need to use
-	# pkg-config
-	prune_libtool_files --modules
-}
-
-multilib_src_test() {
-	gnome2_environment_reset
-
-	unset DBUS_SESSION_BUS_ADDRESS
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	unset GSETTINGS_BACKEND # bug 352451
-	export LC_TIME=C # bug #411967
-	python_export_best
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	# Hardened: gdb needs this, bug #338891
-	if host-is-pax ; then
-		pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
-			|| die "Hardened adjustment failed"
-	fi
-
-	# Need X for dbus-launch session X11 initialization
-	Xemake check
-}
-
-pkg_postinst() {
-	if has_version '<x11-libs/gtk+-3.0.12:3'; then
-		# To have a clear upgrade path for gtk+-3.0.x users, have to resort to
-		# a warning instead of a blocker
-		ewarn
-		ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes."
-		ewarn "You should upgrade to a newer version of gtk+:3 immediately."
-	fi
-}
diff --git a/dev-libs/glib/glib-2.40.0-r1.ebuild b/dev-libs/glib/glib-2.40.0-r1.ebuild
deleted file mode 100644
index 364e341a4831..000000000000
--- a/dev-libs/glib/glib-2.40.0-r1.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.40.0-r1.ebuild,v 1.14 2014/10/27 01:54:36 vapier Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_{6,7} )
-# Avoid runtime dependency on python when USE=test
-
-inherit autotools bash-completion-r1 gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="${SRC_URI}
-	http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-# FIXME: want >=libselinux-2.2.2-r4[${MULTILIB_USEDEP}] - bug #480960
-RDEPEND="
-	!<dev-util/gdbus-codegen-${PV}
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	|| (
-		>=dev-libs/elfutils-0.142
-		>=dev-libs/libelf-0.8.12
-		>=sys-freebsd/freebsd-lib-9.2_rc1
-		)
-	selinux? ( sys-libs/libselinux )
-	xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
-	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-	utils? (
-		${PYTHON_DEPS}
-		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-libs/libxslt-1.0
-	>=sys-devel/gettext-0.11
-	>=dev-util/gtk-doc-am-1.20
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	test? (
-		sys-devel/gdb
-		${PYTHON_DEPS}
-		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
-		>=sys-apps/dbus-1.2.14 )
-	!<dev-util/gtk-doc-1.15-r2
-"
-# gobject-introspection blocker to ensure people don't mix
-# different g-i and glib major versions
-
-PDEPEND="!<gnome-base/gvfs-1.6.4-r990
-	mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# Earlier versions of gvfs do not work with glib
-
-DOCS="AUTHORS ChangeLog* NEWS* README"
-
-pkg_setup() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		if use test; then
-			CONFIG_CHECK="~IPV6"
-			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
-			export IPV6_DISABLED="yes"
-		fi
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
-	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
-
-	# Fix gmodule issues on fbsd; bug #184301, upstream bug #107626
-	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
-
-	if use test; then
-		# Do not try to remove files on live filesystem, upstream bug #619274
-		sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
-			-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
-
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die
-			sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
-			sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
-		fi
-
-		# gdesktopappinfo requires existing terminal (gnome-terminal or any
-		# other), falling back to xterm if one doesn't exist
-		if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
-			ewarn "Some tests will be skipped due to missing terminal program"
-			sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
-		fi
-
-		# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
-		if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:3' ; then
-			ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3"
-			ewarn "not being present on your system, think on installing them to get these tests run."
-			sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
-			sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
-			sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
-			sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
-			sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die
-			sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
-			# needed to prevent gdbus-threading from asserting
-			ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
-		fi
-
-		# Some tests need ipv6, upstream bug #667468
-		if [[ -n "${IPV6_DISABLED}" ]]; then
-			sed -i -e "/socket\/ipv6_sync/d" gio/tests/socket.c || die
-			sed -i -e "/socket\/ipv6_async/d" gio/tests/socket.c || die
-			sed -i -e "/socket\/ipv6_v4mapped/d" gio/tests/socket.c || die
-		fi
-
-		# Test relies on /usr/bin/true, but we have /bin/true, upstream bug #698655
-		sed -i -e "s:/usr/bin/true:/bin/true:" gio/tests/desktop-app-info.c || die
-
-		# thread test fails, upstream bug #679306
-		epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
-	else
-		# Don't build tests, also prevents extra deps, bug #512022
-		sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
-	fi
-
-	# gdbus-codegen is a separate package
-	epatch "${FILESDIR}/${PN}-2.40.0-external-gdbus-codegen.patch"
-
-	# do not allow libgobject to unload; bug #405173, https://bugzilla.gnome.org/show_bug.cgi?id=707298
-	epatch "${FILESDIR}/${PN}-2.36.4-znodelete.patch"
-
-	# leave python shebang alone
-	sed -e '/${PYTHON}/d' \
-		-i glib/Makefile.{am,in} || die
-
-	# Gentoo handles completions in a different directory
-	sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
-		gio/Makefile.am || die
-
-	# Support compilation in clang until upstream solves this, upstream bug #691608
-	append-flags -Wno-format-nonliteral
-
-	epatch_user
-
-	# Needed for the punt-python-check patch, disabling timeout test
-	# Also needed to prevent cross-compile failures, see bug #267603
-	# Also needed for the no-gdbus-codegen patch
-	eautoreconf
-
-	# FIXME: Really needed when running eautoreconf before? bug#????
-	#[[ ${CHOST} == *-freebsd* ]] && elibtoolize
-
-	epunt_cxx
-}
-
-multilib_src_configure() {
-	# Avoid circular depend with dev-util/pkgconfig and
-	# native builds (cross-compiles won't need pkg-config
-	# in the target ROOT to work here)
-	if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
-		if has_version sys-apps/dbus; then
-			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
-			export DBUS1_LIBS="-ldbus-1"
-		fi
-		export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
-		export LIBFFI_LIBS="-lffi"
-	fi
-
-	local myconf
-
-	case "${CHOST}" in
-		*-mingw*) myconf="${myconf} --with-threads=win32" ;;
-		*)        myconf="${myconf} --with-threads=posix" ;;
-	esac
-
-	# Building with --disable-debug highly unrecommended.  It will build glib in
-	# an unusable form as it disables some commonly used API.  Please do not
-	# convert this to the use_enable form, as it results in a broken build.
-	use debug && myconf="--enable-debug"
-
-	# Only used by the gresource bin
-	multilib_is_native_abi || myconf="${myconf} --disable-libelf"
-
-	# FIXME: change to "$(use_enable selinux)" when libselinux is multilibbed, bug #480960
-	if multilib_is_native_abi; then
-		myconf="${myconf} $(use_enable selinux)"
-	else
-		myconf="${myconf} --disable-selinux"
-	fi
-
-	# Always use internal libpcre, bug #254659
-	ECONF_SOURCE="${S}" econf ${myconf} \
-		$(use_enable xattr) \
-		$(use_enable fam) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable systemtap systemtap) \
-		--disable-compile-warnings \
-		--enable-man \
-		--with-pcre=internal \
-		--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
-
-	if multilib_is_native_abi; then
-		local d
-		for d in glib gio gobject; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use utils ; then
-		python_replicate_script "${ED}"/usr/bin/gtester-report
-	else
-		rm "${ED}usr/bin/gtester-report"
-		rm "${ED}usr/share/man/man1/gtester-report.1"
-	fi
-
-	# Do not install charset.alias even if generated, leave it to libiconv
-	rm -f "${ED}/usr/lib/charset.alias"
-
-	# Don't install gdb python macros, bug 291328
-	rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
-
-	# Completely useless with or without USE static-libs, people need to use
-	# pkg-config
-	prune_libtool_files --modules
-}
-
-multilib_src_test() {
-	gnome2_environment_reset
-
-	unset DBUS_SESSION_BUS_ADDRESS
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	unset GSETTINGS_BACKEND # bug 352451
-	export LC_TIME=C # bug #411967
-	python_export_best
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	# Hardened: gdb needs this, bug #338891
-	if host-is-pax ; then
-		pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
-			|| die "Hardened adjustment failed"
-	fi
-
-	# Need X for dbus-launch session X11 initialization
-	Xemake check
-}
-
-pkg_postinst() {
-	if has_version '<x11-libs/gtk+-3.0.12:3'; then
-		# To have a clear upgrade path for gtk+-3.0.x users, have to resort to
-		# a warning instead of a blocker
-		ewarn
-		ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes."
-		ewarn "You should upgrade to a newer version of gtk+:3 immediately."
-	fi
-}
diff --git a/dev-libs/glib/glib-2.42.1.ebuild b/dev-libs/glib/glib-2.42.1.ebuild
index f82b25a5760d..4942595ba843 100644
--- a/dev-libs/glib/glib-2.42.1.ebuild
+++ b/dev-libs/glib/glib-2.42.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.42.1.ebuild,v 1.1 2014/12/14 22:37:29 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.42.1.ebuild,v 1.2 2015/01/21 09:44:49 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -68,9 +68,11 @@ DEPEND="${RDEPEND}
 # different g-i and glib major versions
 
 PDEPEND="!<gnome-base/gvfs-1.6.4-r990
+	gnome-base/dconf
 	mime? ( x11-misc/shared-mime-info )
 "
 # shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf needed, bug #498436
 # Earlier versions of gvfs do not work with glib
 
 pkg_setup() {
@@ -89,11 +91,6 @@ src_prepare() {
 	# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
 	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
 
-	# Fix gmodule issues on fbsd; bug #184301, upstream bug #107626
-	# Upstream doesn't even know if this is needed, looks like openBSD
-	# people is not needing it
-	#epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
-
 	if use test; then
 		# Do not try to remove files on live filesystem, upstream bug #619274
 		sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
diff --git a/dev-libs/libgweather/ChangeLog b/dev-libs/libgweather/ChangeLog
index 0f51fd25e610..7cf2e72010b9 100644
--- a/dev-libs/libgweather/ChangeLog
+++ b/dev-libs/libgweather/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libgweather
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/ChangeLog,v 1.119 2014/12/22 18:10:18 eva Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/ChangeLog,v 1.120 2015/01/21 10:17:07 pacho Exp $
+
+*libgweather-3.14.3 (21 Jan 2015)
+
+  21 Jan 2015; Pacho Ramos <pacho@gentoo.org> +libgweather-3.14.3.ebuild:
+  Version bump
 
 *libgweather-3.14.2 (22 Dec 2014)
 
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index 9f2dceeb5672..4ad3070cda8d 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -3,14 +3,16 @@ Hash: SHA256
 
 DIST libgweather-3.12.3.tar.xz 3982352 SHA256 89f65b1ffb84775c2d73e8daa67dd97f930afe73bae57985ade1e9e37019b435 SHA512 30b0bf57a3ddc090156f3abacd19168f1a3e4eb661e4113eac15f5acb231eb369187806ec6b61518e330b5185d4d9269f5421be056d7502fa700a4379bd9294f WHIRLPOOL 181f51c2a4cafb69ccc7ace69ecff8c61dd9c98de4c1acddc3c460c561f3ee6289dbd9f13f51da7eb3e57bc9122723bdec14cd5acfea0cf1df6ead4bf7a84a95
 DIST libgweather-3.14.2.tar.xz 3543696 SHA256 aa0d03132fc6c446cf549df1d91e319e1abcc676f1d9f8bc1dc01f033dcff493 SHA512 ae488bfbe46b95ab874767a9d604f28307cc5138c58080b9aa7d7bf2c29abf3c0a285772a4681b5c1227176735c890a7f27ce9c46e6adf1fb308ebefc33d1a96 WHIRLPOOL 3bea7e42d93917fbbad8ee0d5b3664fc04113e02b7d1dc0610ebd5e66aebfad992db1fda5c0aea59e66915efadc114da86e40fc6b44ae99a4bcef1a624f1ba2c
+DIST libgweather-3.14.3.tar.xz 3467744 SHA256 04dd25064cdc7715c1bf5fc476c8596d640cbcb3551217867195cef16bbbbf6b SHA512 f6e82c1a1b26ccaf0f6feb533147ac4108210096a7462ec394aa4174d772ad74c92ecae16450875a5c965ee17c0d041bee25de98a6ee8b842091adb426bd1d01 WHIRLPOOL bdf76e024bd0d7d71f60d162f7cee5e8b407bff318a71e28112c2ee5b68c66c726eb1b9484c3e033b7f3c7d1b515dad3b5c91c1de53d8d10e2cef26e1cd9f66d
 EBUILD libgweather-3.12.3.ebuild 1491 SHA256 6c6a68409d28b347093a11d13bed518c9b6d6154af1e7861b8f1634f7b0479cd SHA512 999b4937c0a42a9437551f787091f13aa138f1c1aec26cb6a75d3ab1716a9af3afcc9baae307b1efd8760a44f5bc6a1cb7c776d41958f60f15922c8c19fb4dd9 WHIRLPOOL 57fb70f52b26c008e8d66260e582ae6d2fe74396cca7bd8461d5c145009fa87d473805223fbe563ef50496e2e754ee66ded659de257d0bff9ea20afbc428bda6
 EBUILD libgweather-3.14.2.ebuild 1512 SHA256 ae55134f094e13431605c28d30af8f1a9168e47b13eccb2922c8f3824b5caa9a SHA512 b3e5ef08556f360ef2651b77a33b81152a27d144be1ab06dcfe522fa06edae402bf1abb9bde1b8c4f0acb09d9ea9ca8284fde2e3b19526155b487f3a08b87c69 WHIRLPOOL 0bf9bc6e9a85e95c91a661eddaa12c84ffb9d2dcadec8d1930d7ced11bd9f9c64458a3922a1eea23332bbc0b83c9b85b0286418a5354c29cac3d7d5bc5c27b2c
-MISC ChangeLog 17057 SHA256 0796c597dd42d908ef35878a3fbb2917cc0fe8b6888576a58a2b3c88eef7e55b SHA512 8496d2d1d24e4506940dcdafd353e09ab04cf25e87f8da757e0d9c47c0dbdccd1244077a4893830f7a05df552b399dcb3a76d5cea4ab88902f9c2430e6c1214b WHIRLPOOL 8b5e60305f97f59cc306f48742043911f31c4b3c9dde36c059c570d3834296500d910751ac29447e9705b87e00d096b3c1a9c300ac5bb47fadb5d98d383f4972
+EBUILD libgweather-3.14.3.ebuild 1514 SHA256 6c38aaa18d4a2c5caacd2dae63480cd0b08bd80ae703b75e0dfe50dcae0a5d8d SHA512 f657658cfc069ff013ef623c680e243c5571c5ab9aea07443b3a6a2e4dfa9798a00a0caf50348cb2ec9f2dd0bd11422db241a06fbfc111ea1a5551cfedff702c WHIRLPOOL c3b5cf8a19bc3ca781e55a6a4726bf40044a5a5683392ca7fe4ed08fc69fca3a0b205c63eb008b144f86f1c257df34b87044a7f4af529e355bbc136bdd964367
+MISC ChangeLog 17184 SHA256 c8ae016576276116e5f0edfddbda230fa4fd12e27e135614dbadd737742e65de SHA512 d3095346c18b622b0a6a9add064f6a2ce8ca0a8694bcc2f62530f2c20ae5068cf1bd82cb0cbb2fd4c7ebfd74cf519618669a28ce1d8a8fe218573b75ad0528f3 WHIRLPOOL 0212e49e09da597738f1be5d81e41955459ebf0ca60760e73bbc22aee3f5dcc0e6b10af7efd3589a3fc6d39a96505f40a17a4e032f112b9d2b05aa2471a99271
 MISC metadata.xml 255 SHA256 46fe560312c5a99fbd5a22a133b1f29a8c05a832b5d368809d39467e2a03ca00 SHA512 ba171878fa6c0faf41fcf9171e47e8a40871e57adfe816afa1aff814520af6e739a3cd48940ed9c9e99e660004e4d7c24f635b0f60b768c45f13b40a25e4bf00 WHIRLPOOL dbcd3a1f9de18ce3229431938eb17033710ada6827899a3b9e35f8bccf6eab41330c4b548e1f47764523a5be12add795b279c564c1d8698dde760b6cecc0d4fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSYXosACgkQ1fmVwcYIWAaY7gCfZabTzxS2JpxYijChCNujyvS+
-FIkAnjo5gvKT8NUUKt4+MWdmkxPsIva4
-=23Km
+iEYEAREIAAYFAlS/fKQACgkQCaWpQKGI+9SGTwCfaDuhOd802z3u+owCGzBaHGAW
+fvcAni9A7UIMd59+5xfOAqFCRHbeM/8N
+=9Lo8
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libgweather/libgweather-3.14.3.ebuild b/dev-libs/libgweather/libgweather-3.14.3.ebuild
new file mode 100644
index 000000000000..28984819d7ec
--- /dev/null
+++ b/dev-libs/libgweather/libgweather-3.14.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/libgweather-3.14.3.ebuild,v 1.1 2015/01/21 10:17:07 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="Library to access weather information from online services"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather"
+
+LICENSE="GPL-2+"
+SLOT="2/3-6" # subslot = 3-(libgweather-3 soname suffix)
+IUSE="glade +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+
+COMMON_DEPEND="
+	>=x11-libs/gtk+-3.13.5:3[introspection?]
+	>=dev-libs/glib-2.35.1:2
+	>=net-libs/libsoup-2.34:2.4
+	>=dev-libs/libxml2-2.6.0
+	sci-geosciences/geocode-glib
+	>=sys-libs/timezone-data-2010k
+
+	glade? ( >=dev-util/glade-3.16:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gnome-applets-2.22.0
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.11
+	>=dev-util/intltool-0.50
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS MAINTAINERS NEWS README"
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable glade glade-catalog) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
diff --git a/dev-perl/Test-TCP/ChangeLog b/dev-perl/Test-TCP/ChangeLog
index 02bd4f220daa..6b29043c4988 100644
--- a/dev-perl/Test-TCP/ChangeLog
+++ b/dev-perl/Test-TCP/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-perl/Test-TCP
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-TCP/ChangeLog,v 1.15 2015/01/13 17:27:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-TCP/ChangeLog,v 1.16 2015/01/21 16:04:25 zlogene Exp $
+
+  21 Jan 2015; Mikle Kolyada <zlogene@gentoo.org> Test-TCP-2.60.0.ebuild:
+  Stable for all wer bug #535238
 
   13 Jan 2015; Jeroen Roovers <jer@gentoo.org> Test-TCP-2.60.0.ebuild:
   Stable for HPPA (bug #535238).
diff --git a/dev-perl/Test-TCP/Manifest b/dev-perl/Test-TCP/Manifest
index 087cbaaf96c2..71c2cf38ae75 100644
--- a/dev-perl/Test-TCP/Manifest
+++ b/dev-perl/Test-TCP/Manifest
@@ -4,13 +4,15 @@ Hash: SHA256
 DIST Test-TCP-1.21.tar.gz 27903 SHA256 476a230f8db228819bd05efca932a2a9b06d25c3f9de920e2c9c9a723033bbed SHA512 f68bbaa153e05a43f3ee718a6ab81d2bddeca075457082b7a6df25ebd0b99e9608e74d547c3e4241c29222ec10422117a688c811f2d55f97252916b83d39b0bb WHIRLPOOL c6ed35173f1c6b2461c41aeefcd61fef69c1416a25578f7b3ef0862c9e21f1030360a82a6a2ab3d3adc218a890d67be3d3ad047527ab2b52c6605fa6b4e9b969
 DIST Test-TCP-2.06.tar.gz 21848 SHA256 714956bb012536f617988e9cfb588253e908144e9169e5862356091f44e59229 SHA512 e4fcc79f8d62a8ce669a975e89c4bbf3fd56396c83a8c3b750fec002b3e9bd8dd829faf30bfa47f0db31bc0b5daedfa1e6edc3e2e9f628b0d0c7c25fef1081ab WHIRLPOOL 61e719ed5f4dcbd9e504f99ab4d7b5ea2a8708a31898b15dba5c924d5ee69b6cdaa75a4512a226005bd96c8fd7278777e734de7d6153f44d3a9c03b04a0e4717
 EBUILD Test-TCP-1.210.0.ebuild 546 SHA256 cb792fe21fd894cc0f334b5dee73a44a099b1b50e1375744dcc4714be26bade4 SHA512 84782432d6d1aad391f5afab76da2c5b4eeecea22af3da6545f3220829900364409413ded4b426fb52cc6f34fb7478c4ff076f1595484d9cb5eee114781e9ab1 WHIRLPOOL bcd94e92a157d66d19b457721374ff2d016ae8fdec625645f7502c9415fa355e9d86ccb2d7812eae9220b61bb06a4ee3117d4e5f146f0bb9a58b741e1342dfcc
-EBUILD Test-TCP-2.60.0.ebuild 545 SHA256 213254e9c27b0437012d962d7947bf0b5d537b89ecc62d2fa94c52a22345d226 SHA512 4d5d40278b447b621a7569117076da5c8c37845f1aa3adc0c9d3b859a3880f9b108c07936fcc99910d58658f8218b64809f3e7f08869debb045e2431c5a556c2 WHIRLPOOL a412183720ae1c9f80b348d81ced184b5e3424c26086bce68d435409a3e2987fc0f4f5f67f74cd9611c84bdd25703969b9a7e2dff047337c5e1759fce54e8521
-MISC ChangeLog 3429 SHA256 4dd00e3262470e7cbe11746021098ba64feda7eac4fb137059bf917749f7a8ca SHA512 f8a88ebc800518a2d231f93c0c04a46599cde2af642e91c3563fe720918d80068a8136fde388e89825c80a360a1b438bb123094ccef7b9274c0e10713d7aba9e WHIRLPOOL e745d3b94576145e1a8c9ccc4cea3700ea76bc9bdb4f49b06fd0702e3dcc8f8b706c1f606056e5c333155f187bebb174989466ec6da10a44c06e58b12164d513
+EBUILD Test-TCP-2.60.0.ebuild 545 SHA256 008a62fa31ce3a60ff82c10963d0c3c52bde6fa50c24b0fc16086d0f1e052bc0 SHA512 22954697a82668833e995399daaa319c2e0317d5927924449db5de161609de5a422e7789801ed6ebc564c74561f9aeb1b623c58abd6e0df2f5d158655aff2c54 WHIRLPOOL 1272433610eeee696a111548a4a04dae1744f9f216e597eb5f6e7a0677d5661f0a42566db94c086f7c27f555a2404a66d5855a7d21d1ef247a1251bb6a14f710
+MISC ChangeLog 3541 SHA256 eebd1eacf693dc858acbefebbd0f4087dad0273dad2804535ce88dc60342f6f1 SHA512 e85bdee60c91115eef6a1f32c5a6f72c5688ea59e9f3a7a8cb82dc4a05d94420ea8a74a22aded138e39ae6c5e99c63cc6f836d46cf1ac5e5c03b848695f2e877 WHIRLPOOL 671286b18bb6e4536624bc82cc44e79bfd61469ca40122993dbd41ff7924e80e602d0a3a234b1f91f660806fa51e7ade7e7a4065c42bd2a96697251a5cf83b4d
 MISC metadata.xml 418 SHA256 9686c38ba8a1fa71f6a59fdc61ab125c42b7d62094418e17f9f2702485777d52 SHA512 93fbd5f3576824d65636e38e2f70c5ca1592e7c45828aa130b74469250635e9d68f057b0411e07ebecf1cd27c3d4c1cf90084901fa62574fc3fbc9c7c27a7e3a WHIRLPOOL 852c17699e8521d8039efae4e64e4027e5dbab37574b55b479f6b846fbae9d1f1bfd4944c005a72a1869834f2dd1f950734a8c1b27a663fca01d5bc41346c9cd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlS1VYoACgkQVWmRsqeSphNB1gCeLtF09Xbi0eGUWwZbNrvAMowv
-VzMAn2GAC1R7hjXM+CkVTRkqyVb8XGKZ
-=OBeD
+iJwEAQEIAAYFAlS/zakACgkQG9wOWsQutdY1nQP/fZUW708y8MGSwSIDs+Sm63dg
+gs0iPXdU8ipp/Sb8lHFu5uaAI0u5O0V/x52anFFskKyY9NC+nag7qMtdsSP9PNL+
+OE+mcFNTnOPTAzEAohxn4CtJVqGMp+kdIh+Oxv7QNMU6vuv4tH5w6pcDQwGne3Nu
+ZqDdPXi+n2mzB8iYKF8=
+=6I8x
 -----END PGP SIGNATURE-----
diff --git a/dev-perl/Test-TCP/Test-TCP-2.60.0.ebuild b/dev-perl/Test-TCP/Test-TCP-2.60.0.ebuild
index 993600a39c85..4107a46b811f 100644
--- a/dev-perl/Test-TCP/Test-TCP-2.60.0.ebuild
+++ b/dev-perl/Test-TCP/Test-TCP-2.60.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-TCP/Test-TCP-2.60.0.ebuild,v 1.2 2015/01/13 17:27:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-TCP/Test-TCP-2.60.0.ebuild,v 1.3 2015/01/21 16:04:25 zlogene Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Testing TCP program"
 
 SLOT="0"
-KEYWORDS="~amd64 hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 hppa ppc ppc64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-php/ZendFramework/ChangeLog b/dev-php/ZendFramework/ChangeLog
index eff604463f61..9405c8e4419f 100644
--- a/dev-php/ZendFramework/ChangeLog
+++ b/dev-php/ZendFramework/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php/ZendFramework
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/ZendFramework/ChangeLog,v 1.23 2015/01/20 07:38:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/ZendFramework/ChangeLog,v 1.25 2015/01/21 10:20:22 ago Exp $
+
+  21 Jan 2015; Agostino Sarubbo <ago@gentoo.org> ZendFramework-1.12.9.ebuild:
+  Stable for x86, wrt bug #523198
+
+  21 Jan 2015; Agostino Sarubbo <ago@gentoo.org> ZendFramework-1.12.9.ebuild:
+  Stable for amd64, wrt bug #523198
 
   20 Jan 2015; Jeroen Roovers <jer@gentoo.org> ZendFramework-1.12.9.ebuild:
   Stable for HPPA (bug #523198).
diff --git a/dev-php/ZendFramework/Manifest b/dev-php/ZendFramework/Manifest
index 021409245c29..674ee43d952a 100644
--- a/dev-php/ZendFramework/Manifest
+++ b/dev-php/ZendFramework/Manifest
@@ -10,13 +10,23 @@ DIST ZendFramework-1.12.9-manual-en.tar.gz 3475776 SHA256 ceea2d668ccafce6e053b5
 DIST ZendFramework-1.12.9-minimal.tar.gz 8451777 SHA256 c0b353a797db77c0f52ac06f5f39b1b0ea43f98166a645c0dc75454e0be97b29 SHA512 5cc80773a6d2a9a0c9403c97c13ebec5fa3f119e5dd52a619ecfc967237e03ea0c919f35fb4c5594f9f001468161fd2d1d9dcefaa858713e8a0d6f3d99c2f338 WHIRLPOOL 125e30118c1f940137dea1e351757d5e70de1ab83a6ed09ced3f4fb0369c4a4d44304d15333acd28bcfbb229b1682aa6e4d538b09212c50a44a7721082411d4e
 DIST ZendFramework-1.12.9.tar.gz 27343626 SHA256 ba9dbcc0de424876ffd5bf6293522f68677fcea862546ee1fc9219bcff2bf690 SHA512 591fd92b80fcbae5dfbd3b2aa3678ae7c307b20cb62f91d1f45df821bf2d0876d0d006a0077dd217fe192914608a816afbe09f90f4fa991d97a64558d76be389 WHIRLPOOL 5460db9a52106d09c30999ccabe983a55c19584162d527569c70faf3cf1466bc44e8206ab068519cc8b655fca435693bab73d9debdcd7e8cd1de34a938512a84
 EBUILD ZendFramework-1.11.12.ebuild 2022 SHA256 b55e0896806fccc2d061c540b3d588d9958bc31559397132c2d459a1c4b31aca SHA512 118305556bf321ed5df83eece944a3c8804eb70bc13da47b24e42df3a2405edb9909cd80c54e33b594fe51ae2ac268f8540eebd3a200799c8a13cf901b065847 WHIRLPOOL 3e28a05a234ab3d47a8e7ba555e6882e241a2fc67e2f5f465836d7f2abae6934f572bd8724c3d3688c8f78e6380186ced54879e5ce919fb84ef36dd59947dcbf
-EBUILD ZendFramework-1.12.9.ebuild 1966 SHA256 e72ad2b7e4ec1a13060d911ba2bd511b077c34be37a60ab2d61d995b7ead0b44 SHA512 76616730cb210f80ff9045737b91ca2356fdcd0f4c2815e07ad04e291d5b5b9cc0b25fa17db7171c063c9cb8f550f1ff681b5efbb7ab7004f82ff3e48c5438fb WHIRLPOOL 3f89edee66ac276807314ca8acfa9b7b6fde44cf746b22ccaaa74840755663bc648c111277645440b0c327f8202c545758f4cd6559505ad45ea866008f6a5214
-MISC ChangeLog 15098 SHA256 3055276624b4da90b5827f25aeaf81318d9651865137c3c4533210c23fbef1ce SHA512 9848be73f662e26f406818e5cf89191bafda21d9e2f64ad1127901ae73753dff38fc766ed1e712f58ab6133f8fedbc80da4fcb5e56336ceda8a81a3ab7f91d7a WHIRLPOOL 8ae5d48b94919b0f46fc59424163e2deceb2453fca792b20afbc55a7400431824eb3dbb2ab7ea9a875752a33427fccfc29c24244b7123d00639403f393050271
+EBUILD ZendFramework-1.12.9.ebuild 1964 SHA256 2d4d67dce39c12c3a69de81cbc751980334eb1072e08cd390f26f4775f6832e5 SHA512 b27186f65873ed4ebf33cfb68a1f03900c8af41b95236c1c21b6efada835cd5d7926f97c393bece9a23c60e09469ac053eae25d6873109dc709795bb6eb02e5e WHIRLPOOL 0c0b3755ccd336954b9f761b31fb9cf9ff08a44090dc4674088142986e9f787cb0116575111183de23814548ed75461c1e16f38a04a9b0deb035d8b470cea202
+MISC ChangeLog 15326 SHA256 6306558d8c800340d093a54658b76b828563a06abc9eb507c10f520600491667 SHA512 4b47efc521bc8a9f1759e4e33fd19b24e814c970b3d1f54b6664f9a8deccea43a73bb92602908794bbde00d34d651b51ae7b3f9fcf05e629ec4593b9545de49a WHIRLPOOL 2bf8552d1d40d4fc346c9adc44f38dd9c3764b2810a142f3b43e7d0bfcacdf223630cc493fda89c69e6108f353f753a139d47a3bb02bf7ef3f0af0e64c4064f2
 MISC metadata.xml 523 SHA256 ea4383a6e685b9e68b44e3edf3494439ecaf4ac56e4bf1bc3cd5dd5c6427ccec SHA512 c1b5a0cb3fe8021462a6f10927c32104af50093d4eb577e15ace7e0c09eb6968492400ae8b2a1c312e073c65cab3d3b262fac17de68ede59d0c1e59a818bae69 WHIRLPOOL add0d782db87edbf037206d42f76791ba1971728d2a010bd89071e735f47e355bb666eaf44887163e104fbfa5145ef62f8bf77a60d824b13bfe249e3cd2930d2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlS+BfUACgkQVWmRsqeSphMoOACeM4Uh+WDcCAK3Ie6n3sAMUrMu
-uXsAn3qdR/OZKD8n48HQu1Wi/wZjVCki
-=NYUM
+iQIcBAEBCAAGBQJUv31nAAoJELp701BxlEWfZDwP/0evxPuWikSdP5y0qHJBnxMz
+UTFnf4D3Z/5sz01ulq7yY2+RNB41XC1pvSXsoz7aZ99T+CoLgQL1VDOjKUKAieRx
+OiCk1h2TR9YD+YJv3xRyG9VC/InO8bplBydGqWAdku5xAAKFtWWm5KS49R+xdHNk
+MmwmiIFSJWaHwkwaWbI9hr3SU06liFLuFVw2X3DWwTVfmgKYoBrwJYbIUzRlnMiL
+Z/klC7mdH2pCitFpFHnFlHhJcgCwckMkkjWePwdS+kOvhYa2HpEvZL5p9LpMWMZ9
+2QkFJM6K+Nd4kruTKfJ1amdQ/SRXVrrQ67JCX4moCvnSnd2JG+/ixN6QOxjyumfm
+JGDP+YOCAd/gdw+OcI8bqKW7r7iNUQ9+mcpcYK4fVN1vC46oRDWNCr+RxMeVFQIj
+A1nFPhXvL8A6k+nOtpowZ0JU4BJ4qAM7doocx57RRDUFb3R+Y+Bl6xp9GacScmLe
+xiqtzKaCZK7QwJ6QMV9qhn5d/3fTQCKJj0a5xjNdmXO6Z53xg8uA83Z4eTbrWnCr
+tSKp7wjTuet8AzH5fSOvbuDfJNw5I1UCZ4yP92RIaWT6TQ4q38eiy9MaDl5xhCdW
+XS8PHxk7SFo+vGGcX2RXZ5cIzNjf8A3Z2er7rgOprDoCCQvZ4PzwMup6CE83hmwT
+7GyR96ionivXfj5xb4gB
+=wwIG
 -----END PGP SIGNATURE-----
diff --git a/dev-php/ZendFramework/ZendFramework-1.12.9.ebuild b/dev-php/ZendFramework/ZendFramework-1.12.9.ebuild
index e831fba255a3..d328c99fb4fa 100644
--- a/dev-php/ZendFramework/ZendFramework-1.12.9.ebuild
+++ b/dev-php/ZendFramework/ZendFramework-1.12.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/ZendFramework/ZendFramework-1.12.9.ebuild,v 1.2 2015/01/20 07:38:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/ZendFramework/ZendFramework-1.12.9.ebuild,v 1.4 2015/01/21 10:20:22 ago Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ PHP_LIB_NAME="Zend"
 
 inherit php-lib-r1
 
-KEYWORDS="~amd64 hppa ~ppc ~x86"
+KEYWORDS="amd64 hppa ~ppc x86"
 
 DESCRIPTION="Zend Framework is a high quality and open source framework for developing Web Applications"
 HOMEPAGE="http://framework.zend.com/"
diff --git a/dev-python/CoverageTestRunner/ChangeLog b/dev-python/CoverageTestRunner/ChangeLog
index 2088e9d075ea..20af7e8af756 100644
--- a/dev-python/CoverageTestRunner/ChangeLog
+++ b/dev-python/CoverageTestRunner/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/CoverageTestRunner
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/CoverageTestRunner/ChangeLog,v 1.10 2015/01/20 08:45:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/CoverageTestRunner/ChangeLog,v 1.11 2015/01/21 10:06:57 ago Exp $
+
+  21 Jan 2015; Agostino Sarubbo <ago@gentoo.org> CoverageTestRunner-1.10.ebuild,
+  CoverageTestRunner-1.9-r1.ebuild:
+  Add ~sparc, wrt bug #530672
 
   20 Jan 2015; Agostino Sarubbo <ago@gentoo.org> CoverageTestRunner-1.10.ebuild,
   CoverageTestRunner-1.9-r1.ebuild:
diff --git a/dev-python/CoverageTestRunner/CoverageTestRunner-1.10.ebuild b/dev-python/CoverageTestRunner/CoverageTestRunner-1.10.ebuild
index b145f868d1bd..3b728553e602 100644
--- a/dev-python/CoverageTestRunner/CoverageTestRunner-1.10.ebuild
+++ b/dev-python/CoverageTestRunner/CoverageTestRunner-1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/CoverageTestRunner/CoverageTestRunner-1.10.ebuild,v 1.7 2015/01/20 08:45:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/CoverageTestRunner/CoverageTestRunner-1.10.ebuild,v 1.8 2015/01/21 10:06:57 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://code.liw.fi/debian/pool/main/p/${MY_PN}/${MY_PN}_${PV}.orig.tar.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}
diff --git a/dev-python/CoverageTestRunner/CoverageTestRunner-1.9-r1.ebuild b/dev-python/CoverageTestRunner/CoverageTestRunner-1.9-r1.ebuild
index 65c19fb208b2..f4e1601b2036 100644
--- a/dev-python/CoverageTestRunner/CoverageTestRunner-1.9-r1.ebuild
+++ b/dev-python/CoverageTestRunner/CoverageTestRunner-1.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/CoverageTestRunner/CoverageTestRunner-1.9-r1.ebuild,v 1.5 2015/01/20 08:45:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/CoverageTestRunner/CoverageTestRunner-1.9-r1.ebuild,v 1.6 2015/01/21 10:06:57 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://code.liw.fi/debian/pool/main/p/${MY_PN}/${MY_PN}_${PV}.orig.tar.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}
diff --git a/dev-python/CoverageTestRunner/Manifest b/dev-python/CoverageTestRunner/Manifest
index d8090c2e5b19..6b125b6437a8 100644
--- a/dev-python/CoverageTestRunner/Manifest
+++ b/dev-python/CoverageTestRunner/Manifest
@@ -3,24 +3,24 @@ Hash: SHA256
 
 DIST python-coverage-test-runner_1.10.orig.tar.gz 19149 SHA256 550fbffe220007608e6aa41904134321d2fb32af11078cc280fe39d84b251300 SHA512 041896468863d1f06a932da4a4113d9afe952ca88004feb3ac872cc8352a94e5f4b5d7444f8b5dce49e5dc3ccfc727553d540b9865e8bf00724ae312ff1be2e6 WHIRLPOOL 3d11391e7624e8e3743d3d01cfb915523361f9cae3dbae1709eb45b6c467f4bbbbe83eacb7f093e74b25f82c2ce6e982bf921c748b73a233e96bc19cd99a4eae
 DIST python-coverage-test-runner_1.9.orig.tar.gz 19175 SHA256 d3bf062e6f7797a71e8958f2cf1b879e2037c0b2cb9b4deb73c769bafe295437 SHA512 7793fc4eed0eb92a53a4dd1662a92dc131ebefe1194196f9a8e022d8d63da779aa8f978c056e981629324465f919869b5dc31cc9b31fe5e3173f1ac3f3f5c83e WHIRLPOOL f54e309fd0526740c8b580ac2d1eea4858af313564fa59ce92b812f771199a5b6b8dc4b36d235554939db45d18d4671287e1ab7bace37fdce136c0c52c215931
-EBUILD CoverageTestRunner-1.10.ebuild 714 SHA256 9a67cab6dc36d1baf85c565e9430bafb5e66e02f4490a89dd9ce280aa74a9152 SHA512 c33519d395633fefc5a5eb9fa9d2dd3cbf8309df0383e7121b9b1cda83b297f95536402b8b25a9bc9d70e1f5e41d83d52f2fb684489ec2f9d11051cc87647e82 WHIRLPOOL e2be1a4c247a5bba0202d5890b7cbc4e8b98b5ab9463356134e604b2a8a224bff14c619d7a62095d059100a388d97e3dbab9315cb997faa84f0f115ee416b717
-EBUILD CoverageTestRunner-1.9-r1.ebuild 705 SHA256 3cd847989586c3825557bb2c670cf87361a721dd80778742433cefad0655e5cb SHA512 0b1563dabfb32e469b3da77fda4eda1e8da2c1821b094018129c7104c43564c5514a3b342d5af0e543f23443632fff31a70fbdb34f097cf489f59163a4c29f6b WHIRLPOOL de030f6bd58e5dbd35d9596ed020bc073560c0711533d9b17442498503f721c773e4f6a644febb41a8b9272fe07fedefdf719a0cab270c02e2ad365ea7853236
-MISC ChangeLog 1743 SHA256 688d6937903324bd11ae2bdec4aa365899387a170a923e3d90fe14be1aa49d74 SHA512 02834676dcb2e9c71f66eb25c4c1180faf46ed6b77ab64a22ef50f0bff5a66892843f87019210f2bf24fbf769eae0d02d9a90ebab636594db6c319560bb43938 WHIRLPOOL 1cf339e511784ccdbd7c5e7daa9a5effc0c54b3c137488d077e0977a7362124fdee26930c407eb61636436b71312ac92dbb6c71902bf112bba00c9f1b6d21786
+EBUILD CoverageTestRunner-1.10.ebuild 721 SHA256 fec8b97be0b47579cd75adeb687bae9b0584d344cb5a9ef4aa1b8f601ef14f58 SHA512 dcf409ec855167f3879713a3c42ebd9ced743c824adcdd83da1062884827c33945b97af8133e17968f303028fc5bee4f1dd7c0fee7db1d9aa8337f5355e74f53 WHIRLPOOL 348a8655f1f778e2e1cfbd2ab3ced49d26f2b0d5c58de3734fecbe38b4b80b123319726fc6d20f707f57eae79bf00d21dcb921833f255fa65ba87d386fe40a54
+EBUILD CoverageTestRunner-1.9-r1.ebuild 712 SHA256 34d9b7754a83d9458a362feff7f42392e5341bffd2c9c7d87a9420b499054a71 SHA512 5153954129acb12661517d5597c316465795533f81e934af97522a0f0036e95a175ea609d2edcec1d420021cac456588abb83550a348c8a069dca56fe251b7fa WHIRLPOOL 9063d2d6c1b4c34022dbd33e433a26fe7b1359a17f7c41cd9d34583868390faa04593e05d627ede50f629de3c6b2102c333ab08632d1e2cf8f92cc1baca20f8b
+MISC ChangeLog 1891 SHA256 06f61b6968cea69ffd7a1351618926d68c738e239f9c3b2dbb4bde3648131ebd SHA512 9c43f2fa95b30624b19fc9aaaad81d94a69e0ee35359f7b6c2627bec3b66f338c377c58fe0d371fbefc49bcab5ca51e083f09ebba1fe1f3f1c395a3c86d9b9d5 WHIRLPOOL 26bfb35398a5d409644b7361cd5fe4eb5252c1fa076e4719b7491d7158ddee33f6f186dbcd5152940fd2f249a0e28dabec0aecd365dcd2d1af6292a46fed1927
 MISC metadata.xml 236 SHA256 f55443c9b3d97fcc9437b9aeba1b3beae39e38599620bd520d0693bb8948b531 SHA512 842ec0962624e280c2c3909e6da541cdaf35532f0f00d76cc9ca0e03dfb8c3dc83a426ae370bc37d73d0c4b1fdd4983171a0586220546b967afe3a3f5dd78ce4 WHIRLPOOL 8ee0a6397a1bae24973eba9b31e1ac64bac9726ca45e5f2127a3ffc991627479030060c605c7cf0957891c184f5e5d01fb2387f94c3a68693c988e4a180c7260
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUvhWdAAoJELp701BxlEWfkKwP/0KyEZ21CnAGjoc2Wx3epGmT
-YC9CLJ1jBKCELk3DPdXz+l6Yr6633ZWjQvE61Ck/zHrTHB5bpWHccwQnclhJcOBn
-hfrQUwYY+NMQUHUrd2A0KHNh1Np/vej1d6BE/RM9ArxM/dV0zPPyrLsbZwvgOzX4
-DXvMKusem5lx1wYFMnWrb9AkUvY3roVkWrPT47FxqflNAmy2+JNJDikdbSv279zp
-RhkSe7UQnym3oR7/nJkbQwT3p357XcDqIiJDWpDBogxSSmE9JcWDU6vU6XG/QLp9
-iVYrABgcw6wWokxnUBqXRwuV57+ZLKRBnvLKbl0l9LIVysTOgKvo4ef8/SNRjpc7
-1aTTrnOQkLtzsQKE52FltmjzwGPC6FsUdYmhpwF8BQs/E1H4KyVMRs74kzsKAcVD
-zIGRcwL5G6A6iSyHQ7YMSmihf1ponBMOkuPRVBmVDSMdm/Pepu0jsp4spEMBja1I
-Hr2q1UXlYHPOlX8Xo6henRD1SDbueBuYWcrtAzytHzoe95IpSaBRT9xTxZXdovlU
-zeci9D7AEotH2FnDZrg/UL6D/EaioMsP+7Tp9/MnkyQZmRYmEXHSPZAKpvswYQiz
-3fkCFe7B6x+MpIoOztPxOG31C9vXKPDFY5mMsZkuzQkbbo/tQY0AThg3nMJPhFUx
-TXHtoSxfw6Kz1j1ysHUx
-=1C38
+iQIcBAEBCAAGBQJUv3pCAAoJELp701BxlEWf5ooP/ipgfIdMcINPhvVD8GCXHNAt
+qyb7pumqwTuq2xDEy80pmBD3R7MLInFP2r+PR9MBpRqpgOgN3XfMUsZlAo7olMys
+Z6xBysV6pE5NxMEgPfDctmHYOePpbKv8h2d5GQIwYrL4hhWovL+19dBo1qQvNVVt
+e7XvJsKvD3GwwX/7biJ9EVCsLsybkEF3I0CQWjdv8iilamokgTXDoXPdsTItuTDV
+Nh7USOw0w2vVjBTn+/akunSEj+DhYAmm1ZcwYZVU6mCAZ5R/VIr6mjD8kozHVDPy
+Zk0+A3TdSs47J1P9EB8kOZspDseXn3BXOTkqllTouIa0e+nz/udEtozWgDkEX48n
+JCqe/fJ4x8lHuUHIKT9EmxMYFGX9jgPe9kMZO2AysiykP2SM19eaXc7p8Od7zj7U
+NQH6ibWtyUMmRT4xx5IpycyMhF7Uo+2qcKoU3gXi79k4SjrYN/ZwcmF+G8J9Q3wq
+fWbOosSUumyfAkoLU5qznNy+lOfXJN9WLSfEvD8zwA/4LNgoFYGk08hdMhh/IkR3
+LBr12fcUrrca25bVu6+AuL0vexQ64kTAyzAIq+OT9PBvuF+xLUydl+PHokfMoXzN
+jaK1M9gerJC3H8MeWbrnARP+uNQluoJx+m670n5EijtgiX4XV+SeTRFgDMZAclCg
+Q0q8jyHcNpkrHlz2bVUB
+=Tc18
 -----END PGP SIGNATURE-----
diff --git a/dev-python/chameleon/ChangeLog b/dev-python/chameleon/ChangeLog
index 38b400d0f627..3982ea029186 100644
--- a/dev-python/chameleon/ChangeLog
+++ b/dev-python/chameleon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/chameleon
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/chameleon/ChangeLog,v 1.29 2015/01/11 08:13:30 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/chameleon/ChangeLog,v 1.30 2015/01/21 09:10:57 idella4 Exp $
+
+*chameleon-2.20 (21 Jan 2015)
+
+  21 Jan 2015; Ian Delaney <idella4@gentoo.org> +chameleon-2.20.ebuild,
+  -chameleon-2.18.ebuild:
+  bump, rm old
 
 *chameleon-2.19 (11 Jan 2015)
 
diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
index 70705e34f166..a66f83b2f2d7 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 DIST Chameleon-2.16.tar.gz 200838 SHA256 87c82d657fbc1b47decbe605a6f6105d9190cb19e924b59262cfdfa03e7a512d SHA512 a6f1491a11e55231ed5304b297d749dd590f1d0340732e00d20e4af1b311df297df2a72cc79f0e4949e5ac00acb9dec29dcb50423facb2b3bcff6ad3d1d75350 WHIRLPOOL 7ed76fbb05f3c413d86f42b45ef73d5b333718031434273e512db43eae69900abfee7b10deff78f360131d50a1093e22786ca01b8eb5984ac5ac5330ba1f7eb1
-DIST Chameleon-2.18.tar.gz 201784 SHA256 b1dddb4d6c19c3464dafdc157ce50b7bdc172c9a1a04b8a5d8173d615f2b6885 SHA512 f58a8610f10902082950e35a260f44ea5bdb89c58a1812a411b87379c430efac66b44cb681abf980044494421d35d97865a9b16448b34c3813faaa3b25e348ea WHIRLPOOL e0bba8f3a8d9f826c53dd62b613ae926fc98185b00c32d37a3327c8f4383e3323d1a1cbebc4ac22098618a4ea653f78b6cdfe299e82a21471680ba46bdb24f1d
 DIST Chameleon-2.19.tar.gz 202197 SHA256 744070535f8e85a277aef07b0a98256aec5bf6a0d9b909686ce571eb26914491 SHA512 7e90ccf5f53000b94452b8c343cf232d4bc48857dd33ea19bf44e6732033851459a0761cc0f2af5851b11f5c1cd698679ef541cbaa895373f59d66717b3fc267 WHIRLPOOL 6c24d006a707f2b3e2a0b2df5ee2fc52314a5c830fbb8096429ac40dc43e932ddcc38fbeef5886066f848f10076ea8a171a557f995c7b1df16bdf709a858ee4f
+DIST Chameleon-2.20.tar.gz 202396 SHA256 557deb604cc2fb235441f449f44feb3942258fcf233c7e75fcae6adeb886ced4 SHA512 805189e49c6b326f82ffaefdb1d734e3959167a0e3523531f9c9c554fc8412ab4ae401aacae023a3ba43d18019a6fccebafae87f2c6bed6c1c2f5b1aff080153 WHIRLPOOL 1c84afca8e7eb6231f9caea4934351d347bfc6cb52025754b197595eac368fb9e5a6ae9888809aca99f80ca8f0544e54426bc284a2314033b07771156011e597
 EBUILD chameleon-2.16.ebuild 932 SHA256 681be8d53859136efa40be1b98e195c6a823f4cc24eec802b5bf517b1a50b3fa SHA512 b33c370811d9360d074bfd9b424c6295bf2bce91a680fc8af2a45b3fb1453abd3865ac660109b49461053eac0c9d6dd9ce1466f4da2f3a8a43e3ec75788028a1 WHIRLPOOL 5732202768295bc4aa634f74ed31c6203cc87eb3d0e80b6251218dcf1230745110f2e739151faf6b854196f4ea3af6ba31dcca6e6fcda79df4651031831987a6
-EBUILD chameleon-2.18.ebuild 944 SHA256 652ccdffd5d8881695635110dbbd8a63ce33e4ed6da3287bad3452b9b0285be9 SHA512 dfee1562fd3623a946d3e60d79541b1c088d1f7af70cc849f4f3e1775e664133b7f35a828bab22530110860d5bfdd8568d4ce29c95e9d29a3d37801b6b1caeb1 WHIRLPOOL 93bc61bd3abf7337235104d170f59c1c92add3dd5fbceb17e68b0dcfad7900907f45df7ac7017571954bd5cf07524241659a7a832289a984707ea3bb898b007c
 EBUILD chameleon-2.19.ebuild 944 SHA256 8c241bd195b7bd353afdb707145b787825f061356045be867822431a4d87c158 SHA512 9fa0c00d1fc302fef04cb2145231032c195219b1530ed31beecb325531f96d0f0c49b1f19ec3cde0108976fc0faa308819482b04c0e7c03f8eda2362fbb6dfdd WHIRLPOOL d1eff7cffc2d2b9f2cde4ae00d63861b47d5262971cc870fd4e9385a7d065d06c177a9148070e87535e0b35bb7a20b8c27a2ad075e0ca8fde8b9db723a1395c1
-MISC ChangeLog 4472 SHA256 001435ddc705af130b7c02e49f781680a57dd4e9c951dfb0c83285bf7d56d6a6 SHA512 1ba176cfede3a0473dc20797fcbe6f97bb54fb0b4c9833c102c87a5c2dea63dcdfce5af276484753e3f486d0e7194a76feefa827cbffedad2298f869e661b2d5 WHIRLPOOL 6d728a50f72a36584bcae051dd324968e68ba18ad1f98e7c411097009538112379487029f38295fc663081271726d60588ef11e3f03ff26d091994e617d34f47
+EBUILD chameleon-2.20.ebuild 944 SHA256 50c5cfb2f5efce0cf8334666dabad9ff4df3e2a544081e4162e2e396ca625c4f SHA512 9c8a80e917a001ca6771a29a692b71ab679de76b29ef97751391cd4d02ea4e56cfc10327d9a2cbfd15e4dc4cbf5463c1274107594f5c7a4e7006e04000d11e89 WHIRLPOOL 8856c3c4b773bb91f5dacafcc6e3e52512b70351c6a89ada692fb224be26dff34ca72375775bebe2bb17b983f1280ffc588f1a0adee46b24b1173c63bfc57093
+MISC ChangeLog 4617 SHA256 1fa3224161f167140bf2bb7fc45ac45e6379d5f7667f919136bc6ebfde7f830b SHA512 b1342e90e5ba413ade4646c556c9fa8e841430519ca8b45ec4eed9cb0169b6aab8454bfe52630298c69897b4f7930b065994b2c690017526b7c4e2061252af1c WHIRLPOOL b52d1ece622f60f9d73ef6fc3771564da415ab296807d07ae3330d8b8e2fa33189f88eacb0644be6fa6b340063f3044e77914a95c5ec3fbe919012d26b3c0f23
 MISC metadata.xml 232 SHA256 c0cac02ffe32edb941fbfe04c5572a09534a29f17eefc8edb585a873eb061a86 SHA512 04c8fe97873a13e1adbb87e0a45fbbed06fc62a4ed817472da405d146e5302d2c5960ad1ea1d127f5938d552a506452a882fe2e54c6a99f8252caf2e18f1a48a WHIRLPOOL 8d6a77e092bcaac34f13e6a160cd065d78c240a9e22b7e10c5240da869e5580ae625327fa1e40b325a4ff5b073e186a77a878d26097712b636b268e1cc9f4ab4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSyMLgACgkQso7CE7gHKw0BfwCgk69dsS1aJ4sV+x1MlXRsbXdZ
-Q/QAn0lE+HvqxM7C0CULj5ddvU5PGzDB
-=mIut
+iEYEAREIAAYFAlS/bS0ACgkQso7CE7gHKw1lZACgsDjLSStSdm0QGJovkfQ/r/Ax
+bJ8AoNNk6GPtSQXEOuyai89Ok+nfbu/q
+=K3e+
 -----END PGP SIGNATURE-----
diff --git a/dev-python/chameleon/chameleon-2.18.ebuild b/dev-python/chameleon/chameleon-2.20.ebuild
similarity index 90%
rename from dev-python/chameleon/chameleon-2.18.ebuild
rename to dev-python/chameleon/chameleon-2.20.ebuild
index 971960f1e8ad..d0ac821ab34d 100644
--- a/dev-python/chameleon/chameleon-2.18.ebuild
+++ b/dev-python/chameleon/chameleon-2.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/chameleon/chameleon-2.18.ebuild,v 1.1 2014/12/07 08:34:09 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/chameleon/chameleon-2.20.ebuild,v 1.1 2015/01/21 09:10:57 idella4 Exp $
 
 EAPI=5
 
diff --git a/dev-python/cliapp/ChangeLog b/dev-python/cliapp/ChangeLog
index e3ba0da0e408..5fbfe3b71be3 100644
--- a/dev-python/cliapp/ChangeLog
+++ b/dev-python/cliapp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/cliapp
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cliapp/ChangeLog,v 1.16 2015/01/20 08:45:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cliapp/ChangeLog,v 1.17 2015/01/21 10:06:59 ago Exp $
+
+  21 Jan 2015; Agostino Sarubbo <ago@gentoo.org> cliapp-1.20130808.ebuild,
+  cliapp-1.20140315.ebuild:
+  Add ~sparc, wrt bug #530672
 
   20 Jan 2015; Agostino Sarubbo <ago@gentoo.org> cliapp-1.20130808.ebuild,
   cliapp-1.20140315.ebuild:
diff --git a/dev-python/cliapp/Manifest b/dev-python/cliapp/Manifest
index d32e54f18325..8feb1c765066 100644
--- a/dev-python/cliapp/Manifest
+++ b/dev-python/cliapp/Manifest
@@ -3,24 +3,24 @@ Hash: SHA256
 
 DIST python-cliapp_1.20130808.orig.tar.gz 50236 SHA256 62944c5b99beecb3fe5fff5321b35b71e0cc21c9cc212ebbad26b00cd5c42e45 SHA512 6f8b3bdcf2e737ecf3ebc92f43b85aaf9fbf848635ddcdf7f252dca9a2ea7b8fceb47908742cbbb2e25695ce7ffc7110053c9d648f3616aff87434ecdcb0b493 WHIRLPOOL 5d4f253ae265b37ae59679625daafd7bde39cdb8403663c3b537d27108f47e908888efc504e9e63d20ac0f7e564148ec0424a39864f76b1047116ed9b8f5a93e
 DIST python-cliapp_1.20140315.orig.tar.gz 51107 SHA256 55bec495881ba6759c07f1b94658e3b3b21fa3f04c8bbac2c5fe8b8ce1bf862d SHA512 ce538baec212d5d5149b0aa0ab542919e465fee6700104079842022bc47ef42e65d42179689e998d524feb6b7981e3e396f30266a4a8aa7373ebf1ae8013c2d9 WHIRLPOOL 3237ee51e1c8c15355e1b8a24e25f5c70eb242783e7be226bc400e750e98f708ccf3eb004a2bae4a6b8dc7ba4d39f512de8db4577123a5433e3ffc4f50bf7c71
-EBUILD cliapp-1.20130808.ebuild 758 SHA256 2f95ed087d6b4720ff31a1a6c4368c0a3d7d8b20b33cecd71b4cd69f8f2e114c SHA512 992430460f5439f2c48c9760ff6002c202a69f509c4f66ab4646f5a2166553c6fc657f435924d7899e5ae7f6533fdfbaa38977bbac62261f423271862bfa7ed4 WHIRLPOOL 90ed530bd2c32b8ba9080a7258d275517fec4ab26e5db7a7a7b51b46a3751b901c09c29a45a7ff841acf7b728486eb44ffdb05f914adc7ad9e17599042da240e
-EBUILD cliapp-1.20140315.ebuild 781 SHA256 a6b23b7d2e4bd77cb156fd0aac9b5358e98a5204db7c87392081d7fb93b4aa48 SHA512 09515745eec8efa67b2294c735425e2933657d2bdce14c5de894729125bb0bdfc471a3a7d7a9ac5a410b38530ec3b5cb13ba982882d3502e9d30183f34c54038 WHIRLPOOL af1bb1f4ddd2a381aa50638d8e157ae93dd8434a637cc92f8d35e3e955ff0265b760456cc81547d9aa1627c3d870cff62b8ae7e6721402dddbde0c2953ba2b97
-MISC ChangeLog 2378 SHA256 27667a85d2a3b1198e870a53eb774cf9aee2cf647bbe163ba446ac397ec10aea SHA512 6bf48d791ea4c1af835dcfdfa61eb504b2efe85b6a6c3894b6d8efaf109b798f6f37f38183facd12347f6d8d2cc121a344c3c2cbe1c44082dd1ed781e68046a9 WHIRLPOOL 5d8e6b996c77e14af8b7239082de3ae64e418fb716e4cd2e9fb9fdb792ccb2a2717ad7a2e403b156afe4d29a7ae248b0869e77b4311c4ff7f0ba5c293a529ae0
+EBUILD cliapp-1.20130808.ebuild 765 SHA256 d9eaa3c646b0686411ebbb68d281bc4910ea80708609a6ce5112767039315ffb SHA512 7e5f12a8b9176ea84dffeee84f9ee1645fa342a31cf5aa0d0c7a6d3c70bfd54b0d4ba6bf0be11a9ecd86c067bb44e60ff200c7da4d646a9270ed08dce636ce95 WHIRLPOOL f5325cbbc76ca89de1c7258eb3d91b0eacf8fa57f84f348d294d0c6fef0ee7bc0046864b963991a58a531cb8552374bea752d86963d064204bd48846e4c23294
+EBUILD cliapp-1.20140315.ebuild 788 SHA256 bda4a70c376f79ee1cc3d87de60859d1b669eb35e3b1d50c8bc628fcb1dbdac0 SHA512 43c18950a60f08bac3bade62de9819f0845c389ba11ae86bc2130e64aa42c485ba60accef290a37f5bb95a1e5592447e22e02c7fa46e241c3bc72a62beb582e0 WHIRLPOOL 073a139a5004e17f721f494a36d97714856626a032bb9abba219e1549aa214c4c07e1af5e9abe6b7a5aebd6787cfbc9f84c1914b48f0b93fd01ea62873b5f5d1
+MISC ChangeLog 2512 SHA256 d74dc9d169ccb3b79ff80d8d0ab7a191cd0e7dd6824667d0bcd511a386e1a76e SHA512 c46c4762e9d8ba54b5ee7fc739f8fa2fdefa67f9a6267ed812ca22c43523667575f3f12287410b389f07eb24f3f4551bbc3630022162007e3262b4a293dfbfc7 WHIRLPOOL 384abd27c32cec00348a3532b5426682ec36f8256a9cfa1ca9af6e538b7d7a73a9789842b43f948d2c6922e50a62b7ae298b1189021294e94f5d39f846d1832a
 MISC metadata.xml 236 SHA256 f55443c9b3d97fcc9437b9aeba1b3beae39e38599620bd520d0693bb8948b531 SHA512 842ec0962624e280c2c3909e6da541cdaf35532f0f00d76cc9ca0e03dfb8c3dc83a426ae370bc37d73d0c4b1fdd4983171a0586220546b967afe3a3f5dd78ce4 WHIRLPOOL 8ee0a6397a1bae24973eba9b31e1ac64bac9726ca45e5f2127a3ffc991627479030060c605c7cf0957891c184f5e5d01fb2387f94c3a68693c988e4a180c7260
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUvhWgAAoJELp701BxlEWfLaAP/1n4n3SN2il9lz+6AHwyXgtB
-rr05dv6b//sKNtrjHdqLzQexFBhfeSXrkWcQS1oEx200LBfO29ukUMDBbt/2ptt0
-ezcSsFBRAK5Is7T7+eN6/UNJDpeCZwvf2Jg9fQDiMP7NDFGReWLFbaCiJlGRFAlm
-zMv6s1bhTd9JK1SV9pqcCLTH3JcRQC5uQDlIAdxYqzpHEFZ3eVOGBX8S0/daQf9u
-Qbl6nyMz3EhsnUbaxoKzxca35Xpms/W2ryhnLzWxXIi0WGvtFdvUqLnha/t35BiI
-BMrLpt1zzN6RMG9iL/BK5CulyYX1GtHiOL+NbAXIk7zjx1wgPcbdN3TosYDfbIBT
-WKsgD8UWVpmG5zv/+yQbsTpwKmRvOjZBi5uqXqHcoD79Qakkp5oPfBAEybzPj0c8
-r7op/CRQD839wpcIG8Nprrk4w94sq8BfMR+//VzjPJfi7vpGx1lLp1gvX5+TQf/u
-XHoX4FIrZvn8v9eUcHq8BCrdWyJuHr/XuzyfL9DUpj4/dw85j1kPBxGr5TxEJC9L
-En4JQmljLYIt0rj6U9q5nGWY7+qUaafnlFSr2zJ3Hgp+wYHqsBRxmiTEv9zH/N2K
-ySxwwRiHkYnJAe1k9FzpX/CUiaIjeP/GWvZkOa0ADOwptgvhOj59xi7bYFfG22kb
-T5HmLEhA+HNSCW7xQD+e
-=2Rtv
+iQIcBAEBCAAGBQJUv3pFAAoJELp701BxlEWf6FkQAKpiGnzsNdtw+3FV6GYb5uE4
+LoJ2WxflwsnNsxrVFoefa383BZE2YTTlxySsR6YITT0oU5D6xdfzvD5WvmsyCi3x
+5bj2C4nMr9CgrY+mdZW/CmhZGJLD99EkzRqnUPZeDsWmKGaUPrMAVs4DRQfDgyCZ
+OjzM4o16rmi6OFNMnxYdeaqP82r5mXswtdMk5Bo+JeQ8skgO5nJ3sE2dA7fh5ZU5
+TjkZX63pstxsJoKlcr72/T01Vo/3CTbBcV5O/G2x4yRLR9DKsXoYZ8pHrEoPTv2W
+XMdBm+mS5MPsjidXocQ0f+UPH3fB13Mo6OWCQ5QjC04TYTzlwSxR8aXgFDV8pevm
+sqQ+/8cJMrJliuwKuSIdxHnRJE6rpf+f7SI6xe2mNVibVTpzcrsDI/2+ajuzPgZu
+EZHdiC8HukHvnEFBxihQ3fqSII+pXQOXFuNYsk2MSsMb/uSpBMXI4ma7W4buyLzz
+QYQUfaymvkXz3Aa95UagxH+dP6xBO273WKSuuEpjV+XhobAI9bbsAyKaEQz8/Rvk
+0QDkD+SO+5nbHH6lqWmhc5P82CqBaC8L3TlegNUTVFxo+JEyxmgXyJTtI5pu+po+
+kuuYcgEidXLZEa93cj6UU4iUBbINO2VVGD5bw7oWNDvISD0vkpnqa6pU5w+iYv0P
+zQJcQLNuGagksnCgWID/
+=mjfy
 -----END PGP SIGNATURE-----
diff --git a/dev-python/cliapp/cliapp-1.20130808.ebuild b/dev-python/cliapp/cliapp-1.20130808.ebuild
index 84db43921cc0..39f95a667fcb 100644
--- a/dev-python/cliapp/cliapp-1.20130808.ebuild
+++ b/dev-python/cliapp/cliapp-1.20130808.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cliapp/cliapp-1.20130808.ebuild,v 1.5 2015/01/20 08:45:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cliapp/cliapp-1.20130808.ebuild,v 1.6 2015/01/21 10:06:59 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://code.liw.fi/debian/pool/main/p/python-${PN}/python-${PN}_${PV}.o
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 DEPEND="${PYTHON_DEPS}
diff --git a/dev-python/cliapp/cliapp-1.20140315.ebuild b/dev-python/cliapp/cliapp-1.20140315.ebuild
index ff4581a3126a..14600d6e56f2 100644
--- a/dev-python/cliapp/cliapp-1.20140315.ebuild
+++ b/dev-python/cliapp/cliapp-1.20140315.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cliapp/cliapp-1.20140315.ebuild,v 1.7 2015/01/20 08:45:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cliapp/cliapp-1.20140315.ebuild,v 1.8 2015/01/21 10:06:59 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://code.liw.fi/debian/pool/main/p/python-${PN}/python-${PN}_${PV}.o
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 DEPEND="${PYTHON_DEPS}
diff --git a/dev-python/graph-tool/ChangeLog b/dev-python/graph-tool/ChangeLog
index ef5e0e19b329..bcecbe53c01d 100644
--- a/dev-python/graph-tool/ChangeLog
+++ b/dev-python/graph-tool/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-python/graph-tool
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/ChangeLog,v 1.21 2015/01/17 14:03:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/ChangeLog,v 1.23 2015/01/21 16:37:51 radhermit Exp $
+
+  21 Jan 2015; Tim Harder <radhermit@gentoo.org> graph-tool-2.2.36-r1.ebuild,
+  graph-tool-9999.ebuild:
+  Use has_version instead of built_with_use.
+
+*graph-tool-2.2.36-r1 (21 Jan 2015)
+
+  21 Jan 2015; Tim Harder <radhermit@gentoo.org> +graph-tool-2.2.36-r1.ebuild,
+  graph-tool-9999.ebuild:
+  Link against the right version of the boost python library (bug #536734 by
+  Justin Keogh).
 
   17 Jan 2015; Tim Harder <radhermit@gentoo.org> graph-tool-2.2.36.ebuild,
   graph-tool-9999.ebuild:
diff --git a/dev-python/graph-tool/Manifest b/dev-python/graph-tool/Manifest
index 486907870c77..793d0d72fb6b 100644
--- a/dev-python/graph-tool/Manifest
+++ b/dev-python/graph-tool/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA256
 
 DIST graph-tool-2.2.36.tar.bz2 15050904 SHA256 e1e030306480393464501cbcf3f3c938c2105c95fd0d67a8fe8bb4296e0be872 SHA512 3867fed367b547f28147c3234cf391d5415e5cf4594bc495abab1e1f827ba89af44d9d2bc92ee604ed184ce48f1644076aa852a0035fa2f8cdb449157d6b32bc WHIRLPOOL 741091c5504234767ed2662f69307aeaffb344ec132f708b494288d03485ff1910a967b244c35f5e7b77bad0564b249fd7b80ddb39051928f9806310c4d7843e
+EBUILD graph-tool-2.2.36-r1.ebuild 2086 SHA256 1ffea4b7ef68faf3fd8d0ae28dd794b76e658e865181c89e401bc0e9b544fe16 SHA512 23dd9f6b8dc625ee3b9725d393866644c466520781a87bc3cb71d116172131233ccf93b28be503245b1dd63e3184b00e265c764380a322ac23e518312992ca18 WHIRLPOOL a12526d8f3979ab07dc1ea127305024cc2727748154ee6ca933de93a7b6aed5ff79bf77f399d0cf7c982eda97d7756bc084233de57dbfdde1086f90bb032f657
 EBUILD graph-tool-2.2.36.ebuild 1935 SHA256 5ca0dbf521e6d3b163aee977bd41d60636f94e6d163c1ea300b8d7e941f0ccc1 SHA512 31a91b1dc06b0c239271c93a6059dfdd8a240a7c080e494c05464c8f460e02ed8ab92af8ad72eeece89cda08d48004b72bc4f9743547ca61e03e77748a7b8397 WHIRLPOOL 4a78e46be4d3bd52334f7fe8ec81c33c43363e7bdb0b2e24974d8e272880efa3c40ea1108a1eaf27618c623eef94f3515b93f8702fc54d0902cc85291f95ae10
-EBUILD graph-tool-9999.ebuild 1934 SHA256 7ccd791b016986840649bba83154e164fd7ea34211fcd70a2ffaaeedd26272a6 SHA512 e9783247f0a557071444bab0d9ef99cb2821400b4243979d881480a58c2740449c89dff073ea30d07f77eb8f9788bf7211bcc5f04c89e99a8254778e34094dab WHIRLPOOL 3d6923809cd621247761291aa7dff9da3f8e6cec9065d89c143056eb0fe04c955101bb520190142719e1d42d993f9de04c8bb437bd2a582585c13d26883fe3ec
-MISC ChangeLog 3148 SHA256 05eaa8c23034d8613b394f6446ff472cace7184967e5fee2a0db5e9cb5cf6cc5 SHA512 0b0f7327056a268549df9eeca37c139cddbe032e11836cb55fb2a2563ad6fd3fe1857c95d66c938f501403845e7a0df35a1aafb69d9c9b906bfc356f7a5872d4 WHIRLPOOL 377ce3012e5fd6108088cba83394c12daa7136893edadb1ee3d751d05a04f3063d6538149d371856418cc221838faee6b18aa85dbe39592db9e9260bfa119f93
+EBUILD graph-tool-9999.ebuild 2082 SHA256 48cdccd14f3506b89e269a66cb436663b03abec7dd46b76edf7b362894649f31 SHA512 621f9f40fd3ca74c4574b4cbd37637c65831860bdaba46edd9414bb6ec9d752e762a992e7cbe462c68a2248970de8e82a5883facd835ad929e5c8a0fb3f9c0ef WHIRLPOOL 5bb5bceeb5f8b7cc64d99e83c215ff63a9d1d4d2e9e81f8a05a07000e2eefb4fe1ce8ea8294b9d3d29cf7972b75520d0a3f3d416ea31c70cca4f2e21041d353e
+MISC ChangeLog 3535 SHA256 e766d308b2a828bd2336f6f4863121fa96f0b28edf9036648a2677ceb6a5d281 SHA512 fd566ca2e063c041e5072369f9e8c151e41fe7e0ac9de06e04bee5da05a20402790373585493d6e7dcf3ee3c46e7f7b4db156db2657f38557283bce187589603 WHIRLPOOL d983dc32865e36d89c0b631e6f95b2657e73954bd779684a2691d89fe9782f704fe5e052a88ccd135cf062a995073fb7ffb43b2baece50d46739f8108085bcb6
 MISC metadata.xml 253 SHA256 9f2f51fd5d49ee6b0ef785dd7256455213e0e18e37f23b498cfee07dc1efac7f SHA512 5cb93e348b913d23ba4283ee3baf4a052658e27cbfad60ae3b80e68317909342ad3ec537724886b746f3cc1ada9db3010e41d80b615919d596df11bbe7bc7fed WHIRLPOOL e98beb144d79c5c872f1709991bd5b3ad17b63c494bcd4e9b2282957b309a888788e2b1c3ed8231a108914f76e0bfd21b5bd395236c09c25caa71df3a6063a90
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUumugAAoJEEqz6FtPBkyjmQcH/icTfT0gsox1fSyB62ewy05U
-pfgh0uuG0wtfQaGGoa2YoyiVLG/nJNns7/7rIbwKFqMea8eRDEVbRYLH3xUWSXQ1
-DNhgXURDaGPYcnUhEWQ5QpXjU15Hzc5VGNDJ4UgMmieyIYK7ekJVsiOVIk5dAH8P
-SwfJW3Jl5imptnEljkBEn0BelsXAXtgnHETqbQlnpdo2nPTG9jSI/yud9qAyJVSj
-R0E6Pg5F15UVupvtWMV77f8sXKBhlcpdadgECoLsgW3rLozX6Bt9/P/4LNnlXBhN
-BxP84XuGCrpshEOK2aXxYZerdgAppMC6Yrc6JNnFdk4/ZZCi3YQqiiDB+RarwHE=
-=JBj+
+iQEcBAEBCAAGBQJUv9XiAAoJEEqz6FtPBkyj06UIAIgGqa/8+eXndGgBBUCMHC/5
+IaprBTBAOn3n8ArvOKNzgxmIyA96GDbL4+mfey5+Juov4FsHxTMk7u22s0cs1K7v
+XxC5MpEhIatekYSh+1VmBkB4/BgGPgqdHoCP4kkMKCNunnpejiJ30OXchU3coyM7
+Hpecv9nMeg23syiHPEdGKPKImDQf/jlUw/8dWcO/dVX5sCcQIzT7NTt7FQVX+Y9Q
+hU2S1Nl1kD7ggxz5pGCbFA2XdyMJmAthnoLpTKUoQqqPYICM0rZaUBEmp5sqsoDf
+5dJCy7i867uEptR6UCO8JIHHf4MJVkBgnatDac/nJ52vd6CC5rk3NQRFPVJ42wc=
+=zAis
 -----END PGP SIGNATURE-----
diff --git a/dev-python/graph-tool/graph-tool-2.2.36-r1.ebuild b/dev-python/graph-tool/graph-tool-2.2.36-r1.ebuild
new file mode 100644
index 000000000000..9ac2ded1dd0f
--- /dev/null
+++ b/dev-python/graph-tool/graph-tool-2.2.36-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/graph-tool-2.2.36-r1.ebuild,v 1.2 2015/01/21 16:37:51 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit check-reqs toolchain-funcs python-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/count0/graph-tool.git"
+	inherit autotools git-r3
+else
+	SRC_URI="http://downloads.skewed.de/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs"
+HOMEPAGE="http://graph-tool.skewed.de/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+cairo openmp"
+
+CDEPEND="${PYTHON_DEPS}
+	>=dev-libs/boost-1.54.0[python,${PYTHON_USEDEP}]
+	dev-libs/expat
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	>=sci-mathematics/cgal-3.5
+	cairo? (
+		dev-cpp/cairomm
+		dev-python/pycairo[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${CDEPEND}
+	dev-python/matplotlib[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-cpp/sparsehash
+	virtual/pkgconfig"
+
+# most machines don't have enough ram for parallel builds
+MAKEOPTS="${MAKEOPTS} -j1"
+
+# bug 453544
+CHECKREQS_DISK_BUILD="6G"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+	check-reqs_pkg_pretend
+}
+
+src_prepare() {
+	[[ ${PV} == "9999" ]] && eautoreconf
+	>py-compile
+	python_copy_sources
+}
+
+src_configure() {
+	local threads
+	has_version dev-libs/boost[threads] && threads="-mt"
+
+	configure() {
+		econf \
+			--disable-static \
+			--disable-optimization \
+			$(use_enable openmp) \
+			$(use_enable cairo) \
+			--with-boost-python="${EPYTHON: -3}${threads}"
+	}
+	python_foreach_impl run_in_build_dir configure
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir default
+	prune_libtool_files --modules
+
+	# remove unwanted extra docs
+	rm -r "${ED}"/usr/share/doc/${PN} || die
+}
+
+run_in_build_dir() {
+	pushd "${BUILD_DIR}" > /dev/null
+	"$@"
+	popd > /dev/null
+}
diff --git a/dev-python/graph-tool/graph-tool-9999.ebuild b/dev-python/graph-tool/graph-tool-9999.ebuild
index 9f020f3f47a4..04133556b338 100644
--- a/dev-python/graph-tool/graph-tool-9999.ebuild
+++ b/dev-python/graph-tool/graph-tool-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/graph-tool-9999.ebuild,v 1.10 2015/01/17 14:03:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/graph-tool-9999.ebuild,v 1.12 2015/01/21 16:37:51 radhermit Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -58,12 +58,18 @@ src_prepare() {
 }
 
 src_configure() {
-	python_foreach_impl run_in_build_dir \
+	local threads
+	has_version dev-libs/boost[threads] && threads="-mt"
+
+	configure() {
 		econf \
 			--disable-static \
 			--disable-optimization \
 			$(use_enable openmp) \
-			$(use_enable cairo)
+			$(use_enable cairo) \
+			--with-boost-python="${EPYTHON: -3}${threads}"
+	}
+	python_foreach_impl run_in_build_dir configure
 }
 
 src_compile() {
diff --git a/dev-python/pycurl/ChangeLog b/dev-python/pycurl/ChangeLog
index a6595203fa67..675b7ad1bc27 100644
--- a/dev-python/pycurl/ChangeLog
+++ b/dev-python/pycurl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pycurl
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/ChangeLog,v 1.107 2014/12/27 19:26:52 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/ChangeLog,v 1.108 2015/01/21 13:11:33 armin76 Exp $
+
+  21 Jan 2015; Raúl Porcel <armin76@gentoo.org> pycurl-7.19.3.1-r2.ebuild:
+  alpha/ia64/sparc/x86 stable wrt #530290
 
   27 Dec 2014; Agostino Sarubbo <ago@gentoo.org> pycurl-7.19.3.1-r2.ebuild:
   Stable for amd64, wrt bug #530290
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index f7039d4807f2..35daafb6c0ae 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -9,23 +9,13 @@ DIST pycurl-7.19.0.tar.gz 71346 SHA256 eb782dfcc5a7c023539a077462b83c167e178128e
 DIST pycurl-7.19.3.1.tar.gz 116687 SHA256 c0d673fe99a9de07239eabe77c798f1b043f60c02afaec1430ceaf59d7501a4f SHA512 65ccb07638c663bc2a723664f1ade50f08eafa70bbcdc492cc99362a91873f453b63336a6b393d9f6591308f1450dadc64ce729b29990f37b170dda0eae0b23f WHIRLPOOL bf25bbb959e30140a261b9bede2e1a3675ec99c8f6c36f8afc8ca73288aa7f7cea6fa1d28385ca808872b251a676aebf8d77d203aed60619dab8852cac17b296
 EBUILD pycurl-7.19.0-r4.ebuild 2121 SHA256 dd1ad66d3931e769ec932b511a8d9ec2def5ecded5e97ab142f1dcee3d7b6cdb SHA512 aa319ddb75383cc81ee458e8c3761b12e452119eeaedc84b4b5119ea409f6bf5ae5f98a1ab6e56c686225595228de976a5a289bbed817cd60d5ad51ba3b17c82 WHIRLPOOL 5a1c9f8e55da570de5edf0d2dde60865b9d1c4e144b1937a272ed7f1263a9b90fa7805ff0cf34dbfbb35517583bd1a68e5b681e11f5a7f78c7bb738685992b39
 EBUILD pycurl-7.19.0.ebuild 1293 SHA256 3c6c97f33a00cbe22abd3d6fa0c50f4a1828463a856b95d5ba46f8e4fd438b2a SHA512 6316ffa211ecc161d98ecf648573c2ad9d0b8fd9a38fe7db2b7817afb5cda65079d3ff7d4755bd1e052d4c0fcf10505cb86b46b170508d10632a9380eeaa416c WHIRLPOOL 16c87bf989a7fb403fe230f62ef8950434dd1f503a5695a91287b43dce78a444015e9b97e732259d08e0dfaf2e669705fa2d8f7f8cb96476577343d688d79eda
-EBUILD pycurl-7.19.3.1-r2.ebuild 2420 SHA256 8434a5ba49216b277c4ff4cab7237d88d577c2cbb15d8006734dff23b14d3214 SHA512 305f0989bf9778f028ccfdc8c54d04d9e24a1fbf4814bb05049275397f47323565f20edf61214bc410f69d38d9ee45c8cd16af066acdbe62c9f9ce66c062b35e WHIRLPOOL e67040b1bf32a74882afbc4c5bb8546777ed55fd34bc4d9c6ca733d0ea56b0ecfba368accd8303e26ac2e58b6cb841821fb45d30308926387cb8a551f2f69a2a
-MISC ChangeLog 14983 SHA256 e494deaea5e2e929629ede68bd17b6d0e67e976b955c246d3b1258011a659b57 SHA512 a7a4a8837f6468dc42a97f6435410d1c5170e81eb6bde0d70e9c23e7365a4cde27d046d25e1cf656ed8e221abf64ffcd8930f1e37d30aed7b4bae9758e3b97b1 WHIRLPOOL 27198a3c55bd83a036e3e1feda83094ea04197b3169c5c367517bbf0aa2190203629b4ba9218a947d86c5acb84bc8d3324a2c5837a18c955bb18ba84744fd919
+EBUILD pycurl-7.19.3.1-r2.ebuild 2420 SHA256 f01556e4f8ccd4efdcc8fe62f2ddd1d6919dfd10915ab3bccdd1c4d33425a242 SHA512 13501b5ac093ed047275673d286c7bf7ecd9766197c531ddde9d4015c4dbf072e41a5b116a7676a215f11739aca859b9af82b9ef9a9f01e40a6bea4eef15f9dc WHIRLPOOL ee8acc991acc8c24399dcc48f6b1869a362d4ce4c1796d9d3045c4278898c994c0114a0f9bf7f0542088aeea055ab12c7b47adb1759782fe70492a21c0a291ac
+MISC ChangeLog 15106 SHA256 64b927164cdfabfcfcec464075aabef73db275d6597b618cba186d777670f519 SHA512 ed85e2e3ed82edcbc52deab7775fcaf1dce7b9ebf39968870e194b2c204589ddbb523843fca12ac4694fd65431ea366133367317111ba5c6a9ee8873ed4234cc WHIRLPOOL 0f6cb988b94bfba463b0cac2fad3369ab624c03d3662e3a343e32a5d9c5093319020e32bf4566863f2939e068fde0e76dc12bd9373367a8aa2bd92599b85347c
 MISC metadata.xml 826 SHA256 fdc8c57902acabf11f4b07cd9ac36960db5c41d8f9e94e238cf9e40903a51dad SHA512 cd860d6a4151ac15bb7d9c355d0222f91b429993d56083670f3325ecde4f4fda8f4bf374aba3b1c65270a786e12c30c0344917fd04b608ebdc0c94b392279e61 WHIRLPOOL 397cf201be522437cc691b94d0aee887c8678b73e4533938edbbd1774c0a26907585b18584b39ce83e2868c6d896445c3dc940c2a2abf061ecb703ddbd35ca72
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUnwf9AAoJELp701BxlEWfeb4P/jIYLUkq7Etl938YEwGLJiSr
-3W9A3BtH7QBhO36RXQ7THjBnkgkX42x7EFd4GULXorxaEqs1/a77YSXZ7s0FT2Yt
-iV8WjtXytjGBml+icE+CaYdXbq0MHgw8rhbssFSNs4EqP4DpOQnTHmtIdunKm+Mi
-Se09CwdrOkms9RB4b6MKt6XxbBI7QvsIwbUULqjrkhL69NwYC64BCk+xqy50OgdY
-b51qWA9+/PbDkAvL9ELgHPX6VOQR4XfnJ2og12/zoUSyIT70f8NIwg3RzNqXE63N
-mz35tom2RHEcgUnIjsnAELuFp9yF1NL5mL5C4zcBZadvlyZoKF1kcdOMWT5DHHkm
-tI2nfY0J7dC+RGMtCE5Ca00G5MGhHgp4kCQwoH3g8Ch20ei8wy4rlW7XQapz76+q
-WudiHpQaLwxx11wa0R2qljPStDeMZnlSjru+hWZWsE3lkxvSqieOn56/WRJu50yc
-pmrjwmm7w9zgv/Kxook9754aK+bxsRlavJpxGNbVtB5EpOAnIX2Vkw/4Qh9OaoyJ
-V4b48+z2O4uHTPwitj9hTFXPtJliqi21dW6/g3nPoVM1wPiEIMx95A25AA7FnE2Z
-n3fY/9e0LE4GdGhurfoxyPPSDtLDxPNXWMYKNK+7MXsv2sPlfcG6G+yCpeXUZCow
-CJQbtycJX7ZSG72CAzOd
-=Be3o
+iEYEAREIAAYFAlS/pYcACgkQuQc30/atMkBYBgCfbBHDQCEkweBI0cVfbKfGBmOh
+7TkAnRcHcC3B4xxO8ia7IPaq7xnQ+lKd
+=jZqJ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pycurl/pycurl-7.19.3.1-r2.ebuild b/dev-python/pycurl/pycurl-7.19.3.1-r2.ebuild
index c4258a1c59a3..0bf1834777cd 100644
--- a/dev-python/pycurl/pycurl-7.19.3.1-r2.ebuild
+++ b/dev-python/pycurl/pycurl-7.19.3.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.3.1-r2.ebuild,v 1.6 2014/12/27 19:26:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.3.1-r2.ebuild,v 1.7 2015/01/21 13:11:33 armin76 Exp $
 EAPI=5
 
 # The selftests fail with pypy, and urlgrabber segfaults for me.
@@ -14,7 +14,7 @@ SRC_URI="http://pycurl.sourceforge.net/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test"
 
 # Depend on a curl with curl_ssl_* USE flags.
diff --git a/dev-python/setproctitle/ChangeLog b/dev-python/setproctitle/ChangeLog
index 3004a68742f4..2b44e023a294 100644
--- a/dev-python/setproctitle/ChangeLog
+++ b/dev-python/setproctitle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/setproctitle
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setproctitle/ChangeLog,v 1.47 2014/11/24 10:18:35 idella4 Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setproctitle/ChangeLog,v 1.48 2015/01/21 06:53:55 idella4 Exp $
+
+  21 Jan 2015; Ian Delaney <idella4@gentoo.org> -setproctitle-1.1.3.ebuild,
+  -setproctitle-1.1.6-r1.ebuild, -setproctitle-1.1.6.ebuild,
+  -setproctitle-1.1.7.ebuild:
+  rm old
 
   24 Nov 2014; Ian Delaney <idella4@gentoo.org> setproctitle-1.1.8.ebuild:
   re-add pypy support
diff --git a/dev-python/setproctitle/Manifest b/dev-python/setproctitle/Manifest
index 8fe6b9119c37..6698ee9f7c20 100644
--- a/dev-python/setproctitle/Manifest
+++ b/dev-python/setproctitle/Manifest
@@ -1,21 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST setproctitle-1.1.3.tar.gz 19286 SHA256 4af97eb01a2febb810a08b46f7f53b460c1eda6beba07895c13ebe756f422306 SHA512 d306e0a1e84ace4d04787a090a2f93df64d3d673e9c96306ee9c4adb985b7616a64e30a73d4fbc577cd810a331734b25a857cb581708c21cb71342cb1861a32d WHIRLPOOL 650c88705d14c6a0208a8c42fdfd4ce1caa9c882552dcae74d289b5eb77d07099fb109179c44e2500b5e6aee3492695eaa07db6e0c14b6bb3701e359263f7ac7
-DIST setproctitle-1.1.6.tar.gz 22589 SHA256 f2926abd47803e288f665401268a9950961be734e981035bde9acb4af80a032d SHA512 a8423cf628453458f82994020a385d50bdb931870a89c5a40b6ad202b747b8b97ac9c11f3c9772768a39c8319d13f774c77040131306e3cdb060f7ebeac26467 WHIRLPOOL 55545e8e46268ef7a5d38c2abbf002c5dc0b5d3ce5c7fe79414010de1827e502eb4dc4e6763cca701327ad78f03660ff9cd467a1f18b90f62cfae7aa0cddec77
-DIST setproctitle-1.1.7.tar.gz 23209 SHA256 c7fca7ca317e309f4d77649ed94ef296e30f8444a9fa75bfb6483b5e70efa882 SHA512 2dc6cfd599329ca881cdbe298496cdd30d27118070fec37db997785eb38bd53e30fe08214fe1e05b29d3a839b80d6baf9fe6cb5d2d3a751063113e16ecdf68ee WHIRLPOOL bea904bf2e38445859e40d16ad24d7e1e09615a29a0508138ff47c203ed6121c914cd5ff9cd8684bcddf0a049ce4ac3b50e6736c212c062c87e2d672851363f7
 DIST setproctitle-1.1.8.tar.gz 23208 SHA256 b564cf6488217c7a4632a9fe646fc3a3bea2f9712b4e667e9632b870d1a58211 SHA512 9d0ab8e65afd7e1ac019ea47995498dae1f82d8aebb333dfc4c953e745441cb9a8db942ad8417522d1f9a805bc50ad680f3a37cb4cbbd4214d261d4fed600b20 WHIRLPOOL 4014739eab6ba3d91a15e2c11d9e91ee6a0254a23be1c2f8a7963bc327559a5a7c6197398d6053743a9479562e76873fe47f11a6c810f2c21d3e462440183166
-EBUILD setproctitle-1.1.3.ebuild 1580 SHA256 4cb7396f6fbbb4bb86413e3882ae550f50a84fe4549684a04d7a94c62cf808ac SHA512 21830c6f5499dcebb4c1d0fc37e790bb5551d64505c161c1840dc4a068c33222a67371cfbc1cd050814628a93a7fdfd11660a6e16ea8c411cf6d58c276058abc WHIRLPOOL 78a99109fba32bb8c0e64d736ae5661e94eea5e1c62e254a5dd39a3c27009d460f0e7be071e9795e6f3d8fbcd5e682af04593fc0019d81d172d96c4db761fe86
-EBUILD setproctitle-1.1.6-r1.ebuild 1445 SHA256 37a6d3cf12c5d526dd158b60b32c2e78797c9c0b32db2a510cc9dbdf2164d428 SHA512 e7c61f69486437d0d554b9422860c39908c202399a429bbd3bb79b2c83bb20e20061359ce023bc3f75ded354533e98b4f000bf2a32d6d8a69a937f7dd800e439 WHIRLPOOL 41734801b8a17b378b1530e5b80cd2aab7c66cf6dd1a1d752247659c3c3e506f75403fd8b0ee45bef75df2c8504d31a87b95de2ed7579f12f59024305c077a64
-EBUILD setproctitle-1.1.6.ebuild 1700 SHA256 0514ab80537fe74296310c2e0582242df84143037ca96e931961fdfc75609932 SHA512 a252b1aeae830e839f1eef5783bbdd76a3f62c50d0518b442139a6c109fa4328bc563572a1a7a2f7c07e28ea8a91f66ed92a7b16ba1539ed33338494a63137ae WHIRLPOOL cb5c7b098a1f1831ada71558ee18a645dec9769f9ed4d5aaec2e23ee9920ea14391548105e0311c0decc46358f1e9e0a1ee51078c5f8706edbc03223fe163328
-EBUILD setproctitle-1.1.7.ebuild 1435 SHA256 e4015872171d736ed5c4bfbf7571d23edc81082e05e077e64dc2c5714512d1ab SHA512 43a9811021e171b59447167931dcab31ab4273efee93a210c8b5cdfe398e00c1dd71758006799a7aba537988ccb963d754edf97790eac26cc97aa73d9ef16bf3 WHIRLPOOL 83259b3252fb9f84b21baf083e429c2fbda54ddc66abd242ef77a1bb749fab7d3ed31ad5272486a9c98f50f8318838801e16f09a6911cbc56649fca577c784bd
 EBUILD setproctitle-1.1.8.ebuild 1437 SHA256 ad58c0399d3f17b8587e1ae52a52353b18bf7f61aa0472d9f0145772f464933d SHA512 d720460bc3eccb9cd3350abc7438b469e0b57c965000143f7648faada1b5642ddd9c424add95a8d149b9304a766607c689b0bb5e5a51612fb97da1d3d41d0658 WHIRLPOOL 8614ce17a493cc6efafa05caec1c02867e62daabe37ebd17f60a874e0b694748763d406f678ec8c2a34ce31838e0f0c633851621bce3a6046f781cf8fb5d4024
-MISC ChangeLog 6118 SHA256 066de6306ac522c97f693433552adbf3254409deb341c071082e005cfadf8b10 SHA512 9bde732c59e2280ea6627ae9644064c0aa61ccf5b5f2c8837f5e313537dcb1352faa50bc61fe7c1d32411330f7c35a26c72408cb445d50781b915625bb6d1eb6 WHIRLPOOL 290f240d6a1f973a0cf810600a2c204de9335f23df8a06cb3ba196f53a842f5b65895b88283dac76efb9183f26f4981bfc6d4f05ee488e925e5ea6cb24ba2168
+MISC ChangeLog 6295 SHA256 c65f881aac5dabf5f030e338f45ed8892f312430ef9a25e1fceb0d2da6711fb0 SHA512 795b01394df07e29cf6fb4a38c90ee50dcfda32c9ba8ae9f5f6deee1326ce40691ef10196b41a84908a10c7fe456eca0d38001adefd668c39cec456afe150d9d WHIRLPOOL b25f7550e24165dbd65a6480627c33eb0edb9ebbfadd64e379b523c8eff58405c24a18da1b690d7ddc240052ba18903c0d52392c6aff8b3e114ac6edc21bb2bd
 MISC metadata.xml 235 SHA256 0c79c32d61fec9061bfedbe34a422d35c57d3619fbbd483a2da27c134c534ad8 SHA512 6fd1225e6ed43648c8478f23b75550c0184aa915182366a743aeec64ac30f99dfe544dafe7b4a83387cbe9f2ae212c2124d1da919164f6d7e174881dfa19556c WHIRLPOOL fc441ba4e128835cfc7830354e54573b10f3247b6caa1c5d47ec470a5c7ce3195c1a840bb4334ea3df9858cfd8d06a50ad0cf1d74d6a62d4489603a433d7e44d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRzBgwACgkQso7CE7gHKw1KegCgvNLXhmMpMAM/l2Hi4l5XlsMb
-Ov0AnAnHLmW3sEvhblrS3sJdT6EjCCkQ
-=2TJ5
+iEYEAREIAAYFAlS/TRAACgkQso7CE7gHKw2k8wCfRuY3LSQuWM5l2pnjog0P3ib8
+6m4An1jp0cWRDLcqtxDRofgU6TBCwDZ4
+=8O1E
 -----END PGP SIGNATURE-----
diff --git a/dev-python/setproctitle/setproctitle-1.1.3.ebuild b/dev-python/setproctitle/setproctitle-1.1.3.ebuild
deleted file mode 100644
index 1554b4ecb75f..000000000000
--- a/dev-python/setproctitle/setproctitle-1.1.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setproctitle/setproctitle-1.1.3.ebuild,v 1.6 2014/08/10 21:21:38 slyfox Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils toolchain-funcs
-
-DESCRIPTION="Allow customization of the process title"
-HOMEPAGE="http://code.google.com/p/py-setproctitle/ http://pypi.python.org/pypi/setproctitle"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
-DOCS="HISTORY README"
-
-src_prepare() {
-	python_copy_sources
-
-	conversion() {
-		[[ "${PYTHON_ABI}" == 2.* ]] && return
-		2to3-${PYTHON_ABI} -w --no-diffs tests > /dev/null
-	}
-	python_execute_function \
-		--action-message 'Applying patches for $(python_get_implementation) $(python_get_version)' \
-		--failure-message 'Applying patches for $(python_get_implementation) $(python_get_version) failed' \
-		-s conversion
-}
-
-distutils_src_test_pre_hook() {
-	ln -fs pyrun-${PYTHON_ABI} tests/pyrun
-}
-
-src_test() {
-	build_pyrun() {
-		echo $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -I$(python_get_includedir) -o tests/pyrun-${PYTHON_ABI} tests/pyrun.c $(python_get_library -l)
-		$(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -I$(python_get_includedir) -o tests/pyrun-${PYTHON_ABI} tests/pyrun.c $(python_get_library -l)
-	}
-	python_execute_function -q -s build_pyrun
-
-	distutils_src_test
-}
diff --git a/dev-python/setproctitle/setproctitle-1.1.6-r1.ebuild b/dev-python/setproctitle/setproctitle-1.1.6-r1.ebuild
deleted file mode 100644
index 9f966f906b9f..000000000000
--- a/dev-python/setproctitle/setproctitle-1.1.6-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setproctitle/setproctitle-1.1.6-r1.ebuild,v 1.3 2014/08/10 21:21:38 slyfox Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Allow customization of the process title"
-HOMEPAGE="http://code.google.com/p/py-setproctitle/ http://pypi.python.org/pypi/setproctitle"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-# on <py2.7 the test suite uses SkipTest from nose,
-# so we need to run it using nose.
-DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-DOCS=( HISTORY.rst README.rst )
-
-python_prepare_all() {
-	sed -i -e "/pyrun/s:%s'.*):'):" tests/*.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cp -r -l tests "${BUILD_DIR}"/ || die
-
-	if [[ ${EPYTHON} == python3.* ]]; then
-		# Notes:
-		#   -W is not supported by python3.1
-		#   -n causes Python to write into hardlinked files
-		2to3 --no-diffs -w "${BUILD_DIR}"/tests/*.py || die
-	fi
-
-	cd "${BUILD_DIR}" || die
-
-	# prepare embedded executable
-	emake tests/pyrun CC="$(tc-getCC)" \
-		CPPFLAGS="${CPPFLAGS} $(python-config --cflags)" \
-		LDLIBS="${LDLIBS} $(python-config --libs)"
-
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/setproctitle/setproctitle-1.1.6.ebuild b/dev-python/setproctitle/setproctitle-1.1.6.ebuild
deleted file mode 100644
index 6d65f3973fa2..000000000000
--- a/dev-python/setproctitle/setproctitle-1.1.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setproctitle/setproctitle-1.1.6.ebuild,v 1.11 2014/08/10 21:21:38 slyfox Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.4"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils toolchain-funcs
-
-DESCRIPTION="Allow customization of the process title"
-HOMEPAGE="http://code.google.com/p/py-setproctitle/ http://pypi.python.org/pypi/setproctitle"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
-DOCS="HISTORY.rst README.rst"
-
-src_prepare() {
-	python_copy_sources
-
-	conversion() {
-		[[ "${PYTHON_ABI}" == 2.* ]] && return
-		2to3-${PYTHON_ABI} -w --no-diffs tests > /dev/null
-	}
-	python_execute_function \
-		--action-message 'Applying patches for $(python_get_implementation) $(python_get_version)' \
-		--failure-message 'Applying patches for $(python_get_implementation) $(python_get_version) failed' \
-		-s conversion
-}
-
-distutils_src_test_pre_hook() {
-	local version=$(python_get_version -l --major)
-	ln -fs pyrun-${PYTHON_ABI} tests/pyrun${version}
-}
-
-src_test() {
-	build_pyrun() {
-		echo $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -I$(python_get_includedir) -o tests/pyrun-${PYTHON_ABI} tests/pyrun.c $(python_get_library -l)
-		$(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -I$(python_get_includedir) -o tests/pyrun-${PYTHON_ABI} tests/pyrun.c $(python_get_library -l)
-	}
-	python_execute_function -q -s build_pyrun
-
-	distutils_src_test
-}
diff --git a/dev-python/setproctitle/setproctitle-1.1.7.ebuild b/dev-python/setproctitle/setproctitle-1.1.7.ebuild
deleted file mode 100644
index b0448b2b087e..000000000000
--- a/dev-python/setproctitle/setproctitle-1.1.7.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setproctitle/setproctitle-1.1.7.ebuild,v 1.11 2014/08/10 21:21:38 slyfox Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Allow customization of the process title"
-HOMEPAGE="http://code.google.com/p/py-setproctitle/ http://pypi.python.org/pypi/setproctitle"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-# on <py2.7 the test suite uses SkipTest from nose,
-# so we need to run it using nose.
-DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-DOCS=( HISTORY.rst README.rst )
-
-python_prepare_all() {
-	sed -i -e "/pyrun/s:%s'.*):'):" tests/*.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cp -r -l tests "${BUILD_DIR}"/ || die
-
-	if [[ ${EPYTHON} == python3.* ]]; then
-		# Notes:
-		#   -W is not supported by python3.1
-		#   -n causes Python to write into hardlinked files
-		2to3 --no-diffs -w "${BUILD_DIR}"/tests/*.py || die
-	fi
-
-	cd "${BUILD_DIR}" || die
-
-	# prepare embedded executable
-	emake tests/pyrun CC="$(tc-getCC)" \
-		CPPFLAGS="${CPPFLAGS} $(python-config --cflags)" \
-		LDLIBS="${LDLIBS} $(python-config --libs)"
-
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/tempita/ChangeLog b/dev-python/tempita/ChangeLog
index f77da1ec4c67..1d60e4f0bf9c 100644
--- a/dev-python/tempita/ChangeLog
+++ b/dev-python/tempita/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/tempita
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tempita/ChangeLog,v 1.39 2014/06/06 13:29:38 djc Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tempita/ChangeLog,v 1.40 2015/01/21 06:17:38 idella4 Exp $
+
+  21 Jan 2015; Ian Delaney <idella4@gentoo.org> -tempita-0.4.ebuild,
+  -tempita-0.5.1.ebuild, -tempita-0.5.2_pre20130828.ebuild:
+  rm old
 
   06 Jun 2014; Dirkjan Ochtman <djc@gentoo.org> tempita-0.5.3.ebuild:
   Update MY_P for tempita (fixes bug 512596)
diff --git a/dev-python/tempita/Manifest b/dev-python/tempita/Manifest
index bcfaecb02edf..b8409290c275 100644
--- a/dev-python/tempita/Manifest
+++ b/dev-python/tempita/Manifest
@@ -1,31 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST Tempita-0.4.tar.gz 21531 SHA256 abf66d20932f1875a9c290345f19f35dad9031d4a9397de242a2b34e87ccddb5 SHA512 c6f628b0bc9524c8c5884783f37e48f56d3ec6800f57b0c3007a8d96def77c9391fd68ac53c98c811295e108ad0bc746c060d02a0f8bcdb31e5b22d48a9bcf1e WHIRLPOOL 06572f3c085ca8aaa6467a68996eae94ed89c2cb61d4eae3900f970a8fe38898ff7a9cb38b10c8b041e5bb8a9afaa9f03fc2a40f0be5feda2f9570959c374c5e
 DIST Tempita-0.5.1.tar.gz 12097 SHA256 0ebe6938ca7401db79bac279849fffcb5752029150bcb6f3c3edbe7aa9a077d8 SHA512 5381bfd3cdfc2a0cb64d5e0d6eba7e2b5258e18396a44a3ceeeade71a664eb99dfbcc8948b79ad2b6a5dd30f91fa96079dbda98b708f4dbf7ef1d60c2677e3ff WHIRLPOOL 9a0d326c104aef36372f1337fe8a2588d9d41fef3da3dc12d5bea34d870be2059f4c909f0eef598e192b4b829494d0744714d21ee0ac184c22dc2c8c1df8951e
 DIST tempita-0.5.3.tar.gz 12707 SHA256 38392bb708a10128419f75fa9120a6d2c8d137013b353968e5008a77a5c7a2ca SHA512 43bafd42ab0c07bec636d637bfcd42053559d188e13bccc66527dc5f735fd9c3ec30fcf29f3e650d88315fe8f2eb2c5af280f51d2c64db099e08d8a70969a1c4 WHIRLPOOL 0c78ac7e92b16556e295fb807e87665977ea2df14211c3254efcf3ffade8a1318a89e5887dfa3ce44ac7cb6c608a35a51f70856f5e56c1e07c09a9f0fa9c6388
-DIST tempita-abe6a7282d363fa9136199dcaf04b2c0d501d4e6.tar.gz 24246 SHA256 eb821385da5a47f8a9f20a5f758f8729134c99ab72ac8c61c23f8a2965627fe0 SHA512 f2d91f4c890ace07bf5b441eaf2c362a6f0dd3c4d8ce416e45d57b5d19f44f690e0eb9eecc2258eb91942c4148d2f0a6a5eeca49137d1cabc556c40bb01925a7 WHIRLPOOL 9df6507c1a093241d681b17c7f8966813a703cdf6171dbb62b49382e125fd3bc4b9af8c51590103d0c40e8cde6cd5e4863d7a54217aaab5f08169a10f040f6a1
-EBUILD tempita-0.4.ebuild 710 SHA256 143b16da19d119b9727eac872c39626175dee88c1464da162584bd8ef749415b SHA512 e9be3533a06a8cb503176720b9804f2ac5a9bdc2120f4bf9652d19d8e205acb2bf2fa505400aaabba1b608dfe95cbbbd2e84178373d4e061461a699b2b24345a WHIRLPOOL 768f0bcf2ccdf768a72de2e6ff7ce4dffd7040cc37100bc5a04e9335d6f17b68fc7a2f914ec7f9ca40ab6a3e101e6fb3f6f6c67c34d0ee6bbcc6f06543c9ba96
 EBUILD tempita-0.5.1-r1.ebuild 841 SHA256 1ba21045372613f6eae4f9f8331cfe7be19d21f95072570bfe713be4153d31c3 SHA512 f03a0cdcf56ffadedd999df8d548d4966fc05b29d7477ff161404f8672201134169d0deb00a8396582acf4c99e977152d232c97bc4e6ed38de19a78300dcbf0d WHIRLPOOL 2a921d88548edc72bbc0387f07cae7ba8a7fe7f92e9350b3989a981ed2d6f442e8fb7d26c2504d801daa3ad17b697eec2097fdce5ef64a7b0e6d4b7fadf87e1b
-EBUILD tempita-0.5.1.ebuild 750 SHA256 dcb95ad5e9dc5ddb53550e9e5c5f87be7e73dcd596af5280ea86c1b8a1605770 SHA512 7ee019d6519f48b75b68ed51a184395be9258707038871626663845cf6d4820af28602fcfb4c36eb0f2141467a6d371ca62bd7fc4abcf0ae732a1895d1cfdd63 WHIRLPOOL 2712359a03fe852df37da362aab2b71f2ede6e12da63cb1116a1b8d13949d8f39180697615bf28ff0275dcef51c0bc57fb6d6f6834c902b98989da110d0fa8d7
-EBUILD tempita-0.5.2_pre20130828.ebuild 1027 SHA256 5fae16550834e2bcd9473e7cd474e1c0b880b042c5db75a86e0bd708a1f72ca1 SHA512 4876dffcff455ae5c751ed0d864723d0ad5b4828d9f3b44c098f47fc939d3a225cf0a00cf76445b401cfed5d40a0d913e3a762f8dff0ae01bbdb4c2f9938d51f WHIRLPOOL 30997bed0e1f7c04f51846353b1c1b11580bd9fbab43e829d31572111c1f9b4203b8483f891ac017efd4d2df026ced4ca3f32013bd95bffae3c43efca54b5ba3
 EBUILD tempita-0.5.3.ebuild 774 SHA256 975baa617964caf0bd03ea0cee6ce8e3b91d29c121d4cdd6e28132d24a027557 SHA512 534781592a54603d70d4c74323aec77a36be73b99308d31cf71aef5fd39069ce71e2510d980dc5d0430239a2d9fa03264fe5ed1f1cccc2025abce0d6d6ff29a3 WHIRLPOOL ffd707308be1d8d0b17663c4c3efa96a5780002427def723a1335dbdb8e5f7cde058fe9992363f8c00c7f281cf494d0ec0461730794b004d40939253d1d68bae
-MISC ChangeLog 4798 SHA256 acba962dece1a893156cae09dfd8a70afae792b59673a7e918594d10ac0d4a22 SHA512 15276f83ceaeb07e0c3feb3d364dbae8b45a7f3dac49d68940664a7791a9d03fe3d2a7fd485aee6c00134902467e9d246e6119646e0734e75ca49872b284be15 WHIRLPOOL 68489883789acf1eee2b17a821ce2e9c85dcfceeb66a31f65a175bf2646481999a53f4e286bc087b7d7271b6f145de4d5669dcfde385d2aeacbb76d0f6d16318
+MISC ChangeLog 4941 SHA256 795efbedc038f1ed3c5349f23a77232124ea1e13f70670dc17e25d1b643275f3 SHA512 c0891595d97e7d52cb45fc4c058a94fe28633640df44ba8066bf37208590022ff9d7b6798f55cf8924246ddfc6e897388f911746c2f43267741067873d70fe06 WHIRLPOOL 37b82a72e6166cadab81109f006605887d542c3f6db2d7cdfbcad826cc8f22195688ba39ffb10880c92536e98cda8ce2a4ff58a31650249b761bef02a72870c2
 MISC metadata.xml 235 SHA256 cdbe4909fcb4aad32e4d84f4bcb5f4c95e4c4b1644d85d2eea14d5d8d001e63b SHA512 4b065a364f98b42e33191b781ca6153aa1ae25fdfe7c8cddde8b0dd0b0cdb2f39dce73300e08288dc55a2e99c7912d1cd7f03da134a6b4a977f4eaa55268604e WHIRLPOOL 99448d127bffbe64b0d14f188999c81bfabe96b87edf29887c2f66ef2d355350416828fa85c9e24d9fb7c48c06bbd2de0169beb926fea9fd6bad8ceed226aa7c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTkcJIAAoJEJ+WuSkwOAOB17YP/iCttj4z682rMhOiTefARp+p
-xPi7sYr3MO2wfe6XkUOjhwNvGpvz1vqzoELePVo5pFMSYVun+EaaD3PvpuUUQa7d
-GKd6QEzq8eGK5NbtmxSRPwZBX9PzJ5q9cDk91OB0DfesOST0Tw80VY11DU3/qIsT
-n9R5G5Rq/K5FmhOwNPvmbEliMTy8dYLg7Ynt/NhPluRWGeKSM0OPuWOGpzOywu0R
-P22q+Frs/7EgKSSAEuCgBZtO9qgSYVCMcgg0jgmYq4iFMkb0a3e6bsQvLDfxHB12
-PF1mU9JDwjRT5RW2w93af7j4Nsb5bQTaubBzTfoyJdbg1IXWoSbAloRAnToKCS3t
-YvzA0mz4wTr5Zv2lcMu6gi2EPvySJAJonOfljSJZF/AHo0JEygVa0KgdqEFhlr6w
-B8iBkhy+4pL+yZ3RrpuWec267J5YwzCbYXNf/6QIMbPnqf2lsm3b0Sh5dv/znTI6
-AumZm0UyXuAVvYLEbeblfBNCY4bWO56V0pbkQqCIgKY1M030WVfcTcBP2/cxpLy1
-E8eSO+WmVfLY4wz4A+fnQAZBDaebZEZejizehgnFSPqQbtMb4uahHTE+kWDYJZHg
-n5sQJCNqtDwqeaEJNt0IjUSSWYSYWwU/8adNvJpr7aupr7PnXA/EhqQoGc2EbQza
-cWMASJYmIpjo+QkEveDA
-=0SZ1
+iEYEAREIAAYFAlS/RI8ACgkQso7CE7gHKw1S7gCeJQQNnZ1Gpd951066FUljcRe1
+vsoAoI+p3KKpqTsSyY71eXckMAEsRz2P
+=5TtQ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/tempita/tempita-0.4.ebuild b/dev-python/tempita/tempita-0.4.ebuild
deleted file mode 100644
index a62d1b8d254b..000000000000
--- a/dev-python/tempita/tempita-0.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tempita/tempita-0.4.ebuild,v 1.6 2010/12/26 15:46:00 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils
-
-MY_PN="Tempita"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A very small text templating language"
-HOMEPAGE="http://pythonpaste.org/tempita http://pypi.python.org/pypi/Tempita"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/tempita/tempita-0.5.1.ebuild b/dev-python/tempita/tempita-0.5.1.ebuild
deleted file mode 100644
index e96cb858bad9..000000000000
--- a/dev-python/tempita/tempita-0.5.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tempita/tempita-0.5.1.ebuild,v 1.18 2013/02/24 17:49:17 ago Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils
-
-MY_PN="Tempita"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A very small text templating language"
-HOMEPAGE="http://pythonpaste.org/tempita http://pypi.python.org/pypi/Tempita"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/tempita/tempita-0.5.2_pre20130828.ebuild b/dev-python/tempita/tempita-0.5.2_pre20130828.ebuild
deleted file mode 100644
index fb30bb2df6ff..000000000000
--- a/dev-python/tempita/tempita-0.5.2_pre20130828.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tempita/tempita-0.5.2_pre20130828.ebuild,v 1.2 2014/03/31 21:07:37 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
-
-inherit distutils-r1
-
-MY_PN="tempita"
-MY_PV="abe6a7282d363fa9136199dcaf04b2c0d501d4e6"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="A very small text templating language"
-HOMEPAGE="http://pythonpaste.org/tempita http://pypi.python.org/pypi/Tempita https://github.com/gjhiggins/tempita"
-SRC_URI="https://github.com/gjhiggins/tempita/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	nosetests -w "${BUILD_DIR}" || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/timelib/ChangeLog b/dev-python/timelib/ChangeLog
index 3499f6693baa..7e4a6cb177c7 100644
--- a/dev-python/timelib/ChangeLog
+++ b/dev-python/timelib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/timelib
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/timelib/ChangeLog,v 1.13 2014/11/25 12:56:19 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/timelib/ChangeLog,v 1.14 2015/01/21 06:27:09 idella4 Exp $
+
+  21 Jan 2015; Ian Delaney <idella4@gentoo.org> -timelib-0.2.2.ebuild,
+  -timelib-0.2.3.ebuild, -timelib-0.2.4.ebuild:
+  rm old
 
   25 Nov 2014; Pacho Ramos <pacho@gentoo.org> timelib-0.2.4-r1.ebuild:
   Support python 3.4
diff --git a/dev-python/timelib/Manifest b/dev-python/timelib/Manifest
index 4d79346c25de..1fa0469c2595 100644
--- a/dev-python/timelib/Manifest
+++ b/dev-python/timelib/Manifest
@@ -1,19 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST timelib-0.2.2.tar.gz 289526 SHA256 80fae14e86d71e375290bd460f3c4de6b6f8742e55fca089d6f04303222c7e19 SHA512 ed2d2cf2bb441c179e3c8dc90b827f1326a9583c85718531e6537aacfb4ff94952b3ee39c2d68a889f4ec79b80d03b448f495ba8af76d42d7f5224fffdb33a67 WHIRLPOOL d9991c8f9c22c6045ef3cf3757c61d1d142bf2bbd49339cbd7e6cbfc91d7d166e1266ee4221ff9a6b750656d534879f08084dbe0a53a1c150f779d35c2d1a91d
-DIST timelib-0.2.3.zip 318349 SHA256 65420a98db482b011bb98a8fab953f27eca09e1b8fb60e85c59f3716e43d69cd SHA512 ba1b16f71b17a4769c92ba84c15d78d3516d887670c0c3d6c951c6d8a396465cb77e543d9208e4c9a6c1fa28d022ba17bad29465c5c64266832385fb34165f74 WHIRLPOOL c8771deafdd672b75b41d8fa1498a19216938a12ff77d5842e74a14ecb18ad662a2c5dad866272224245ab7d86806f6eac103f1c30106e2460252d180d4af0b8
 DIST timelib-0.2.4.zip 281070 SHA256 49142233bdb5971d64a41e05a1f80a408a02be0dc7d9f8c99e7bdd0613ba81cb SHA512 871683756318f8896592e154a6949e6c96f9b9177ecd8694db2a48b16104cf35d11f550355a4723a097e9f17e3b7020d09a23916bd55a3dd463c22bed68991af WHIRLPOOL 941e3bccb1fba22eb54530c111ed0cbad136481e1e4f9c7107ae82625452b3534ad0b218b08eaf542efa159bc5df3afd49346cbc4fa297471998bd4412d3154b
-EBUILD timelib-0.2.2.ebuild 615 SHA256 1768132364ebcfa698b6c45f33899a2c5e3ab1767eeda5ee98bfd683913a4ce6 SHA512 4ee38d75e0f436210c0cefa9c4a64ac76784df4b116b3d02792e0afbfdc8209456b354a9a55e2b8fa20ccdbbf087e66809124a23ebc25d7181c64b30af1dd581 WHIRLPOOL 9fbb2067700cdc6abfe186f8d863d50a8aa263fe6f209fa67812c2d7d94169843b7848d14b6b8431d766ff56259081c5abfb95d8eccae57e1a404f9c78bf818d
-EBUILD timelib-0.2.3.ebuild 593 SHA256 0cefc293c0813c9472e9ca8bde8a7a49802a9eb5e12e2dac0625c8cba292c031 SHA512 708b4c9614a0f0a211f9f1a0850268f40a3a2285ad7dd29b62acb03b4e2540fa5b18774872bad6ec9dfb9792001d23b418b233c057d0ca55733b3e1a96486b2a WHIRLPOOL 5bad3f7544a97d41f3aa62afb74599987aa512019af37e533f397f3cb082b2afb3edc265fbdc3b54ac5008afe81555d3bbe265ea190a6b72104cee89a895e1a7
 EBUILD timelib-0.2.4-r1.ebuild 605 SHA256 6ca315e7c9b08fbaecac993fed92f4f05a42316316fc4d55b3e29979966536fd SHA512 a6de07caeb09e6fffe675f1810f6c6c9bfcc649725494db07bd996f38837277d9052f20f452874576c210a76a5817b0eb3ac509d7761129c633386520146765b WHIRLPOOL 49ce5ded7564cd0456951dabc85109218f874e63c0da4d2f8a7d3a181aecd70733ed020a3bec7058d2be29ad78ebe8d2b538fe215814e164845afe1d8b40112b
-EBUILD timelib-0.2.4.ebuild 593 SHA256 0f27d9e0d54188c41ce724f098c005991fbf06f3a76f0e3975bd9eb19cd2df3b SHA512 f34524b6b43130875df7ebe59ba5d66b12c3cbe7882f16e3457e7647d52402a55894d671092bb9d78d303dfc00079806350e71f954dfd888d5f9ce31e4447a3c WHIRLPOOL 9c87cfcc13bedac5ea10bcd49717896533ee1488c4530cf33489ad86142527fae8317b57cd2ccf917761c2a4f21dad023f8545884f1235974421e77ace971bb9
-MISC ChangeLog 1863 SHA256 2128460fb84eb3c944505bd6172518a3969967c15a89e86a92fd4ca09a18ae7b SHA512 7f73a9cd7a21a8865ac2a99678f324004e6205686904a4ebd279ce1b17708b43b58ca09a93925bdca9dcc8cd351e956445c4b0971ed10d48640677a734c95218 WHIRLPOOL 37ea2917fe1ab0df3cd5fbed664e14291f5fe1338199d29f3c5082f1108ec6859c2946f09741114f217c4a154341572aba3ecec62a70b6fa9e9375327e04b63a
+MISC ChangeLog 1994 SHA256 7eb723df71cd6d1147273463f1421392a1858a7d08db8cddd0adba2d62a5ec00 SHA512 d57e7038c204fd15463724c6516ffb976d05722eaa8cb2803f730903d091a6a302575a006c1f8a9eee447090456e422f5da78f4a38d7c8214ee856b21d6cf19a WHIRLPOOL 375cded2800e9028067bfec8199d5d05566e8f4e291ae03fd1487656203df0b77b8bddd27bea37aef4d92b2baebc679ffe37223178369753ccb6d9ac3933a4ad
 MISC metadata.xml 230 SHA256 b00a4ac090aa6d909ec5e6b69feef2adf6014bbc33d89ea12bf975a791dfafb0 SHA512 95ea02be843b56e2e0303dd74407357e2a14406b6d56318ed9b6e418403393a806141f9d4691ad9f85e25b0a3937e846152b6f5ea66ffcc42cb698c178cdbcbf WHIRLPOOL 5b6f63dc22a622b14cb915c8dc1a5830d5d42767c1c2db5b60f4960bb30e9ef738b077e756d52dc951a317b36ac4ccf1bd15452ab5b0656980073823b3d7234a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlR0fHQACgkQCaWpQKGI+9QxeACeL+B1wMm9RQRfRD52FFa8nqzP
-UA8An0QNMTzN5xJbR7WvyNlO/JR15e/I
-=UqDc
+iEYEAREIAAYFAlS/RsoACgkQso7CE7gHKw2dQwCeJrwI7fNVrEmoJ/Jz19qEUjhy
+L2MAoKDV/XBdJn0pmyh7C3Q2vf4rduns
+=Izht
 -----END PGP SIGNATURE-----
diff --git a/dev-python/timelib/timelib-0.2.2.ebuild b/dev-python/timelib/timelib-0.2.2.ebuild
deleted file mode 100644
index 18a609199681..000000000000
--- a/dev-python/timelib/timelib-0.2.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/timelib/timelib-0.2.2.ebuild,v 1.2 2012/02/20 14:52:46 patrick Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.7-pypy-*"
-
-inherit distutils
-
-DESCRIPTION="parse english textual date descriptions"
-HOMEPAGE="http://pypi.python.org/pypi/timelib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ZLIB PHP-3.01"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND=""
-
-PYTHON_CFLAGS=("* + -fno-strict-aliasing")
diff --git a/dev-python/timelib/timelib-0.2.3.ebuild b/dev-python/timelib/timelib-0.2.3.ebuild
deleted file mode 100644
index 83501f34b335..000000000000
--- a/dev-python/timelib/timelib-0.2.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/timelib/timelib-0.2.3.ebuild,v 1.4 2012/02/20 14:52:46 patrick Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
-
-inherit distutils
-
-DESCRIPTION="parse english textual date descriptions"
-HOMEPAGE="http://pypi.python.org/pypi/timelib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="PHP-3.01 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip
-	dev-python/setuptools"
-RDEPEND=""
diff --git a/dev-python/timelib/timelib-0.2.4.ebuild b/dev-python/timelib/timelib-0.2.4.ebuild
deleted file mode 100644
index 8f53c8899b7d..000000000000
--- a/dev-python/timelib/timelib-0.2.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/timelib/timelib-0.2.4.ebuild,v 1.1 2012/10/09 13:07:41 patrick Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
-
-inherit distutils
-
-DESCRIPTION="parse english textual date descriptions"
-HOMEPAGE="http://pypi.python.org/pypi/timelib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="PHP-3.01 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip
-	dev-python/setuptools"
-RDEPEND=""
diff --git a/dev-python/transmissionrpc/ChangeLog b/dev-python/transmissionrpc/ChangeLog
index e6f7fc18c185..6ced4239dc4e 100644
--- a/dev-python/transmissionrpc/ChangeLog
+++ b/dev-python/transmissionrpc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/transmissionrpc
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/transmissionrpc/ChangeLog,v 1.12 2014/11/28 12:54:04 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/transmissionrpc/ChangeLog,v 1.13 2015/01/21 06:36:32 idella4 Exp $
+
+  21 Jan 2015; Ian Delaney <idella4@gentoo.org> -transmissionrpc-0.10.ebuild,
+  -transmissionrpc-0.8.ebuild, -transmissionrpc-0.9.ebuild:
+  rm old
 
   28 Nov 2014; Pacho Ramos <pacho@gentoo.org> transmissionrpc-0.11.ebuild,
   transmissionrpc-9999.ebuild:
diff --git a/dev-python/transmissionrpc/Manifest b/dev-python/transmissionrpc/Manifest
index 7b4e10967086..4b1e77243461 100644
--- a/dev-python/transmissionrpc/Manifest
+++ b/dev-python/transmissionrpc/Manifest
@@ -1,22 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST transmissionrpc-0.10.tar.gz 65953 SHA256 22a44e731e102e1baef0615b9382e1cb8abd795f6e6df8afc385a68b03a28d97 SHA512 ee7394cc9fc96bda0ef26fc0ca66b20ef56245287c6056450cb25ffb775837b3e713e3d43ee585d3580398617508bedd234676749a0093c1d2bbe4d457d00f6f WHIRLPOOL 875012ec1782b85b87f336e10a3a02e1170b8d8f14bcd4d8d3147ccde3fa6477bb546e5d5f2523266ab098e4366d9fcff609a3d3f5f7cc599e3f2be49aee57ed
 DIST transmissionrpc-0.11.tar.gz 96091 SHA256 ec43b460f9fde2faedbfa6d663ef495b3fd69df855a135eebe8f8a741c0dde60 SHA512 778c4099264d38deefbcf05c8f9e5d165ce113b4180e3797eb3cf11f0a9ba5393c0b2e6f1f0ae7c2dcfc679bfc1d0d69cb3715b3db6ac90a1a840fbd0775f82f WHIRLPOOL fabee8985ce38d6430aa80fdda1ea90d244a33cd50f1cb8200b10e81b607000e119cb70a9dd7ed5276ed8384e5dc32f1fb47ab50143b4cbec535ed759989ec64
-DIST transmissionrpc-0.8.tar.gz 16826 SHA256 aecab48383dd231575dc6ba017f9e36a85e706bb2acd90a0ececc7777a78d25d SHA512 34e4fe6c1aa0fdf51c383a35ab2f501f7c40f5665d754ee008620e7207dbb0a400ed775e762ee60b94a0c8079fcd9841dd07e0d731e14fcd302fa202f50fb9de WHIRLPOOL 89f624d81430d7bd878dfa1e45699e522bdd9ff0705722e814fd90af540a75b8a1c9bae4afdd5833bc6a0ce6c817e3c749d47c5b1f6834736d99c5fa20f2fa90
-DIST transmissionrpc-0.9.tar.gz 18989 SHA256 0ea1d48ad1bdc26413361c92763e4d724b74590d73b7ae654f621d7fe13b7aa6 SHA512 cb78c197fdad5b58bf953a1a3412d984a86c32db2bd8d65f32fb0a7759b559ad61a734e5b11a65a49728b63e6016fff51896fd0b6f5866d1160975be31724c88 WHIRLPOOL 2b427e6cdcf590655ab7cd72b2df154bd1f8d871cd2630a8304ace49c93fdb98432d08825383a9dafdbb659e155cebe7048d195bf0152c8bf520be5c4648179f
 DIST ubuntu-12.04.2-alternate-amd64.iso.torrent 28541 SHA256 2fe13c38b0b9ab9b1d3d92c53af8f8c0be5e9d36dd270591deee922bdcceaf64 SHA512 a597d9c5258111cb9c42dfcbb0804e093b6c69d4cdf178c961de1d52ec64e75f76d078700b59535e631575e42d3a995844ac0d30c9f7e852ab1ece149ec1f6de WHIRLPOOL 36323cf11643be4fd51b2dc658c0bd96b2dafc5ceffeed71cfdc6603520e78cc52ba19ace46b642e03fb950aae7b6b9ca7e3c0ee2f2790341820cf06ff52f71d
-EBUILD transmissionrpc-0.10.ebuild 1093 SHA256 e55ea77d6d03737d4df229e64424d64a013567f2ffe5041d0df88d25c84c0ef9 SHA512 e6af935f4e7f0dbbeaf37944b48772fa5e95f2c5e76ffe71c2dd71c90042455543066e6deb6963728fbeab51a41f0495b3f325c69190e7952badfec7cd3fe766 WHIRLPOOL 23d1a92cde664c1eadf4f9c588b34a21064640d9e00e7c969273c490895910d825ce76cf3e600d13b744bf30832ecbd4b520bcbea75eecd513d38fa70e869613
 EBUILD transmissionrpc-0.11.ebuild 1092 SHA256 03a2466db4996ed2a23e4c43ca9605c4a7cb6e0a4ee2528f67db89c42f8fa7e4 SHA512 2c018050d74745d1269799f7aab897038163880e6b6729bed6ce4ffa51626bf71ae5336d8b67cd3025bf13af30ab7288b8369db502eae4ecc7bdcf91e3f131cc WHIRLPOOL 20c430693b57bc74adaaa1ee3280ea0aa97526c8534527e17224185ddcee519335a62bb18a48e13cb30d2facbb458fdc55d84bf8cb4c90867212d39d063ba080
-EBUILD transmissionrpc-0.8.ebuild 642 SHA256 3992dde5f1b96c1fb0ec9feed4b1de6abdeb7fb2af7e2e8f397dd27b4aafa588 SHA512 cc54f183ed276e7e27cc4389a8c22d64dc50b0a7758530be21f20f9568339d29c9e6e1b63ceb1c7faee941218a211fa08d824855e6d6d16e2a486e074a002ab6 WHIRLPOOL 9dc64599e91c019dd4cad365729eb20d9af5153ca5b712fb2b83a3c3e3ed809b672995fb6d77ad8e77c118361fe9e55e0ca4e2753920511447f722f5c7b8cf29
-EBUILD transmissionrpc-0.9.ebuild 809 SHA256 339becb44024ea4189b1d901f57f984e8a328bedb19269f0930ad4e5459f477f SHA512 6013585aca37d45521e1eb99ea2a2a98c253234712e6579f3a34bfe77fed9bc1b5d206f5e152b1f23e81287274e3326a3bc36faeb0e4bdc88205f9c1500aa5bc WHIRLPOOL d5e8a4f3bb8f5f335e3e81ebabd35d954f521c3cfdcfafdcc0ac9e8951382d0d15c317cca30c5e50a405c980240cbf974295bdfa483721fca0943f008b05feae
 EBUILD transmissionrpc-9999.ebuild 852 SHA256 71fdb8eff833ebf98e68381f963a406b4c4dac2979abf53dba4f6fc6063559bc SHA512 098ac75ec4a5cf81694ada941b0d79c50aafff41e995c25f1b339a07edb08201742e04e0e7f9fad383476f94c3706defb0d722bc9681ac9b81a4ce94448a9d69 WHIRLPOOL 9d4ead030e82bb235fc13eaebff6f1515078366e65d41f5f2805a51b4391aadc88c3e5a9412151c6fefa95b308ab4e373c1adf30b208e0ad36e51491bb266cf9
-MISC ChangeLog 2415 SHA256 0397f963c6c3f54f97bf7554eb89fcd905fd528c1937fbea5dae56b441236706 SHA512 69df4077c9afdb29fa157757e14a0ab6f82c149ad8a20d844f4472d70920b3ddc4ce1451c77482934e581cc52645329088e98d20f6127ada00bacf1fc81db49a WHIRLPOOL b6719192dfef5d47fef8b6a4e2328d60349688caa4b301513d24cfece068d61f674bfd963fb9325cfc032ffeeb92d3ff28b777ed840bd2150dbb801f93094d11
+MISC ChangeLog 2565 SHA256 fe65f4562f4528ec0161f8fc1698336e2b45f5f0af991e4593cd86e1a78c9952 SHA512 da89295f6071119632176faae611c348133278bb3b6d7075e98f50e8173e9b9a3f6c360742da8c652775a562aff3a722b186bd5c071509813cb0a19c80c7aff4 WHIRLPOOL 7499419ffdfdfeffba5a61acb87fab566e9dd7e6e08850c43de90b547b0f088d84bb5bfae015b138f87b948f916d3937b084d60a655fd6745bf7192299fad47b
 MISC metadata.xml 310 SHA256 78bcdda6bbdfd37d01f4887f392f6f02681d4f803e04febae1573ed8a794d820 SHA512 45a03e99349a1679afbb5170322746ddd6b33c30ae80b993e62d2d2dac1a58063d09fa8d90e7fff042f549d96565956c066c16e01c58d1b3528512bc7d7ee99b WHIRLPOOL db687dcc8147fbcc46abec2ceda8ba5d0413fa6da7745e995c1f744a107812c4c1b3150a63de1484d3623b66f976ea79f8d46896e9107973b12a3cb319af7619
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlR4cG0ACgkQCaWpQKGI+9QXRQCfTgnCDnyMDqI3YBKU3cy39B1J
-/mkAmwQpyU47e9muxNM1NaDsz6Si369V
-=UH1I
+iEYEAREIAAYFAlS/SP0ACgkQso7CE7gHKw3HwACeOYw8jmgqSSAvbBbLkXPMcTk6
+fUMAoJtYcHJtJZ9LqGLcGKFRMs8hdBkd
+=crSH
 -----END PGP SIGNATURE-----
diff --git a/dev-python/transmissionrpc/transmissionrpc-0.10.ebuild b/dev-python/transmissionrpc/transmissionrpc-0.10.ebuild
deleted file mode 100644
index dc768b2d4b5f..000000000000
--- a/dev-python/transmissionrpc/transmissionrpc-0.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/transmissionrpc/transmissionrpc-0.10.ebuild,v 1.3 2014/03/31 21:14:24 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
-
-inherit distutils-r1
-
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-		https://bitbucket.org/blueluna/transmissionrpc/src/release-0.10/test/data/ubuntu-12.04.2-alternate-amd64.iso.torrent"
-	KEYWORDS="~amd64 ~x86"
-else
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/blueluna/${PN}"
-	KEYWORDS=""
-fi
-
-DESCRIPTION="Python module that implements the Transmission bittorrent client RPC protocol"
-HOMEPAGE="https://bitbucket.org/blueluna/transmissionrpc"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=dev-python/six-1.1.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cp "${DISTDIR}/ubuntu-12.04.2-alternate-amd64.iso.torrent" ${P}/test/data/ || die
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/transmissionrpc/transmissionrpc-0.8.ebuild b/dev-python/transmissionrpc/transmissionrpc-0.8.ebuild
deleted file mode 100644
index 6fbea1be5b76..000000000000
--- a/dev-python/transmissionrpc/transmissionrpc-0.8.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/transmissionrpc/transmissionrpc-0.8.ebuild,v 1.1 2011/10/18 02:47:39 floppym Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS="2.[45] 3.*"
-
-inherit distutils
-
-DESCRIPTION="Python module that implements the Transmission bittorrent client RPC protocol"
-HOMEPAGE="https://bitbucket.org/blueluna/transmissionrpc"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND=""
diff --git a/dev-python/transmissionrpc/transmissionrpc-0.9.ebuild b/dev-python/transmissionrpc/transmissionrpc-0.9.ebuild
deleted file mode 100644
index bcca2b619bb4..000000000000
--- a/dev-python/transmissionrpc/transmissionrpc-0.9.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/transmissionrpc/transmissionrpc-0.9.ebuild,v 1.4 2014/03/31 21:14:24 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
-
-inherit distutils-r1
-
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	RESTRICT="test"
-else
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/blueluna/${PN}"
-	KEYWORDS=""
-fi
-
-DESCRIPTION="Python module that implements the Transmission bittorrent client RPC protocol"
-HOMEPAGE="https://bitbucket.org/blueluna/transmissionrpc"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/ttystatus/ChangeLog b/dev-python/ttystatus/ChangeLog
index 56c5828f3c2c..6ff3f173da62 100644
--- a/dev-python/ttystatus/ChangeLog
+++ b/dev-python/ttystatus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/ttystatus
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ttystatus/ChangeLog,v 1.18 2015/01/20 08:45:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ttystatus/ChangeLog,v 1.19 2015/01/21 10:07:03 ago Exp $
+
+  21 Jan 2015; Agostino Sarubbo <ago@gentoo.org> ttystatus-0.22.ebuild,
+  ttystatus-0.23.ebuild:
+  Add ~sparc, wrt bug #530672
 
   20 Jan 2015; Agostino Sarubbo <ago@gentoo.org> ttystatus-0.22.ebuild,
   ttystatus-0.23.ebuild:
diff --git a/dev-python/ttystatus/Manifest b/dev-python/ttystatus/Manifest
index 8db655f8e541..852cdbd26a2c 100644
--- a/dev-python/ttystatus/Manifest
+++ b/dev-python/ttystatus/Manifest
@@ -3,24 +3,24 @@ Hash: SHA256
 
 DIST python-ttystatus_0.22.orig.tar.gz 30262 SHA256 ce3c0578364fab86278a694c2a193faf81c8e83df06f489d5395bd9d9706fbc3 SHA512 c6bf2a6dc81842799aecd9cacc0f91ea95cbe0befa80beef454c9f6e819f03180ee4964018c698a39cc2b7e245402a7c1d422fe5e0b750715bb068c22373d90a WHIRLPOOL 203446bfc2886b3a2c562675a6826ed0d8bcd475f77efc3326dbf2d2280cd17c77660d97041e3d3954243a34e1ac0d22f835b0d149c52db726a83783fad5ffe0
 DIST python-ttystatus_0.23.orig.tar.gz 30299 SHA256 1ecd58dff0049fdccedb6cd41ff0ddc51971c943e8d1887f8c027ae9e3aeb17a SHA512 29dd9ee0a063b4f49c72a1f08acfe80f4db9b3a374b1424a98926d25e22c8df0ed89441997322556edaad03a339dafdbf874a1247f095f1f857ef04f90b8a040 WHIRLPOOL 82576ac9346fe025d1ebc6d53e61cdfbcc3cb75f2c17e4bfb365d75088e5cf1bc00c6be6acfb729457324ea8e89d7d554efd2f3ab0c8a76103656a5a516e7172
-EBUILD ttystatus-0.22.ebuild 593 SHA256 39333752b1b82fa517f55ce8dda29f4af097a4c4bdf88aed27a68f3b612f328c SHA512 5e40c523fa6374fbd27a0c989b49495be7485e10af2bf3fe8ba2fb904d76884dc5a425f322cd923c123f4b06eab4a2205c2439f6bb75a0f242c3b7a68c3ca7ff WHIRLPOOL 73c6c2aa020f4b6742fb85b7398c0164aa0fb918cb981ea2ed3174afbbe68f5952e44c48d83fb52ba008388d4699bd2204d3e4813e7da514aca6af1cef7fa7fd
-EBUILD ttystatus-0.23.ebuild 602 SHA256 fc6dbd86ca53388de44e433d448035ac91cdcacd0988121330f71208b26e60a1 SHA512 cff09e89b47d6a9506d0318ae685de149e92ace3c63aedad4a2b53455d724ad1fe8f772be5933fae8b601d986af63c4444bcfb44d356a253f2c67a8ddcc678b4 WHIRLPOOL 6c26a0b08e9a600a8323490ba6fa61ef69114bbd4af02f4de7f51ff2d83db3bb3c127fb063a07cd0c345dcaf6add22346772ce10e0d6110ba164e008b961cabb
-MISC ChangeLog 2395 SHA256 60eb456708c1fa21cbb0a892e958d38b339c75ce1020a73d66c66fb68e7ee6ce SHA512 ddf8606569a04b214075429ac01f1d309976dbb188f4f7364772b588ccf925dc6c9da2a92a96db9c664d42af1f563e4a78e4b1ee1238c2acf571d9c55309c1ba WHIRLPOOL 80d5d377404e7ae0d161829ff8243bd9095d76f918156d418e2cc6ec7f8896434e5bde5b5eb179b99988f765e930afc40a5a8d8a64a9baa4bc7d55c0358621f2
+EBUILD ttystatus-0.22.ebuild 600 SHA256 9e18ae0b018971b61171892351b477b248ec1a92aeb6806c5c3deef4a5ab754d SHA512 89b092f277ce0c18f170b5e69984af9778bfd7ab550d75dac5b9c0e83262282c2b09784c3b6a13375424bf08bdb084a6a95b63098c5aaeea4f403ee7e95f79a7 WHIRLPOOL 825fc38b06e3061daebd02217de1cebc18ecab718d4e1eb312edf7686177f520fe74165fd00d060fa400b2459f1a4e66b86dd7e749a4d2580b969faf01d333e0
+EBUILD ttystatus-0.23.ebuild 610 SHA256 b9bce29f7f3763eb1f265e99f18a72d03f9a9fcec18884715fbf217ad67aaee6 SHA512 cb65738111a32355d13e6a68be346ba80f3fc434c73d8f19dcadaf8e8479dd9285ee4dc13f9b818916c0ff49e77e14d4d91a8787649b2e141453155472aabcdf WHIRLPOOL 6de79869c603d6a88da6bfd7e02f960a6d0f765711ab779149005ae45bff1d5622b9fa1219dd4fdb650f79f3b84a81b501ad46eec14548fdbef002f3561f4c39
+MISC ChangeLog 2523 SHA256 6fce35c6994ffa62a7da84f746092edcd0e95266976d251242aa93db79baf1be SHA512 bf512865a748035bd180527119a20e47ce079e86f1e9d8b1d1a3cd97cd1bc9673e01aeebe6c2a072c333e553edc03cf4cd8189b631c10b09099dc6a49a917991 WHIRLPOOL c6b8d6a9bea7104786c3a3a327bd3c7a89dfd09d964618d7dc925690c1a53f942b9f0989f4557647a44f40420eb87a62c7451271ede08f4a05ecc44914c1cf13
 MISC metadata.xml 236 SHA256 f55443c9b3d97fcc9437b9aeba1b3beae39e38599620bd520d0693bb8948b531 SHA512 842ec0962624e280c2c3909e6da541cdaf35532f0f00d76cc9ca0e03dfb8c3dc83a426ae370bc37d73d0c4b1fdd4983171a0586220546b967afe3a3f5dd78ce4 WHIRLPOOL 8ee0a6397a1bae24973eba9b31e1ac64bac9726ca45e5f2127a3ffc991627479030060c605c7cf0957891c184f5e5d01fb2387f94c3a68693c988e4a180c7260
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUvhWiAAoJELp701BxlEWf7i4P/igOs5JEd50qggcjyYk31Xa6
-VEG3n6B59zX93X4+EOEPydus59j8gAS6RzHCl7/KrgS/xGlOleTGzCRYc2FHFbWg
-99axMg3gGvnzGMhbdurRy13rJnR9piJIgAJBMQyskhgV9q8qDJLdnIGOlcJO2I5i
-JfHoC5ubXBlJpV+fPeuf2nUPQnqPdtu01GWketz3JUJyjlFd1/RVdE3UjVUk2XSZ
-YKhwgybHu3GSZHZNxMPluL+4QyUJD+NDxxDku5GcCNXMul+/hsQHATr0nhbf5PGW
-JfSsksxFM/3BMDcH3shRHOZVoFtApeHXGD2+SkTs4Ac0C2Nhd7LqTkznfzrZ0Gn0
-taQ8HtFEM0AxEWl38ucaQ7eS2Fo0kipPWzQfpCqQiGtYirc9MslCMrjwcdf+sYZG
-NHsluCNLQGcmKYoZTdMtSFZN2+JTR6ZldKqjVQfMoXZUVktWJ5q3WQ1wagmFlZsk
-7wIoGmb9A2w7AeZHHOWYrDu8f+kEYdOBjpXgdh5syqd4FQR0roZpyeqcey4yEHw4
-AzZ7I/Q1PA8Vn2xBvXAA04F57Arpz8ZCAfI+ckYgOP6kOeNYRGYD2fxDc6GyR/Xf
-pl8ouid0ARlLfUJrgxw6KQFfbUVmj+xoKA4j3NZJ9OiknaVEoLXw8SUXZDiUU88Z
-DJwKCPvzJn5i3bcgbIFu
-=u1sj
+iQIcBAEBCAAGBQJUv3pIAAoJELp701BxlEWfyGAQAI9EV/LwjehVBBul6qsYd+wE
+4uRNQd3o/RUJuMWSE6o6j/Rr4YIBHLh8p4YHq/VnjEVECXjrrMJ63j+OOn2quGr9
+fyl4JYI4QWT2fFrmI/QLlMAveo/3ja+yfr4hucbJkFimnEl1am38WodWsGRgi/Xh
+hc6O0kJrNXvoUYGMFbcBdv8BChUeZDEDFiAIyH8qlwUyDVtTZoa3AsB9GhR4uZIj
+Rj32cJYmTTFlWRbR61IeW64B4tkU/NJcRmfKsOk6B2HhB3FO2TpfwTmEEJgeyFl9
+HLM/l3vdSawNKsTjfoQaxLhuvB2Ozj5PjmTPQTaw7fCiUF99MyguEyYZzf/2bQ/l
+h/ukjK3/gXx1D48VJP3IMyZDamZBmC/nB3S0vmqL14Q2NNIqW2cOTd24CDlZOdG0
+q/3ZhecSxXaNWEENKeT6xN1w2GzX088dNRJ6n6efsEPkVx6gs4p9aKd/e4EYp4sa
+RsnPQBIAJGwAavzZKcCQ9Frtuhdh8WgQ09y1upCFYMkEAfhkSgM9jUQd0laoauWZ
+jYM/962hxAJNUfvHHorsqoXIvsekdzmW7HMFmrCskxYlNVwBnj54IEuz1fVK8ed7
+3EA1HFoyF2YvBsWlJVKLOJ1Fyz9hkM9Nw6qhkQKjPyasWmZL1HpAhnXhAtBeloKb
+oTZG8Y97nCnuMv2fHnnR
+=pCBl
 -----END PGP SIGNATURE-----
diff --git a/dev-python/ttystatus/ttystatus-0.22.ebuild b/dev-python/ttystatus/ttystatus-0.22.ebuild
index 53bb2e7c7865..76c091c3e511 100644
--- a/dev-python/ttystatus/ttystatus-0.22.ebuild
+++ b/dev-python/ttystatus/ttystatus-0.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ttystatus/ttystatus-0.22.ebuild,v 1.7 2015/01/20 08:45:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ttystatus/ttystatus-0.22.ebuild,v 1.8 2015/01/21 10:07:02 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://code.liw.fi/debian/pool/main/p/python-${PN}/python-${PN}_${PV}.o
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/dev-python/ttystatus/ttystatus-0.23.ebuild b/dev-python/ttystatus/ttystatus-0.23.ebuild
index 7c81a6e8c5d4..6e1004797cbc 100644
--- a/dev-python/ttystatus/ttystatus-0.23.ebuild
+++ b/dev-python/ttystatus/ttystatus-0.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ttystatus/ttystatus-0.23.ebuild,v 1.9 2015/01/20 08:45:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ttystatus/ttystatus-0.23.ebuild,v 1.10 2015/01/21 10:07:02 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://code.liw.fi/debian/pool/main/p/python-${PN}/python-${PN}_${PV}.o
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/dev-ruby/msgpack/ChangeLog b/dev-ruby/msgpack/ChangeLog
index 39650752c706..d9c067e0946d 100644
--- a/dev-ruby/msgpack/ChangeLog
+++ b/dev-ruby/msgpack/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/msgpack
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/msgpack/ChangeLog,v 1.27 2014/10/17 06:04:02 graaff Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/msgpack/ChangeLog,v 1.28 2015/01/21 07:13:22 graaff Exp $
+
+*msgpack-0.5.10 (21 Jan 2015)
+
+  21 Jan 2015; Hans de Graaff <graaff@gentoo.org> +msgpack-0.5.10.ebuild:
+  Version bump.
 
 *msgpack-0.5.9 (17 Oct 2014)
 
diff --git a/dev-ruby/msgpack/Manifest b/dev-ruby/msgpack/Manifest
index 36d145b8d2f9..ff774df8ac2e 100644
--- a/dev-ruby/msgpack/Manifest
+++ b/dev-ruby/msgpack/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+DIST msgpack-0.5.10.gem 52224 SHA256 38265964c605e8002779fa6fea2ef7e2fe3108a0fda207b420a84abd096831fb SHA512 f41eb0690bccad5dcb41cbb27427df46ad5815e650b11b39f67b20acbb34b2b18cfe948ef335520bd772b6dec22d86818510edfe951abeaf1413b2f1f34f63bf WHIRLPOOL 87b740daaf796f1ede470727e9c2d8f0374d44796e99aa379b03b952be65d4a6ae030584752007a54d154e620b37ff966c49056c38be7d23502b2938b47ffd65
 DIST msgpack-0.5.8.gem 37888 SHA256 223f7f5d400dfbc698da933e339f5c99e1a0a3a1229a965ecb9c5ebd4e1a129b SHA512 5061716147ac5c268f89f5e32a76504832ae201e2b0ca4a7ffd8639438e22227a8b1369777ccb4343131057f398eb5f4402599830b38df7da51ea41e163dfe96 WHIRLPOOL cfb1ba4b43cf7fb211ce55c12d4a502b21186994561d33e94631f9dc28dd576520e2b3e3c9903e3607671caf9915d452210427522241448a02d4cbbffdcc22d1
 DIST msgpack-0.5.9.gem 39424 SHA256 67001f7b9cef6b08deef5c0c33bc945a718c90339fb15929a951468935db01da SHA512 760ccf56c23f81a9009970788616c6e64880d5b008c250b858a1380e9551eb40fafee693fb4587608bbe9f449714f70dba6c813651fa39de7d0ec5417658b797 WHIRLPOOL 30c06845bb0be59eda0f36d56805604b349562cefc1e2ce607fcd823464ffc0fb9df4ee7743e9f365d597461a217fbc4164b88026e79b5ae2861f0c6c017dfc2
+EBUILD msgpack-0.5.10.ebuild 1053 SHA256 f7d23966ed40a4b42ada5837e89ea5ff3ff6ab0854814fd2f82f0bee0aa12130 SHA512 9a31a59845126d049c567c181062276e6073b336dba1a555a762a4abc6b215244ac3efb44a44df6a60e6a820a85d2e48f64e8e76554d20d1adbc291773be5a05 WHIRLPOOL 8a93a445d31b9f7a9e8d4724acec207dd52301ea03b04242d465419d86f45feb9b5699f8f7e76eb6e3e77b7e11493f19a2b19b471ecffa15d55511fc74bf323b
 EBUILD msgpack-0.5.8.ebuild 992 SHA256 d89569f07b9b43ff3a31e78e9ed624e1aeae77e2a8d9724b05fabd9a233c9cf3 SHA512 e5ba0e6595f4d62a60b15b597351dd66768d50995637be6f6851477ad90384171f8bafebfec3b7f0915e2810571a5e56c6e017af632fd65bfe591296a01f5b30 WHIRLPOOL 711379f82dcc68212580631a1bf6c6613535c55fb00b096840865f332d422007907e5ec6f6997224386811ddffd0a4defcf292f8993af85f9729df39d287f661
 EBUILD msgpack-0.5.9.ebuild 957 SHA256 b7960040392c207ffec36683d8155604ece0e3e5f85b2842829300eef128c1de SHA512 f2ead690f69ac453b274efc266a7c3238d407e450c6b06fbbea89739ed75e526b50266b91318aac408d2aefab1fcf00990c9c1b948b7d62191c21b862cbe27d9 WHIRLPOOL 008df8458f8be3fa4d103b8e3aab4a691d8e9d38623a0e53f4c7beda6eb9b8ba0a3c511e602415dc54425b27ff2d1054fb78fa574b69de4335ca7a818abeb49b
-MISC ChangeLog 3773 SHA256 f56d00dbfb78291d5811c9eb1aaa3cc40b9c4f3df366398d751f38ca0c7611c4 SHA512 aa6138af1c9245702d5e97007ff935a414c17ce83fcba43f68a4ae5caf28b1ac4be23db485046e830dd455d568bd9ab80a812455de93f06813beba9859a1927d WHIRLPOOL dc7b7a5db75434456e290a95635678d07e8871bcc4fe8e01a187377fde3a6a4f86373d6456345827720997d2f79995c14637bb9656f17df7f6e77c3b7bf795c6
+MISC ChangeLog 3895 SHA256 4c3e6a3f3b04bc085c3c271bf66dfb8222b0e11a024ac54839122475e6ab550f SHA512 ca3bd6768208de9bde1dfb71e30345c011dbb6ad60b9a8634e81b14d953e793e430eb813f2f2acdd0cb7958687d60985db471c53479e278b956f051a477cef2b WHIRLPOOL 47304300fc2f77050b60063959e7c322bb585fe96a22d5189f8048c54b6a12d3ccf87a72224d61657863fef233a74cdd68325c926c538bed35cf340837c95d21
 MISC metadata.xml 158 SHA256 cb912d1f997e9e0c5122d4a02de6e3fa5bb4d91fc1eb5a5ca616becca5db2a7a SHA512 9032da465411436fc83b6e6667030e4fc9d0f28e743286af88407d46a331b5ce5f6ffd55d8ac5b49390a964d915af79743aeb0edd10fc9e72e30dc00b40abe3b WHIRLPOOL ed69120b1be86fbda44122a32c1f1bc69fb4ad6f56aede11046cd19d278304f5cc76f60aabf89fea24b3f1246b9c54eca199ddc50c1a93f10b50a5ed6d1d58cb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlRAsVkACgkQiIP6VqMIqNdEUgD9HK6bPdiIZdNRCotZyvAgX2b8
-ar095T/pkYwBi2/GkjAA+wfb7aHI4dF6jKwvfgjtoWgMPX9oMETAuFGB92VW0Dui
-=lWuZ
+iF4EAREIAAYFAlS/UZkACgkQiIP6VqMIqNdk5QD7Bm2WhKcRKeZFsG2n+e9e6iuP
+h1BANzzt+/92d4p46kUA/Rr40F+Fsx4ACjCr6n8PrH42mSTUYd3eyIKbd6zVktO8
+=1VBb
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/msgpack/msgpack-0.5.10.ebuild b/dev-ruby/msgpack/msgpack-0.5.10.ebuild
new file mode 100644
index 000000000000..d9dd00ee59cc
--- /dev/null
+++ b/dev-ruby/msgpack/msgpack-0.5.10.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/msgpack/msgpack-0.5.10.ebuild,v 1.1 2015/01/21 07:13:22 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Binary-based efficient data interchange format for ruby binding"
+HOMEPAGE="http://msgpack.sourceforge.jp/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="doc"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+
+	# Remove jruby-specific specs that are run also for other rubies.
+	rm -rf spec/jruby || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/${PN} extconf.rb || die "Configuration of extension failed."
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/${PN}
+	cp ext/${PN}/msgpack$(get_modname) lib/${PN} || die "Unable to install msgpack library."
+}
diff --git a/dev-util/cmdtest/ChangeLog b/dev-util/cmdtest/ChangeLog
index 9d2fd0f9ce10..bddeac0684aa 100644
--- a/dev-util/cmdtest/ChangeLog
+++ b/dev-util/cmdtest/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/cmdtest
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmdtest/ChangeLog,v 1.10 2015/01/20 08:45:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmdtest/ChangeLog,v 1.11 2015/01/21 10:07:05 ago Exp $
+
+  21 Jan 2015; Agostino Sarubbo <ago@gentoo.org> cmdtest-0.10.ebuild,
+  cmdtest-0.6.ebuild:
+  Add ~sparc, wrt bug #530672
 
   20 Jan 2015; Agostino Sarubbo <ago@gentoo.org> cmdtest-0.10.ebuild,
   cmdtest-0.6.ebuild:
diff --git a/dev-util/cmdtest/Manifest b/dev-util/cmdtest/Manifest
index 694f66ce1d72..3ba082662fb6 100644
--- a/dev-util/cmdtest/Manifest
+++ b/dev-util/cmdtest/Manifest
@@ -3,24 +3,24 @@ Hash: SHA256
 
 DIST cmdtest_0.10.orig.tar.gz 34152 SHA256 d9a421ed916213c5c6660a1057a560afff6e5c7606fe0e1cba3a359f66f23068 SHA512 da3e042c1c7d4379316fb6e3bc642a2e57fa12004434296c30f77debc7662bed49726057eb280461d18308739e86082fd96efe1642d1c531321b1c10f06d3595 WHIRLPOOL eadb47185a977d74ff046654b9845be9e49b859a88d10001f6eb809b1de8cb7697f840942dca100007ef00c98faafc9d7f127c9359108148372fd7175b88c509
 DIST cmdtest_0.6.orig.tar.gz 18603 SHA256 7367d4c6db3b84f6c74209fed179749434ac84dfe6e039fc1a58dd99a5048802 SHA512 67ef446034890bd93e66b8577a5d1f70e490550e9e72204225eff0d91f15c8610c4d7b7167461c08b070ed108d8326e3c9ef87cfc339fbe320c17c2be87ed429 WHIRLPOOL ac57c94497b6da5740435f513112574bc41e152605ecce89e9cd5a788f656c49ec8a5a318eef536754bdd8ec5a9bc204032ed1b4ffb847462ffe52eeb1dca5a9
-EBUILD cmdtest-0.10.ebuild 672 SHA256 f46699996a0848d51147ab522f47894a707c833a582eea8239a27b8ff076dee7 SHA512 ab1d769a32aea3f587f866a868c0417c1b7322d8bb5f670e89159ee947d547e586bba2b45ca8a0e0997ea93ed343219a629ff184e0a255cba2cc6465de673d3b WHIRLPOOL c6739b7aade757302ba0db5b6d9cb3075fcb05b690568871a1b96651565db8b97465419ba3de1fe7df8c580c33448c265bc0c164f1ff6a36d82c20daaeacb928
-EBUILD cmdtest-0.6.ebuild 660 SHA256 75255ecc1e4cd7d5e31a1a8c6a568ed9e19f7f26bc660def08bb713da328c3f8 SHA512 00fff37e504c07b1bf4e5911e3e7fa38cd6c44e2848d6dece02705f61aa3f6dd8568728ecb8b8aa14037ac5a56472c7731ae5cd7e1fa5b7946a61b58b9297d48 WHIRLPOOL 646b07ce179e75914db4b52609349b47f9c2cef2d06387a910c24fc87eeda6e48f96018f9ede19da13ea43bb87171fe6f468eb0c2f33a140a27e5783996eac3f
-MISC ChangeLog 1460 SHA256 b06d1b927f79dadfe4459da50f3a2a7188d26a508b3c7ecca4f26276e9f8163a SHA512 51a0be7521397e60dc6f3cb54c5b2bd6a04b2c66ee5732917797704d41ca15aec4101e5b44fb909153b4d2fa4b05c850c7b4bf6f06b68afdeab4fed3f53b2866 WHIRLPOOL 6334d89d48647856e74dfe22511d3c4f22d60a16b64a2ad1b3b3f7cb58945b3d5adaed654fc8493bb35c3903b9e8446b2c8c4c70a7b0d76157599b75c6e2d2d0
+EBUILD cmdtest-0.10.ebuild 679 SHA256 63e5be9111d4ee533a805408e268be89d21c92acc8edd384b12ab37a5cc968a1 SHA512 5fd42931817e4707ea6f6015eb2ac9e3b20eedffd126b82a2b239fe86208ae5593427884771ac7c33639689c5a48f4abbc2ab83e6f9aabf506cdac02dfd3d3a9 WHIRLPOOL cdbf25b22a681a5b12ec82ff29c78c4fed7d017c997914514a82a11df4a7a94ebd8c31b12b96ab2366539a129fb6785b2bc4f8127e038b763aa00aa3a74fbe9d
+EBUILD cmdtest-0.6.ebuild 667 SHA256 a60d8096281a4f14fc7a685c9c4a060033fa5ed83ee04b1159b0b5f07bd990fb SHA512 6a6d91e5a54f90a03742dbfcad1ca735c01ada7baf07e4a8f0dd2d96cc9c071e1c4e9b6378e79b1b5fa9b3a5db7e32c0bff28d79ba9c7e86a417566912940c13 WHIRLPOOL 3bead27126ac8ddd3a595b7703af2164d1e78e98c64be6e556858a49681892cda46d682b0c113a9007556228807b7396d69b7e3b2f858913b198974e6e363a70
+MISC ChangeLog 1583 SHA256 e42c168dfe6e769708e67cc843db88da5f44875253b6953f42107fe68add484b SHA512 cb11a52a822e08fd70f6926b2170904ebb499e28fdbe0acd6f73d1e7d35c948ef37a44d12f83870466166b999a0bb9af61ab2cc5b59744aab0a416977d7b2b08 WHIRLPOOL a464b2599c8801e18c4fb73f633bab74ff4277f0624dbacc5d638e1953c63f3eb54020333b4835e97793fded7f868b64bc20f2c3e68cc9c9ce5c5eff520ca3c1
 MISC metadata.xml 236 SHA256 f55443c9b3d97fcc9437b9aeba1b3beae39e38599620bd520d0693bb8948b531 SHA512 842ec0962624e280c2c3909e6da541cdaf35532f0f00d76cc9ca0e03dfb8c3dc83a426ae370bc37d73d0c4b1fdd4983171a0586220546b967afe3a3f5dd78ce4 WHIRLPOOL 8ee0a6397a1bae24973eba9b31e1ac64bac9726ca45e5f2127a3ffc991627479030060c605c7cf0957891c184f5e5d01fb2387f94c3a68693c988e4a180c7260
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUvhWlAAoJELp701BxlEWf6voP/jEBJp4XQn7ktwRu3Er2rGMk
-K81aKk1CDYsnvwxSlGR4Su+8Wf9iijCDHbW9b5tBvTXtXDIoQd05lBdtyTk0M0hy
-nmquuL8v3PvNHhMk0NCGyigbD/GcGnZsmajqHP7RcOcWg76TaZClXTgoHR3PHhRw
-E6LrCP97EBGisGj7JgMhH7WXaIDCoBDKgNj9qqU6ra3gYjE4jQl0K5FvJBBOZeyC
-7C9YlGAqyCdWSi127RAu1VGCfHV9nm+IUr3YV+lys99JTp6+3nHuFG6+bIaUV441
-zCrI0zpRu97OyXmfLBOImKgovgw9LnOLkQpNwjS6wbAyjC8cPOA3lPwilou11kAH
-vD6h+3acsuPcEC1TFIMU+TRvPk34tvwF89W2+ZX9vfZ3ArNt1rxjk38qio+qGktK
-WzLraHplFZwaBE0C5ORJ61irFUBc8tJQQvYDUathXpmcWFoLQnyo37whfpPT8W/v
-UgM/tO16qgry0ow5DyHuEry/9NGdMV87b4cCq7xWDkWo/iaNVr8jPXsPkV8E+ESv
-83PsGrALgL1rukQrmJOIq+l1FFjiYC+VXKSXG5+FJS8mQnx/vRIiSEiuiAVg9ZCC
-lTanr1LFYTOgN5GUagXFoAlKGU3GKFTONeSgNQxAwtBzPgneUwdvV7zmNj97CqeA
-ism1pttDa03rMThnmdjs
-=YCN+
+iQIcBAEBCAAGBQJUv3pKAAoJELp701BxlEWf3i8P/RP384FSq+mpVf3q/+Kivc+j
+czy7wSsWj84bpnTFaCSvYb821eRYmWlK5MAMdv6zPFcD8WhxjdOvaPrPmwtm0M6/
+OuBxqsLRcP6KcjnEBKAISVJRq4h3tuUV+878kikYOoHdr8cdyietR7/GBVuobTRo
+GDhP+9G0peGA1YQkIa2RxSxweucMD1Z/F2LsJ8xe9OpWvTqvOyut5lI7T/Dym3Zx
+wP48VThbGNxt/URSUV35SkAP/voyO5AtwNA5yGHMPHhfPxxtL8aXr4/sInDST9tk
++Y1oHbr46EkucHDBhbjuZjjFbgUrbbFn4qOSOOv90jzbn2z8j7rFucX6QBke9uwW
+lyiTS9oa7WgIJ3rRVPbNuigGsxBo5/GLsZV5yirLhscX7/0WoKqhoOTAu0UxKCtQ
+wOkj6vaT/V8Ii0nxfXl61xfdSJXxmWGrgUDjckllMkqYiOVCLR1Crk5Q93Lo/sFu
+C4GPsaBKsDJidqwTKsVecyYOUIkyRnm4iyxiEY83LhBZJ633WAYIQIImo0g2DWuZ
+pS6+HKlIuHF5+vFrz9/x4ScFNpzpgjYeqi2EaL4G0/BBYxhjhHTYqQm3nJGmIRCn
+yvtAI3IHF5qH9wjnJxn7mQiiHdOfMZMmE0o3AqOnlWZvK0ORQ+vuAQD4AWKFoDSG
+AbL0bKYellDRgfmFSw7f
+=ACPH
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cmdtest/cmdtest-0.10.ebuild b/dev-util/cmdtest/cmdtest-0.10.ebuild
index 453f3153e572..5765edb9d445 100644
--- a/dev-util/cmdtest/cmdtest-0.10.ebuild
+++ b/dev-util/cmdtest/cmdtest-0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmdtest/cmdtest-0.10.ebuild,v 1.7 2015/01/20 08:45:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmdtest/cmdtest-0.10.ebuild,v 1.8 2015/01/21 10:07:05 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://code.liw.fi/debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND="
 	${PYTHON_DEPS}
diff --git a/dev-util/cmdtest/cmdtest-0.6.ebuild b/dev-util/cmdtest/cmdtest-0.6.ebuild
index adf96394d9ad..a566515dfa6b 100644
--- a/dev-util/cmdtest/cmdtest-0.6.ebuild
+++ b/dev-util/cmdtest/cmdtest-0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmdtest/cmdtest-0.6.ebuild,v 1.7 2015/01/20 08:45:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmdtest/cmdtest-0.6.ebuild,v 1.8 2015/01/21 10:07:05 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://code.liw.fi/debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND="
 	${PYTHON_DEPS}
diff --git a/games-engines/openxcom/ChangeLog b/games-engines/openxcom/ChangeLog
index 7e6d8a2c60be..98b389a49f04 100644
--- a/games-engines/openxcom/ChangeLog
+++ b/games-engines/openxcom/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-engines/openxcom
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/openxcom/ChangeLog,v 1.3 2015/01/21 04:59:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/openxcom/ChangeLog,v 1.4 2015/01/21 05:33:56 mr_bones_ Exp $
+
+  21 Jan 2015; Michael Sterrett <mr_bones_@gentoo.org> openxcom-1.0.0.ebuild:
+  point people to additional language packs
 
   21 Jan 2015; Michael Sterrett <mr_bones_@gentoo.org> openxcom-1.0.0.ebuild:
   improve sdl-mixer use deps per Azamat H. Hackimov
diff --git a/games-engines/openxcom/Manifest b/games-engines/openxcom/Manifest
index 503da63aaf46..6210111095cc 100644
--- a/games-engines/openxcom/Manifest
+++ b/games-engines/openxcom/Manifest
@@ -1,4 +1,4 @@
 DIST openxcom-1.0.0.tar.gz 2068640 SHA256 45acb280010a01d60506b1c5f2951ae501c012cc6161aac470bd15c1e6981246 SHA512 597abd2e7160551a3d6020d7c6fec863f86b708910ee582d446f2a5f97be94dc7e2522ede2e7ab4f62a2d21acf07ce441a435f74b530950e2f0b5791c00e06ab WHIRLPOOL fe63cb513b5413e16656f711564ce21eac3d3dc7a7674dcb62bc01f022b49c23dead30e80bbc0545f58e5a8a35cd635fd721c6243900a0bdba86de14c8ab8de9
-EBUILD openxcom-1.0.0.ebuild 1735 SHA256 efb635fd3ad596afb8de49f821fff05b6a313cc68aa59aa84837c7817d7fb687 SHA512 206a7d7251e15a347504caa68c5be64dc88787954262d5802e700799d02c3ab12a52d6380bf46a77681757af704dc86b79c143efda8a02cae0c6c4294a89102f WHIRLPOOL 79680b1569d17893f57854bfc3d42f73b3349dc24b4a5830d569f5d6c70d4ea61fcb778036be8e1d515f24be40954c8238658c163e7cd6b40c6e7e30a5d5aa4e
-MISC ChangeLog 621 SHA256 974030949a6d73bee7575e3e214c26268177f32be1bc5a8e753a5e08af221c4d SHA512 bc8ee23a8e8f54b52b6ede17a6242829bbc46785e4e98af2d623c76d0ec8e3ea83838b34e7c782e51b063d5f64902ce5af48c91519966f8f642c186dde9fcc0c WHIRLPOOL af80c3fd5161bdad9f442dea37081aabc9b4c29262898493ee3cdb8f2a285b5c05ed53791e16452a275758e8764e31874e522968e4f2a39206e06b9d14e66a03
+EBUILD openxcom-1.0.0.ebuild 1939 SHA256 272f508e5d8c581556740ffed260d2a8b9e644e5a44aede411f0b4f6f3099009 SHA512 d54c0f702b857301781aa7a28a75509e4ae7ffda496056b639d6687da44c35417fc01ec63e8f1fade1948aaff8a4a407166785758cf717f0daa8de1fa6ad61f1 WHIRLPOOL b83f786310cc2180660730d8f77a88ca7420893d0360993e75e96cbd7b75eab7c068aa12bbe0f85526fc3271a491993b50647799cbe45744f5de8b6a49c82c1a
+MISC ChangeLog 744 SHA256 3bbc981b59b265a32a9230998eba1d70019ece66e0a3ddb54184760d4b72cd9c SHA512 59e41ea4fe560653e113ae65800a99d02981de5306bdaecc6600be3ce480ac50b377d8755ed00042201fba7588d1b1c9818fca2db13d23ddea53099897c3ad72 WHIRLPOOL bb1dbc1a92dba7d40a25a70ee3ca5cda9c5222d2acb39d9d90d2717249f4d8c3703c71cc0de64cb6f867bfa214c475bbd5c8dba6bfae8b1ae001d5e31b9250d5
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-engines/openxcom/openxcom-1.0.0.ebuild b/games-engines/openxcom/openxcom-1.0.0.ebuild
index 11c3411d5883..ee6b34fe6d91 100644
--- a/games-engines/openxcom/openxcom-1.0.0.ebuild
+++ b/games-engines/openxcom/openxcom-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/openxcom/openxcom-1.0.0.ebuild,v 1.3 2015/01/21 04:59:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/openxcom/openxcom-1.0.0.ebuild,v 1.4 2015/01/21 05:33:56 mr_bones_ Exp $
 
 EAPI=5
 inherit eutils cmake-utils gnome2-utils games
@@ -62,6 +62,10 @@ pkg_postinst() {
 	elog "In order to play you need copy GEODATA, GEOGRAPH, MAPS, ROUTES, SOUND,"
 	elog "TERRAIN, UFOGRAPH, UFOINTRO, UNITS folders from original X-COM game to"
 	elog "${GAMES_DATADIR}/${PN}/data"
+	echo
+	elog "If you need or want text in some language other than english, download:"
+	elog "http://openxcom.org/translations/latest.zip and uncompress it in"
+	elog "${GAMES_DATADIR}/${PN}/data/Language"
 }
 
 pkg_postrm() {
diff --git a/games-roguelike/angband/ChangeLog b/games-roguelike/angband/ChangeLog
index c0459cad353a..fc5dabbbc371 100644
--- a/games-roguelike/angband/ChangeLog
+++ b/games-roguelike/angband/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-roguelike/angband
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/angband/ChangeLog,v 1.54 2014/09/19 19:04:20 mr_bones_ Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/angband/ChangeLog,v 1.55 2015/01/21 06:30:18 mr_bones_ Exp $
+
+*angband-3.5.1 (21 Jan 2015)
+
+  21 Jan 2015; Michael Sterrett <mr_bones_@gentoo.org> +angband-3.5.1.ebuild:
+  version bump (bug #537196)
 
   19 Sep 2014; Michael Sterrett <mr_bones_@gentoo.org> angband-3.4.1.ebuild:
   EAPI=5; work around X_PRE_LIBS (bug #523214)
diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index 0ed68e65b2ea..b81e44325eb2 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,4 +1,6 @@
 DIST angband-v3.4.1.tar.gz 17880537 SHA256 461e36d22c15df330b4d4eaa850e4f2c2da6731d23e99fa13a056249343fd945 SHA512 76099c8fa999e88ea1324bb70b4dee5df1faccd1fa256cc0c460ce2c5ddae9634fdef876bd0d826e99e6dcc54a9f9cf619d82552dc658d0115b97e0e644c19d3 WHIRLPOOL 4e74092deb1868a7c172c206058ebf198f5bdf08f50ebfa5cd3a4a4200998283d9d1896ff39f41fa88f74b78940bee16a3f8a2ce949a69b3e01417017cc32545
+DIST angband-v3.5.1.tar.gz 20539732 SHA256 c5ca3ab75fd820a49eb2b9ab8b1c2a811ff992276f9800cc61c686e90bd4d447 SHA512 a45a64b4de1161f327594b93177432c22a00301e7e6058a5e9c1407343c4448217564303578d46f3ea15c94b86aeaf813685a04a70a5dae58511cbf0427b86dc WHIRLPOOL b5f32d90b9923c8ea00eae762b3e743f3d1175290feb5bd38064a29954e8685545eb2129eabcb98e2386f7d425c9ce966c8824634844d23dd91dbbd8b32586bd
 EBUILD angband-3.4.1.ebuild 2429 SHA256 9dc68614d7f3becb9a146a9b4c432d7406b0fae3b3d40123d79debd91bb794ac SHA512 5f62566ccc535ab4e63c915c92a5c4d035b42773733e5d07ce05fef4855517e77393af642f22e8aa53056d96fd3db24add9f74a85616f5b4e8a13b57cb9ba5f1 WHIRLPOOL b61f9a5a9ca8afd627602cea88f43aedfe31bca3e92e5404d19a7ad9ea327aa884d4d99e9463759ce6ed997f935face1b6794606aadc52e8397bc7f30d95da61
-MISC ChangeLog 7253 SHA256 814dfe2a77912cebd33cb1123a52ba3cd1dbc2dc2538e56700ca69d6ef96e3b2 SHA512 466bd9f542e4d72f083a06ec616dbd3a519cdc9765e42bb10cadd46090ed7a18119747f1962e3eda5e3daeeb54480f42d7cc8727d25bd85ca884c6af3272317a WHIRLPOOL 687407e919b3cb5d2af7e890e55169b27973b423368eabf687941acd86059fdc1b01190b10fef218e736947a528feb6269f56d38371122c14f352c2e70a61c66
+EBUILD angband-3.5.1.ebuild 2416 SHA256 43cee75acdbc16b70a03f3408ee4e0eca2b5eb3f2fc6ba6acd7100dae65bd5b3 SHA512 e734d0074d8e31a548e6157231f9be663447f53fa56ff4216653bb11c2f34415274f6aa08f810604331e502d6ca0e6b20009ce9182defb5b27dd6af3fe5627ff WHIRLPOOL e14851b980c764a46a6b9af0ba3896de6d032010e8fc3f7558b2c5aba63620d5d8562f383d9537b741c7f235eb6610cce9512a09e5e9d7a83bc45a2b1e5209a9
+MISC ChangeLog 7391 SHA256 0f2a88f933432b0d1565a51516085c34a706bcc583e66ad02a3c2b406cd41edd SHA512 32f698656e276639c8ea217cc9c226a27dc563fb180973be306ad1e9822e1e7c09467e30c6de67ca3591bb1a7b707eab27e68b15aa130fadda1517dceb20e837 WHIRLPOOL d05cd30a00ee29c6c3b04d244d451cd9f00873e8a15185f80a650dedc0693030cf6f1cbaa600afdceefb812512dd9ac283d7f82d0332933ea960b6e5164f0afb
 MISC metadata.xml 228 SHA256 82862f0e444b920d358b225084911a03058e8d38cd80328d83777f61ef924adc SHA512 909720ea55bcbf61f4d607187dcbb770074c69a1bed175e6bf3337256e63e7cccc396b9091f1706db9d9fa49d93711c26b45e97d222bd2d168c5c62cb2339155 WHIRLPOOL 82fd41ad84c121ad09c38a5c41e93e71f7ccf6a54e90baa5fbd731d4694572e1e0d6d5c3a248c752579894316297d5479287e7a779ccc7c4e8e2c52498914305
diff --git a/games-roguelike/angband/angband-3.5.1.ebuild b/games-roguelike/angband/angband-3.5.1.ebuild
new file mode 100644
index 000000000000..1274f2687181
--- /dev/null
+++ b/games-roguelike/angband/angband-3.5.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/angband/angband-3.5.1.ebuild,v 1.1 2015/01/21 06:30:18 mr_bones_ Exp $
+
+EAPI=5
+inherit eutils versionator games
+
+MAJOR_PV=$(get_version_component_range 1-2)
+MY_P=${PN}-v${PV}
+
+DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. Tolkien"
+HOMEPAGE="http://rephial.org/"
+SRC_URI="http://rephial.org/downloads/${MAJOR_PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ncurses sdl +sound X"
+
+RDEPEND="X? ( x11-libs/libX11 )
+	!ncurses? ( !X? ( !sdl? ( sys-libs/ncurses ) ) )
+	ncurses? ( sys-libs/ncurses )
+	sdl? ( media-libs/libsdl[video,X]
+		media-libs/sdl-ttf
+		media-libs/sdl-image
+		sound? ( media-libs/sdl-mixer[mp3]
+			media-libs/libsdl[sound] ) )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	# fix paths
+	sed -i \
+		-e '/libpath/s#datarootdir#datadir#' \
+		-e '/X_PRE_LIBS/s:-lSM -lICE::' \
+		configure || die
+
+	sed -i \
+		-e "/^.SILENT/d" \
+		mk/buildsys.mk.in || die
+}
+
+src_configure() {
+	local myconf
+
+	if use sdl; then
+		myconf="$(use_enable sound sdl-mixer)"
+	else
+		myconf="--disable-sdl-mixer"
+	fi
+
+	egamesconf \
+		--bindir="${GAMES_BINDIR}" \
+		--with-private-dirs \
+		$(use_enable X x11) \
+		$(use_enable sdl) \
+		$(use_enable ncurses curses) \
+		$(use !sdl && use !ncurses && use !X && \
+			echo --enable-curses) \
+		${myconf}
+}
+
+src_install() {
+	DOCS=( changes.txt faq.txt readme.txt thanks.txt )
+
+	default
+
+	# Edit files are now system config files in Angband, but
+	# users will be hidden from applying updates by default
+	echo "CONFIG_PROTECT_MASK=\"${GAMES_SYSCONFDIR}/${PN}/edit/\"" \
+		> "${T}"/99${PN}
+	doenvd "${T}"/99${PN} || die
+
+	# Create desktop entries if required.
+	ICON_LOC="${GAMES_DATADIR}/${PN}/xtra/icon/att-32.png"
+	if use X; then
+		make_desktop_entry "angband -mx11" "Angband (X11)" "${ICON_LOC}"
+	fi
+
+	if use sdl; then
+		make_desktop_entry "angband -msdl" "Angband (SDL)" "${ICON_LOC}"
+	fi
+
+	use ncurses || rm -rf "${D}${GAMES_DATADIR}/${PN}/xtra/graf"
+	use sound || rm -rf "${D}${GAMES_DATADIR}/${PN}/xtra/sound"
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	echo
+	elog "Angband now uses private savefiles instead of system-wide ones"
+	elog "This version of Angband is not compatible with the save files"
+	elog "of previous versions"
+	echo
+
+	games_pkg_postinst
+}
diff --git a/games-roguelike/zangband/ChangeLog b/games-roguelike/zangband/ChangeLog
index bcaf258393ee..ce3a80060d6f 100644
--- a/games-roguelike/zangband/ChangeLog
+++ b/games-roguelike/zangband/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-roguelike/zangband
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/ChangeLog,v 1.20 2013/01/13 04:39:19 mr_bones_ Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/ChangeLog,v 1.21 2015/01/21 07:28:07 mr_bones_ Exp $
+
+  21 Jan 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/zangband-2.7.4c-configure.patch, +files/zangband-2.7.4c-makefile.patch,
+  files/zangband-2.7.4c-rng.patch, files/zangband-2.7.4c-tk85.patch,
+  zangband-2.7.4c.ebuild:
+  EAPI=5; tidy install; avoid bashism (bug #527202)
 
   13 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
   files/zangband-2.7.4c-rng.patch, files/zangband-2.7.4c-tk85.patch:
diff --git a/games-roguelike/zangband/Manifest b/games-roguelike/zangband/Manifest
index a7609ffb7f55..39c26a2345c0 100644
--- a/games-roguelike/zangband/Manifest
+++ b/games-roguelike/zangband/Manifest
@@ -1,6 +1,8 @@
+AUX zangband-2.7.4c-configure.patch 1506 SHA256 ca32b55fbc3bff799e59cb7a11650f9d7950d74802820775121333d3349ea961 SHA512 a5f0e8265aa05da7881b0e194bd4b1cc07d1376ad14d20bb4707d08ba1042a919d57f5ec7a8c990fd1d7f13d9dd8e5f147c1816eb99f2589dfdf0d399161c3ea WHIRLPOOL bdd138212d1ae4988439511f54f25606f533dfac0e7de5e705c66a236f611722f61035e22920f18b01f5c34f4a6ebc92b35838cc3f7651724b94bb898f70bb43
+AUX zangband-2.7.4c-makefile.patch 631 SHA256 90a745022235031c0bd31f72bc8e58eab47640d0673061a775447250b08af832 SHA512 c6453d867336a7974757b1240a28715fd0e801d59f61fed23d053be86c7cdf6ea07bc874415b860076a4e5fd08537eff17793f0caa52a2bdb219514a7b8d1fd8 WHIRLPOOL 98c3312e8026071d824ff2438cfa68848dc31555fe46153b593d208596147b2e89ba565f944d107816eac1b5b7070b0f371121c8b79c5ceec0fcf5edaf68a00a
 AUX zangband-2.7.4c-rng.patch 285 SHA256 518c9353b4feed8e984b9aff61ad18bbcb24bdd431413b33fa5bf61f27d1ec97 SHA512 ff6e63d15c8d6243b24fc580c8e21c556edf578b5c31b6c0af62db8f096e4e47ebe50d201811d834ba32af678e5c6775b4d4426295dd3d87dbd8ce798d13528c WHIRLPOOL 65cc4596b76311090a2db1b62cbec6c3eec3d0653d8a44ba617d9121d7111f9b859309f67a7d17e837696f0a68402fda847584d03dab7d938ea9cb2425aa6fff
 AUX zangband-2.7.4c-tk85.patch 1405 SHA256 6b55fef0367c8780fe084b05fbdaf3360c3c809bdcbcc7609cdc25a197851015 SHA512 358edb61b0703dabbe780a2fdca284b80c1fd68dba16e1b70de42b96c7407e5eaf6d9304789c2a37098c1ed2c10690731c9ad10002995f82c6289c1657d2e2c3 WHIRLPOOL 0f62d81953b90e0a8bc895504bad230334d127259cce1959bd605aad5a513c72e3248f9eeba0b5b91e017aff19c935b93f6e9cbfa3e6444aa638054fef3542a3
 DIST zangband-2.7.4c.tar.gz 2821355 SHA256 3033fc52d0daab6098394a8caaa6572ba64585d7b9deb62800328ca7ba592cdc SHA512 491dfeb72b6eb34f7feaa45d5360014da8eaeccd173dd75b3f7a1c2034e4fb634817493957b75babc0d9600077a80d88529cf2e86769948fc86d05e59958356e WHIRLPOOL 4a6cb2cdcb27449d4f1967c1e502cf111aa703b19ed77b2285a63f4cbd7ed70bb081a30a5d95ca3268c7b65bd975ef6b67179b92cd7357da59dc9e63291986f0
-EBUILD zangband-2.7.4c.ebuild 1707 SHA256 eaec8d4f3a647f99ca046bad3a2d106d988a02234bd3f076d274663877c64eb3 SHA512 ff5fbe45e3c88ca8c3dff364103d104c64d1e6c0a9f3aba8aaa860ae253b433fa07a1b7cbbb7c8218de898cdfddc428869a56a91c5211cbf19038493c539f9e0 WHIRLPOOL 5963607565ce3e95960b727d950d350a1214ca48983cfef9e103a18c6a2579a5df06cf250920e823b158cc0b676c30c90f0a2772c3c0a0a3fc2ddadba76b5d0a
-MISC ChangeLog 3282 SHA256 8db90e5bb69dcfd870987133237bc2b1ee0053195ae3f34b68b230167ec3f0a3 SHA512 a1e2e007f51986453f81b0f5a7bd6e7dc0669c47bebfcdc61a3cb43c9d19887da47e34023690fbdd51db3472f46bf9aa816d7f048bf33eda564b65a39ad0d076 WHIRLPOOL 2d8ee113419474a6dfbc4d2f75e6ec56827fa5f0d1317f1416a9270bda134a81c78b969ad481efd2e9d21da2e8f9e98e75b1c6f9849b4f50b26af38a6523b8b1
+EBUILD zangband-2.7.4c.ebuild 1705 SHA256 d459f04726f6a329a7bc0b4516d0c4d5d8206bf886380f1fc544d541fa61c018 SHA512 03196e44af401953dc93949dd0ebe730a1f348e243350efc3be49e79ba0fab8b153673c5b7f03cc61a669da5abed04d63b7184ff98b67bc8ddf5fc44008d6ca4 WHIRLPOOL 12adbe71d0f280a14dd213beb446f6fe50cb14bc3eb64729055e83869504ba2bd893d64814259fca548af93008044bae97d51a8c14480a8e08eb699d5768e6d5
+MISC ChangeLog 3566 SHA256 31906b3ceae1aac690750e157c92111d4ead7cdc73cdd1daa5a89925f2e474d7 SHA512 ea84f60b6d19db60db0d25f876c7594fc4a8905d6b8e57c04a6aa1e918481d69e2d6861000d968fb64f74c31be51ccc7f193bc1d8a5cc2b423715c380d50aeb8 WHIRLPOOL 2b7d57bd05bb7726315e661c0634321d261040b0fab4093cf2c78a2b412ac2631446bebd0f42034fe251baa9d879e3a351290529c3e6eb70d8493d5c20bd933f
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-roguelike/zangband/files/zangband-2.7.4c-configure.patch b/games-roguelike/zangband/files/zangband-2.7.4c-configure.patch
new file mode 100644
index 000000000000..756ea757845c
--- /dev/null
+++ b/games-roguelike/zangband/files/zangband-2.7.4c-configure.patch
@@ -0,0 +1,51 @@
+--- configure.in.orig
++++ configure.in
+@@ -236,48 +236,5 @@
+ AC_CHECK_FUNCS([Tk_SetClassProcs TkpSync])
+ AC_CHECK_FUNCS([mkstemp usleep getpwuid getpwnam shmget])
+ 
+-dnl A nice function to test compiler options (like warnings)
+-AC_DEFUN(AC_CHECK_CC_OPT,
+-[FLAG=`echo zangband_cv_cflag_$1 | sed s/-/_/g`
+-AC_CACHE_CHECK([whether ${CC-cc} accepts $1],
+-[$FLAG],
+-[echo 'void f(void); void f(){}' > conftest.c
+-if test -z "`${CC-cc} -c ${CFLAGS} $1 conftest.c 2>&1`"; then
+-  eval $FLAG=yes
+-else
+-  eval $FLAG=no
+-fi])
+-if test ${!FLAG} = yes ; then
+-  CFLAGS="$1 $CFLAGS"
+-fi
+-])
+-
+-dnl Check for lots of extra warning options
+-AC_CHECK_CC_OPT(-pedantic)
+-AC_CHECK_CC_OPT(-W)
+-AC_CHECK_CC_OPT(-Wall)
+-AC_CHECK_CC_OPT(-Wmissing-prototypes)
+-AC_CHECK_CC_OPT(-Wmissing-declarations)
+-AC_CHECK_CC_OPT(-Wno-long-long)
+-AC_CHECK_CC_OPT(-Wwrite-strings)
+-AC_CHECK_CC_OPT(-Wpointer-arith)
+-AC_CHECK_CC_OPT(-Wbad-function-cast)
+-AC_CHECK_CC_OPT(-Waggregate-return)
+-AC_CHECK_CC_OPT(-Wstrict-prototypes)
+-AC_CHECK_CC_OPT(-Wredundant-decls)
+-dnl AC_CHECK_CC_OPT(-Wunreachable-code)
+-AC_CHECK_CC_OPT(-Wchar-subscripts)
+-AC_CHECK_CC_OPT(-Wimplicit)
+-AC_CHECK_CC_OPT(-Wparentheses)
+-AC_CHECK_CC_OPT(-Wsequence-point)
+-AC_CHECK_CC_OPT(-Wreturn-type)
+-AC_CHECK_CC_OPT(-Wswitch)
+-AC_CHECK_CC_OPT(-Wunused)
+-AC_CHECK_CC_OPT(-Wuninitialized)
+-AC_CHECK_CC_OPT(-Wundef)
+-AC_CHECK_CC_OPT(-Wnested-externs)
+-AC_CHECK_CC_OPT(-Wdeclaration-after-statement)
+-AC_CHECK_CC_OPT(-Wsign-compare)
+-
+ AC_CONFIG_FILES([makefile])
+ AC_OUTPUT
diff --git a/games-roguelike/zangband/files/zangband-2.7.4c-makefile.patch b/games-roguelike/zangband/files/zangband-2.7.4c-makefile.patch
new file mode 100644
index 000000000000..bae74904cf02
--- /dev/null
+++ b/games-roguelike/zangband/files/zangband-2.7.4c-makefile.patch
@@ -0,0 +1,29 @@
+--- makefile.in.orig
++++ makefile.in
+@@ -111,17 +111,6 @@
+ %.o: %.c
+ 	$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $< -c -o $@ $(DEFS)
+ 
+-##
+-## Hack - make sure the build system is consistant.
+-##
+-makefile: configure makefile.in
+-	$(CONFIGURE)
+-	
+-configure: configure.in
+-	aclocal
+-	autoheader
+-	autoconf
+-
+ dirs:
+ 	-mkdir $(DESTDIR)
+ 	-mkdir $(addprefix $(DESTDIR),$(filter-out $(srcdirlist), $(dirlist)))
+@@ -205,7 +194,7 @@
+ 	@echo $(srcdirlist) $(srcfiles)
+ 
+ # Hack to remake files depending on DEFAULT_PATH
+-.default_path: makefile
++.default_path: 
+ 	@if [ ! -r .default_path ]; then \
+ 		echo "$(DESTDIR)" > .default_path; \
+ 	fi
diff --git a/games-roguelike/zangband/zangband-2.7.4c.ebuild b/games-roguelike/zangband/zangband-2.7.4c.ebuild
index 4aa553fe2e1c..792dfa529934 100644
--- a/games-roguelike/zangband/zangband-2.7.4c.ebuild
+++ b/games-roguelike/zangband/zangband-2.7.4c.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/zangband-2.7.4c.ebuild,v 1.11 2010/03/04 00:52:42 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/zangband-2.7.4c.ebuild,v 1.12 2015/01/21 07:28:07 mr_bones_ Exp $
 
-EAPI=2
+EAPI=5
 inherit autotools eutils games
 
 DESCRIPTION="An enhanced version of the Roguelike game Angband"
@@ -25,7 +25,10 @@ S=${WORKDIR}/${PN}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-tk85.patch \
-		"${FILESDIR}"/${P}-rng.patch
+		"${FILESDIR}"/${P}-rng.patch \
+		"${FILESDIR}"/${P}-configure.patch \
+		"${FILESDIR}"/${P}-makefile.patch
+	mv configure.in configure.ac || die
 	eautoreconf
 }
 
@@ -39,19 +42,16 @@ src_configure() {
 
 src_install() {
 	# Keep some important dirs we want to chmod later
-	keepdir "${GAMES_DATADIR}"/${PN}/lib/apex \
-		"${GAMES_DATADIR}"/${PN}/lib/user \
-		"${GAMES_DATADIR}"/${PN}/lib/save
+	keepdir "${GAMES_DATADIR}"/${PN}/lib/{apex,user,save,bone,info,xtra/help,xtra/music}
 
 	# Install the basic files but remove unneeded crap
-	emake DESTDIR="${D}/${GAMES_DATADIR}"/${PN}/ installbase \
-		|| die "emake installbase failed"
+	emake DESTDIR="${D}/${GAMES_DATADIR}"/${PN}/ installbase
 	rm "${D}${GAMES_DATADIR}"/${PN}/{angdos.cfg,readme,z_faq.txt,z_update.txt}
 
 	# Install everything else and fix the permissions
-	dogamesbin zangband || die "dogamesbin failed"
-	dodoc readme z_faq.txt z_update.txt || die "dodoc failed"
-	find "${D}${GAMES_DATADIR}/zangband/lib" -type f -exec chmod a-x \{\} \;
+	dogamesbin zangband
+	dodoc readme z_faq.txt z_update.txt
+	find "${D}${GAMES_DATADIR}/zangband/lib" -type f -exec chmod a-x \{\} +
 
 	prepgamesdirs
 	# All users in the games group need write permissions to
diff --git a/gnome-base/dconf/ChangeLog b/gnome-base/dconf/ChangeLog
index 67ff656fddd0..81d768c79946 100644
--- a/gnome-base/dconf/ChangeLog
+++ b/gnome-base/dconf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-base/dconf
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/ChangeLog,v 1.74 2015/01/07 20:03:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/ChangeLog,v 1.75 2015/01/21 07:45:36 jer Exp $
+
+  21 Jan 2015; Jeroen Roovers <jer@gentoo.org> dconf-0.22.0.ebuild:
+  Marked ~hppa (bug #498474).
 
   07 Jan 2015; Pacho Ramos <pacho@gentoo.org> -dconf-0.12.1.ebuild:
   drop old
diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest
index 4e50930b3a37..392cba0da377 100644
--- a/gnome-base/dconf/Manifest
+++ b/gnome-base/dconf/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
 DIST dconf-0.20.0.tar.xz 389388 SHA256 22c046a247d05ea65ad181e3aef4009c898a5531f76c0181f8ec0dfef83447d9 SHA512 d3069638ac8bfc077bbcef7878ad7e39c5c008d6b673128b685817e94a5ba147f4a3218e9547d9ce1a70260771f6f8e5c4c609fa5cf5530160373d7191aa3b00 WHIRLPOOL a82657d2ff5d0defd81fa9380a28798353e2e907869e85c089eb3c81c542662918cd15b850c9fb2929beee610f205aab01ddfe42312d571ae7712208e1a946fb
 DIST dconf-0.22.0.tar.xz 393260 SHA256 0a277cb0c3f09e77d9413c5a9b3577fc2b5d6e941b59b44940392e024a224b8e SHA512 fee502b599da3634934eadc3d9fc138f2036118e88edadf0e3dc157f8e689ee1fee057342a296197b126e5f657fcb2bb1f399b6a3ffa9ff5fdcc3119d9433d9b WHIRLPOOL 71214ae41394e5c86091674950bb0560f451247d5ae497411a37eebee89fa9ee6605206996303c3826247f31e6a05d2e693830cccd99e2991f0f76e130a4d3b0
 EBUILD dconf-0.20.0.ebuild 1817 SHA256 9967e0756b7e4e59c5f160c929a3d1a5f03210a712b23cfbdb01afc88dfbbda6 SHA512 89fdf6177f1db8e085bc362aa200efa4abb9f9dcc09ae354989d2a1ca6befd7aa31a9edf7e5ed1edce06965c3ca08434c8dbae45f7f6111b799dc43823a7dfcc WHIRLPOOL 87c1d6ffea25f08f051924ec6b2873033b1e0e72e0187e96d504b4696d9656526534163c4dc330a576bdfb2763adbe3718eb917bbc8fa79f1f1db4ebeb4d7af4
-EBUILD dconf-0.22.0.ebuild 1822 SHA256 537b428d183ff95bfa74920162f8c6e12e26e9946131d89874943cb8f7ff8af4 SHA512 f31b2e36e2f9aedd26b7921aa02af46d7949f038d96d8811dea339916f44322d0918cebefe872ead372c4d0b104db97d88e89db75f7fa417e218e991582caf43 WHIRLPOOL 6d7e000710341ed82a94ab37e070b0c5b59fc348ad4c7924bb7de23dcf376413dd775ef4e11d8f2564bf78b001116c1596d0a2fcd5a40ba862d7f84e4b3c1f47
-MISC ChangeLog 9759 SHA256 296cd000318815cd389ab9ca596e8d1043142431cc4dbde5e66ed89b1b05e194 SHA512 2ab8a42740639fdd06a8d556793761af2296be29939755033bdb275cb0b4f62cc1560cf55a0ba5294a2317a4e059af510f45c2c4ab41f39081e54ef92f3d2eee WHIRLPOOL 4c6791c4b654ae3226e53d4a0a281b1c6a353481f5154df18570a8f81a75f7f8a50054a25a983fa996b77425bef5f522fcfc528746383d8c1e095fc08808c2e8
+EBUILD dconf-0.22.0.ebuild 1828 SHA256 74c0b4e042d42eebb549c6fd404278a5c72d118d36d61ad85e011eefc04cf38e SHA512 6993163dad2a9ce5c25da7ec1f6bb8fb8be149ed40ec0ff1a034fa592c3c62ae4b70d936db234100c550b96d124cc10dac72b5d84245290c09c79112f84ed623 WHIRLPOOL 365e00ce57c427b66ba32a32e44f9cce5fa78233958d4f2085bedc1cdddb9f77f91151c400c8a5e36886d4e05cddbaf96790320792fc04af880abb6e799b43ad
+MISC ChangeLog 9856 SHA256 2f6bd23ef382f91245cf634f8c1050c280a00470281548dbb67a18832e465139 SHA512 83b61e180b837174f9112f3646dbdb825c6f1cec337854a8976ca162a8cb309f7a15178b6326034c3f7dbcaff49a76459bc4c8a0dc7d13a3cd3eb13d0d730cb8 WHIRLPOOL e99ea258d5d448a1b972fb7a38dbd0462dfc8164c30e8fd6e6764b64ce3c771c8651efe121fcb48f59c19b68251ed33156d01699033572eeedbe1e264bb73350
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlStkQ8ACgkQCaWpQKGI+9S1CwCffVtsvTMORRR5ohtOkqDwi2jk
-o5sAn1N6Wld5cYSbUyt11Ie6D86i1XAz
-=OpGn
+iEYEAREIAAYFAlS/WSEACgkQVWmRsqeSphPOKgCggOYK5SzyQAPWG18xDc0Mo6jn
+SxUAnjvyvZVoJmfzl8Bd/UYD5KTSVLQf
+=PI73
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/dconf/dconf-0.22.0.ebuild b/gnome-base/dconf/dconf-0.22.0.ebuild
index 8f41bdac0b90..a51af46cdd2d 100644
--- a/gnome-base/dconf/dconf-0.22.0.ebuild
+++ b/gnome-base/dconf/dconf-0.22.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/dconf-0.22.0.ebuild,v 1.1 2014/12/22 21:16:30 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/dconf-0.22.0.ebuild,v 1.2 2015/01/21 07:45:36 jer Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -16,7 +16,7 @@ SLOT="0"
 # TODO: coverage ?
 IUSE="test +X"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/glib-2.39.1:2
diff --git a/kde-base/kwalletd/ChangeLog b/kde-base/kwalletd/ChangeLog
index 2d3f013d7786..1da1622c94dd 100644
--- a/kde-base/kwalletd/ChangeLog
+++ b/kde-base/kwalletd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kwalletd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletd/ChangeLog,v 1.229 2015/01/20 21:07:52 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletd/ChangeLog,v 1.230 2015/01/21 10:24:32 ago Exp $
+
+  21 Jan 2015; Agostino Sarubbo <ago@gentoo.org> kwalletd-4.14.3-r1.ebuild:
+  Stable for amd64, wrt bug #496768
 
 *kwalletd-4.14.3-r1 (20 Jan 2015)
 
diff --git a/kde-base/kwalletd/Manifest b/kde-base/kwalletd/Manifest
index 068e4a498140..3aea593ecfcc 100644
--- a/kde-base/kwalletd/Manifest
+++ b/kde-base/kwalletd/Manifest
@@ -5,24 +5,24 @@ AUX kwalletd-4.14.3-CVE-2013-7252.patch 21806 SHA256 08d048f6a90be17d51522660d02
 DIST kde-runtime-4.12.5.tar.xz 7856352 SHA256 b43e1aebd7e9dd13677f2205bb6eef7ee02a7085ae9fd34a39bad55d5df56fe7 SHA512 777916ea15cf5e36218e36a2b67758dbaa2bbdbdc50c3c67d65b69085416502962ece4977a81a182197ab733f44735ddf9b539a3c76cc70a98bdcece368491dd WHIRLPOOL 8c7adec7a55d8126ac7aba4964c42057831c7d26f69e33aa319adc701ef7f368d094c9b3e88b12e729682aa0da8789b5b69cab55737b4be1d1a9020649dc5ac5
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
 EBUILD kwalletd-4.12.5.ebuild 694 SHA256 d938bb7c226149dd7150f0f577fdaa5fa9a0bd70313aad0037c106bf3213fe4e SHA512 75c43d6bfe4164181bbe60d4e5c94a352b4731c07daa19e9005f727da35cfab45f2f2155aa7ee2e6790cd18de473c8d60d1526006b4ac7e4d2331a67dc07e6e3 WHIRLPOOL 6fa8f0c0f0600c8981bd8f517a9d27e832561d2c80420aac8a304956d93ba8a01cfe1a188b54832fb42e3127a2f0eb29ab3c4932c05d89283f8f38432a497ef5
-EBUILD kwalletd-4.14.3-r1.ebuild 781 SHA256 9f287cb559c5a96781cc556a9f95497aff3af55ff2d5934d7152e53fe5be8964 SHA512 4ec2e6ba792d59b7f4fc1497e66d1ec9d3490ff7fb5a0873345ee8733dcd8e3895a488411de2cb1873ad73b01e85cea01ab2fe09f85dd14ab1e6a8217718fce2 WHIRLPOOL ef3d5b07dcdaf684f80e0eee49bbe66d6a597a1028676bb87a8549581f4c4165f4ea49cebb77aae5fde5af789e877da764cd68b65310f25f06e678e95f08e8b2
+EBUILD kwalletd-4.14.3-r1.ebuild 779 SHA256 cacd9e73f15e0c09e8faf86712af5b2d65e0f49f88ffae715912dbdd4f0b9bd0 SHA512 b74bcc2063e67a7aef6b4e6fd92ed4da460b20a38053ee9fb5dfaa909de73349718f7894467856301ad68fc3fb772b2e5b2afe6b798c72b459badc4560417de2 WHIRLPOOL fd0e10561aa97fc67962b3bfe5cc3064b5342b0cf69ca6cad98fd85cfb22e0088f0741634d2e3baf4cd8f8b9dc81d497c0b74ad0c6da44a81b9db255acac6969
 EBUILD kwalletd-4.14.3.ebuild 728 SHA256 e17ced270175345cf919a706cb40d0ef334d6901bb6a98939a4639d972d32ed5 SHA512 a4582692d9766c09373625b14c20e61937999f1dd48699fb6c9651ac555b3420d7f93b93de4f4caf144da85d93e60cfce5ac36d3cb87bef0e84adfa8d645f109 WHIRLPOOL c2ce234062e1941fac0414900f7fe6bb0734c09aada8afe93bc8ab4904135153688a6d4254e9b314af0d1a0f1af9cdbfad2dc4cb496640b207c34b725a5a7c5d
-MISC ChangeLog 27022 SHA256 1c336811b7b1ed9f6d9e69ec82b3075935f6bb8e5e127201d689394271ee00be SHA512 a5847e4e386fd22ca9ea595388e9539103f8dd3b26b7a4672c69b8b225490c66fee0df13c947529fcd07cf1411a881e69c1ce4eb7a217ae001275cb836b19cc1 WHIRLPOOL 6767bca53b8a46e80b77b170cf077e970ab4029d5fa03f56aa622225cb043b884d3d41b0f2618cb14f9f9b55182302719c73eb420b0f02a8ca6bff1c19b8dc5b
+MISC ChangeLog 27134 SHA256 35b9afed5e1a685ac15cf8d688595fc7d409623c8b73b7961fb0b45b2728c6eb SHA512 91d6b52369285be12c719de5dd947fd763a05f27aaa0579f36097f6b8a21e0359d271a07fb75e74db09d073ff0940283318f6c83d1a7b25b1a8b6324227e92a0 WHIRLPOOL f38e724cbf1ca903011493153b6f9d30a1ac9d6449d7c0040adb58bfc6fb3ae68b028314f08917a055c394eaaae55ea776236a17b43323b56ab51676fa691978
 MISC metadata.xml 280 SHA256 2a89088a60a3a553f10e587547ae1f20d6f9ef11a19adea0ee1f1bf64c7699b1 SHA512 872f8f6e475a90b03742078986ae1776e83c1c9f2cb7259c4e134b24e00990a81a9381921bd40e7fc5aeb3106c828dfa81f57969fd185866c44d285b991cc413 WHIRLPOOL f5974a759fda2aebc8e2954afba7172c5e8bc92d6e0fa5da48f2c7264bcec14e2f1114ae2db2cba40221457808b007102a29e6176f2cd335b997cd69b14827d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUvsOsAAoJEGVpnaTzz9K9UdUQAILn3D8Dgv5AWy9s2gN/MAM8
-3WiWTD20BpJWYEb0rnTJhbK8SOXHjfqXTV7U9CFiS1qCzlj+yzhfqtXva/Tw/cWu
-jXj5Hrlmrx2oUELFr9vjie2TrVl6UeUSxqDQ7VAZUFOVOSnfX5UM3f0lNNl/Etxg
-lVNaoC3HScPuu+jTPofY5f0HOSHWORPLniPaGc1J0zQCmlSxUpR3teN6xT1W0t3K
-FebtZ49rsNAWo0b5dsrogUBhEGnOs+foQvDXYYtSoC3F9czXpx7gYTkfZuJjSvj4
-mLhTCVAsptftAVg2HB4KiHi5U9ukXzQ8OSFOqgTLl3kcnll7CkAbvxH+IVPrHR1f
-M66Ym7UJ1PWNz7imHE/HhNcyMYb6S4QU9+eSlzn3gejfIJwcHYMFL5J3th1+AVoM
-Qv7w6Dh9IAnIFH3bfD5aLjq3igqlB4FnFghbAL2llLQocxO8wQAlp8N1YQFM04Zd
-4fZaT5R268gXGO1KEHHnawW/Rq1yItgNROBz3T1daVH0PB0OklsbDaqq2HA1yOR1
-mmFRIX0Veh3c5jfq/gr/jeZhWbcSpBLhY6neAOJV7+IwbIvXXvU0wflQRkMWLSY7
-w0YHYd+5RLwtA9catY4hUBMrIuFWkCU20aV6UK4c5sG3RceG7CDuTFmPr4+aRUeX
-UYzLj3Hm5Q1Wz3lKu2J/
-=cWFU
+iQIcBAEBCAAGBQJUv35hAAoJELp701BxlEWfgkoQAJrZH+qfWWMGw4LEkzzMQOnI
+CsaajOWXg3t5Gfqz7uN2HhJp8c4tcw/mTenx8zFVOHwl3w5TlDbmQ4Dp9VUnORJO
+uAeFkKxTQAkRTVWSrPy/5oT2bm3Ni4RQtcuflIrW5AMuzxF3Jjqe2OGlEXK44KSN
+N33bbkD+RzChjPJAWlc/sVpaxRsySciqHhZziYETO1q16ZFLSUx7q3mosC9AmRD4
+T+t+EY8uVXvtBYCyiNzqxtzajE3pmacS4lzg68T/ca9Wf+ZcZqokgTBZSe0I4whc
+n4KIpYHqmgaL2l0Scf98Bchi/TfnnOsN48KbZLbXULzfjme9uqsdnSU2r5zwHMQQ
+AJlGBuHA4h5ofphjbFTPHg/eJHNk2DVZyhmtYFAh8cSuY7FupqE8tGh9tts88BQ0
+vxIl5jay4/pqMxPh5kUmgwLGMvghbkXvCrAZ8eJX7AhKIaxL8AhOpYYMnDj+ezrO
+x1PWaggd3GJS34J9j2WdWNPkgYuInF7xV658qVAr79q00TXBhOKtoJ3GGMVH0PP7
+ds+gFCiJ8jzZukMkNUBiTHxclpoBGJPEOXjWJCJvTIOpoGvvesX0MDUZUwPq0yxC
+/oO2GZW8HbAgJznlpNmxxjQ95avq0+P6pHrnl/eziL+u2o2lD9h1LAiRHrj1UJH5
+REiU0PPLl+c+Nz+ljvoH
+=uneH
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kwalletd/kwalletd-4.14.3-r1.ebuild b/kde-base/kwalletd/kwalletd-4.14.3-r1.ebuild
index 44ea2f0bd694..0487e61bf9d6 100644
--- a/kde-base/kwalletd/kwalletd-4.14.3-r1.ebuild
+++ b/kde-base/kwalletd/kwalletd-4.14.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletd/kwalletd-4.14.3-r1.ebuild,v 1.1 2015/01/20 21:07:52 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletd/kwalletd-4.14.3-r1.ebuild,v 1.2 2015/01/21 10:24:32 ago Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE Password Server"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug gpg"
 
 DEPEND="
diff --git a/kde-misc/kio-mtp/ChangeLog b/kde-misc/kio-mtp/ChangeLog
index 054d1c4b5a2b..904293243d21 100644
--- a/kde-misc/kio-mtp/ChangeLog
+++ b/kde-misc/kio-mtp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-misc/kio-mtp
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kio-mtp/ChangeLog,v 1.3 2014/04/24 00:40:35 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kio-mtp/ChangeLog,v 1.4 2015/01/21 07:18:43 mrueg Exp $
+
+*kio-mtp-0.75_p20141221 (21 Jan 2015)
+
+  21 Jan 2015; Manuel Rüger <mrueg@gentoo.org> +kio-mtp-0.75_p20141221.ebuild:
+  Add new snapshot.
 
   24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> -kio-mtp-0.75_p20130912.ebuild:
   Cleanup old.
diff --git a/kde-misc/kio-mtp/Manifest b/kde-misc/kio-mtp/Manifest
index 43e1a2532035..35a3e09b1bf6 100644
--- a/kde-misc/kio-mtp/Manifest
+++ b/kde-misc/kio-mtp/Manifest
@@ -1,25 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST kio-mtp-0.75_p20131020.tar.gz 22791 SHA256 29130a8c449411b82ddf444fa51dccc3310e356669a843acb91df7c191ddcb91 SHA512 fa7cdc92d34d3941bb88074275bfb69d0ff4d3637d9677fffa5b66f64ca11d3edc2941986944a7b5959620435734df4e509631d4adb48d6ef451a940edf1cd03 WHIRLPOOL 1fc4ed45745301e4614800b4af3d79c166c340b10cac700700cee7311848ec72df3b2f70f2343cb498595a461ea29eae63589e3d7ecd41152ffb09861f6db921
+DIST kio-mtp-0.75_p20141221.tar.gz 22946 SHA256 9d314d5f959a0ec30f75ceb678faf118385c1379dea1da628457ab8623d703fa SHA512 d72dcc21181014f2b52562341a0cb88854ba2baad0a94c715e9b6c6f89e8e7f3c0bb70b8a99a7c7414f06a8582a98de8db753ad24a8f7cf53bbbd7ab796af831 WHIRLPOOL 1d6b7e02feebf2b10b5e3ace056435a90c33a96a6059a992ec4be740b8870e1afcbf052053d158d92c3946b5dfdf63998c229c949d90e4be30e6aa0189b64898
 EBUILD kio-mtp-0.75_p20131020.ebuild 654 SHA256 7d79767de11b5e65718d6caa588cdb287cc111a0a02c2e6edbd93a7915ec3808 SHA512 1e03029f8367b649490000d9d2524e3b40cf91056658307145b4e83ee69aad7821ffc2df31a67dbc8dec8846c2d749643d39e2944b374a9abc102bc7cce9b169 WHIRLPOOL cdf5ea7ad5508d5af7ea1069a866a29c4a798f748a8401655da6283cf1ad3b4c60fde8cfac050ef93ac183ff44a32dd9a60b146b2e25ea7de4b0ae248b650c59
-MISC ChangeLog 629 SHA256 af0fa18014f0c2a790fff210393c55a16721c20e99c911dcf9978993fe29d9e5 SHA512 31cd0d46be4dfd38641d6fcb77db121089c7dd889a0a46d32ce328fa09ad22d8af8ea75566eac1c9cff5e7d91bac5b8465738851cf09549d04e4566b80f28732 WHIRLPOOL b518bf6839f3c1fcd4bb315ead3d2f6f67ff152ce08d22bd4a0e60d419af5a0c61e4028758bb1d41f12c97b678a4bcca9e2ffb8fb424efd3af547fa828e3ef87
+EBUILD kio-mtp-0.75_p20141221.ebuild 654 SHA256 4b49669442dacb14f201d3ace6c1a71f0795d05790512436931e2a97ee395f4f SHA512 2790cc8122e552dd6d9c45d47be6d85cd4f34ce1c0e5d027dc5c12fda183d037595fc4594a32cb5a7e1cb21d8d35e61d44a63a6140d4eee2063e859ed26b9e15 WHIRLPOOL a04972c3e3dd851d17755781fc6af7049051c0699d6de0d270e0d64b794672e43c4742ebbda6b344a7efb8da50ae9bb6d1134d7b9b1787dec9ad31a7dd5c5d67
+MISC ChangeLog 769 SHA256 486525359c78c1d1148dd18d5b4f5814d65fa3275f9ece9a85bbef9e86226b52 SHA512 a64069b3582d2cab9ce7bbded0dc391075d20546ddd4a57dd00720855f4711ed890c6789d62545abd345dea162696265eb58800835c4a260e7b8067c191c44da WHIRLPOOL 6414283766948058537240d38d9fc4a2794490e08efd63048f9e4f6206eb0842f65d427399d1bf6e2231f799dea14e0d93be53e9d91fa234bd1fa850c1c78c27
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJiBAEBCABMBQJUIDCMRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7H5MD/4kPkGQjkDB9kLw3AWy5KjcjN2euNNU/10uedieNyOxjIPuiiQ8xH0KbUcu
-e3i8HA4ycQ11k3pfhzh8f5hd8lmhicyZzIvKbjXiDhNHqglGK99PgpIr7WXR8P3F
-MF3neNkwB4xayCQmwXScmfQZDrwi1UOyMleH+Kw2UN8lHSEIhRrc31BJHyNfSXDF
-XmRfnPPHZXJClstkUFRTLX8CE4c+U3knQNLgAsOk/so4VXnxSRNvVLiplFT+d5ER
-Aotdx8xAvrZk6a/ac0v8dFHWYyr+ryQ3adygVKTmcRZb7j6RTcv1yW6jD6An9DD/
-6Uf7q0D3+1oMfTjcF5FzspiM5w65EsIy5C3AMDfBRsBYiwP1utm/PquqofIU7SXK
-9weQu1t/tMbgp6fkT+kDpO9sS+VHR86EuCkYcG8HF02m+nCuakpNelIv/d6/dVbY
-wXcbeyMl7Fgm5aHjq+bgoyDOpAaTh0Ra/7GedRfALhbfrOGDDHMn7fSjKOEbFp/U
-mOieaDAheYDg8EehxDY2cGEJhG9ZPBU1KX6d7fbuZvWb0/L5EIxGf5OoXGF0yXj5
-kwvimaBCUn+gWIl8ibbX/BvWykYWr4jK7esVlLgEeoB9ng9EX0F4DWPEkd5kfMA3
-UXnehQ3IAiJ92t4pC6WvGtR6YMLF8oyHiWz/IS40v70ZANNZDQ==
-=8ZnZ
------END PGP SIGNATURE-----
diff --git a/kde-misc/kio-mtp/kio-mtp-0.75_p20141221.ebuild b/kde-misc/kio-mtp/kio-mtp-0.75_p20141221.ebuild
new file mode 100644
index 000000000000..55dc5048a4fe
--- /dev/null
+++ b/kde-misc/kio-mtp/kio-mtp-0.75_p20141221.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kio-mtp/kio-mtp-0.75_p20141221.ebuild,v 1.1 2015/01/21 07:18:43 mrueg Exp $
+
+EAPI=5
+
+inherit kde4-base
+
+DESCRIPTION="MTP KIO-Client for KDE"
+HOMEPAGE="https://projects.kde.org/projects/playground/base/kio-mtp"
+COMMIT_ID="c418634e4216279fcedfa5cc14f20bda7672b609"
+SRC_URI="http://quickgit.kde.org/?p=kio-mtp.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+S=${WORKDIR}/${PN}
+
+DEPEND="
+	>=media-libs/libmtp-1.1.3
+"
+RDEPEND="${DEPEND}"
diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 143f97a17e91..cd33f00c3f23 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.561 2015/01/02 12:30:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.563 2015/01/21 10:51:31 eras Exp $
+
+  21 Jan 2015; Eray Aslan <eras@gentoo.org> -postfix-2.11.1-r1.ebuild,
+  -postfix-2.11.1.ebuild, -postfix-2.11.2.ebuild:
+  Remove old
+
+*postfix-2.12_pre20150120 (21 Jan 2015)
+
+  21 Jan 2015; Eray Aslan <eras@gentoo.org> +postfix-2.12_pre20150120.ebuild,
+  -postfix-2.12_pre20141228.ebuild:
+  Version bump
 
   02 Jan 2015; Agostino Sarubbo <ago@gentoo.org> postfix-2.11.3.ebuild:
   Stable for sparc, wrt bug #531430
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 9b14a5b9015f..ee8759f52bb6 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -10,37 +10,34 @@ DIST postfix-2.10.2.tar.gz 3828326 SHA256 f1a735a5a9ffeac8fca59046c437c3b76e7f92
 DIST postfix-2.10.3.tar.gz 3828808 SHA256 7815d8ad88af76e0962f18bf1e80b1aa5a0d096a00dac1d313fbab3e824b3f5b SHA512 f21ae36f9fa7fd8ad1727f5595e0f65fe49a3a5937269ad68b0a96e666e61d49cf6c72303d84c81ae7fc902146121443f9e27b876b447594557a756f239937d1 WHIRLPOOL b7a7c6f31a78a9ce92ca072c11e1ecc44c72cd5c37fb2067f91a4bcb2a92556e60f41ba23e065c31acd58a97f5497d4f62af01edd3003de5e6c6879a304a4a9f
 DIST postfix-2.10.4.tar.gz 3829427 SHA256 e5233438420fbd6b49a64f007bd8da7dd046777436fb82dd50eadcd8901e7201 SHA512 619b6e2cfa0bd50148fe7ad7df09c13b9e5e8e43fe9331ce03010911f02b9daac16df863cc3ce604375f7e3ae076bf316fed7ffb6f424f873c869d3797d5c81f WHIRLPOOL c7b23975484383be1001f5da96a98614ac96f50c9083fff0986c8303933f51c673c1cd389dbaaa92c17b0f3c087f7979ef9d2a03cfa03c1d5f6c771554269cad
 DIST postfix-2.10.5.tar.gz 3830067 SHA256 3a172c1e892b951dfe3d4e703f49359a66b281b3ab7b4e987b6746d2992f623b SHA512 d11beac9fa7a1fe50b522d91975d493e485721596e7930051d9880947ca88e75468ad2036e0902e34b39f44d115c4492c2599bfca5477b28a39672109eda3b0e WHIRLPOOL 22935c2520d349c04a50c88d783fcc9d8ea69f8275f8ec62e7c12a484474e570f4ba2355ddb75edcc49dabe59c3ecb7b9fba95359b5cce4f521f0af666d11f5e
-DIST postfix-2.11.1.tar.gz 4035026 SHA256 487f98a73b95a5799409caf21ec065efea91c1dcdfb84c038a0e3a265d6489e2 SHA512 988659ed7f256fdc831c6a211c33aede922d5baf32da7129afe0ec2fe5011ac95dacb21e59c92f658323b6ea773ebf2bcd66a796d9271c1e7b949d5d9b9ee977 WHIRLPOOL 902eff1304b9d0d52a759f0a0804cd5e34d44b8f1acde26f60db6ddc69d84ff93c70c7b27b9c39318b124582b13d61685fc46c2513044fd4c7511370a33efde7
-DIST postfix-2.11.2.tar.gz 4039038 SHA256 aa6eba4842457c88c48fb65faeb4fc6496cb3e9ceb9e0ddcb3c13b501821a258 SHA512 065688e2d95616dec5111a46d0e2a564d8617a5001156da79833b56056dccad411b5205ab4c304ffa49519dd810539543978f0babd7daba0e5618d8e448c9fcb WHIRLPOOL d15ed1456b4905ced04afaeee13150aff36c971fd1cdc4e19be18740249c188e071d353004728ca5474727e7eccc35eb61cbbf07ad8a1e5fd15261d31a134c92
 DIST postfix-2.11.3.tar.gz 4039705 SHA256 04e5146e6e56261baae9f63c590348a4b12ce22d3d46260e26e97233f40802c3 SHA512 b371f1099b1e6e653242a9b4f3812b38b6a9145a4f4c1c9fa5bef6a02e1a9a8f4ec2979c8946f6c873e303ac54f5dd1a84b934eeea8169e2ce187028c36c857e WHIRLPOOL 7b639ae7a5d0bf16ec0c1568b6f1bb486ccf540ae75269d97be36135441513730d78449b29c99403c6876609ddcc676f5740683a963281f1b2481c33bd4cab8e
-DIST postfix-2.12-20141228.tar.gz 4236173 SHA256 e9a6fc4dc8aab6cdbfff15aff58c15bd1839ce294c53afb032f2d1c4b29ddddc SHA512 6716d71547f4d3d9ddfa54459fc68b795b43e20d0a019dbb91110b3adb75197ae38e5ddd68a5e3f4429ebfe2f3c046cb97a171e4181484ae76818f9a0b87f860 WHIRLPOOL ab37865a4e2ab3783fcfbb426b9384e08463975d5107774600a3b2485b95cfa2ab486c3b4a9835ca09dbbcf27a47be9a4161772bbd8eac78d3d8d8d3a29f6e7d
+DIST postfix-2.12-20150120.tar.gz 4246167 SHA256 0fd79e174cb0648f96bd14389fcbf98dda7bc2420a65995fb8557c7dc20ee499 SHA512 8f358ec582011da6eaf193da82552e7b99119d7df18203d77dea0d1f0900dabb4b7284335c7d031a29862528272bdb9ccc1c2f3dc3d8f5086edb4bd264910063 WHIRLPOOL 2023ce0f9f664f4a5a057ec04220a5aac413b8f8d7c7af6fd69c22397c5c0b71e84e4448ccdc524a82aed10119a6a4f0f022c24f93720fb969905749950c4bcd
 DIST postfix-vda-v13-2.10.0.patch 55701 SHA256 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62 WHIRLPOOL d98b7d2177b8b69738086880fd08c336fa60b99ff7413624e628fd5f17be2064f2ccaa37c047d3013ed41c0ff1bcb76e7962f8390c4179f28ab11733dd3b59d3
 EBUILD postfix-2.10.2.ebuild 9626 SHA256 e1eed601fffd00f97425d124ea682af9727c91dbc3652b0fd1ad94f2a912952f SHA512 5e93b23528d430702aa71b3bbea58606df320ff27bc3b57aac210c3a42746a30557d355f6b437efc86e2b88fc221089540863a592e8fc69a1bd12142c5acdd3d WHIRLPOOL 1d4469fae66d04214d92228f1150e2a82574ca18f31ea351dc8055ff15f0f87e6fc64cda52c4f956408bf82767b857935a924eecc3cdda55d76c07f695ba50f4
 EBUILD postfix-2.10.3.ebuild 9629 SHA256 37d37a4c736bb2489be86e1bc2270e7fd2d8e2155d05ef67f10d929beece5896 SHA512 3b3916c5ba2514f176626a8bb78e7bf53a5d960f45066903628a9a3e4f1140bff591f84f30baa66af5396e13aad39cc58be33b901c9ddb88b2ca10cc31a79bd3 WHIRLPOOL 7204a4e70ec610649d3e5769eb08949df54a3f080f17d84b24528ce41eeaa1351bac9188737e4617b817d5a245d76abe77c38f5db68d8e3ca8fed254681a77a6
 EBUILD postfix-2.10.4.ebuild 9679 SHA256 7ab4ce58ee3bda67cda9c99a7be313ee7b3893ec65e9d3d05986278e31d1d132 SHA512 0b53186370aca9c60fe42af1d6aa2e504c6d22e2e91d217bcb84c6027f3ea6871b2f4c5b613d38392e5d23bf1c441998ac53f27184a4666d75b292112397b578 WHIRLPOOL 850676f5057aa8bf73d0ddab235d504cff2668f445ee2d2d5912500abcc7a9f88407e9f65566b9a463ecc0dda087039b4da0f155194e78306e8fb4556714da9d
 EBUILD postfix-2.10.5.ebuild 9679 SHA256 7d21737d40e17b799eb440da62396e9f624febf30646f16846a8c80b7c40fee7 SHA512 1a291b24d3bcb63b3eb34e4fbcc8725a2c3244a9422950d1080ab19f704b2f1a9722f41b45b0df2bf2c4f297b21d92001dead1293023d42739907b82af8fe3b2 WHIRLPOOL adea5d903d71581439a4667f422bffdda74da11e12dc6b683fce47f1496fc51157bcfd2bd95094cadf086008e74dab6c867b0e73f76460feedcf9b41d7132db3
-EBUILD postfix-2.11.1-r1.ebuild 9763 SHA256 b41fbe60775ee7c1ff0004c7c2992551f02fc95dd399bd7a9cdc513714714474 SHA512 6224fca0c17552332acd47c68d3adc5f1a37a87b03920f72c57598c157b6c2083376ab1fe815ced9a5f9c2afed0e53b701b2654051b93989d30b86750fe1bbd6 WHIRLPOOL 1d81462f7263bfcf5672151a6449bd48057b50bcbe9c9b3d23bbbc7f731a56617e7abdb717feae64ba7eba261807ad8a79a7c1ef1fd85454f8928bc2f34fc625
-EBUILD postfix-2.11.1.ebuild 9709 SHA256 ff723e17b1c2e0e867561cfd42140325d425cac53957398bcd16a7d940c008b8 SHA512 e113400b21e774d5457dcc853011d7a479e9326ab4108e3ec9d92cc8d5d6cfd070b474da65f165dd93a71c096df6ee24d78278d6934b146acecc7dab535fe99b WHIRLPOOL c0c82969995e53bed5af5cd6a4eb16f55238f8de60ce2679884711dc435303b9a5e7b20971661cc62c750a8fb2dcf1b8dd39921deac314a502e3ddba1aba71c7
-EBUILD postfix-2.11.2.ebuild 9768 SHA256 19a7326047c10e1996c07de350a480da0cdb8043e5ae91d8af51e78078379935 SHA512 612fb4dc3cdb73ab80d742883988996de97f7c6c0aec07b67d5a900d941efeb1f46bd1149ed44149bafc0d8a7c607e98781d7540a7da04ba6e47536863baa6f3 WHIRLPOOL b200c0aa43b72d6b78a42d25d8324b2ef1869963a09f257ef80b1ea13e4ef9c865e7669342ece4bfd7cc54eeec086708b6542f66c1b2099225184853fa15b8a3
 EBUILD postfix-2.11.3.ebuild 9781 SHA256 6de9ddb9a04d522709124a3a8b7d1be57b31c2b52441e7f9bfde7bae3b1532fb SHA512 da80436e5949c857fedac81d1e13d49dcadff17e345dae7c3e14b9b85f8a73c75d637c8e7485ca58ea0c9d41041f881b709e6b55503fbc042293a60768edf624 WHIRLPOOL 31a97aaf6f0168e75bd7966ac10a41fee865fe08d8a74d599a077d56e1b8c0011ce727a018c8e160809529fcf1a61b4ba9cec2c9d4b109f9539f501874053b86
-EBUILD postfix-2.12_pre20141228.ebuild 9694 SHA256 431d35aef05ddebe146ef8d5c36ec4bba5c1c06912129650a9709e09ed9bf97c SHA512 1e099ce12497557b27361d322a9f336fd36a4edc3b7f56ae6c34ea49da6bf30e2875a21db68d27e41a5fdde7cda337bf5ab63b6dea51f4f9a1f8e86d6b03bce4 WHIRLPOOL 7bfd562ef8e35ee72f66070f2b1e310f1671d61bedc9909d39f73d9375be00eb42a1385c19e29b87ded8adfa07c4f3ce2ca518c8413f5f3850607bcdd33f2fa4
-MISC ChangeLog 12292 SHA256 4bdcaf77201efcc1bca85f171f946dbe81ec9cca2dd837c3b80363940fc9decd SHA512 1b2a9ef9858118613af26969157a490f5ac99bb4ea3fea197bb1def403d5aadf8f004eb4b1234ba10c9ddd7964094de11ee5ddfc4136b539790b5e714c696641 WHIRLPOOL 7779bbe6a8c8810ad1a814c8a423d5465f15d8a566d13b8868ae94bbb35d6a730e87fcb318b65d41c1fe0aedd9ed896b5c3eec0c2417a528a24fd0aa74a8b3d1
+EBUILD postfix-2.12_pre20150120.ebuild 9694 SHA256 1c51ecdf64463b337ae9702fbfb22866a2d8bf4ae066168324ce981760c708a5 SHA512 e6516ed8704787e2d026442c7d10f724b8de7d3fb787d872a04d9bfd9c8442af66538af7ec0a775353a0a334cda42118280de7c7fe4f716c3189761b6cac4a91 WHIRLPOOL 27179cbeabd01670761287705f52aea805d65baac165f2cef643b26204b02bd99dd35c5fea1f1e1417f67ee7b25d4f4f5654cd2e5500caac5bb22e1a73af0273
+MISC ChangeLog 12599 SHA256 8437653bbadca4b1e64ae63d8b8213dcc583bb4a0a4903bbe80693c2516b8a3a SHA512 b15b4a41f531ceea5c65c2f44abf946d729f5e0aa028c8a78d73b937257e22c0e90c008d8e4868a4063676f3e276db31ad580b8291af9375a78051b1ce006fb2 WHIRLPOOL 88d7cd87dfe2d202576eaa105964069ff6b1274b1ad0608176536ee9cca1f3ba429c93fef40c8113c6c3619991fdf58a7d956ad44f8e276aca32d47f447b73ab
 MISC ChangeLog-2013 100301 SHA256 439e93c3f6ea08471888157d2347da51181aa9031d4bfdeef2197a6b26680246 SHA512 c678433163e86def50d59e47d7a1a0e8f4c4af860f80932255a7c95544e1f5b55a70b68905b02a417b2332bcf3aaa59281814d8504d70085f0874a23faa2bf02 WHIRLPOOL 15a12897a576cf98d856c551157b72b47aa45fd61d05c6ed55033ce37ce247045c6bcc8143b7ccce4666900d85e0a04087c977a311e31c20f554a991bec74fbc
 MISC metadata.xml 754 SHA256 52b30e7748a792a156ad44b46878b67cb1a359c882e03f76b1d7b3b0bf111129 SHA512 bef165b527524efdcabce97c2fc0735f784dfc014ae810294e6a19b534edc6a01e14e532d730c8b8c2b76c99dafac672074317ec6dc23942285ad27895fd7220 WHIRLPOOL 702d14bd15db16217c664a39534bd1b19774d5f6c5a4a2a43e6595f400c06332c56849fd0d722c7982f5c40398b4bb0b3398b96c6f370a57d99d323d0e84ab51
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUpo9cAAoJELp701BxlEWffecQALwvz9emCySf4Fckpr0+8QR8
-L1iNFJ3JCpoJD8JC8hjjMEPtN9BKw/ELI7ninJWjRQGmaK+lfuQ8stQl5t2myWyM
-zbzPgxJFCH1ZJDc5zedvXiwzzZYaSatjZ+1X7c9z/P9D8BBfNRHvhWCVWUDmBKqu
-AzzVZ2Xm/GWRFBrZjbburbji39y0vVIeY1bq4cZwdT2gXQHi6qbS1ylpLmC6TE78
-4LQhnYT6cpW25S/L5x9LNPf0AbjfViymGr8VnQXcjJZbASBSztb5uwqPn+VvqyJo
-delZluyxscZY7+DJOiO2tDuHhjXgMyVySqP9vNiKy2SSrV+Lmp3BkqByzpU8zooA
-YEU4pqFo1bIJXW6WOXchiOUA3gC/sp4NQqvxtft4LJdjEZlHE9CwV43UFxBgwPBr
-hG/5mTtP300wm7USxAHlJOz/DldXQcW49lodb7nZ+bonG37hDhMZicd02JtoYYjW
-IL/eIXKmq9fJUy28PKimzCzMuCwJnMmhyHr3NPfRl6RUuvfPtCwWYr3RxOyApJn4
-9ZJRVXHgjvrkKSOznPNiBV3fwfpr5BVnrmPhG7Hv/mF523wM+YZIf4RNr0aN/+KG
-xYjynaE49WCrNtbW8akAMjfTQ3irbrL80fGn6ZSUcMpU+2/dm4LYV8Rg0xTmq8IP
-Hm+NMaso5swzwSdske/B
-=gYmQ
+iQJ8BAEBCABmBQJUv4S0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBQjk1NkM0NUMxNzFCRTY4Rjk4NENDMDk3
+N0YxRjE3NTU4NkEzQjFGAAoJEHfx8XVYajsf3OAP/jKqvbecI/VB/eeTGHmhHS/+
+hr7yrykQmSQtkLeINaAC9HUlz5Jo5dj0dtVT6qDqW31FnNqmyBiOn+vLPxUfClFe
+RPVWPLyu6OnO7sRfTjj3Pk1nDWGZZ34NoWzehav3MQFIr0cM+W0Ba6PR7DK8fEMi
+VKxQyhSFEy54uIk2Z+3V+VFvDu1ZK4mffnKhiYSgOWXbjouu6xx/Ey3NYqBHWBbX
+y5IxCGVfg6zj5sRLX4Eqejli8eiG5JxcUj5eC34l4jjRFY6MDL5b74Km6zMJe4GC
+thSfcmECuaFO0nObzYOqMG0wxOn+pr6fZ0cSGx2FqWtV+dp1DmlC0hzjr324LCA/
+mZgcXA9z7fa7Sximj7K45JklLH403kwV2rpxFAUUUQbC65mkEkF/hl+LPu9K/q32
+0wFdUbf3f0lw6WrrLLNNaoNm5IeMESRj5HORBitEOAlb/yLF9OwCylGMY85LF6NI
+8gt260hT/GVlG48N2g7kgoHS4EQN6vhdMh1IUCNZkj1uaZZljyu6XmAsb1xQrKOw
+s2Lsz7a29NqyhQrZzrg7FcnHhXkxEkuAWIqkHbievY2/6hbcMOBp2xxDcx3nYip7
+JFxNwQamGDkaFlEZUWT3x4FmJhWxZBTl+O0qFjjJIaTaQRhp4F/uW+VP+A1uUgME
+xG0Yti4Ajr4v9t6J5g7W
+=jbpr
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/postfix-2.11.1-r1.ebuild b/mail-mta/postfix/postfix-2.11.1-r1.ebuild
deleted file mode 100644
index c694e2c628f2..000000000000
--- a/mail-mta/postfix/postfix-2.11.1-r1.ebuild
+++ /dev/null
@@ -1,324 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.11.1-r1.ebuild,v 1.5 2014/12/28 15:59:10 titanofold Exp $
-
-EAPI=5
-inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
-
-MY_PV="${PV/_pre/-}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_PV="2.10.0"
-VDA_P="${PN}-vda-v13-${VDA_PV}"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
-	vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
-
-LICENSE="IBM"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
-
-DEPEND=">=dev-libs/libpcre-3.4
-	dev-lang/perl
-	berkdb? ( >=sys-libs/db-3.2 )
-	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) )
-	ldap? ( net-nds/openldap )
-	ldap-bind? ( net-nds/openldap[sasl] )
-	lmdb? ( >=dev-db/lmdb-0.9.11 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )"
-
-RDEPEND="${DEPEND}
-	dovecot-sasl? ( net-mail/dovecot )
-	memcached? ( net-misc/memcached )
-	net-mail/mailbase
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/opensmtpd
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/fastforward
-	selinux? ( sec-policy/selinux-postfix )"
-
-REQUIRED_USE="ldap-bind? ( ldap sasl )"
-
-S="${WORKDIR}/${MY_SRC}"
-
-pkg_setup() {
-	# Add postfix, postdrop user/group (bug #77565)
-	enewgroup postfix 207
-	enewgroup postdrop 208
-	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-db6.patch"
-	if use vda; then
-		epatch "${DISTDIR}"/${VDA_P}.patch
-	fi
-
-	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-
-	# change default paths to better comply with portage standard paths
-	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-
-	epatch_user
-}
-
-src_configure() {
-	# Make sure LDFLAGS get passed down to the executables.
-	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -lpcre -lcrypt -lpthread"
-
-	use pam && mylibs="${mylibs} -lpam"
-
-	if use ldap; then
-		mycc="${mycc} -DHAS_LDAP"
-		mylibs="${mylibs} -lldap -llber"
-	fi
-
-	if use mysql; then
-		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
-		mylibs="${mylibs} $(mysql_config --libs)"
-	fi
-
-	if use postgres; then
-		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
-		mylibs="${mylibs} -lpq -L$(pg_config --libdir)"
-	fi
-
-	if use sqlite; then
-		mycc="${mycc} -DHAS_SQLITE"
-		mylibs="${mylibs} -lsqlite3"
-	fi
-
-	if use ssl; then
-		mycc="${mycc} -DUSE_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if use lmdb; then
-		mycc="${mycc} -DHAS_LMDB"
-		mylibs="${mylibs} -llmdb"
-	fi
-
-	# broken. and "in other words, not supported" by upstream.
-	# Use inet_protocols setting in main.cf
-	#if ! use ipv6; then
-	#	mycc="${mycc} -DNO_IPV6"
-	#fi
-
-	if use sasl; then
-		if use dovecot-sasl; then
-			# Set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		if use ldap-bind; then
-			mycc="${mycc} -DUSE_LDAP_SASL"
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis; then
-		mycc="${mycc} -DNO_NIS"
-	fi
-
-	if ! use berkdb; then
-		mycc="${mycc} -DNO_DB"
-		if use cdb; then
-			# change default hash format from Berkeley DB to cdb
-			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
-		fi
-	fi
-
-	if use cdb; then
-		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
-		CDB_LIBS=""
-		# Tinycdb is preferred.
-		if has_version dev-db/tinycdb ; then
-			einfo "Building with dev-db/tinycdb"
-			CDB_LIBS="-lcdb"
-		else
-			einfo "Building with dev-db/cdb"
-			CDB_PATH="/usr/$(get_libdir)"
-			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
-				CDB_LIBS="${CDB_LIBS} ${CDB_PATH}/${i}"
-			done
-		fi
-		mylibs="${mylibs} ${CDB_LIBS}"
-	fi
-
-	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
-	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
-	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-	filter-lfs-flags
-
-	# Workaround for bug #76512
-	if use hardened; then
-		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
-	fi
-
-	# Remove annoying C++ comment style warnings - bug #378099
-	append-flags -Wno-comment
-
-	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
-	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
-	emake DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" makefiles
-}
-
-src_install () {
-	local myconf
-	use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
-		html_directory=\"/usr/share/doc/${PF}/html\""
-
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		config_directory="/etc/postfix" \
-		manpage_directory="/usr/share/man" \
-		command_directory="/usr/sbin" \
-		mailq_path="/usr/bin/mailq" \
-		newaliases_path="/usr/bin/newaliases" \
-		sendmail_path="/usr/sbin/sendmail" \
-		${myconf} \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade
-	rm -Rf "${D}"/var
-	keepdir /var/spool/postfix
-
-	# Install rmail for UUCP, closes bug #19127
-	dobin auxiliary/rmail/rmail
-
-	# Provide another link for legacy FSH
-	dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
-
-	# Install qshape tool and posttls-finger
-	dobin auxiliary/qshape/qshape.pl
-	doman man/man1/qshape.1
-	dobin bin/posttls-finger
-	doman man/man1/posttls-finger.1
-
-	# Performance tuning tools and their manuals
-	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
-	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
-	# Set proper permissions on required files/directories
-	dodir /var/lib/postfix
-	keepdir /var/lib/postfix
-	fowners -R postfix:postfix /var/lib/postfix
-	fperms 0750 /var/lib/postfix
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02711 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	if use mbox; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
-		-e ${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}"/smtp.pass saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
-	# do not start mysql/postgres unnecessarily - bug #359913
-	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
-	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
-	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
-	mv "${D}"/etc/postfix/{*.default,makedefs.out} "${D}"/usr/share/doc/${PF}/
-	use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-
-	pamd_mimic_system smtp auth account
-
-	if use sasl; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}"/smtp.sasl smtpd.conf
-	fi
-
-	# header files
-	insinto /usr/include/postfix
-	doins include/*.h
-
-	# Remove unnecessary files
-	rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
-	rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_preinst() {
-	# Postfix 2.9.
-	# default for inet_protocols changed from ipv4 to all in postfix-2.9.
-	# check inet_protocols setting in main.cf and modify if necessary to prevent
-	# performance loss with useless DNS lookups and useless connection attempts.
-	[[ -d ${ROOT}/etc/postfix ]] && {
-	if [[ "$(${D}/usr/sbin/postconf -dh inet_protocols)" != "ipv4" ]]; then
-		if [[ ! -n "$(${D}/usr/sbin/postconf -c ${ROOT}/etc/postfix -n inet_protocols)" ]];
-		then
-			ewarn "\nCOMPATIBILITY: adding inet_protocols=ipv4 to main.cf."
-			ewarn "That will keep the same behaviour as previous postfix versions."
-			ewarn "Specify inet_protocols explicitly if you want to enable IPv6.\n"
-		else
-			# delete inet_protocols setting. there is already one in /etc/postfix
-			sed -i -e /inet_protocols/d "${D}"/etc/postfix/main.cf || die
-		fi
-	fi
-	}
-}
-
-pkg_postinst() {
-	# Do not install server.{key,pem) SSL certificates if they already exist
-	if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
-		&& ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
-		install_cert /etc/ssl/postfix/server
-		chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
-	fi
-
-	if [[ ! -e /etc/mail/aliases.db ]] ; then
-		ewarn
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-		ewarn
-	fi
-
-	if [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 9 ]]; then
-		elog "If you are using old style postfix instances by symlinking"
-		elog "startup scripts in ${ROOT}etc/init.d, please consider"
-		elog "upgrading your config for postmulti support. For more info:"
-		elog "http://www.postfix.org/MULTI_INSTANCE_README.html"
-		if ! use berkdb; then
-			ewarn "\nPostfix is installed without BerkeleyDB support."
-			ewarn "Please turn on berkdb USE flag if you need hash or"
-			ewarn "btree table lookups.\n"
-		fi
-		ewarn "Postfix daemons now live under /usr/libexec/postfix"
-		ewarn "Please adjust your main.cf accordingly by running"
-		ewarn "etc-update/dispatch-conf or similar and accepting the new"
-		ewarn "daemon_directory setting."
-	fi
-}
diff --git a/mail-mta/postfix/postfix-2.11.1.ebuild b/mail-mta/postfix/postfix-2.11.1.ebuild
deleted file mode 100644
index 61eaedb0436d..000000000000
--- a/mail-mta/postfix/postfix-2.11.1.ebuild
+++ /dev/null
@@ -1,321 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.11.1.ebuild,v 1.8 2014/12/28 15:59:10 titanofold Exp $
-
-EAPI=5
-inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
-
-MY_PV="${PV/_pre/-}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_PV="2.10.0"
-VDA_P="${PN}-vda-v13-${VDA_PV}"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
-	vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
-
-LICENSE="IBM"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
-
-DEPEND=">=dev-libs/libpcre-3.4
-	dev-lang/perl
-	berkdb? ( >=sys-libs/db-3.2 )
-	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) )
-	ldap? ( net-nds/openldap )
-	ldap-bind? ( net-nds/openldap[sasl] )
-	lmdb? ( >=dev-db/lmdb-0.9.11 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )"
-
-RDEPEND="${DEPEND}
-	dovecot-sasl? ( net-mail/dovecot )
-	memcached? ( net-misc/memcached )
-	net-mail/mailbase
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/opensmtpd
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/fastforward
-	selinux? ( sec-policy/selinux-postfix )"
-
-REQUIRED_USE="ldap-bind? ( ldap sasl )"
-
-S="${WORKDIR}/${MY_SRC}"
-
-pkg_setup() {
-	# Add postfix, postdrop user/group (bug #77565)
-	enewgroup postfix 207
-	enewgroup postdrop 208
-	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
-}
-
-src_prepare() {
-	if use vda; then
-		epatch "${DISTDIR}"/${VDA_P}.patch
-	fi
-
-	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-
-	# change default paths to better comply with portage standard paths
-	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-}
-
-src_configure() {
-	# Make sure LDFLAGS get passed down to the executables.
-	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -lpcre -lcrypt -lpthread"
-
-	use pam && mylibs="${mylibs} -lpam"
-
-	if use ldap; then
-		mycc="${mycc} -DHAS_LDAP"
-		mylibs="${mylibs} -lldap -llber"
-	fi
-
-	if use mysql; then
-		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
-		mylibs="${mylibs} $(mysql_config --libs)"
-	fi
-
-	if use postgres; then
-		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
-		mylibs="${mylibs} -lpq -L$(pg_config --libdir)"
-	fi
-
-	if use sqlite; then
-		mycc="${mycc} -DHAS_SQLITE"
-		mylibs="${mylibs} -lsqlite3"
-	fi
-
-	if use ssl; then
-		mycc="${mycc} -DUSE_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if use lmdb; then
-		mycc="${mycc} -DHAS_LMDB"
-		mylibs="${mylibs} -llmdb"
-	fi
-
-	# broken. and "in other words, not supported" by upstream.
-	# Use inet_protocols setting in main.cf
-	#if ! use ipv6; then
-	#	mycc="${mycc} -DNO_IPV6"
-	#fi
-
-	if use sasl; then
-		if use dovecot-sasl; then
-			# Set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		if use ldap-bind; then
-			mycc="${mycc} -DUSE_LDAP_SASL"
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis; then
-		mycc="${mycc} -DNO_NIS"
-	fi
-
-	if ! use berkdb; then
-		mycc="${mycc} -DNO_DB"
-		if use cdb; then
-			# change default hash format from Berkeley DB to cdb
-			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
-		fi
-	fi
-
-	if use cdb; then
-		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
-		CDB_LIBS=""
-		# Tinycdb is preferred.
-		if has_version dev-db/tinycdb ; then
-			einfo "Building with dev-db/tinycdb"
-			CDB_LIBS="-lcdb"
-		else
-			einfo "Building with dev-db/cdb"
-			CDB_PATH="/usr/$(get_libdir)"
-			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
-				CDB_LIBS="${CDB_LIBS} ${CDB_PATH}/${i}"
-			done
-		fi
-		mylibs="${mylibs} ${CDB_LIBS}"
-	fi
-
-	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
-	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
-	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-	filter-lfs-flags
-
-	# Workaround for bug #76512
-	if use hardened; then
-		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
-	fi
-
-	# Remove annoying C++ comment style warnings - bug #378099
-	append-flags -Wno-comment
-
-	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
-	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
-	emake DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" makefiles
-}
-
-src_install () {
-	local myconf
-	use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
-		html_directory=\"/usr/share/doc/${PF}/html\""
-
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		config_directory="/etc/postfix" \
-		manpage_directory="/usr/share/man" \
-		command_directory="/usr/sbin" \
-		mailq_path="/usr/bin/mailq" \
-		newaliases_path="/usr/bin/newaliases" \
-		sendmail_path="/usr/sbin/sendmail" \
-		${myconf} \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade
-	rm -Rf "${D}"/var
-	keepdir /var/spool/postfix
-
-	# Install rmail for UUCP, closes bug #19127
-	dobin auxiliary/rmail/rmail
-
-	# Provide another link for legacy FSH
-	dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
-
-	# Install qshape tool and posttls-finger
-	dobin auxiliary/qshape/qshape.pl
-	doman man/man1/qshape.1
-	dobin bin/posttls-finger
-	doman man/man1/posttls-finger.1
-
-	# Performance tuning tools and their manuals
-	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
-	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
-	# Set proper permissions on required files/directories
-	dodir /var/lib/postfix
-	keepdir /var/lib/postfix
-	fowners -R postfix:postfix /var/lib/postfix
-	fperms 0750 /var/lib/postfix
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02711 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	if use mbox; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
-		-e ${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}"/smtp.pass saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
-	# do not start mysql/postgres unnecessarily - bug #359913
-	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
-	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
-	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
-	mv "${D}"/etc/postfix/{*.default,makedefs.out} "${D}"/usr/share/doc/${PF}/
-	use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-
-	pamd_mimic_system smtp auth account
-
-	if use sasl; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}"/smtp.sasl smtpd.conf
-	fi
-
-	# header files
-	insinto /usr/include/postfix
-	doins include/*.h
-
-	# Remove unnecessary files
-	rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
-	rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_preinst() {
-	# Postfix 2.9.
-	# default for inet_protocols changed from ipv4 to all in postfix-2.9.
-	# check inet_protocols setting in main.cf and modify if necessary to prevent
-	# performance loss with useless DNS lookups and useless connection attempts.
-	[[ -d ${ROOT}/etc/postfix ]] && {
-	if [[ "$(${D}/usr/sbin/postconf -dh inet_protocols)" != "ipv4" ]]; then
-		if [[ ! -n "$(${D}/usr/sbin/postconf -c ${ROOT}/etc/postfix -n inet_protocols)" ]];
-		then
-			ewarn "\nCOMPATIBILITY: adding inet_protocols=ipv4 to main.cf."
-			ewarn "That will keep the same behaviour as previous postfix versions."
-			ewarn "Specify inet_protocols explicitly if you want to enable IPv6.\n"
-		else
-			# delete inet_protocols setting. there is already one in /etc/postfix
-			sed -i -e /inet_protocols/d "${D}"/etc/postfix/main.cf || die
-		fi
-	fi
-	}
-}
-
-pkg_postinst() {
-	# Do not install server.{key,pem) SSL certificates if they already exist
-	if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
-		&& ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
-		install_cert /etc/ssl/postfix/server
-		chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
-	fi
-
-	if [[ ! -e /etc/mail/aliases.db ]] ; then
-		ewarn
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-		ewarn
-	fi
-
-	if [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 9 ]]; then
-		elog "If you are using old style postfix instances by symlinking"
-		elog "startup scripts in ${ROOT}etc/init.d, please consider"
-		elog "upgrading your config for postmulti support. For more info:"
-		elog "http://www.postfix.org/MULTI_INSTANCE_README.html"
-		if ! use berkdb; then
-			ewarn "\nPostfix is installed without BerkeleyDB support."
-			ewarn "Please turn on berkdb USE flag if you need hash or"
-			ewarn "btree table lookups.\n"
-		fi
-		ewarn "Postfix daemons now live under /usr/libexec/postfix"
-		ewarn "Please adjust your main.cf accordingly by running"
-		ewarn "etc-update/dispatch-conf or similar and accepting the new"
-		ewarn "daemon_directory setting."
-	fi
-}
diff --git a/mail-mta/postfix/postfix-2.11.2.ebuild b/mail-mta/postfix/postfix-2.11.2.ebuild
deleted file mode 100644
index fcc30a519812..000000000000
--- a/mail-mta/postfix/postfix-2.11.2.ebuild
+++ /dev/null
@@ -1,324 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.11.2.ebuild,v 1.4 2014/12/28 15:59:10 titanofold Exp $
-
-EAPI=5
-inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
-
-MY_PV="${PV/_pre/-}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_PV="2.10.0"
-VDA_P="${PN}-vda-v13-${VDA_PV}"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
-	vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
-
-LICENSE="IBM"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
-
-DEPEND=">=dev-libs/libpcre-3.4
-	dev-lang/perl
-	berkdb? ( >=sys-libs/db-3.2 )
-	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) )
-	ldap? ( net-nds/openldap )
-	ldap-bind? ( net-nds/openldap[sasl] )
-	lmdb? ( >=dev-db/lmdb-0.9.11 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )"
-
-RDEPEND="${DEPEND}
-	dovecot-sasl? ( net-mail/dovecot )
-	memcached? ( net-misc/memcached )
-	net-mail/mailbase
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/opensmtpd
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/fastforward
-	selinux? ( sec-policy/selinux-postfix )"
-
-REQUIRED_USE="ldap-bind? ( ldap sasl )"
-
-S="${WORKDIR}/${MY_SRC}"
-
-pkg_setup() {
-	# Add postfix, postdrop user/group (bug #77565)
-	enewgroup postfix 207
-	enewgroup postdrop 208
-	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.11.1-db6.patch"
-	if use vda; then
-		epatch "${DISTDIR}"/${VDA_P}.patch
-	fi
-
-	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-
-	# change default paths to better comply with portage standard paths
-	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-
-	epatch_user
-}
-
-src_configure() {
-	# Make sure LDFLAGS get passed down to the executables.
-	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -lpcre -lcrypt -lpthread"
-
-	use pam && mylibs="${mylibs} -lpam"
-
-	if use ldap; then
-		mycc="${mycc} -DHAS_LDAP"
-		mylibs="${mylibs} -lldap -llber"
-	fi
-
-	if use mysql; then
-		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
-		mylibs="${mylibs} $(mysql_config --libs)"
-	fi
-
-	if use postgres; then
-		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
-		mylibs="${mylibs} -lpq -L$(pg_config --libdir)"
-	fi
-
-	if use sqlite; then
-		mycc="${mycc} -DHAS_SQLITE"
-		mylibs="${mylibs} -lsqlite3"
-	fi
-
-	if use ssl; then
-		mycc="${mycc} -DUSE_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if use lmdb; then
-		mycc="${mycc} -DHAS_LMDB"
-		mylibs="${mylibs} -llmdb"
-	fi
-
-	# broken. and "in other words, not supported" by upstream.
-	# Use inet_protocols setting in main.cf
-	#if ! use ipv6; then
-	#	mycc="${mycc} -DNO_IPV6"
-	#fi
-
-	if use sasl; then
-		if use dovecot-sasl; then
-			# Set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		if use ldap-bind; then
-			mycc="${mycc} -DUSE_LDAP_SASL"
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis; then
-		mycc="${mycc} -DNO_NIS"
-	fi
-
-	if ! use berkdb; then
-		mycc="${mycc} -DNO_DB"
-		if use cdb; then
-			# change default hash format from Berkeley DB to cdb
-			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
-		fi
-	fi
-
-	if use cdb; then
-		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
-		CDB_LIBS=""
-		# Tinycdb is preferred.
-		if has_version dev-db/tinycdb ; then
-			einfo "Building with dev-db/tinycdb"
-			CDB_LIBS="-lcdb"
-		else
-			einfo "Building with dev-db/cdb"
-			CDB_PATH="/usr/$(get_libdir)"
-			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
-				CDB_LIBS="${CDB_LIBS} ${CDB_PATH}/${i}"
-			done
-		fi
-		mylibs="${mylibs} ${CDB_LIBS}"
-	fi
-
-	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
-	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
-	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-	filter-lfs-flags
-
-	# Workaround for bug #76512
-	if use hardened; then
-		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
-	fi
-
-	# Remove annoying C++ comment style warnings - bug #378099
-	append-flags -Wno-comment
-
-	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
-	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
-	emake DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" makefiles
-}
-
-src_install () {
-	local myconf
-	use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
-		html_directory=\"/usr/share/doc/${PF}/html\""
-
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		config_directory="/etc/postfix" \
-		manpage_directory="/usr/share/man" \
-		command_directory="/usr/sbin" \
-		mailq_path="/usr/bin/mailq" \
-		newaliases_path="/usr/bin/newaliases" \
-		sendmail_path="/usr/sbin/sendmail" \
-		${myconf} \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade
-	rm -Rf "${D}"/var
-	keepdir /var/spool/postfix
-
-	# Install rmail for UUCP, closes bug #19127
-	dobin auxiliary/rmail/rmail
-
-	# Provide another link for legacy FSH
-	dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
-
-	# Install qshape tool and posttls-finger
-	dobin auxiliary/qshape/qshape.pl
-	doman man/man1/qshape.1
-	dobin bin/posttls-finger
-	doman man/man1/posttls-finger.1
-
-	# Performance tuning tools and their manuals
-	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
-	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
-	# Set proper permissions on required files/directories
-	dodir /var/lib/postfix
-	keepdir /var/lib/postfix
-	fowners -R postfix:postfix /var/lib/postfix
-	fperms 0750 /var/lib/postfix
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02711 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	if use mbox; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
-		-e ${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}"/smtp.pass saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
-	# do not start mysql/postgres unnecessarily - bug #359913
-	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
-	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
-	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
-	mv "${D}"/etc/postfix/{*.default,makedefs.out} "${D}"/usr/share/doc/${PF}/
-	use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-
-	pamd_mimic_system smtp auth account
-
-	if use sasl; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}"/smtp.sasl smtpd.conf
-	fi
-
-	# header files
-	insinto /usr/include/postfix
-	doins include/*.h
-
-	# Remove unnecessary files
-	rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
-	rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_preinst() {
-	# Postfix 2.9.
-	# default for inet_protocols changed from ipv4 to all in postfix-2.9.
-	# check inet_protocols setting in main.cf and modify if necessary to prevent
-	# performance loss with useless DNS lookups and useless connection attempts.
-	[[ -d ${ROOT}/etc/postfix ]] && {
-	if [[ "$(${D}/usr/sbin/postconf -dh inet_protocols)" != "ipv4" ]]; then
-		if [[ ! -n "$(${D}/usr/sbin/postconf -c ${ROOT}/etc/postfix -n inet_protocols)" ]];
-		then
-			ewarn "\nCOMPATIBILITY: adding inet_protocols=ipv4 to main.cf."
-			ewarn "That will keep the same behaviour as previous postfix versions."
-			ewarn "Specify inet_protocols explicitly if you want to enable IPv6.\n"
-		else
-			# delete inet_protocols setting. there is already one in /etc/postfix
-			sed -i -e /inet_protocols/d "${D}"/etc/postfix/main.cf || die
-		fi
-	fi
-	}
-}
-
-pkg_postinst() {
-	# Do not install server.{key,pem) SSL certificates if they already exist
-	if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
-		&& ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
-		install_cert /etc/ssl/postfix/server
-		chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
-	fi
-
-	if [[ ! -e /etc/mail/aliases.db ]] ; then
-		ewarn
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-		ewarn
-	fi
-
-	if [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 9 ]]; then
-		elog "If you are using old style postfix instances by symlinking"
-		elog "startup scripts in ${ROOT}etc/init.d, please consider"
-		elog "upgrading your config for postmulti support. For more info:"
-		elog "http://www.postfix.org/MULTI_INSTANCE_README.html"
-		if ! use berkdb; then
-			ewarn "\nPostfix is installed without BerkeleyDB support."
-			ewarn "Please turn on berkdb USE flag if you need hash or"
-			ewarn "btree table lookups.\n"
-		fi
-		ewarn "Postfix daemons now live under /usr/libexec/postfix"
-		ewarn "Please adjust your main.cf accordingly by running"
-		ewarn "etc-update/dispatch-conf or similar and accepting the new"
-		ewarn "daemon_directory setting."
-	fi
-}
diff --git a/mail-mta/postfix/postfix-2.12_pre20141228.ebuild b/mail-mta/postfix/postfix-2.12_pre20150120.ebuild
similarity index 98%
rename from mail-mta/postfix/postfix-2.12_pre20141228.ebuild
rename to mail-mta/postfix/postfix-2.12_pre20150120.ebuild
index bed19e5eae26..ac4b4be23ad5 100644
--- a/mail-mta/postfix/postfix-2.12_pre20141228.ebuild
+++ b/mail-mta/postfix/postfix-2.12_pre20150120.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.12_pre20141228.ebuild,v 1.1 2014/12/29 07:24:57 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.12_pre20150120.ebuild,v 1.1 2015/01/21 10:47:28 eras Exp $
 
 EAPI=5
 inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
diff --git a/media-gfx/exiv2/ChangeLog b/media-gfx/exiv2/ChangeLog
index 57bc68737628..60b93abfce8d 100644
--- a/media-gfx/exiv2/ChangeLog
+++ b/media-gfx/exiv2/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/exiv2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v 1.130 2015/01/20 21:40:26 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v 1.133 2015/01/21 11:18:29 jer Exp $
+
+  21 Jan 2015; Jeroen Roovers <jer@gentoo.org> exiv2-0.24-r1.ebuild:
+  Stable for HPPA (bug #534608).
+
+  21 Jan 2015; Agostino Sarubbo <ago@gentoo.org> exiv2-0.24-r1.ebuild:
+  Stable for x86, wrt bug #534608
+
+  21 Jan 2015; Agostino Sarubbo <ago@gentoo.org> exiv2-0.24-r1.ebuild:
+  Stable for amd64, wrt bug #534608
 
 *exiv2-0.24-r1 (20 Jan 2015)
 
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 518563591bd2..680ea323319e 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -8,24 +8,14 @@ DIST exiv2-0.23.tar.gz 3524381 SHA256 81fa50900be7ab16e24c6551252c21fc97abcfe855
 DIST exiv2-0.24.tar.gz 4635028 SHA256 f4a443e6c7fb9d9f5e787732f76969a64c72c4c04af69b10ed57f949c2dfef8e SHA512 e2d5d076c09a36d88472485c9d9d99b5a50aea1ab59b1e5c9301b1ce9fe2b2af02acae2662c9ff56b4c749a224688387ba58334d31b74f04f3d2d3d3c0e387e9 WHIRLPOOL b5b7eb544975d8e14739b39fc294279b58369944172684c0f881348ebf47ef0f9ccd18e8bc41113d9da3a72f8d6c048641f547a7071a7ca6d93d1d30ea2d7aed
 EBUILD exiv2-0.23-r1.ebuild 2971 SHA256 54408b5d3ead00b89fdb2d35a1e64ed23b3c7a0027c2b288cb9b62f828b98792 SHA512 6ae58afa22b3d8dde7d8e0b94393e31fd054825dc80c288baf44e30fa8d4ae1bd44bf697934d79ec2ec544f0ec527301d7acd1b2fac20d8562d33a0c24561a7b WHIRLPOOL 49a2083b8e8926e70714ac291983b1adfb48196bc76087e427c13b7f093440378cb07682d9fac19159b089baaabd5893a8e21a5dad6deae29473962ad9a6d197
 EBUILD exiv2-0.23-r2.ebuild 3234 SHA256 7113c6ca0bfe85aa523eadd7eb615ac26189dea8a91028275c6b714259c81a6b SHA512 20b0affcf7e50683289706a8820c9c7dc1484b6e4f574b06ea256a21a549b93ed8b5c6575d92095c3b68b8177437a030f030344233f1c347ba6f9dab90a88098 WHIRLPOOL 75618fca6c031a15e210b45f411995b2ba33a7548fa74451d22275694a52bf71a965ab2cfff7c1f8e671894565556efa8f9bd2dfc174768e63e0d30c27602987
-EBUILD exiv2-0.24-r1.ebuild 3532 SHA256 03fe45583c20adaa199fe7111f4a4e83c94974e9611433f36a67e1d703a34009 SHA512 aa7ab6b091b46be3f66eae79831eecfb03628e6af8a7b43b37ad396272c2d386becc2548cc1cc9d8876e04c38ae60c36d3e5879a1fbebb804e5cc1de0ae64abc WHIRLPOOL e30deb51f1db1e9169d093a7b180c9209740bffe40138e17126fd5fd2205b74708a788cf1d3c6850177c15a5c1932360bbb9df1f09114768266dde60b0323731
+EBUILD exiv2-0.24-r1.ebuild 3528 SHA256 7d8ebe755c32a968aa02ff08f8a3b803792dd9426c1ef8f61eaef99ba4275a63 SHA512 7eda0309049df4712ccf4b5d724549cf383391b73225d28926b51364102beff8cf3c42f156208905e091459be86a09f60182cdf6c53eea3bfa948b2972da60f5 WHIRLPOOL 43384c06d4e411a77a4f227d2425d0147e965890b330ca5153d09039af46c16ff6b936ce3a856a4b9054a00e1997600f47ea120f3ff3b7394febce59edf631ed
 EBUILD exiv2-0.24.ebuild 3476 SHA256 187bf01a9a519a27427508ef94278a61a681288d67b4f50d54f25d1e5a172447 SHA512 afe3e16eada5dcec2403e382b7bd7beed7a95dc9946a7a1374fcab3ed4376da39ac9df160b8ef11bc23e3a9c493edc18ff5565347bcd32eb40b44ef45efc7f3f WHIRLPOOL e29aa38908e497aa872ade6176ef56240297503ed3e00c8fc3fd35c4bbf6d9c2509bb259e1bc678c813575c0dd9599ef4ced4c88cfe64027ced66948b25f5855
-MISC ChangeLog 16955 SHA256 a7a2057a863e4e360fb2e288b6ec8ec5dc06425d2be70cf538d838bbb6347639 SHA512 cbbe5bc16da6d4a645ae001fa535f447cdb967221edd25111830adf6f25a7824e4a9b637064af8f44f059b5988273bde26be846df1011cf4061635081ce9392e WHIRLPOOL ded809f46d2ac2a8096301174938e84537644d255f68ee7a9e8382e6040aac5e1b41c468fc5d8b06364f76f038a2efe8d52657bcceaa881e92c0f19b18e1391c
+MISC ChangeLog 17271 SHA256 05da2bbe539523e843f435914a8876832ac4ec1e7f0b9a721d5e2d385e78c6f0 SHA512 cf35e7e33c0c4476db9b18b0876c1fbb0f30d867c15d4c1a326e6c9061bf36084c0efa566d3a02af3c5b7805c038fff5ca1a423dd2e539399dacd695c90d427f WHIRLPOOL 7cfcd6a059aae5931242f3f1012082b551a09c372b1c54eddbca6742856e1bb2c89dea555081992691e724ae398ba06e846892637cf8ae6e3c380fcfe3f225e3
 MISC metadata.xml 419 SHA256 b23b53944ad27145ff517ae6e120a7788b6417358e340aaba5322897b697c810 SHA512 020bb5dd8b13580d300d7931e0d3acc9ef3d43881e06a3548dd887c05a4867493b9ee20464327d007841a5d793576008c464fed384d9dbe25a4ae6be0ccaf073 WHIRLPOOL 46b25df6e357034b8ddbe150cbd9c2da15f65866c4b8ce360d88941be536e39cde8c6189f7c18355dc15ef782ff96d3c7a387d92f28c01137d48aeb90509ae51
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUvstOAAoJEGVpnaTzz9K96NIQAMcjrp37OymfdtyHrZ6tXOjv
-jWh/BLQm6OXBdOENG9EOdBacFihk+oXhf5XevNOLGABrn/2Ynes/WHjcNpgUsbq7
-q7MBTfrfqmEXe2iBk/1t1mlL0s1YVKBEIbP+iQg+Gvv9LF3+IasnBrPfFetcLAkQ
-n51qPxyAYE0yKjpomVIhhc233x8C8vK4biW1U63sXA3/qxsrxvZPdrjg4U6N6++g
-IBZHHOfPi3MiMN6+MlO+q7gVc2//Z1nuBichJ8f/VKcXrI3AOPYpyWYfafp+klFT
-U3p7sHe7w5qKjSP1rc0TaH6ZaoE5BLJ5C+A6AHBTi14t0d9tJ2wEFjUj5jP0bju0
-f0huU3E41O90E4Rq/eSqOhfOyG8yN4PE/LT9kPfc2Nd0SkKx7edoRBpV+RcuqIhW
-XClPILCNJDD4xln8K8wTRIPY2woUh2ihNLvCTS3URhXN8OitRFfF73Deu6/PH15C
-ctk6hxAwsnBMm6Rwa5EpefN+Ek6yyQHp9wJtDDYlYv0lHYBdxnlK0cgngS3Ydcrk
-HG9J+V4vDf1ARCUYCSA65r5c5TL+ol5QdICtkGxWQqS9BgBDt6CrTJM5E/fsJmq2
-GZw1eqkTbfMR74Unp82Cg//u3oJC9hwvsWRk3VIY/HIivCsc57zQS7TzkEhr3F43
-LCpHy7cMUOCQ6pw3nfuD
-=Rx7d
+iEYEAREIAAYFAlS/iwYACgkQVWmRsqeSphMJawCfbZ/4WAgLQOCfeVV+mMlFOtxi
+v2gAn2/QruS6IEIYEyP+qKXg5W/gk4oo
+=0O0G
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/exiv2/exiv2-0.24-r1.ebuild b/media-gfx/exiv2/exiv2-0.24-r1.ebuild
index 5e50ec0ab1c1..f30add3ea516 100644
--- a/media-gfx/exiv2/exiv2-0.24-r1.ebuild
+++ b/media-gfx/exiv2/exiv2-0.24-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.24-r1.ebuild,v 1.1 2015/01/20 21:40:26 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.24-r1.ebuild,v 1.4 2015/01/21 11:18:29 jer Exp $
 
 EAPI=5
 AUTOTOOLS_IN_SOURCE_BUILD=1
@@ -14,7 +14,7 @@ SRC_URI="http://www.exiv2.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/13"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE_LINGUAS="de es fi fr pl ru sk"
 IUSE="contrib doc examples nls xmp zlib static-libs $(printf 'linguas_%s ' ${IUSE_LINGUAS})"
 
diff --git a/media-libs/schroedinger/ChangeLog b/media-libs/schroedinger/ChangeLog
index fc3c5c1a05d1..ed61e29b2ba6 100644
--- a/media-libs/schroedinger/ChangeLog
+++ b/media-libs/schroedinger/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/schroedinger
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/schroedinger/ChangeLog,v 1.71 2014/08/07 19:05:57 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/schroedinger/ChangeLog,v 1.72 2015/01/21 11:41:25 pacho Exp $
+
+  21 Jan 2015; Pacho Ramos <pacho@gentoo.org> schroedinger-1.0.11-r1.ebuild:
+  Fix sandbox violations, #534582
 
   07 Aug 2014; Jeroen Roovers <jer@gentoo.org> schroedinger-1.0.11-r1.ebuild:
   Stable for HPPA (bug #512012).
diff --git a/media-libs/schroedinger/Manifest b/media-libs/schroedinger/Manifest
index 4dc20c93c3f2..e11b7b8d7516 100644
--- a/media-libs/schroedinger/Manifest
+++ b/media-libs/schroedinger/Manifest
@@ -9,15 +9,15 @@ DIST schroedinger-1.0.11.tar.gz 1019247 SHA256 1e572a0735b92aca5746c4528f9bebd35
 DIST schroedinger-1.0.8.tar.gz 863436 SHA256 2a3cac3d561af744d1f7b0f2d00540153beb6ce5293de7f822cfc7e86c380d29
 EBUILD schroedinger-1.0.10-r1.ebuild 1082 SHA256 d4318dbfb58492315590b11260b58172f161bd3ba5ffb4902d23d382fd941af1 SHA512 90454998aa6826686c3c9c83cc9170f910de598e36a0644575a6877a4dbb8dc50420cdf4cc0c154dd32ffd184ec86bd3898919fdfd6b4ff30a3aec679e11d9f4 WHIRLPOOL a6dc978d1ccee6593079ca60e7eab36923473e98d6e641cf466161a5e081ad8ba6ce8d61a5257cf80c6a088b66f82db639dc04b17f7f13618ee9bde02f1896d6
 EBUILD schroedinger-1.0.10.ebuild 1077 SHA256 799de0da6ddde43f968ca49b2b624a48385c7e74b6ad780c13295c12ca9ce4e5 SHA512 3c5a48eeba4f2faea6dce3df198e6625554bc77b5b3cb2d53846d1fce9e0a988c1faa4f0b414167d7fd0ed9ccd29e4e5cfc616a9df5467eb8fe39558a73eac4c WHIRLPOOL bdc1a31af66ba6e776d79fd01976f5f8a9047bc875f1d4d985828cc714e3f5a23124c82167c1cc1ab00f3473c0723d3314322913e0ce3c01cabcabbcd4d7e168
-EBUILD schroedinger-1.0.11-r1.ebuild 1236 SHA256 ec47b4b6b819f315fd155de4dba0ca8ea65e5869aa33dc537e11647dd0254583 SHA512 bb4ea67d994acee0f1cc41271504be72aa3680da77566b5af97860db0f591655c45d19073615b4138218f82265bc29db17fce6a591153527cee0c0b99f39bf87 WHIRLPOOL 714c1effa75011bd438ce29d57cd176d6417ff98c2e1dd5511017956b244a1a0828c422745588a86c35ac8b57b2f63fa2b644ae23ac9e7c665c78d6448dadfdd
+EBUILD schroedinger-1.0.11-r1.ebuild 1286 SHA256 51e4d419b77e52c3e3f23f11789c8392cec0f4f07ed2e01f518d0cde142e85ac SHA512 2db4ceef803956935e39212712c7e15d670895a6307efaa86f792124808ef883cf330c7e82f45f40b76aee4ae59eb06040c919e73c39fc16cb43c1e9477d7f49 WHIRLPOOL 8a1caa8284af3c09fc21baf1ec971f2141d810ae00bb5685fb8e28c6eba3f0cf93f7d0143da2a7c0c83301f912726cd6c66e297121a8a8dfb758c10b82afae26
 EBUILD schroedinger-1.0.11.ebuild 1178 SHA256 9c1394e3adc61ca6c7654fdb84f78950df645c353f9d45da683325cb7df1e016 SHA512 32be32192916b2311f063f803a092215013a2413efdd453f2df34150614dd006d77ff1cafbea6718a1f0507ba51146c10c4542b0c99f145e6b43fbeb427b87f9 WHIRLPOOL b5c8bf157731bac04a633dd4b3883a50074b199560b597d5ac194bbab5592abb9fd9c0bf5a01f2c1cee19802bc7a75f9d250edad5a679de09af82970e24f4c62
 EBUILD schroedinger-1.0.8.ebuild 927 SHA256 866b845c21c9e93f832b29c281e0cb554af3ab95cd3fda13e373221a3c83669e SHA512 c743e1eca2a255efd0cf2d08aa4d5d2d33139161f0aa29856549cd230f5dd6bccc8c0a5e815e20c639176207261eb4dfa8260332b9bd7412309f1e8b2ab67c23 WHIRLPOOL 66ad9267572bcc4693f97a714c61c7c44c62b0aa12e3ff4830760771727607b6a13a57f2a6d4c8e8b15460eb444f4fa590895a93c66ae7465006588109c87c40
-MISC ChangeLog 10049 SHA256 d3368326ca986dfbc7aa4592d9b8c79204bb54851e93deae51e9e41951fe9987 SHA512 3667f1fd9f66bb12bcba9dbce21dfba28553869c4e3046d1c887f87ed76516b6db188f7ec947216fd76aef0c36e4a938f156c10825f99e45db696699e5d92836 WHIRLPOOL 618b2da455fc9068cc8a21301725406424201c8092979fd07baa4eeb4c3d5db4d5ed8c4bbdc373b0077f7b16e480faeb0f32c86ea898f6f5c3a203c597350ccd
+MISC ChangeLog 10163 SHA256 0d382f0d9e6fd93c0da9a7820f51f066e5b6767c987a692cc7fb39f03f0f4aba SHA512 e9751f04385597fb311e41ce6156f9f56c6207c3f5238ba65671bd5d85848df1ed631d4445f4a2c83a613e001b347cc4df1ae885867b0d94ad93f05dfab235e6 WHIRLPOOL 9136be6d56168b34ed8652de08342fcfbd930dc178c3ffb4d26aa15186548c2764cbd57b77b0ce129f8188be0af6e95cfa2000d8fa96861d0f4c1bbf83419922
 MISC metadata.xml 233 SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a SHA512 89b49780f54132f4768196e82bc7c534157728f4ec8db2a2ce9c2748859d136a7622d5239848010ab72aea19ebfb0eea3d8563737b5b888a09f56134e3424c87 WHIRLPOOL 86f0c2c9825ec94c962485b82d678e412401eb73e74d030cdc4308e015880b0a0e77bf5ea671f0920d5e9e91b5c732c13bdb5903fbb6d0485dfad9026d554e6c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPjzhYACgkQVWmRsqeSphOHnQCcD64H/zmWMLjLkbcT9cMANANu
-qloAoICaqOhwr60ex0S4i41O0EvauFr2
-=ZUsR
+iEYEAREIAAYFAlS/kGoACgkQCaWpQKGI+9SpJgCggQC9eBabmCPSdoxZ2WGWHa5i
+rm4AnRr4rP5whlJYGw8MoR+U/w19jQnd
+=4EEV
 -----END PGP SIGNATURE-----
diff --git a/media-libs/schroedinger/schroedinger-1.0.11-r1.ebuild b/media-libs/schroedinger/schroedinger-1.0.11-r1.ebuild
index 0fce2a1141b6..f1810fa4b9b6 100644
--- a/media-libs/schroedinger/schroedinger-1.0.11-r1.ebuild
+++ b/media-libs/schroedinger/schroedinger-1.0.11-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/schroedinger/schroedinger-1.0.11-r1.ebuild,v 1.6 2014/08/07 19:05:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/schroedinger/schroedinger-1.0.11-r1.ebuild,v 1.7 2015/01/21 11:41:25 pacho Exp $
 
 EAPI=5
 
 AUTOTOOLS_AUTORECONF=yes
 AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
 
-inherit eutils autotools-multilib
+inherit eutils autotools-multilib gnome2-utils
 
 DESCRIPTION="C-based libraries for the Dirac video codec"
 HOMEPAGE="http://www.diracvideo.org/"
@@ -24,6 +24,8 @@ DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am"
 
 src_prepare() {
+	gnome2_environment_reset #534582
+
 	# from upstream, drop at next release
 	epatch "${FILESDIR}"/${P}-darwin-compile.patch
 
diff --git a/media-plugins/gst-plugins-vaapi/ChangeLog b/media-plugins/gst-plugins-vaapi/ChangeLog
index 7cd01d803720..4c5ef8decd6f 100644
--- a/media-plugins/gst-plugins-vaapi/ChangeLog
+++ b/media-plugins/gst-plugins-vaapi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/gst-plugins-vaapi
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-vaapi/ChangeLog,v 1.7 2015/01/13 12:27:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-vaapi/ChangeLog,v 1.8 2015/01/21 09:05:48 pacho Exp $
+
+*gst-plugins-vaapi-0.5.9-r1 (21 Jan 2015)
+
+  21 Jan 2015; Pacho Ramos <pacho@gentoo.org>
+  +gst-plugins-vaapi-0.5.9-r1.ebuild:
+  Use system libvpx (#537084 by Michelangelo Scopelliti, Siuchung Cheung and
+  nvinson)
 
 *gst-plugins-vaapi-0.5.9 (13 Jan 2015)
 
diff --git a/media-plugins/gst-plugins-vaapi/Manifest b/media-plugins/gst-plugins-vaapi/Manifest
index 2115fe205c1e..87c3266c3a48 100644
--- a/media-plugins/gst-plugins-vaapi/Manifest
+++ b/media-plugins/gst-plugins-vaapi/Manifest
@@ -4,13 +4,14 @@ Hash: SHA256
 DIST gstreamer-vaapi-0.5.8.tar.bz2 822266 SHA256 24fee8a1ca4cb99ed7739d876b17a4085e81b28550350867dee5105300d343c6 SHA512 f05f4e16183bfaa1d8b2c366385a83d531657addd8f47cea63213c3986a8a88d43fff82723f3f19466ad3e381847c354e16306578b6959e1f9271fc8cfd39f98 WHIRLPOOL f8bc90be677d883559860a3b2706db17d2b66ed34385d40d686e5506edf89f868b371a09c1b1f95bbce8efab68d4c6fa53224bc829ad087eee8d02668e7f5525
 DIST gstreamer-vaapi-0.5.9.tar.bz2 1320740 SHA256 b5efbb5ccd3e9fd1ce16193dd14cfac327a8ec2662794c0067ff2603c3355003 SHA512 9a5d15d8a96ca29b97f0d3ba2724b75b3867dcf4574dca678dd9aac665a74e567cf0eae6ba39ce9f48910dc1081a03b2d8ac799c91ad388d24eb68c17bd849b0 WHIRLPOOL 56232859b1d6cec0df1efc42959357f06cfddf8b39f4126f31652dc3938ce2617b009bc696fa809106513feb1357e8fa89c69739dd0f029fe4262b4abf3ed2e0
 EBUILD gst-plugins-vaapi-0.5.8-r1.ebuild 1685 SHA256 567bd228e54d6d91bd03aa0a3b6285be76504060e46fa51bee56f1ae26e10de2 SHA512 950e9b6bfbf55a1b7d0e168d411542c2cb67af0c99f9a4a715a3959612836b5eee06c60e3f08ad6d9a5ee16b1da2d2a99cd2f31ed4a5b4141cfb10aa8cb15c9d WHIRLPOOL c342a7065e1211fd7cb1749a0d15a906133363e33ca756085ff6301447d95a084ea18e1df0a7c0b104e1023b380fd704f01beefde1edc6f9654b0af1bf5a2061
+EBUILD gst-plugins-vaapi-0.5.9-r1.ebuild 1642 SHA256 7bba1180335cf8aae2f7ca8a9d95a440907aa92cb40883935909381b6cccd8eb SHA512 47e4239048e8499e7a4b7bb0fc893322128775dafcf0adb17d4b20268e318feed30a592d485a4e07f67ddaf46867dcc1f8420d5f0e14f08a7690cc6c6f0731e8 WHIRLPOOL 92866ec9a3f238443049f71b3cc8d85dbb272a1052f3efa4dde39c76d4f6ca09b7d97a95eb57c0ceeb7ec2b03d5b10d6b115f68fa66f916347ff629ef8875361
 EBUILD gst-plugins-vaapi-0.5.9.ebuild 1569 SHA256 cac724ae999b5bf945e0ed352f9aa8136d31cfce03dfb45ecf048cbda64cdcf2 SHA512 e79688838d96b4c54a2918e024251af4b6480f8ec3ad5474aa6e7e2019b4273f34839225b0597724c631e3fc08e05ebac2e1795a95f9b393a9288f34192fed35 WHIRLPOOL 956f1dee36acecd3c4c9a7f632df08a3c5b57401bc2447f46f3732523b61c7c1c1ef73edd7cea306a142d0ca301e7044fb7565611bf0588e7f032007b46cb284
-MISC ChangeLog 1392 SHA256 d7c5079b253f13e0e02d32730f0bbc9d320e45fbba6aedac615cde5b540bcba3 SHA512 7beee887decf981e3790a9263c1e7136522ff3954c6a73b8cd02102cf58f6cabcc394eaca2824291929e56fd2bbcb7f294a14119e939e0aa3c245363b17c0bec WHIRLPOOL 6516f45ad57b636aa33364683d3fdf708447a1be313c0c019ca3ebe1604134b3e6623cca579c6372e139bda6a88f5be77bdc31c03ca94ec83b80b10da85e6f7a
+MISC ChangeLog 1608 SHA256 1b46da8b417a63f4c62452c84cba27d94054b276be3f78ecec400853880ba77c SHA512 ec556d51663eb5ae1e59a503fcea9683e079ed3e504046e5e24583d7a03b1b2d57f1b55952d3877f1c5d2dccfb6d926dd52b75bc21cc22ec4c83163b6a7ad85a WHIRLPOOL 82d4725bda3d979e27282a8893e27c7e832a5384b9ecb095905bbf8bb89097e277c3668fb8cffa5126c63dbdee6f65498b48428d3757fca893b87ff2c9d8c707
 MISC metadata.xml 163 SHA256 5be82689c9f32031a2438b08ace0c4bcdc738cec0eb736d9aa7e529cde4b8a6c SHA512 9688f0e23097fe5baefa6b3cf28276c88e53314989b51e1afc9edc0e68a19c215a67dd0bfb84a157b130d424912ac72bf6c85f9ce066c8d9f6776e4c1d019ccc WHIRLPOOL 6609d5606451d3adf31c010aeb51bec29714c3cda8e1a730af0ea1f51289f7139ac86f11c056e59143dddcf46291b9d79ae94083b77488f28717bf51972e0c3b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlS1D0sACgkQCaWpQKGI+9TZcwCgh3FwlvFRFpYFAhiyyGD+hesL
-JQEAn3yNyc1ZJq7X1v+3KQGNCQOn+wz/
-=EMll
+iEYEAREIAAYFAlS/a+0ACgkQCaWpQKGI+9S90QCbBc1Z4DEe4HhMpFFX7TfmSW1T
+BtEAoIInyEJnt3YuvSWaFB7fHSMqxEmX
+=4kI9
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.5.9-r1.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.5.9-r1.ebuild
new file mode 100644
index 000000000000..69b66ca85b0d
--- /dev/null
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.5.9-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.5.9-r1.ebuild,v 1.1 2015/01/21 09:05:48 pacho Exp $
+
+EAPI="5"
+inherit eutils multilib-minimal
+
+MY_PN="gstreamer-vaapi"
+DESCRIPTION="Hardware accelerated video decoding through VA-API plugin"
+HOMEPAGE="http://gitorious.org/vaapi/gstreamer-vaapi"
+SRC_URI="http://www.freedesktop.org/software/vaapi/releases/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="1.0"
+KEYWORDS="~amd64"
+IUSE="+X opengl wayland"
+
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	media-libs/libvpx[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-1.2.3:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-1.2.3:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-bad-1.2.3:1.0[${MULTILIB_USEDEP}]
+	>=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libva-1.2.1-r1[X?,opengl?,wayland?,${MULTILIB_USEDEP}]
+	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+	>=virtual/libudev-208:=[${MULTILIB_USEDEP}]
+	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--enable-builtin-libvpx=no \
+		--disable-static \
+		--enable-drm \
+		$(use_enable opengl glx) \
+		$(use_enable wayland) \
+		$(use_enable X x11)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-plugins/vdr-live/ChangeLog b/media-plugins/vdr-live/ChangeLog
index a11b96d61250..8640ee33776a 100644
--- a/media-plugins/vdr-live/ChangeLog
+++ b/media-plugins/vdr-live/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-live
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.44 2014/01/24 05:04:56 hd_brummy Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.45 2015/01/21 13:01:35 hd_brummy Exp $
+
+  21 Jan 2015; Joerg Bornkessel <hd_brummy@gentoo.org>
+  vdr-live-0.3.0_p20130504-r1.ebuild:
+  disabled -std=c++11 due massive compile errors
 
 *vdr-live-0.3.0_p20130504-r1 (24 Jan 2014)
 
diff --git a/media-plugins/vdr-live/Manifest b/media-plugins/vdr-live/Manifest
index 21d6daca872b..ba4c496fbb81 100644
--- a/media-plugins/vdr-live/Manifest
+++ b/media-plugins/vdr-live/Manifest
@@ -11,14 +11,14 @@ AUX vdr-live_pcre.patch 586 SHA256 290fe19ec39c638a78ca4b7f21ab9d337aa85657491e7
 DIST vdr-live-0.2.0.tar.gz 560582 SHA256 30ac64040be4defb75beb9d3a5b0218694fc5b10486926acd989e6eb6c72ca55
 DIST vdr-live-0.3.0_p20130504.tar.bz2 6348021 SHA256 edd577580b9e99de88bcd3794fcf792bee7df7ccc41bfebaeebef22bac5c78a7 SHA512 7a238a4567f90448b7813366dbdb5112ab98079fd5a2c9d59d09273853fd62ad520ca9ad373704a8888eb7c25119772421fe998d87069647c40d6d2d869e09c1 WHIRLPOOL 7f8d7ff69914d90af41d4c550df6f57a658e8263d320167fed84f4990063a5323c1f5d58d44283682807c673af81c8e32cd44e13a9aa57e849e3640b4ecac936
 EBUILD vdr-live-0.2.0.ebuild 1228 SHA256 e68db52ddbb83bc48dc1e9630abb441773c9e40cddbba01bd79b13b8448500cd SHA512 279e7c195e57ffa60322c7f221f9894d0922c29dc718b1c6a867736f3c2e93b5d69e9ba0a71ba99382bef59581436c645b38ba521b722ad19f34bf8321622b50 WHIRLPOOL 1d55af5846f4b84b9cb50b87f5b903b1d145bee16f79de5aadd004c0fe2d0dc425175fdb2768ab39b2b7fb94243880311d1ac0ace9dc85c5e7b5ac431985eadd
-EBUILD vdr-live-0.3.0_p20130504-r1.ebuild 2511 SHA256 6b0a0c136a983e6fa6096ef0af8f94dcd2ab22bea6edf0f8ee7930994cd1c2eb SHA512 ffac01b6ff4838e69f0e7279e9dd175013255c9608ad3bd9b44b23f9f18ead7048172a6a9a2b8d89e51368098b79eebc1ccdb8e10cc6fa3257d7dcc39d1887a0 WHIRLPOOL 46d56f20b49b10fc78c808f66d61d375c2e4287062920c188dd15b828398ae57493efe2c22d00e294ec2c65fd3e3999bf2c3008019fa46514f7fc32cf9487d2a
-MISC ChangeLog 8435 SHA256 01f89cc0a25ad0b287919162ddeb7f4a9e10f422be58b9647a996ff1a3608301 SHA512 1ce89c17dac1280ce355a118c6d784e4d5a63c1f64eed4a4a2c59e94ff9ce3e5c6c7551a74f73cfcdcad9fd60643067edf98b1f948fd5fc2b8e2d0a4cbdbc356 WHIRLPOOL 00a04a53bea04652d55eb6d9a18ccf0a7973166b8c2cc553b4fb006692b6430cfbe2a8bdee4b1ffa206b6dcf6cace966b5b639593648795ce941f6a0620dd846
+EBUILD vdr-live-0.3.0_p20130504-r1.ebuild 2646 SHA256 b5b3be4026824af285d5cd6f8933c9cb82f13e95476583bc934e2308123093fd SHA512 5b5ec1f8edab07699a5a489f87ae4b9a6549f62bdea486d97fa2c6148b7adc7d52200a2074e050352e9f7e93884f151553a335f6f22cd1d045dd6dc57a80fb14 WHIRLPOOL 31b1f52242be559371fde86b1e7ac7106f9277264fe72fc99b2ae99c7b612cfcf92b6e7d70d39c7f9f9b8199f24df0872624e3ebd1107b8707986125de82fd7a
+MISC ChangeLog 8578 SHA256 5394bd68288528bb583bdbc06b5ad30c677b32a2a31b206b20dc538c7e529e01 SHA512 23e07f8370a89548fec181318df2a6ab327c090770031ddfaad1f553e28e9be6e8e576b8b98d1e6c592d65ffa9c47178a18380e1befb0ab3855126ef488a09b4 WHIRLPOOL 624e620c6f5f06cf79a7de837930f7bc3631f4f8f76fc9ae68170884f5b3bb1ea620080ce415bbaf15998b7b640b20a2b0a38ea7a712593882ddd2b9f6435a2c
 MISC metadata.xml 251 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f SHA512 8f48311caba6e3069390a1871a0cb9b8731ff57b812b3b8d5a5b5147d4e2b8ad28232d059abb00f049ba78a10570d9326957a57349d2f080624b41b043112056 WHIRLPOOL 2b082e9ef2c0a111b189ec0a020a10fcf8ddb4ea6f2eb5d9627f98ab6edb72cac03a9a04f97ee4624f27852b85bb06f2d662a54b0ee421c777eba10e85e37cbe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFS4fSGdn07HTTCgIoRCGASAKCamlr1woSHbY/LwJ+ItX3dZBFcoQCeL2wR
-mSu3Va7guGYWChNsBuXxkMg=
-=4ep0
+iD8DBQFUv6M0dn07HTTCgIoRCNgTAKC9gycupRw5bBzzu//VIxXLrOZnTgCfbu51
+yduiXi74bDX2Lll5id1esJ0=
+=yqpS
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild b/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild
index 4e97acefc9b3..d722d2f65a97 100644
--- a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild
+++ b/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild,v 1.1 2014/01/24 05:04:56 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild,v 1.2 2015/01/21 13:01:35 hd_brummy Exp $
 
 EAPI=5
 
@@ -52,6 +52,13 @@ make_live_cert() {
 	chown vdr:vdr "${ROOT}"/etc/vdr/plugins/live/live{,-key}.pem
 }
 
+src_configure() {
+	vdr-plugin-2_src_configure
+
+	# tmp. disabeled gcc -std=c++11, due massiv compile errors
+	filter-flags -std=c++11
+}
+
 src_prepare() {
 	# remove untranslated language files
 	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nl_NL,nn_NO,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 088c7d6ae1ec..8b67b706391c 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 21 Jan 2015 05:36:53 +0000
+Wed, 21 Jan 2015 17:36:51 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 088c7d6ae1ec..e96a5dd3c1b9 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 21 Jan 2015 05:36:53 +0000
+Wed, 21 Jan 2015 17:36:52 +0000
diff --git a/metadata/md5-cache/app-admin/eselect-opengl-1.3.1-r1 b/metadata/md5-cache/app-admin/eselect-opengl-1.3.1-r2
similarity index 95%
rename from metadata/md5-cache/app-admin/eselect-opengl-1.3.1-r1
rename to metadata/md5-cache/app-admin/eselect-opengl-1.3.1-r2
index 9885f6bd20b7..3d89ac504003 100644
--- a/metadata/md5-cache/app-admin/eselect-opengl-1.3.1-r1
+++ b/metadata/md5-cache/app-admin/eselect-opengl-1.3.1-r2
@@ -9,4 +9,4 @@ RDEPEND=>=app-admin/eselect-1.2.4 !<media-libs/mesa-10.3.4-r1 !=media-libs/mesa-
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~mgorny/dist/opengl.eselect-1.3.1.xz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=9b8883fdc7ea53f74acdba56d0850e42
+_md5_=f33efaa4f437856abbb084cbf936d02a
diff --git a/metadata/md5-cache/app-admin/logrotate-3.8.8 b/metadata/md5-cache/app-admin/logrotate-3.8.8
index 351be1037576..2c6b84149ec1 100644
--- a/metadata/md5-cache/app-admin/logrotate-3.8.8
+++ b/metadata/md5-cache/app-admin/logrotate-3.8.8
@@ -4,10 +4,10 @@ DESCRIPTION=Rotates, compresses, and mails system logs
 EAPI=5
 HOMEPAGE=https://fedorahosted.org/logrotate/
 IUSE=acl selinux
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) selinux? ( sec-policy/selinux-logrotate )
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.8.8.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=c90947707cce39a3ed14c3a6c8fffd41
+_md5_=1ce8cb5543f19add07066a4e90ae88e0
diff --git a/metadata/md5-cache/app-doc/doxygen-1.7.6.1 b/metadata/md5-cache/app-doc/doxygen-1.7.6.1
deleted file mode 100644
index 52a6f078105b..000000000000
--- a/metadata/md5-cache/app-doc/doxygen-1.7.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=sys-apps/sed sys-devel/flex sys-devel/bison doc? ( =dev-lang/python-2* ) qt4? ( dev-qt/qtgui:4 ) latex? ( app-text/texlive[extra] ) dev-lang/perl virtual/libiconv media-libs/libpng app-text/ghostscript-gpl dot? ( media-gfx/graphviz media-libs/freetype )
-DESCRIPTION=Documentation system for most programming languages
-EAPI=4
-HOMEPAGE=http://www.doxygen.org/
-IUSE=debug doc dot qt4 latex elibc_FreeBSD linguas_hy linguas_ar linguas_pt_BR linguas_ca linguas_zh linguas_cs linguas_de linguas_da linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_el linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ko linguas_lt linguas_mk linguas_nl linguas_nb linguas_pl linguas_pt linguas_ro linguas_ru linguas_sl linguas_sk linguas_sr linguas_sv linguas_tr linguas_uk linguas_vi linguas_af
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=qt4? ( dev-qt/qtgui:4 ) latex? ( app-text/texlive[extra] ) dev-lang/perl virtual/libiconv media-libs/libpng app-text/ghostscript-gpl dot? ( media-gfx/graphviz media-libs/freetype )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=http://ftp.stack.nl/pub/users/dimitri/doxygen-1.7.6.1.src.tar.gz http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	qmake-utils	9e0174de733aecba0a7e66b2b01841d2	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=e0ecfd5b7057e5357bb54eb9a130eeec
diff --git a/metadata/md5-cache/app-doc/doxygen-1.8.9.1 b/metadata/md5-cache/app-doc/doxygen-1.8.9.1
new file mode 100644
index 000000000000..1af5ebf8dde1
--- /dev/null
+++ b/metadata/md5-cache/app-doc/doxygen-1.8.9.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=sys-apps/sed sys-devel/flex sys-devel/bison doc? ( || ( >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python:3.4 >=dev-lang/python-3.3.2-r2:3.3 ) ) app-text/ghostscript-gpl dev-lang/perl media-libs/libpng virtual/libiconv clang? ( sys-devel/clang ) dot? ( media-gfx/graphviz media-libs/freetype ) doxysearch? ( =dev-libs/xapian-1.2* ) latex? ( app-text/texlive[extra] ) qt4? ( dev-qt/qtgui:4 ) sqlite? ( dev-db/sqlite:3 )
+DESCRIPTION=Documentation system for most programming languages
+EAPI=4
+HOMEPAGE=http://www.doxygen.org/
+IUSE=clang debug doc dot doxysearch qt4 latex sqlite linguas_hy linguas_ar linguas_pt_BR linguas_ca linguas_zh linguas_cs linguas_de linguas_da linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_el linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ko linguas_lt linguas_mk linguas_nl linguas_nb linguas_pl linguas_pt linguas_ro linguas_ru linguas_sl linguas_sk linguas_sr linguas_sv linguas_tr linguas_uk linguas_vi linguas_af
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng virtual/libiconv clang? ( sys-devel/clang ) dot? ( media-gfx/graphviz media-libs/freetype ) doxysearch? ( =dev-libs/xapian-1.2* ) latex? ( app-text/texlive[extra] ) qt4? ( dev-qt/qtgui:4 ) sqlite? ( dev-db/sqlite:3 )
+RESTRICT=mirror test
+SLOT=0
+SRC_URI=http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.9.1.src.tar.gz http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	qmake-utils	9e0174de733aecba0a7e66b2b01841d2	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=fce3b6b5fbe6088a68498d74542b1494
diff --git a/metadata/md5-cache/app-misc/wcd-5.2.6 b/metadata/md5-cache/app-misc/wcd-5.2.6
new file mode 100644
index 000000000000..2c6f928720f8
--- /dev/null
+++ b/metadata/md5-cache/app-misc/wcd-5.2.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/ncurses[unicode?] unicode? ( dev-libs/libunistring ) app-text/ghostscript-gpl
+DESCRIPTION=Wherever Change Directory
+EAPI=5
+HOMEPAGE=http://waterlan.home.xs4all.nl/#WCD_ANCHOR
+IUSE=nls unicode
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses[unicode?] unicode? ( dev-libs/libunistring )
+SLOT=0
+SRC_URI=http://waterlan.home.xs4all.nl/wcd/wcd-5.2.6.tar.gz
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=be515f6440c52c8edfbfe6240d9de115
diff --git a/metadata/md5-cache/app-shells/bash-4.3_p30 b/metadata/md5-cache/app-shells/bash-4.3_p30
deleted file mode 100644
index bb54d07c1bb5..000000000000
--- a/metadata/md5-cache/app-shells/bash-4.3_p30
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=sys-libs/ncurses-5.2-r2 readline? ( >=sys-libs/readline-6.3 ) nls? ( virtual/libintl ) virtual/yacc
-DESCRIPTION=The standard GNU Bourne again shell
-EAPI=4
-HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
-IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline vanilla
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.2-r2 readline? ( >=sys-libs/readline-6.3 ) nls? ( virtual/libintl ) !<sys-apps/portage-2.1.6.7_p1 !<sys-apps/paludis-0.26.0_alpha5
-SLOT=0
-SRC_URI=mirror://gnu/bash/bash-4.3.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-001 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-002 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-003 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-004 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-005 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-006 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-007 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-008 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-009 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-010 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-011 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-012 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-013 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-014 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-015 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-016 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-017 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-018 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-019 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-020 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-021 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-022 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-023 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-024 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-025 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-026 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-027 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-028 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-029 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-030 mirror://gnu/bash/bash-4.3-patches/bash43-001 mirror://gnu/bash/bash-4.3-patches/bash43-002 mirror://gnu/bash/bash-4.3-patches/bash43-003 mirror://gnu/bash/bash-4.3-patches/bash43-004 mirror://gnu/bash/bash-4.3-patches/bash43-005 mirror://gnu/bash/bash-4.3-patches/bash43-006 mirror://gnu/bash/bash-4.3-patches/bash43-007 mirror://gnu/bash/bash-4.3-patches/bash43-008 mirror://gnu/bash/bash-4.3-patches/bash43-009 mirror://gnu/bash/bash-4.3-patches/bash43-010 mirror://gnu/bash/bash-4.3-patches/bash43-011 mirror://gnu/bash/bash-4.3-patches/bash43-012 mirror://gnu/bash/bash-4.3-patches/bash43-013 mirror://gnu/bash/bash-4.3-patches/bash43-014 mirror://gnu/bash/bash-4.3-patches/bash43-015 mirror://gnu/bash/bash-4.3-patches/bash43-016 mirror://gnu/bash/bash-4.3-patches/bash43-017 mirror://gnu/bash/bash-4.3-patches/bash43-018 mirror://gnu/bash/bash-4.3-patches/bash43-019 mirror://gnu/bash/bash-4.3-patches/bash43-020 mirror://gnu/bash/bash-4.3-patches/bash43-021 mirror://gnu/bash/bash-4.3-patches/bash43-022 mirror://gnu/bash/bash-4.3-patches/bash43-023 mirror://gnu/bash/bash-4.3-patches/bash43-024 mirror://gnu/bash/bash-4.3-patches/bash43-025 mirror://gnu/bash/bash-4.3-patches/bash43-026 mirror://gnu/bash/bash-4.3-patches/bash43-027 mirror://gnu/bash/bash-4.3-patches/bash43-028 mirror://gnu/bash/bash-4.3-patches/bash43-029 mirror://gnu/bash/bash-4.3-patches/bash43-030
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=3a09b7492845d68486782e4b8f732b80
diff --git a/metadata/md5-cache/app-shells/bash-4.3_p30-r1 b/metadata/md5-cache/app-shells/bash-4.3_p33-r1
similarity index 58%
rename from metadata/md5-cache/app-shells/bash-4.3_p30-r1
rename to metadata/md5-cache/app-shells/bash-4.3_p33-r1
index 3a880a3536ac..681658266b23 100644
--- a/metadata/md5-cache/app-shells/bash-4.3_p30-r1
+++ b/metadata/md5-cache/app-shells/bash-4.3_p33-r1
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2 readline? ( >=sys-libs/readline-6.3 ) nls? ( virtual/libintl ) !<sys-apps/portage-2.1.6.7_p1 !<sys-apps/paludis-0.26.0_alpha5
 SLOT=0
-SRC_URI=mirror://gnu/bash/bash-4.3.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-001 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-002 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-003 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-004 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-005 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-006 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-007 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-008 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-009 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-010 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-011 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-012 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-013 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-014 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-015 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-016 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-017 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-018 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-019 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-020 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-021 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-022 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-023 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-024 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-025 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-026 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-027 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-028 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-029 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-030 mirror://gnu/bash/bash-4.3-patches/bash43-001 mirror://gnu/bash/bash-4.3-patches/bash43-002 mirror://gnu/bash/bash-4.3-patches/bash43-003 mirror://gnu/bash/bash-4.3-patches/bash43-004 mirror://gnu/bash/bash-4.3-patches/bash43-005 mirror://gnu/bash/bash-4.3-patches/bash43-006 mirror://gnu/bash/bash-4.3-patches/bash43-007 mirror://gnu/bash/bash-4.3-patches/bash43-008 mirror://gnu/bash/bash-4.3-patches/bash43-009 mirror://gnu/bash/bash-4.3-patches/bash43-010 mirror://gnu/bash/bash-4.3-patches/bash43-011 mirror://gnu/bash/bash-4.3-patches/bash43-012 mirror://gnu/bash/bash-4.3-patches/bash43-013 mirror://gnu/bash/bash-4.3-patches/bash43-014 mirror://gnu/bash/bash-4.3-patches/bash43-015 mirror://gnu/bash/bash-4.3-patches/bash43-016 mirror://gnu/bash/bash-4.3-patches/bash43-017 mirror://gnu/bash/bash-4.3-patches/bash43-018 mirror://gnu/bash/bash-4.3-patches/bash43-019 mirror://gnu/bash/bash-4.3-patches/bash43-020 mirror://gnu/bash/bash-4.3-patches/bash43-021 mirror://gnu/bash/bash-4.3-patches/bash43-022 mirror://gnu/bash/bash-4.3-patches/bash43-023 mirror://gnu/bash/bash-4.3-patches/bash43-024 mirror://gnu/bash/bash-4.3-patches/bash43-025 mirror://gnu/bash/bash-4.3-patches/bash43-026 mirror://gnu/bash/bash-4.3-patches/bash43-027 mirror://gnu/bash/bash-4.3-patches/bash43-028 mirror://gnu/bash/bash-4.3-patches/bash43-029 mirror://gnu/bash/bash-4.3-patches/bash43-030
+SRC_URI=mirror://gnu/bash/bash-4.3.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-001 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-002 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-003 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-004 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-005 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-006 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-007 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-008 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-009 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-010 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-011 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-012 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-013 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-014 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-015 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-016 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-017 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-018 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-019 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-020 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-021 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-022 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-023 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-024 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-025 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-026 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-027 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-028 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-029 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-030 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-031 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-032 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-033 mirror://gnu/bash/bash-4.3-patches/bash43-001 mirror://gnu/bash/bash-4.3-patches/bash43-002 mirror://gnu/bash/bash-4.3-patches/bash43-003 mirror://gnu/bash/bash-4.3-patches/bash43-004 mirror://gnu/bash/bash-4.3-patches/bash43-005 mirror://gnu/bash/bash-4.3-patches/bash43-006 mirror://gnu/bash/bash-4.3-patches/bash43-007 mirror://gnu/bash/bash-4.3-patches/bash43-008 mirror://gnu/bash/bash-4.3-patches/bash43-009 mirror://gnu/bash/bash-4.3-patches/bash43-010 mirror://gnu/bash/bash-4.3-patches/bash43-011 mirror://gnu/bash/bash-4.3-patches/bash43-012 mirror://gnu/bash/bash-4.3-patches/bash43-013 mirror://gnu/bash/bash-4.3-patches/bash43-014 mirror://gnu/bash/bash-4.3-patches/bash43-015 mirror://gnu/bash/bash-4.3-patches/bash43-016 mirror://gnu/bash/bash-4.3-patches/bash43-017 mirror://gnu/bash/bash-4.3-patches/bash43-018 mirror://gnu/bash/bash-4.3-patches/bash43-019 mirror://gnu/bash/bash-4.3-patches/bash43-020 mirror://gnu/bash/bash-4.3-patches/bash43-021 mirror://gnu/bash/bash-4.3-patches/bash43-022 mirror://gnu/bash/bash-4.3-patches/bash43-023 mirror://gnu/bash/bash-4.3-patches/bash43-024 mirror://gnu/bash/bash-4.3-patches/bash43-025 mirror://gnu/bash/bash-4.3-patches/bash43-026 mirror://gnu/bash/bash-4.3-patches/bash43-027 mirror://gnu/bash/bash-4.3-patches/bash43-028 mirror://gnu/bash/bash-4.3-patches/bash43-029 mirror://gnu/bash/bash-4.3-patches/bash43-030 mirror://gnu/bash/bash-4.3-patches/bash43-031 mirror://gnu/bash/bash-4.3-patches/bash43-032 mirror://gnu/bash/bash-4.3-patches/bash43-033
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=6e76b16cb250de8d279ae3ba6730bc3e
+_md5_=c6e66b263707ca8884554168e948d502
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.1.14.8 b/metadata/md5-cache/dev-db/phpmyadmin-4.1.14.8
index d7a9d1c03097..42f7b19e5f95 100644
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.1.14.8
+++ b/metadata/md5-cache/dev-db/phpmyadmin-4.1.14.8
@@ -4,10 +4,10 @@ DESCRIPTION=Web-based administration for MySQL database in PHP
 EAPI=5
 HOMEPAGE=http://www.phpmyadmin.net/
 IUSE=setup vhosts
-KEYWORDS=~alpha ~amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=dev-lang/php[crypt,ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=4.1.14.8
 SRC_URI=mirror://sourceforge/phpmyadmin/phpMyAdmin-4.1.14.8-all-languages.tar.xz
 _eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=60a5f87bd4420193c5394128d8370bb6
+_md5_=efd7b6d7b5c86f37e0ea0c819d268f39
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.2.13.1 b/metadata/md5-cache/dev-db/phpmyadmin-4.2.13.1
index 04c659b36027..65e1da6be5b1 100644
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.2.13.1
+++ b/metadata/md5-cache/dev-db/phpmyadmin-4.2.13.1
@@ -4,10 +4,10 @@ DESCRIPTION=Web-based administration for MySQL database in PHP
 EAPI=5
 HOMEPAGE=http://www.phpmyadmin.net/
 IUSE=setup vhosts
-KEYWORDS=~alpha ~amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=dev-lang/php[crypt,ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=4.2.13.1
 SRC_URI=mirror://sourceforge/phpmyadmin/phpMyAdmin-4.2.13.1-all-languages.tar.xz
 _eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=d7975005268025ac05535137191cdff0
+_md5_=24c40ec54e7e8df72e379448d5733f1f
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.1.27 b/metadata/md5-cache/dev-lang/swi-prolog-7.1.27
deleted file mode 100644
index 6f61177b0506..000000000000
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.1.27
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) X? ( x11-proto/xproto ) java? ( test? ( =dev-java/junit-3.8* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
-DESCRIPTION=free, small, and standard compliant Prolog compiler
-EAPI=4
-HOMEPAGE=http://www.swi-prolog.org/
-IUSE=archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X elibc_FreeBSD java
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=LGPL-2.1
-RDEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.1.9-r1 )
-SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/pl-7.1.27.tar.gz mirror://gentoo/swi-prolog-7.1.27-gentoo-patchset-0.tar.gz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=39943ee951ea3271dc8431458ceec30c
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.1.26 b/metadata/md5-cache/dev-lang/swi-prolog-7.1.29
similarity index 90%
rename from metadata/md5-cache/dev-lang/swi-prolog-7.1.26
rename to metadata/md5-cache/dev-lang/swi-prolog-7.1.29
index c07b164f37c6..b41afb90e85d 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.1.26
+++ b/metadata/md5-cache/dev-lang/swi-prolog-7.1.29
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/pl-7.1.26.tar.gz mirror://gentoo/swi-prolog-7.1.26-gentoo-patchset-0.tar.gz
+SRC_URI=http://www.swi-prolog.org/download/devel/src/pl-7.1.29.tar.gz mirror://gentoo/swi-prolog-7.1.29-gentoo-patchset-0.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e84102a995809861812f2a373d3f86e4
+_md5_=4132976c78b142e0bc76ef6b3d4e519f
diff --git a/metadata/md5-cache/dev-libs/folks-0.9.7.1 b/metadata/md5-cache/dev-libs/folks-0.10.1
similarity index 87%
rename from metadata/md5-cache/dev-libs/folks-0.9.7.1
rename to metadata/md5-cache/dev-libs/folks-0.10.1
index 93a27e720671..e5e9985ea8d9 100644
--- a/metadata/md5-cache/dev-libs/folks-0.9.7.1
+++ b/metadata/md5-cache/dev-libs/folks-0.10.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=|| ( dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] ) >=dev-libs/glib-2.38.2:2 dev-libs/dbus-glib >=dev-libs/libgee-0.10:0.8[introspection] dev-libs/libxml2 sys-libs/ncurses:= sys-libs/readline:= bluetooth? ( >=net-wireless/bluez-5 ) eds? ( >=gnome-extra/evolution-data-server-3.8:=[vala] ) socialweb? ( >=net-libs/libsocialweb-0.25.20 ) telepathy? ( >=net-libs/telepathy-glib-0.19[vala] ) tracker? ( >=app-misc/tracker-1:0= ) zeitgeist? ( >=gnome-extra/zeitgeist-0.9.14 ) >=dev-libs/gobject-introspection-1.30 >=dev-util/intltool-0.50.0 sys-devel/gettext virtual/pkgconfig socialweb? ( >=net-libs/libsocialweb-0.25.15[vala] ) test? ( sys-apps/dbus bluetooth? ( >=gnome-extra/evolution-data-server-3.9.1 >=dev-libs/glib-2.39.2 ) ) !<dev-lang/vala-0.22.1:0.22 app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=|| ( dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] ) >=dev-libs/glib-2.38.2:2 dev-libs/dbus-glib >=dev-libs/libgee-0.10:0.8[introspection] dev-libs/libxml2 sys-libs/ncurses:= sys-libs/readline:= bluetooth? ( >=net-wireless/bluez-5 ) eds? ( >=gnome-extra/evolution-data-server-3.8:=[vala] ) socialweb? ( >=net-libs/libsocialweb-0.25.20 ) telepathy? ( >=net-libs/telepathy-glib-0.19[vala] ) tracker? ( >=app-misc/tracker-1:0= ) zeitgeist? ( >=gnome-extra/zeitgeist-0.9.14 ) >=dev-libs/gobject-introspection-1.30 >=dev-util/intltool-0.50.0 sys-devel/gettext virtual/pkgconfig socialweb? ( >=net-libs/libsocialweb-0.25.15[vala] ) test? ( sys-apps/dbus bluetooth? ( >=gnome-extra/evolution-data-server-3.9.1 >=dev-libs/glib-2.39.2:2 ) ) !<dev-lang/vala-0.22.1:0.22 app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Library for aggregating people from multiple sources
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Folks
 IUSE=bluetooth eds socialweb +telepathy test tracker utils zeitgeist debug test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=|| ( dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] ) >=dev-libs/glib-2.38.2:2 dev-libs/dbus-glib >=dev-libs/libgee-0.10:0.8[introspection] dev-libs/libxml2 sys-libs/ncurses:= sys-libs/readline:= bluetooth? ( >=net-wireless/bluez-5 ) eds? ( >=gnome-extra/evolution-data-server-3.8:=[vala] ) socialweb? ( >=net-libs/libsocialweb-0.25.20 ) telepathy? ( >=net-libs/telepathy-glib-0.19[vala] ) tracker? ( >=app-misc/tracker-1:0= ) zeitgeist? ( >=gnome-extra/zeitgeist-0.9.14 ) net-im/telepathy-mission-control
 REQUIRED_USE=bluetooth? ( eds )
 SLOT=0/25
-SRC_URI=mirror://gnome/sources/folks/0.9/folks-0.9.7.1.tar.xz
+SRC_URI=mirror://gnome/sources/folks/0.10/folks-0.10.1.tar.xz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	29582087e5f16ca16b1c6815c2ae2b65	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	a41415fe361172827ed11b6a32ee38fb	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=9c25d0f84839dcaa526769c59017c9ab
+_md5_=77266d70880073b47ef13cfda467762b
diff --git a/metadata/md5-cache/dev-libs/glib-2.38.2-r1 b/metadata/md5-cache/dev-libs/glib-2.38.2-r1
deleted file mode 100644
index 062281496fbb..000000000000
--- a/metadata/md5-cache/dev-libs/glib-2.38.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=!<dev-util/gdbus-codegen-2.38.2 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 >=sys-freebsd/freebsd-lib-9.2_rc1 ) selinux? ( sys-libs/libselinux ) xattr? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( 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(-)] >=dev-util/gdbus-codegen-2.38.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-text/docbook-xml-dtd:4.1.2 >=dev-libs/libxslt-1.0 >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.15 systemtap? ( >=dev-util/systemtap-1.3 ) test? ( sys-devel/gdb 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(-)] >=dev-util/gdbus-codegen-2.38.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/dbus-1.2.14 ) !<dev-libs/gobject-introspection-1.38 !<dev-util/gtk-doc-1.15-r2 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=The GLib library of C routines
-EAPI=5
-HOMEPAGE=http://www.gtk.org/
-IUSE=debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr python_targets_python2_7 test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=LGPL-2+
-PDEPEND=!<gnome-base/gvfs-1.6.4-r990 mime? ( x11-misc/shared-mime-info )
-RDEPEND=!<dev-util/gdbus-codegen-2.38.2 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 >=sys-freebsd/freebsd-lib-9.2_rc1 ) selinux? ( sys-libs/libselinux ) xattr? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( 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(-)] >=dev-util/gdbus-codegen-2.38.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
-SLOT=2
-SRC_URI=mirror://gnome/sources/glib/2.38/glib-2.38.2.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a3eefe9a6dfd63877dcedc8c979d2a90
diff --git a/metadata/md5-cache/dev-libs/glib-2.40.0-r1 b/metadata/md5-cache/dev-libs/glib-2.40.0-r1
deleted file mode 100644
index 240578352f70..000000000000
--- a/metadata/md5-cache/dev-libs/glib-2.40.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=!<dev-util/gdbus-codegen-2.40.0 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 >=sys-freebsd/freebsd-lib-9.2_rc1 ) selinux? ( sys-libs/libselinux ) xattr? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( 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(-)] >=dev-util/gdbus-codegen-2.40.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-text/docbook-xml-dtd:4.1.2 >=dev-libs/libxslt-1.0 >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.20 systemtap? ( >=dev-util/systemtap-1.3 ) test? ( sys-devel/gdb 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(-)] >=dev-util/gdbus-codegen-2.40.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=The GLib library of C routines
-EAPI=5
-HOMEPAGE=http://www.gtk.org/
-IUSE=debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr python_targets_python2_7 test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=LGPL-2+
-PDEPEND=!<gnome-base/gvfs-1.6.4-r990 mime? ( x11-misc/shared-mime-info )
-RDEPEND=!<dev-util/gdbus-codegen-2.40.0 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 >=sys-freebsd/freebsd-lib-9.2_rc1 ) selinux? ( sys-libs/libselinux ) xattr? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( 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(-)] >=dev-util/gdbus-codegen-2.40.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
-SLOT=2
-SRC_URI=mirror://gnome/sources/glib/2.40/glib-2.40.0.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=210001cabebfb58792cc3edebb0959d0
diff --git a/metadata/md5-cache/dev-libs/glib-2.42.1 b/metadata/md5-cache/dev-libs/glib-2.42.1
index f34706fca2fc..da72f33ecc29 100644
--- a/metadata/md5-cache/dev-libs/glib-2.42.1
+++ b/metadata/md5-cache/dev-libs/glib-2.42.1
@@ -6,10 +6,10 @@ HOMEPAGE=http://www.gtk.org/
 IUSE=fam kernel_linux +mime selinux static-libs systemtap test utils xattr debug python_targets_python2_7 test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=LGPL-2+
-PDEPEND=!<gnome-base/gvfs-1.6.4-r990 mime? ( x11-misc/shared-mime-info )
+PDEPEND=!<gnome-base/gvfs-1.6.4-r990 gnome-base/dconf mime? ( x11-misc/shared-mime-info )
 RDEPEND=!<dev-util/gdbus-codegen-2.42.1 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 >=sys-freebsd/freebsd-lib-9.2_rc1 ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( 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(-)] >=dev-util/gdbus-codegen-2.42.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=utils? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.42/glib-2.42.1.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	29582087e5f16ca16b1c6815c2ae2b65	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=82926afef9a49bf6996dff23362a2bbb
+_md5_=f05235b03c59450fc8fb70e0486cd628
diff --git a/metadata/md5-cache/dev-libs/libgweather-3.14.3 b/metadata/md5-cache/dev-libs/libgweather-3.14.3
new file mode 100644
index 000000000000..15c6b897567c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgweather-3.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=x11-libs/gtk+-3.13.5:3[introspection?] >=dev-libs/glib-2.35.1:2 >=net-libs/libsoup-2.34:2.4 >=dev-libs/libxml2-2.6.0 sci-geosciences/geocode-glib >=sys-libs/timezone-data-2010k glade? ( >=dev-util/glade-3.16:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) >=dev-util/gtk-doc-am-1.11 >=dev-util/intltool-0.50 >=sys-devel/gettext-0.18 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] dev-lang/vala:0.20[vapigen(+)] ) ) app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Library to access weather information from online services
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/Projects/LibGWeather
+IUSE=glade +introspection vala
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=>=x11-libs/gtk+-3.13.5:3[introspection?] >=dev-libs/glib-2.35.1:2 >=net-libs/libsoup-2.34:2.4 >=dev-libs/libxml2-2.6.0 sci-geosciences/geocode-glib >=sys-libs/timezone-data-2010k glade? ( >=dev-util/glade-3.16:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) !<gnome-base/gnome-applets-2.22.0
+REQUIRED_USE=vala? ( introspection )
+SLOT=2/3-6
+SRC_URI=mirror://gnome/sources/libgweather/3.14/libgweather-3.14.3.tar.xz
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	29582087e5f16ca16b1c6815c2ae2b65	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	a41415fe361172827ed11b6a32ee38fb	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=f7fbd22821ebedbefa3962a0f87a442d
diff --git a/metadata/md5-cache/dev-perl/Test-TCP-2.60.0 b/metadata/md5-cache/dev-perl/Test-TCP-2.60.0
index a6af8a6abf6e..b69c32aa7ac5 100644
--- a/metadata/md5-cache/dev-perl/Test-TCP-2.60.0
+++ b/metadata/md5-cache/dev-perl/Test-TCP-2.60.0
@@ -4,10 +4,10 @@ DESCRIPTION=Testing TCP program
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Test-TCP/
 IUSE=test
-KEYWORDS=~amd64 hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 hppa ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Test-SharedFork-0.190.0 >=virtual/perl-IO-1.23 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOKUHIROM/Test-TCP-2.06.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	4e599aab78ebadca09ce51369fa9019d	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=cd5b12cab66289b269f77735669e84e9
+_md5_=b1cefc3c26fa556aff9887e53c90a49e
diff --git a/metadata/md5-cache/dev-php/ZendFramework-1.12.9 b/metadata/md5-cache/dev-php/ZendFramework-1.12.9
index 03437e4c8fdf..4b1d3b75d7f3 100644
--- a/metadata/md5-cache/dev-php/ZendFramework-1.12.9
+++ b/metadata/md5-cache/dev-php/ZendFramework-1.12.9
@@ -4,10 +4,10 @@ DESCRIPTION=Zend Framework is a high quality and open source framework for devel
 EAPI=5
 HOMEPAGE=http://framework.zend.com/
 IUSE=cli doc examples minimal
-KEYWORDS=~amd64 hppa ~ppc ~x86
+KEYWORDS=amd64 hppa ~ppc x86
 LICENSE=BSD
 RDEPEND=cli? ( dev-lang/php[simplexml,tokenizer] ) dev-lang/php
 SLOT=0
 SRC_URI=!minimal? ( http://framework.zend.com/releases/ZendFramework-1.12.9/ZendFramework-1.12.9.tar.gz ) minimal? ( http://framework.zend.com/releases/ZendFramework-1.12.9/ZendFramework-1.12.9-minimal.tar.gz ) doc? ( http://framework.zend.com/releases/ZendFramework-1.12.9/ZendFramework-1.12.9-apidoc.tar.gz http://framework.zend.com/releases/ZendFramework-1.12.9/ZendFramework-1.12.9-manual-en.tar.gz )
 _eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	php-lib-r1	d7318e400ae0d443613d286980877fd4	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=fe616ebed9868c4227986067c1dc272f
+_md5_=3f91aa3b86957228d9b86098b6542869
diff --git a/metadata/md5-cache/dev-python/CoverageTestRunner-1.10 b/metadata/md5-cache/dev-python/CoverageTestRunner-1.10
index 75b65c370481..160b13b19289 100644
--- a/metadata/md5-cache/dev-python/CoverageTestRunner-1.10
+++ b/metadata/md5-cache/dev-python/CoverageTestRunner-1.10
@@ -4,11 +4,11 @@ DESCRIPTION=fail Python program unit tests unless they test everything
 EAPI=5
 HOMEPAGE=http://liw.fi/coverage-test-runner/
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/coverage python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://code.liw.fi/debian/pool/main/p/python-coverage-test-runner/python-coverage-test-runner_1.10.orig.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=1a43dbafee24ca58bd396fd6fd5a51f9
+_md5_=1d9e62123edc52b90a955356e1a91abc
diff --git a/metadata/md5-cache/dev-python/CoverageTestRunner-1.9-r1 b/metadata/md5-cache/dev-python/CoverageTestRunner-1.9-r1
index 1bf2d79f376c..88580cf0b7f7 100644
--- a/metadata/md5-cache/dev-python/CoverageTestRunner-1.9-r1
+++ b/metadata/md5-cache/dev-python/CoverageTestRunner-1.9-r1
@@ -4,11 +4,11 @@ DESCRIPTION=fail Python program unit tests unless they test everything
 EAPI=5
 HOMEPAGE=http://liw.fi/coverage-test-runner/
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/coverage python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://code.liw.fi/debian/pool/main/p/python-coverage-test-runner/python-coverage-test-runner_1.9.orig.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=752c811ee9790eea3546b4ebe10486bd
+_md5_=65c5164467eedf09b879106f5d43ead1
diff --git a/metadata/md5-cache/dev-python/chameleon-2.18 b/metadata/md5-cache/dev-python/chameleon-2.20
similarity index 96%
rename from metadata/md5-cache/dev-python/chameleon-2.18
rename to metadata/md5-cache/dev-python/chameleon-2.20
index 8e911ed99abf..6f292fa60646 100644
--- a/metadata/md5-cache/dev-python/chameleon-2.18
+++ b/metadata/md5-cache/dev-python/chameleon-2.20
@@ -9,6 +9,6 @@ LICENSE=repoze
 RDEPEND=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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
 SLOT=0
-SRC_URI=mirror://pypi/C/Chameleon/Chameleon-2.18.tar.gz
+SRC_URI=mirror://pypi/C/Chameleon/Chameleon-2.20.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=8c0cf0041664f1e4b2c9946c006ea32c
+_md5_=f795d127fa5df7b2a9228d8f1c82f992
diff --git a/metadata/md5-cache/dev-python/cliapp-1.20130808 b/metadata/md5-cache/dev-python/cliapp-1.20130808
index ac5d3d7010a0..dc50febb81c9 100644
--- a/metadata/md5-cache/dev-python/cliapp-1.20130808
+++ b/metadata/md5-cache/dev-python/cliapp-1.20130808
@@ -4,11 +4,11 @@ DESCRIPTION=Framework for Unix-like command line programs
 EAPI=5
 HOMEPAGE=http://liw.fi/cliapp/
 IUSE=test python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://code.liw.fi/debian/pool/main/p/python-cliapp/python-cliapp_1.20130808.orig.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=06023fdd549da45ac1244a65dc6fd6aa
+_md5_=bc17bd2db0439d36f12158c6fb9d3a0f
diff --git a/metadata/md5-cache/dev-python/cliapp-1.20140315 b/metadata/md5-cache/dev-python/cliapp-1.20140315
index b1e9601bc926..2e194dd378ef 100644
--- a/metadata/md5-cache/dev-python/cliapp-1.20140315
+++ b/metadata/md5-cache/dev-python/cliapp-1.20140315
@@ -4,11 +4,11 @@ DESCRIPTION=Framework for Unix-like command line programs
 EAPI=5
 HOMEPAGE=http://liw.fi/cliapp/
 IUSE=test python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://code.liw.fi/debian/pool/main/p/python-cliapp/python-cliapp_1.20140315.orig.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=e84d0e6e7f12e7f32fb6e4cbf0fe2273
+_md5_=1324180d84409a3d88211ddc5ea49807
diff --git a/metadata/md5-cache/dev-python/graph-tool-2.2.36-r1 b/metadata/md5-cache/dev-python/graph-tool-2.2.36-r1
new file mode 100644
index 000000000000..15bdbdf87907
--- /dev/null
+++ b/metadata/md5-cache/dev-python/graph-tool-2.2.36-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare pretend setup
+DEPEND=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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-libs/boost-1.54.0[python,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-libs/expat dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=sci-mathematics/cgal-3.5 cairo? ( dev-cpp/cairomm dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) dev-cpp/sparsehash virtual/pkgconfig
+DESCRIPTION=An efficient python module for manipulation and statistical analysis of graphs
+EAPI=5
+HOMEPAGE=http://graph-tool.skewed.de/
+IUSE=+cairo openmp python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-libs/boost-1.54.0[python,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-libs/expat dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=sci-mathematics/cgal-3.5 cairo? ( dev-cpp/cairomm dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+SLOT=0
+SRC_URI=http://downloads.skewed.de/graph-tool/graph-tool-2.2.36.tar.bz2
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=99ba145159c25bf5310a5170adbd65ee
diff --git a/metadata/md5-cache/dev-python/graph-tool-9999 b/metadata/md5-cache/dev-python/graph-tool-9999
index 2c17527cd750..dddfdf4947e5 100644
--- a/metadata/md5-cache/dev-python/graph-tool-9999
+++ b/metadata/md5-cache/dev-python/graph-tool-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-3
 RDEPEND=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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-libs/boost-1.54.0[python,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-libs/expat dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=sci-mathematics/cgal-3.5 cairo? ( dev-cpp/cairomm dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 SLOT=0
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	998e5931fb95b10a6a11ec796ada2759	git-r3	6ebae45064cb04482f3c702632dd9528	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=e0d36b9762131090a055c68f42d11639
+_md5_=14d007d0c632c1a9aaf08df3590769f0
diff --git a/metadata/md5-cache/dev-python/pycurl-7.19.3.1-r2 b/metadata/md5-cache/dev-python/pycurl-7.19.3.1-r2
index 4b0816be44bd..cced898655e0 100644
--- a/metadata/md5-cache/dev-python/pycurl-7.19.3.1-r2
+++ b/metadata/md5-cache/dev-python/pycurl-7.19.3.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=python binding for curl/libcurl
 EAPI=5
 HOMEPAGE=https://github.com/pycurl/pycurl http://pypi.python.org/pypi/pycurl
 IUSE=curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=>=net-misc/curl-7.25.0-r1[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 ) ) 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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=http://pycurl.sourceforge.net/download/pycurl-7.19.3.1.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=3ba0a13fb7ce62c83617d239882fccef
+_md5_=bed52067684bae4df59b45246327c87f
diff --git a/metadata/md5-cache/dev-python/setproctitle-1.1.3 b/metadata/md5-cache/dev-python/setproctitle-1.1.3
deleted file mode 100644
index 5894998a7a67..000000000000
--- a/metadata/md5-cache/dev-python/setproctitle-1.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-lang/python test? ( dev-python/nose )
-DESCRIPTION=Allow customization of the process title
-EAPI=3
-HOMEPAGE=http://code.google.com/p/py-setproctitle/ http://pypi.python.org/pypi/setproctitle
-IUSE=test
-KEYWORDS=amd64 ~arm ~sparc x86
-LICENSE=BSD
-RDEPEND=dev-lang/python
-SLOT=0
-SRC_URI=mirror://pypi/s/setproctitle/setproctitle-1.1.3.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=13a7930538a6a0506c7785c6aff9c991
diff --git a/metadata/md5-cache/dev-python/setproctitle-1.1.6 b/metadata/md5-cache/dev-python/setproctitle-1.1.6
deleted file mode 100644
index 69f72526d3da..000000000000
--- a/metadata/md5-cache/dev-python/setproctitle-1.1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-lang/python test? ( dev-python/nose )
-DESCRIPTION=Allow customization of the process title
-EAPI=3
-HOMEPAGE=http://code.google.com/p/py-setproctitle/ http://pypi.python.org/pypi/setproctitle
-IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-lang/python
-SLOT=0
-SRC_URI=mirror://pypi/s/setproctitle/setproctitle-1.1.6.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=6956688a9adce5479b2234d2cfa93958
diff --git a/metadata/md5-cache/dev-python/setproctitle-1.1.6-r1 b/metadata/md5-cache/dev-python/setproctitle-1.1.6-r1
deleted file mode 100644
index 6cf36e1ace2f..000000000000
--- a/metadata/md5-cache/dev-python/setproctitle-1.1.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/nose[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(-)]
-DESCRIPTION=Allow customization of the process title
-EAPI=5
-HOMEPAGE=http://code.google.com/p/py-setproctitle/ http://pypi.python.org/pypi/setproctitle
-IUSE=test python_targets_python2_7 python_targets_python3_3
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=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/s/setproctitle/setproctitle-1.1.6.tar.gz
-_eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=637cf5ee85bb36d642473ac95058c580
diff --git a/metadata/md5-cache/dev-python/setproctitle-1.1.7 b/metadata/md5-cache/dev-python/setproctitle-1.1.7
deleted file mode 100644
index 4e25f4392467..000000000000
--- a/metadata/md5-cache/dev-python/setproctitle-1.1.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/nose[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(-)]
-DESCRIPTION=Allow customization of the process title
-EAPI=5
-HOMEPAGE=http://code.google.com/p/py-setproctitle/ http://pypi.python.org/pypi/setproctitle
-IUSE=test python_targets_python2_7 python_targets_python3_3
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=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/s/setproctitle/setproctitle-1.1.7.tar.gz
-_eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=0cb6ad2cd0e995ad429947faa074953b
diff --git a/metadata/md5-cache/dev-python/tempita-0.4 b/metadata/md5-cache/dev-python/tempita-0.4
deleted file mode 100644
index 37cf8c305f03..000000000000
--- a/metadata/md5-cache/dev-python/tempita-0.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-python/setuptools =dev-lang/python-2* test? ( dev-python/nose )
-DESCRIPTION=A very small text templating language
-EAPI=3
-HOMEPAGE=http://pythonpaste.org/tempita http://pypi.python.org/pypi/Tempita
-IUSE=test
-KEYWORDS=~x86 ~amd64
-LICENSE=MIT
-RDEPEND=dev-python/setuptools =dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://pypi/T/Tempita/Tempita-0.4.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=3fc5b66a613c018436c93df562597345
diff --git a/metadata/md5-cache/dev-python/tempita-0.5.1 b/metadata/md5-cache/dev-python/tempita-0.5.1
deleted file mode 100644
index 2d70eed8355a..000000000000
--- a/metadata/md5-cache/dev-python/tempita-0.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-python/setuptools =dev-lang/python-2* test? ( dev-python/nose )
-DESCRIPTION=A very small text templating language
-EAPI=3
-HOMEPAGE=http://pythonpaste.org/tempita http://pypi.python.org/pypi/Tempita
-IUSE=test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/setuptools =dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://pypi/T/Tempita/Tempita-0.5.1.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=49376792a71c2e2f7af8a6365fcf4b2f
diff --git a/metadata/md5-cache/dev-python/tempita-0.5.2_pre20130828 b/metadata/md5-cache/dev-python/tempita-0.5.2_pre20130828
deleted file mode 100644
index bf112041f651..000000000000
--- a/metadata/md5-cache/dev-python/tempita-0.5.2_pre20130828
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
-DESCRIPTION=A very small text templating language
-EAPI=5
-HOMEPAGE=http://pythonpaste.org/tempita http://pypi.python.org/pypi/Tempita https://github.com/gjhiggins/tempita
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_pypy
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_pypy )
-SLOT=0
-SRC_URI=https://github.com/gjhiggins/tempita/archive/abe6a7282d363fa9136199dcaf04b2c0d501d4e6.tar.gz -> tempita-abe6a7282d363fa9136199dcaf04b2c0d501d4e6.tar.gz
-_eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=7c7012aae1bc6e7ece929bb7479e174a
diff --git a/metadata/md5-cache/dev-python/timelib-0.2.2 b/metadata/md5-cache/dev-python/timelib-0.2.2
deleted file mode 100644
index d8fde4041ea5..000000000000
--- a/metadata/md5-cache/dev-python/timelib-0.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-python/setuptools dev-lang/python
-DESCRIPTION=parse english textual date descriptions
-EAPI=3
-HOMEPAGE=http://pypi.python.org/pypi/timelib
-KEYWORDS=~amd64 ~x86
-LICENSE=ZLIB PHP-3.01
-RDEPEND=dev-lang/python
-SLOT=0
-SRC_URI=mirror://pypi/t/timelib/timelib-0.2.2.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=30de2fd5ca5c168aa1e5523531b4f268
diff --git a/metadata/md5-cache/dev-python/timelib-0.2.3 b/metadata/md5-cache/dev-python/timelib-0.2.3
deleted file mode 100644
index cffc6227042b..000000000000
--- a/metadata/md5-cache/dev-python/timelib-0.2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=app-arch/unzip dev-python/setuptools dev-lang/python
-DESCRIPTION=parse english textual date descriptions
-EAPI=3
-HOMEPAGE=http://pypi.python.org/pypi/timelib
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01 ZLIB
-RDEPEND=dev-lang/python
-SLOT=0
-SRC_URI=mirror://pypi/t/timelib/timelib-0.2.3.zip
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=1bf7aa1e1958f77e5bb43374f5bd468f
diff --git a/metadata/md5-cache/dev-python/timelib-0.2.4 b/metadata/md5-cache/dev-python/timelib-0.2.4
deleted file mode 100644
index 519a1422ff06..000000000000
--- a/metadata/md5-cache/dev-python/timelib-0.2.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=app-arch/unzip dev-python/setuptools dev-lang/python
-DESCRIPTION=parse english textual date descriptions
-EAPI=3
-HOMEPAGE=http://pypi.python.org/pypi/timelib
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01 ZLIB
-RDEPEND=dev-lang/python
-SLOT=0
-SRC_URI=mirror://pypi/t/timelib/timelib-0.2.4.zip
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=5fc19a81b28778613776697b36093c91
diff --git a/metadata/md5-cache/dev-python/transmissionrpc-0.10 b/metadata/md5-cache/dev-python/transmissionrpc-0.10
deleted file mode 100644
index 51c0a79c478d..000000000000
--- a/metadata/md5-cache/dev-python/transmissionrpc-0.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/six-1.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
-DESCRIPTION=Python module that implements the Transmission bittorrent client RPC protocol
-EAPI=5
-HOMEPAGE=https://bitbucket.org/blueluna/transmissionrpc
-IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_pypy
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/six-1.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_pypy )
-SLOT=0
-SRC_URI=mirror://pypi/t/transmissionrpc/transmissionrpc-0.10.tar.gz https://bitbucket.org/blueluna/transmissionrpc/src/release-0.10/test/data/ubuntu-12.04.2-alternate-amd64.iso.torrent
-_eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=8515333535fd83c58787b01ffd92d04f
diff --git a/metadata/md5-cache/dev-python/transmissionrpc-0.8 b/metadata/md5-cache/dev-python/transmissionrpc-0.8
deleted file mode 100644
index beded46d3cd5..000000000000
--- a/metadata/md5-cache/dev-python/transmissionrpc-0.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=dev-python/setuptools || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-DESCRIPTION=Python module that implements the Transmission bittorrent client RPC protocol
-EAPI=4
-HOMEPAGE=https://bitbucket.org/blueluna/transmissionrpc
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=mirror://pypi/t/transmissionrpc/transmissionrpc-0.8.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=052fce89e2ad200ebf4a464f51a2d5d4
diff --git a/metadata/md5-cache/dev-python/transmissionrpc-0.9 b/metadata/md5-cache/dev-python/transmissionrpc-0.9
deleted file mode 100644
index 3c8b85881ec2..000000000000
--- a/metadata/md5-cache/dev-python/transmissionrpc-0.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] 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=Python module that implements the Transmission bittorrent client RPC protocol
-EAPI=5
-HOMEPAGE=https://bitbucket.org/blueluna/transmissionrpc
-IUSE=python_targets_python2_7 python_targets_pypy
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/t/transmissionrpc/transmissionrpc-0.9.tar.gz
-_eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=36f373dddfbb4bbcdab15308e36743ee
diff --git a/metadata/md5-cache/dev-python/ttystatus-0.22 b/metadata/md5-cache/dev-python/ttystatus-0.22
index 49c6f389e776..bd3945f2c98e 100644
--- a/metadata/md5-cache/dev-python/ttystatus-0.22
+++ b/metadata/md5-cache/dev-python/ttystatus-0.22
@@ -4,11 +4,11 @@ DESCRIPTION=Terminal progress bar and status output for command line
 EAPI=5
 HOMEPAGE=http://liw.fi/ttystatus/
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_0.22.orig.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=bbcc20912a20f6a8863261a649f8a919
+_md5_=6f71ff56364e4462304f437541f5c2d2
diff --git a/metadata/md5-cache/dev-python/ttystatus-0.23 b/metadata/md5-cache/dev-python/ttystatus-0.23
index 67c4a40518fa..77841ed389a8 100644
--- a/metadata/md5-cache/dev-python/ttystatus-0.23
+++ b/metadata/md5-cache/dev-python/ttystatus-0.23
@@ -4,11 +4,11 @@ DESCRIPTION=Terminal progress bar and status output for command line
 EAPI=5
 HOMEPAGE=http://liw.fi/ttystatus/
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_0.23.orig.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=dbc5e24704cca59ac7aa6f5ed26f1224
+_md5_=976f087d3ca02a17cc7b9acab1bf3246
diff --git a/metadata/md5-cache/dev-ruby/msgpack-0.5.10 b/metadata/md5-cache/dev-ruby/msgpack-0.5.10
new file mode 100644
index 000000000000..e9fc7614eaf9
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/msgpack-0.5.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DESCRIPTION=Binary-based efficient data interchange format for ruby binding
+EAPI=5
+HOMEPAGE=http://msgpack.sourceforge.jp/
+IUSE=doc elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+SLOT=0
+SRC_URI=mirror://rubygems/msgpack-0.5.10.gem
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=b874e2223b5dc916e5c6933b89b5abe9
diff --git a/metadata/md5-cache/dev-util/cmdtest-0.10 b/metadata/md5-cache/dev-util/cmdtest-0.10
index 95e804c6944c..771d49f7f05a 100644
--- a/metadata/md5-cache/dev-util/cmdtest-0.10
+++ b/metadata/md5-cache/dev-util/cmdtest-0.10
@@ -4,11 +4,11 @@ DESCRIPTION=black box tests Unix command line tools
 EAPI=5
 HOMEPAGE=http://liw.fi/cmdtest/
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://code.liw.fi/debian/pool/main/c/cmdtest/cmdtest_0.10.orig.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=96ee2e2f0c2e88ecb2e1e1cbadbe705a
+_md5_=b06eb63bbb699ef9b3fc46118026131d
diff --git a/metadata/md5-cache/dev-util/cmdtest-0.6 b/metadata/md5-cache/dev-util/cmdtest-0.6
index 59fb32d2f609..b23c32d8f643 100644
--- a/metadata/md5-cache/dev-util/cmdtest-0.6
+++ b/metadata/md5-cache/dev-util/cmdtest-0.6
@@ -4,11 +4,11 @@ DESCRIPTION=black box tests Unix command line tools
 EAPI=5
 HOMEPAGE=http://liw.fi/cmdtest/
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://code.liw.fi/debian/pool/main/c/cmdtest/cmdtest_0.6.orig.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=19af20da983520136cefe4b1baa96463
+_md5_=cf5d823388dd1bf7d38ad9b5648bd44d
diff --git a/metadata/md5-cache/games-engines/openxcom-1.0.0 b/metadata/md5-cache/games-engines/openxcom-1.0.0
index b35b95d7551b..dd01c5f755d9 100644
--- a/metadata/md5-cache/games-engines/openxcom-1.0.0
+++ b/metadata/md5-cache/games-engines/openxcom-1.0.0
@@ -10,4 +10,4 @@ RDEPEND=>=dev-cpp/yaml-cpp-0.5.1 media-libs/libsdl[opengl,video] media-libs/sdl-
 SLOT=0
 SRC_URI=https://github.com/SupSuper/OpenXcom/archive/v1.0.tar.gz -> openxcom-1.0.0.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	games	bc8839608d26ccd57ca4f2f01c67460f	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=49cf9b74279e1cbb7b37b7b23db45f72
+_md5_=bd668f6613cb74aa90c1b56c7ba3ade2
diff --git a/metadata/md5-cache/games-roguelike/angband-3.5.1 b/metadata/md5-cache/games-roguelike/angband-3.5.1
new file mode 100644
index 000000000000..83321de3a66c
--- /dev/null
+++ b/metadata/md5-cache/games-roguelike/angband-3.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=X? ( x11-libs/libX11 ) !ncurses? ( !X? ( !sdl? ( sys-libs/ncurses ) ) ) ncurses? ( sys-libs/ncurses ) sdl? ( media-libs/libsdl[video,X] media-libs/sdl-ttf media-libs/sdl-image sound? ( media-libs/sdl-mixer[mp3] media-libs/libsdl[sound] ) ) virtual/pkgconfig
+DESCRIPTION=A roguelike dungeon exploration game based on the books of J.R.R. Tolkien
+EAPI=5
+HOMEPAGE=http://rephial.org/
+IUSE=ncurses sdl +sound X
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=X? ( x11-libs/libX11 ) !ncurses? ( !X? ( !sdl? ( sys-libs/ncurses ) ) ) ncurses? ( sys-libs/ncurses ) sdl? ( media-libs/libsdl[video,X] media-libs/sdl-ttf media-libs/sdl-image sound? ( media-libs/sdl-mixer[mp3] media-libs/libsdl[sound] ) ) games-misc/games-envd
+SLOT=0
+SRC_URI=http://rephial.org/downloads/3.5/angband-v3.5.1.tar.gz
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=ef78b2352a168ca9091e8c9d5fac12af
diff --git a/metadata/md5-cache/games-roguelike/zangband-2.7.4c b/metadata/md5-cache/games-roguelike/zangband-2.7.4c
index 78aed77fbe94..a1239e9e4efa 100644
--- a/metadata/md5-cache/games-roguelike/zangband-2.7.4c
+++ b/metadata/md5-cache/games-roguelike/zangband-2.7.4c
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=tk? ( dev-lang/tcl dev-lang/tk ) x11-libs/libXaw x11-proto/xextproto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=An enhanced version of the Roguelike game Angband
-EAPI=2
+EAPI=5
 HOMEPAGE=http://www.zangband.org/
 IUSE=tk
 KEYWORDS=~amd64 ppc x86 ~x86-fbsd
@@ -10,4 +10,4 @@ RDEPEND=tk? ( dev-lang/tcl dev-lang/tk ) x11-libs/libXaw games-misc/games-envd
 SLOT=0
 SRC_URI=ftp://ftp.sunet.se/pub/games/Angband/Variant/ZAngband/zangband-2.7.4c.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=d857d3ed982a17d9a6946918df7ad0a4
+_md5_=6c9f511e8e85a35f2a5ff4bacd7bc19c
diff --git a/metadata/md5-cache/gnome-base/dconf-0.22.0 b/metadata/md5-cache/gnome-base/dconf-0.22.0
index 0a4d476235a4..d8ec1c13728b 100644
--- a/metadata/md5-cache/gnome-base/dconf-0.22.0
+++ b/metadata/md5-cache/gnome-base/dconf-0.22.0
@@ -4,10 +4,10 @@ DESCRIPTION=Simple low-level configuration system
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/dconf
 IUSE=test +X test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.39.1:2 sys-apps/dbus X? ( >=dev-libs/libxml2-2.7.7:2 >=x11-libs/gtk+-3.4:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/dconf/0.22/dconf-0.22.0.tar.xz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	29582087e5f16ca16b1c6815c2ae2b65	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3de5bc713cc418500856c37a2a4c524c
+_md5_=35de64ac0a56b634ce8cf5d8c1665314
diff --git a/metadata/md5-cache/kde-base/kwalletd-4.14.3-r1 b/metadata/md5-cache/kde-base/kwalletd-4.14.3-r1
index e6b13682891c..d9288c3394a6 100644
--- a/metadata/md5-cache/kde-base/kwalletd-4.14.3-r1
+++ b/metadata/md5-cache/kde-base/kwalletd-4.14.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=KDE Password Server
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug gpg aqua
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=gpg? ( app-crypt/gpgme >=kde-base/kdepimlibs-4.14.3:4[aqua=] ) || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.14.3:4[aqua=] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
 RESTRICT=test
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/kde-runtime-4.14.3.tar.xz
 _eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	492237eb2823bdc02bc769530501f0ea	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3415df1e5e0878833d1621f21aca8b73
+_md5_=a5696dd26716e4f7ff96b7be4bd84952
diff --git a/metadata/md5-cache/kde-misc/kio-mtp-0.75_p20141221 b/metadata/md5-cache/kde-misc/kio-mtp-0.75_p20141221
new file mode 100644
index 000000000000..5e07686d2ee9
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/kio-mtp-0.75_p20141221
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=media-libs/libmtp-1.1.3 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
+DESCRIPTION=MTP KIO-Client for KDE
+EAPI=5
+HOMEPAGE=https://projects.kde.org/projects/playground/base/kio-mtp
+IUSE=debug aqua
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=media-libs/libmtp-1.1.3 || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.4:4[aqua=] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
+SLOT=4
+SRC_URI=http://quickgit.kde.org/?p=kio-mtp.git&a=snapshot&h=c418634e4216279fcedfa5cc14f20bda7672b609&fmt=tgz -> kio-mtp-0.75_p20141221.tar.gz
+_eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	492237eb2823bdc02bc769530501f0ea	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=44c35e9c2eab43b338b19a90f4001469
diff --git a/metadata/md5-cache/mail-mta/postfix-2.11.1 b/metadata/md5-cache/mail-mta/postfix-2.11.1
deleted file mode 100644
index b1175d86d8f9..000000000000
--- a/metadata/md5-cache/mail-mta/postfix-2.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) ssl? ( dev-libs/openssl ) virtual/pkgconfig
-DESCRIPTION=A fast and secure drop-in replacement for sendmail
-EAPI=5
-HOMEPAGE=http://www.postfix.org/
-IUSE=+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=IBM
-RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
-REQUIRED_USE=ldap-bind? ( ldap sasl )
-SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.11.1.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v13-2.10.0.patch )
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=de1de2758944ad1e1fecbbf2bf0dbdc4
diff --git a/metadata/md5-cache/mail-mta/postfix-2.11.1-r1 b/metadata/md5-cache/mail-mta/postfix-2.11.1-r1
deleted file mode 100644
index 7cb768b2f858..000000000000
--- a/metadata/md5-cache/mail-mta/postfix-2.11.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) ssl? ( dev-libs/openssl ) virtual/pkgconfig
-DESCRIPTION=A fast and secure drop-in replacement for sendmail
-EAPI=5
-HOMEPAGE=http://www.postfix.org/
-IUSE=+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=IBM
-RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
-REQUIRED_USE=ldap-bind? ( ldap sasl )
-SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.11.1.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v13-2.10.0.patch )
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2b2c078d7ebed92dba13de430e1d1756
diff --git a/metadata/md5-cache/mail-mta/postfix-2.11.2 b/metadata/md5-cache/mail-mta/postfix-2.11.2
deleted file mode 100644
index 7844a171da9e..000000000000
--- a/metadata/md5-cache/mail-mta/postfix-2.11.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) ssl? ( dev-libs/openssl ) virtual/pkgconfig
-DESCRIPTION=A fast and secure drop-in replacement for sendmail
-EAPI=5
-HOMEPAGE=http://www.postfix.org/
-IUSE=+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=IBM
-RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
-REQUIRED_USE=ldap-bind? ( ldap sasl )
-SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.11.2.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v13-2.10.0.patch )
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a761ec94ea970fd944b08d475d574c75
diff --git a/metadata/md5-cache/mail-mta/postfix-2.12_pre20141228 b/metadata/md5-cache/mail-mta/postfix-2.12_pre20150120
similarity index 95%
rename from metadata/md5-cache/mail-mta/postfix-2.12_pre20141228
rename to metadata/md5-cache/mail-mta/postfix-2.12_pre20150120
index 60a6ef26dc05..80fc8a9e4ec8 100644
--- a/metadata/md5-cache/mail-mta/postfix-2.12_pre20141228
+++ b/metadata/md5-cache/mail-mta/postfix-2.12_pre20150120
@@ -9,6 +9,6 @@ LICENSE=IBM
 RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) eai? ( dev-libs/icu ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
 REQUIRED_USE=ldap-bind? ( ldap sasl ) !vda
 SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-2.12-20141228.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v13-2.10.0.patch )
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-2.12-20150120.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v13-2.10.0.patch )
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=41bec502867d45b2fdab53ab09b4ea01
+_md5_=a63a36319bdba4112a054841d292708b
diff --git a/metadata/md5-cache/media-gfx/exiv2-0.24-r1 b/metadata/md5-cache/media-gfx/exiv2-0.24-r1
index e0065c144c60..f502d9423551 100644
--- a/metadata/md5-cache/media-gfx/exiv2-0.24-r1
+++ b/metadata/md5-cache/media-gfx/exiv2-0.24-r1
@@ -4,10 +4,10 @@ DESCRIPTION=EXIF and IPTC metadata C++ library and command line utility
 EAPI=5
 HOMEPAGE=http://www.exiv2.org/
 IUSE=contrib doc examples nls xmp zlib static-libs linguas_de linguas_es linguas_fi linguas_fr linguas_pl linguas_ru linguas_sk abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xmp? ( >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/13
 SRC_URI=http://www.exiv2.org/exiv2-0.24.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=794b93b57639a4cbbca437ef8d32719f
+_md5_=6d736f44a14136ae581ea44a881d38ec
diff --git a/metadata/md5-cache/media-libs/schroedinger-1.0.11-r1 b/metadata/md5-cache/media-libs/schroedinger-1.0.11-r1
index a1700f8ca017..0d8509e0a9c9 100644
--- a/metadata/md5-cache/media-libs/schroedinger-1.0.11-r1
+++ b/metadata/md5-cache/media-libs/schroedinger-1.0.11-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig dev-util/gtk-doc-am !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig dev-util/gtk-doc-am !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
 DESCRIPTION=C-based libraries for the Dirac video codec
 EAPI=5
 HOMEPAGE=http://www.diracvideo.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2 MIT MPL-1.1
 RDEPEND=>=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=http://www.diracvideo.org/download/schroedinger/schroedinger-1.0.11.tar.gz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=66b560bdd2ed99146824454b4525f46e
+_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=4ef14a8c8abee4fab990988296844a9e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vaapi-0.5.9-r1 b/metadata/md5-cache/media-plugins/gst-plugins-vaapi-0.5.9-r1
new file mode 100644
index 000000000000..d61609d95dc0
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vaapi-0.5.9-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libvpx[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.2.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.2.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libva-1.2.1-r1[X?,opengl?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland? ( >=dev-libs/wayland-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/gtk-doc-am-1.12 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Hardware accelerated video decoding through VA-API plugin
+EAPI=5
+HOMEPAGE=http://gitorious.org/vaapi/gstreamer-vaapi
+IUSE=+X opengl wayland abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libvpx[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.2.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.2.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libva-1.2.1-r1[X?,opengl?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland? ( >=dev-libs/wayland-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=1.0
+SRC_URI=http://www.freedesktop.org/software/vaapi/releases/gstreamer-vaapi/gstreamer-vaapi-0.5.9.tar.bz2
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=f0bd19ce3b0f165e4dd9a004761bd708
diff --git a/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r1 b/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r1
index 476ca8d62d91..951f9e291239 100644
--- a/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r1
+++ b/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
+DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
 DEPEND=media-video/vdr >=dev-libs/tntnet-2.2.1[ssl=] >=dev-libs/cxxtools-2.2.1 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers ssl? ( dev-libs/openssl )
 DESCRIPTION=VDR Plugin: Web Access To Settings
 EAPI=5
@@ -10,4 +10,4 @@ RDEPEND=media-video/vdr >=dev-libs/tntnet-2.2.1[ssl=] >=dev-libs/cxxtools-2.2.1
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-live-0.3.0_p20130504.tar.bz2 http://dev.gentoo.org/~hd_brummy/distfiles/vdr-live-0.3.0_p20130504.tar.bz2
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ssl-cert	b53367370fde96e19beca78050a47c61	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52	vdr-plugin-2	abe06aa01a351d441519a8a4bcde9b43
-_md5_=b87f3bad3fdc8937b3ecedc9a32d6555
+_md5_=c367c1c8f59ee88e71747dceacecbb4b
diff --git a/metadata/md5-cache/net-proxy/squid-3.5.1 b/metadata/md5-cache/net-proxy/squid-3.5.1
index f92f4369bfe3..d5dc5ec97266 100644
--- a/metadata/md5-cache/net-proxy/squid-3.5.1
+++ b/metadata/md5-cache/net-proxy/squid-3.5.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst prepare pretend setup
-DEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl dev-libs/nettle net-libs/gnutls ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl sys-devel/libtool ecap? ( virtual/pkgconfig ) sys-apps/ed test? ( dev-util/cppunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl dev-libs/nettle >=net-libs/gnutls-3.1.5 ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl sys-devel/libtool ecap? ( virtual/pkgconfig ) sys-apps/ed test? ( dev-util/cppunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A full-featured web proxy cache
 EAPI=5
 HOMEPAGE=http://www.squid-cache.org/
 IUSE=caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap esi ssl-crtd mysql postgres sqlite qos tproxy +htcp +wccp +wccpv2 pf-transparent ipf-transparent kqueue elibc_uclibc kernel_linux
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl dev-libs/nettle net-libs/gnutls ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl sys-devel/libtool samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) selinux? ( sec-policy/selinux-squid ) sqlite? ( dev-perl/DBD-SQLite ) !<=sci-biology/meme-4.8.1-r1
+RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl dev-libs/nettle >=net-libs/gnutls-3.1.5 ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl sys-devel/libtool samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) selinux? ( sec-policy/selinux-squid ) sqlite? ( dev-perl/DBD-SQLite ) !<=sci-biology/meme-4.8.1-r1
 REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.1.tar.xz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=deda1c60cc05062353ed912b7e001623
+_md5_=4ac2bea4d5608ce5ad5c317a5c6463e7
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.7.6 b/metadata/md5-cache/net-wireless/gnuradio-3.7.6
index c60afcd1f5c6..64f06a9c0cef 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-3.7.6
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.7.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-lang/orc-0.4.12 dev-libs/boost:0=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-util/cppunit-1.9.14 sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) ctrlport? ( dev-libs/Ice[python,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( >=dev-python/PyQt4-4.4[X,opengl,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pyqwt-5.2:5[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-qt/qtcore-4.4:4 >=dev-qt/qtgui-4.4:4 x11-libs/qwt:6 ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.4.3-r1:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) vocoder? ( media-sound/gsm ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/wxpython:2.8[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) zeromq? ( >=net-libs/zeromq-2.1.11 net-libs/cppzmq ) dev-lang/swig dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-lang/orc-0.4.12 dev-libs/boost:0=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-util/cppunit-1.9.14 sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) ctrlport? ( dev-libs/Ice[python,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( >=dev-python/PyQt4-4.4[X,opengl,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pyqwt-5.2:5[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-qt/qtcore-4.4:4 >=dev-qt/qtgui-4.4:4 x11-libs/qwt:6 ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.4.3-r1:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) vocoder? ( media-sound/gsm ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/wxpython:2.8[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) zeromq? ( >=net-libs/zeromq-2.1.11 net-libs/cppzmq ) dev-lang/swig dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4
 DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
 EAPI=5
 HOMEPAGE=http://gnuradio.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_pyt
 REQUIRED_USE=python_targets_python2_7 audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) oss? ( audio ) jack? ( audio ) portaudio? ( audio ) analog? ( filter ) digital? ( filter analog ) pager? ( filter analog ) qt4? ( filter ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) wxwidgets? ( filter analog )
 SLOT=0/3.7.6
 SRC_URI=http://s3-dist.gnuradio.org/gnuradio-3.7.6.tar.gz
-_eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=13449bfa4e78cee1cca5b68b589f74ff
+_eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=cd4ccb262d21baaf347912c6071301e3
diff --git a/metadata/md5-cache/net-wireless/gnuradio-9999 b/metadata/md5-cache/net-wireless/gnuradio-9999
index 3f85931f3a90..ea09c72cb653 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-9999
+++ b/metadata/md5-cache/net-wireless/gnuradio-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-lang/orc-0.4.12 dev-libs/boost:0=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-util/cppunit-1.9.14 sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) ctrlport? ( dev-libs/Ice[python,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( >=dev-python/PyQt4-4.4[X,opengl,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pyqwt-5.2:5[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-qt/qtcore-4.4:4 >=dev-qt/qtgui-4.4:4 x11-libs/qwt:6 ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.4.3-r1:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) vocoder? ( media-sound/gsm ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/wxpython:2.8[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) zeromq? ( >=net-libs/zeromq-2.1.11 net-libs/cppzmq ) dev-lang/swig dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=dev-vcs/git-1.8.2.1
+DEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-lang/orc-0.4.12 dev-libs/boost:0=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-util/cppunit-1.9.14 sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) ctrlport? ( dev-libs/Ice[python,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( >=dev-python/PyQt4-4.4[X,opengl,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pyqwt-5.2:5[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-qt/qtcore-4.4:4 >=dev-qt/qtgui-4.4:4 x11-libs/qwt:6 ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.4.3-r1:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) vocoder? ( media-sound/gsm ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/wxpython:2.8[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) zeromq? ( >=net-libs/zeromq-2.1.11 net-libs/cppzmq ) dev-lang/swig dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
 EAPI=5
 HOMEPAGE=http://gnuradio.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-lang/orc-0.4.12 dev-libs/boost:0=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-util/cppunit-1.9.14 sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) ctrlport? ( dev-libs/Ice[python,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( >=dev-python/PyQt4-4.4[X,opengl,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pyqwt-5.2:5[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-qt/qtcore-4.4:4 >=dev-qt/qtgui-4.4:4 x11-libs/qwt:6 ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.4.3-r1:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) vocoder? ( media-sound/gsm ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/wxpython:2.8[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) zeromq? ( >=net-libs/zeromq-2.1.11 net-libs/cppzmq )
 REQUIRED_USE=python_targets_python2_7 audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) oss? ( audio ) jack? ( audio ) portaudio? ( audio ) analog? ( filter ) digital? ( filter analog ) pager? ( filter analog ) qt4? ( filter ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) wxwidgets? ( filter analog )
 SLOT=0/9999
-_eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-r3	6ebae45064cb04482f3c702632dd9528	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=7a496e36e23288bcfa6a6d777f6d22b3
+_eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-r3	6ebae45064cb04482f3c702632dd9528	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=c45c64e907764002a753c4141936fffa
diff --git a/metadata/md5-cache/net-wireless/uhd-3.8.0 b/metadata/md5-cache/net-wireless/uhd-3.8.0
index 40c4a360e06c..72ba0ec69af9 100644
--- a/metadata/md5-cache/net-wireless/uhd-3.8.0
+++ b/metadata/md5-cache/net-wireless/uhd-3.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/libusb:1 dev-lang/orc dev-libs/boost:= sys-libs/ncurses dev-python/cheetah app-arch/unzip sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEPEND=virtual/libusb:1 dev-lang/orc dev-libs/boost:= sys-libs/ncurses dev-python/cheetah app-arch/unzip >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=Universal Software Radio Peripheral (USRP) Hardware Driver
 EAPI=5
 HOMEPAGE=http://code.ettus.com/redmine/ettus/projects/uhd/wiki
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=virtual/libusb:1 dev-lang/orc dev-libs/boost:= sys-libs/ncurses
 SLOT=0/1
 SRC_URI=https://github.com/EttusResearch/uhd/archive/release_003_008_000.tar.gz -> EttusResearch-UHD-3.8.0.tar.gz http://files.ettus.com/binaries/images/uhd-images_003.008.000-release.zip
-_eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=799a1d9460ede5a65cc2ae66182b9575
+_eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=fe29f2fe57d71bd890d1e72d26608b02
diff --git a/metadata/md5-cache/sci-astronomy/stellarium-0.13.2 b/metadata/md5-cache/sci-astronomy/stellarium-0.13.2
new file mode 100644
index 000000000000..d8255a17f282
--- /dev/null
+++ b/metadata/md5-cache/sci-astronomy/stellarium-0.13.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=media-fonts/dejavu dev-qt/qtcore:5 dev-qt/qtquick1:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtscript:5 virtual/opengl sound? ( dev-qt/qtmultimedia:5[widgets] ) dev-qt/qtconcurrent:5 nls? ( dev-qt/linguist-tools:5 ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4
+DESCRIPTION=3D photo-realistic skies in real time
+EAPI=5
+HOMEPAGE=http://www.stellarium.org/
+IUSE=debug nls sound stars linguas_af linguas_ak linguas_am linguas_ar linguas_as linguas_ast linguas_az linguas_be linguas_bg linguas_bn linguas_bo linguas_br linguas_bs linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en linguas_en_CA linguas_en_GB linguas_en_US linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fil linguas_fr linguas_ga linguas_gd linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_kn linguas_ko linguas_ky linguas_la linguas_lb linguas_lo linguas_lt linguas_lv linguas_mk linguas_ml linguas_mn linguas_mr linguas_ms linguas_mt linguas_nan linguas_nb linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_si linguas_sk linguas_sl linguas_sq linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_tg linguas_th linguas_tl linguas_tr linguas_tt linguas_uk linguas_uz linguas_vi linguas_zh linguas_zh_CN linguas_zh_HK linguas_zh_TW linguas_zu
+LICENSE=GPL-2
+RDEPEND=media-fonts/dejavu dev-qt/qtcore:5 dev-qt/qtquick1:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtscript:5 virtual/opengl sound? ( dev-qt/qtmultimedia:5[widgets] )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/stellarium/stellarium-0.13.2.tar.gz stars? ( mirror://sourceforge/stellarium/stars_4_1v0_0.cat mirror://sourceforge/stellarium/stars_5_2v0_0.cat mirror://sourceforge/stellarium/stars_6_2v0_0.cat mirror://sourceforge/stellarium/stars_7_2v0_0.cat mirror://sourceforge/stellarium/stars_8_2v0_0.cat )
+_eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=e36e71b43a0e31e6bd7a6e6a26da99e4
diff --git a/metadata/md5-cache/sys-apps/grep-2.21-r1 b/metadata/md5-cache/sys-apps/grep-2.21-r1
index ab09c9ed6478..989fff8de82f 100644
--- a/metadata/md5-cache/sys-apps/grep-2.21-r1
+++ b/metadata/md5-cache/sys-apps/grep-2.21-r1
@@ -4,10 +4,10 @@ DESCRIPTION=GNU regular expression matcher
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/grep/
 IUSE=nls pcre static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!static? ( pcre? ( >=dev-libs/libpcre-7.8-r1 ) ) nls? ( virtual/libintl ) virtual/libiconv
 SLOT=0
 SRC_URI=mirror://gnu/grep/grep-2.21.tar.xz mirror://gentoo/grep-2.21.tar.xz http://dev.gentoo.org/~polynomial-c/grep-2.21-heap_buffer_overrun.patch
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=dbbbdb1b098218da38aaa21e026c6bb3
+_md5_=6560ed976e8d3366abc0c1d7504d2832
diff --git a/metadata/md5-cache/sys-devel/clang-3.5.1-r100 b/metadata/md5-cache/sys-devel/clang-3.5.1-r100
new file mode 100644
index 000000000000..9c1107c88376
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-3.5.1-r100
@@ -0,0 +1,11 @@
+DEFINED_PHASES=postinst postrm
+DESCRIPTION=C language family frontend for LLVM (meta-ebuild)
+EAPI=5
+HOMEPAGE=http://clang.llvm.org/
+IUSE=debug multitarget python +static-analyzer abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=UoI-NCSA
+RDEPEND=~sys-devel/llvm-3.5.1[clang(-),debug=,multitarget?,python?,static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0/3.5
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=f139d14993a398df2253b70772440304
diff --git a/metadata/md5-cache/sys-devel/dragonegg-3.5.1 b/metadata/md5-cache/sys-devel/dragonegg-3.5.1
new file mode 100644
index 000000000000..52f6745fcf2b
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/dragonegg-3.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst test
+DEPEND=>=sys-devel/gcc-4.5 =sys-devel/llvm-3.5.1*
+DESCRIPTION=GCC plugin that uses LLVM for optimization and code generation
+EAPI=5
+HOMEPAGE=http://dragonegg.llvm.org/
+IUSE=test
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=>=sys-devel/gcc-4.5 =sys-devel/llvm-3.5.1*
+SLOT=0
+SRC_URI=http://llvm.org/releases/3.5.1/dragonegg-3.5.1.src.tar.xz test? ( http://llvm.org/releases/3.5.1/llvm-3.5.1.src.tar.xz )
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=fdeaa5e119f00e269d730f8eafc38d07
diff --git a/metadata/md5-cache/sys-devel/llvm-3.5.1 b/metadata/md5-cache/sys-devel/llvm-3.5.1
new file mode 100644
index 000000000000..451ac7181611
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-3.5.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=sys-libs/zlib:0= clang? ( python? ( 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(-)] ) static-analyzer? ( dev-lang/perl:* 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(-)] ) xml? ( dev-libs/libxml2:2= ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:5=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( dev-lang/ocaml:0= ) app-arch/xz-utils dev-lang/perl >=sys-devel/make-3.81 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 ) clang? ( xml? ( virtual/pkgconfig ) ) doc? ( dev-python/sphinx ) libffi? ( virtual/pkgconfig ) !!<dev-python/configparser-3.3.0.2 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=Low Level Virtual Machine
+EAPI=5
+HOMEPAGE=http://llvm.org/
+IUSE=clang debug doc gold libedit +libffi multitarget ncurses ocaml python +static-analyzer test xml video_cards_radeon kernel_Darwin kernel_FreeBSD abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7 python_targets_pypy
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=UoI-NCSA
+PDEPEND=clang? ( =sys-devel/clang-3.5.1-r100 )
+RDEPEND=sys-libs/zlib:0= clang? ( python? ( 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(-)] ) static-analyzer? ( dev-lang/perl:* 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(-)] ) xml? ( dev-libs/libxml2:2= ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:5=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( dev-lang/ocaml:0= ) clang? ( !<=sys-devel/clang-3.5.1-r99 !>=sys-devel/clang-9999 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy ) test? ( || ( python_targets_python2_7 ) )
+SLOT=0/3.5
+SRC_URI=http://llvm.org/releases/3.5.1/llvm-3.5.1.src.tar.xz clang? ( http://llvm.org/releases/3.5.1/compiler-rt-3.5.1.src.tar.xz http://llvm.org/releases/3.5.1/cfe-3.5.1.src.tar.xz http://llvm.org/releases/3.5.1/clang-tools-extra-3.5.1.src.tar.xz ) !doc? ( http://dev.gentoo.org/~voyageur/distfiles/llvm-3.5.0-manpages.tar.bz2 )
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=fee38f9dd3cd8503ee56d335d7d34783
diff --git a/metadata/md5-cache/sys-devel/patch-2.5.9 b/metadata/md5-cache/sys-devel/patch-2.5.9
deleted file mode 100644
index 41a4dd8d1f1f..000000000000
--- a/metadata/md5-cache/sys-devel/patch-2.5.9
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Utility to apply diffs to files
-HOMEPAGE=http://www.gnu.org/software/patch/patch.html
-IUSE=static
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/patch-2.5.9.tar.gz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=9ff115dc2e56fbf64911df83f0257cc8
diff --git a/metadata/md5-cache/sys-devel/patch-2.5.9-r1 b/metadata/md5-cache/sys-devel/patch-2.5.9-r1
deleted file mode 100644
index 04267b6d5d8a..000000000000
--- a/metadata/md5-cache/sys-devel/patch-2.5.9-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Utility to apply diffs to files
-HOMEPAGE=http://www.gnu.org/software/patch/patch.html
-IUSE=static
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/patch-2.5.9.tar.gz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=4992f567ceb60789f55812e9ad885456
diff --git a/metadata/md5-cache/sys-devel/patch-2.7.1-r2 b/metadata/md5-cache/sys-devel/patch-2.7.2
similarity index 86%
rename from metadata/md5-cache/sys-devel/patch-2.7.1-r2
rename to metadata/md5-cache/sys-devel/patch-2.7.2
index 914a06f6993a..4e58d453a5fe 100644
--- a/metadata/md5-cache/sys-devel/patch-2.7.1-r2
+++ b/metadata/md5-cache/sys-devel/patch-2.7.2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure prepare
+DEFINED_PHASES=configure
 DEPEND=xattr? ( sys-apps/attr ) test? ( sys-apps/ed )
 DESCRIPTION=Utility to apply diffs to files
 EAPI=4
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=GPL-2
 RDEPEND=xattr? ( sys-apps/attr )
 SLOT=0
-SRC_URI=mirror://gnu/patch/patch-2.7.1.tar.xz
+SRC_URI=mirror://gnu/patch/patch-2.7.2.tar.xz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=e2d0581f59ed6196a4e6ec456d85f490
+_md5_=b3cd1d449f4a59304a6b51a7b039c71a
diff --git a/metadata/md5-cache/sys-libs/readline-6.3_p8-r2 b/metadata/md5-cache/sys-libs/readline-6.3_p8-r2
new file mode 100644
index 000000000000..200fbd94ecd4
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/readline-6.3_p8-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
+DEPEND=>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r7 ) virtual/pkgconfig
+DESCRIPTION=Another cute console display library
+EAPI=4
+HOMEPAGE=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r7 )
+SLOT=0
+SRC_URI=mirror://gnu/readline/readline-6.3.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-001 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-002 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-003 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-004 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-005 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-006 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-007 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-008 mirror://gnu/readline/readline-6.3-patches/readline63-001 mirror://gnu/readline/readline-6.3-patches/readline63-002 mirror://gnu/readline/readline-6.3-patches/readline63-003 mirror://gnu/readline/readline-6.3-patches/readline63-004 mirror://gnu/readline/readline-6.3-patches/readline63-005 mirror://gnu/readline/readline-6.3-patches/readline63-006 mirror://gnu/readline/readline-6.3-patches/readline63-007 mirror://gnu/readline/readline-6.3-patches/readline63-008
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=6fb85c9ebaae36cd6ee74e55376b964f
diff --git a/metadata/md5-cache/x11-wm/windowmaker-0.92.0-r11 b/metadata/md5-cache/x11-wm/windowmaker-0.92.0-r11
index 7aeaa0c05c30..40a118a06052 100644
--- a/metadata/md5-cache/x11-wm/windowmaker-0.92.0-r11
+++ b/metadata/md5-cache/x11-wm/windowmaker-0.92.0-r11
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXpm x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=The fast and light GNUstep window manager
 EAPI=3
 HOMEPAGE=http://www.windowmaker.info/
 IUSE=gif jpeg nls png tiff modelock +vdesktop xinerama
 KEYWORDS=alpha amd64 hppa ~mips ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) nls? ( >=sys-devel/gettext-0.10.39 )
+RDEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXpm x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) nls? ( >=sys-devel/gettext-0.10.39 )
 SLOT=0
 SRC_URI=ftp://ftp.windowmaker.info/pub/source/release/WindowMaker-0.92.0.tar.gz http://www.windowmaker.info/pub/source/release/WindowMaker-extra-0.1.tar.gz mirror://gentoo/windowmaker-0.92.0-patchset-5.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=6c682d776e6e7e5941a9e9a341c70092
+_md5_=773d641d16f452f709303dd2d5fd8c67
diff --git a/metadata/md5-cache/x11-wm/windowmaker-0.95.3-r1 b/metadata/md5-cache/x11-wm/windowmaker-0.95.3-r1
deleted file mode 100644
index 7ad37ca46003..000000000000
--- a/metadata/md5-cache/x11-wm/windowmaker-0.95.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The fast and light GNUstep window manager
-EAPI=4
-HOMEPAGE=http://www.windowmaker.org/
-IUSE=gif jpeg nls png tiff modelock xinerama xrandr
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) nls? ( >=sys-devel/gettext-0.10.39 )
-SLOT=0
-SRC_URI=http://windowmaker.org/pub/source/release/WindowMaker-0.95.3.tar.gz http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=f9e6c40588ada6845493a911d07b0651
diff --git a/metadata/md5-cache/x11-wm/windowmaker-0.95.4 b/metadata/md5-cache/x11-wm/windowmaker-0.95.4
deleted file mode 100644
index b5079209c122..000000000000
--- a/metadata/md5-cache/x11-wm/windowmaker-0.95.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The fast and light GNUstep window manager
-EAPI=4
-HOMEPAGE=http://www.windowmaker.org/
-IUSE=gif jpeg nls png tiff modelock xinerama xrandr
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) nls? ( >=sys-devel/gettext-0.10.39 )
-SLOT=0
-SRC_URI=http://windowmaker.org/pub/source/release/WindowMaker-0.95.4.tar.gz http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=edecfab644ed4d95459cf1b4b1794cc3
diff --git a/metadata/md5-cache/x11-wm/windowmaker-0.95.4-r1 b/metadata/md5-cache/x11-wm/windowmaker-0.95.4-r1
deleted file mode 100644
index cf086509af3e..000000000000
--- a/metadata/md5-cache/x11-wm/windowmaker-0.95.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0= ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The fast and light GNUstep window manager
-EAPI=5
-HOMEPAGE=http://www.windowmaker.org/
-IUSE=gif jpeg nls png tiff modelock xinerama xrandr
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0= ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) nls? ( >=sys-devel/gettext-0.10.39 )
-SLOT=0
-SRC_URI=http://windowmaker.org/pub/source/release/WindowMaker-0.95.4.tar.gz http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=7d7c5117a4ea9af7ec773c7e4fc1291e
diff --git a/metadata/md5-cache/x11-wm/windowmaker-0.95.5 b/metadata/md5-cache/x11-wm/windowmaker-0.95.5
deleted file mode 100644
index 7a3002729c6c..000000000000
--- a/metadata/md5-cache/x11-wm/windowmaker-0.95.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0= ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The fast and light GNUstep window manager
-EAPI=5
-HOMEPAGE=http://www.windowmaker.org/
-IUSE=gif jpeg nls png tiff modelock xinerama xrandr
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0= ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) nls? ( >=sys-devel/gettext-0.10.39 )
-SLOT=0
-SRC_URI=http://windowmaker.org/pub/source/release/WindowMaker-0.95.5.tar.gz http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=0f71b4c273c9921470e3e34d40d8bdb1
diff --git a/metadata/md5-cache/x11-wm/windowmaker-0.95.5-r1 b/metadata/md5-cache/x11-wm/windowmaker-0.95.5-r1
index 8c397616a797..ec1bcb9c5c2e 100644
--- a/metadata/md5-cache/x11-wm/windowmaker-0.95.5-r1
+++ b/metadata/md5-cache/x11-wm/windowmaker-0.95.5-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0= ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXpm x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0= ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=The fast and light GNUstep window manager
 EAPI=5
 HOMEPAGE=http://www.windowmaker.org/
 IUSE=gif jpeg nls png tiff modelock xinerama xrandr
 KEYWORDS=alpha amd64 ~arm hppa ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0= ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) nls? ( >=sys-devel/gettext-0.10.39 )
+RDEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXpm x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0= ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) nls? ( >=sys-devel/gettext-0.10.39 )
 SLOT=0
 SRC_URI=http://windowmaker.org/pub/source/release/WindowMaker-0.95.5.tar.gz http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=8ededfaaba2be9daa826e099761ce36a
+_md5_=67c4eb24043973669e216f0bc0e2c510
diff --git a/metadata/md5-cache/x11-wm/windowmaker-0.95.6 b/metadata/md5-cache/x11-wm/windowmaker-0.95.6
index bc8c9610d3c5..82bc419addd4 100644
--- a/metadata/md5-cache/x11-wm/windowmaker-0.95.6
+++ b/metadata/md5-cache/x11-wm/windowmaker-0.95.6
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) imagemagick? ( media-gfx/imagemagick ) jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) webp? ( media-libs/libwebp ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXpm x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) imagemagick? ( media-gfx/imagemagick ) jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) webp? ( media-libs/libwebp ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=The fast and light GNUstep window manager
 EAPI=5
 HOMEPAGE=http://www.windowmaker.org/
-IUSE=gif imagemagick jpeg modelock nls png tiff webp xinerama xrandr
+IUSE=gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) imagemagick? ( media-gfx/imagemagick ) jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) webp? ( media-libs/libwebp ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) nls? ( >=sys-devel/gettext-0.10.39 )
+RDEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXpm x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) imagemagick? ( media-gfx/imagemagick ) jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) webp? ( media-libs/libwebp ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) nls? ( >=sys-devel/gettext-0.10.39 )
 SLOT=0
 SRC_URI=http://windowmaker.org/pub/source/release/WindowMaker-0.95.6.tar.gz http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=607d8229d04670cd51cd8d5c20260f64
+_md5_=29264dc82c825995ed72baf70ea3eb60
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index eefe56d03354..43763194f490 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 21 Jan 2015 05:36:56 +0000
+Wed, 21 Jan 2015 17:36:54 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 67b5eb851cc8..20e0963fa8d9 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Jan 21 05:36:53 UTC 2015
+Wed Jan 21 17:36:51 UTC 2015
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index c3928d06092a..64e1f14e9a95 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -199,6 +199,7 @@
 1402060344 ./sci-astronomy/kapteyn/kapteyn-2.2-r1.ebuild
 1311262118 ./sci-astronomy/erfa/erfa-1.0.1.ebuild
 1405281947 ./sci-astronomy/erfa/erfa-1.1.0.ebuild
+1501211838 ./sci-astronomy/stellarium/stellarium-0.13.2.ebuild
 1312241643 ./sci-astronomy/stellarium/stellarium-0.12.4.ebuild
 1410251142 ./sci-astronomy/stellarium/stellarium-0.13.1.ebuild
 1404261231 ./app-cdr/gcdemu/gcdemu-2.1.1.ebuild
@@ -819,7 +820,7 @@
 1405081201 ./kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.12.5.ebuild
 1412111631 ./kde-base/kwalletd/kwalletd-4.14.3.ebuild
 1405081201 ./kde-base/kwalletd/kwalletd-4.12.5.ebuild
-1501210007 ./kde-base/kwalletd/kwalletd-4.14.3-r1.ebuild
+1501211331 ./kde-base/kwalletd/kwalletd-4.14.3-r1.ebuild
 1412111631 ./kde-base/konquest/konquest-4.14.3.ebuild
 1405081201 ./kde-base/konquest/konquest-4.12.5.ebuild
 1412111631 ./kde-base/marble/marble-4.14.3.ebuild
@@ -1031,9 +1032,9 @@
 1202290231 ./dev-db/vbisam/vbisam-2.0.ebuild
 1501071923 ./dev-db/phpmyadmin/phpmyadmin-4.0.10.8.ebuild
 1412261231 ./dev-db/phpmyadmin/phpmyadmin-4.1.14.7.ebuild
-1501170031 ./dev-db/phpmyadmin/phpmyadmin-4.2.13.1.ebuild
+1501211401 ./dev-db/phpmyadmin/phpmyadmin-4.2.13.1.ebuild
 1501060101 ./dev-db/phpmyadmin/phpmyadmin-4.3.5.ebuild
-1501170031 ./dev-db/phpmyadmin/phpmyadmin-4.1.14.8.ebuild
+1501211401 ./dev-db/phpmyadmin/phpmyadmin-4.1.14.8.ebuild
 1412261231 ./dev-db/phpmyadmin/phpmyadmin-4.2.13.ebuild
 1302192231 ./dev-db/xbase/xbase-3.1.2.ebuild
 1401280101 ./dev-db/SchemaSync/SchemaSync-0.9.2.ebuild
@@ -2014,7 +2015,7 @@
 1304261426 ./media-libs/faac/faac-1.28-r3.ebuild
 1205051202 ./media-libs/schroedinger/schroedinger-1.0.8.ebuild
 1306251654 ./media-libs/schroedinger/schroedinger-1.0.11.ebuild
-1408072331 ./media-libs/schroedinger/schroedinger-1.0.11-r1.ebuild
+1501211501 ./media-libs/schroedinger/schroedinger-1.0.11-r1.ebuild
 1205051202 ./media-libs/schroedinger/schroedinger-1.0.10-r1.ebuild
 1205051202 ./media-libs/schroedinger/schroedinger-1.0.10.ebuild
 1211072303 ./media-libs/libexif/libexif-0.6.21.ebuild
@@ -3453,13 +3454,12 @@
 1212051705 ./app-shells/pdmenu/pdmenu-1.3.2-r1.ebuild
 1211241831 ./app-shells/scsh-install-lib/scsh-install-lib-1.3.0.ebuild
 1410200031 ./app-shells/bash/bash-2.05b_p13.ebuild
-1411092341 ./app-shells/bash/bash-4.3_p30-r1.ebuild
 1410081031 ./app-shells/bash/bash-4.2_p53.ebuild
 1410200931 ./app-shells/bash/bash-3.0_p22.ebuild
 1410200031 ./app-shells/bash/bash-3.2_p57.ebuild
 1410200101 ./app-shells/bash/bash-3.1_p23.ebuild
+1501211454 ./app-shells/bash/bash-4.3_p33-r1.ebuild
 1501011027 ./app-shells/bash/bash-4.3_p33.ebuild
-1410200931 ./app-shells/bash/bash-4.3_p30.ebuild
 1410081031 ./app-shells/bash/bash-4.1_p17.ebuild
 1410200031 ./app-shells/bash/bash-4.0_p44.ebuild
 1409290614 ./app-shells/ksh/ksh-93.20140625.ebuild
@@ -6456,8 +6456,8 @@
 1411100101 ./app-doc/NaturalDocs/NaturalDocs-1.52-r1.ebuild
 1408020131 ./app-doc/doxygen/doxygen-1.8.3.1.ebuild
 1412241801 ./app-doc/doxygen/doxygen-1.8.5.ebuild
-1308110031 ./app-doc/doxygen/doxygen-1.7.6.1.ebuild
 1408020131 ./app-doc/doxygen/doxygen-1.8.4-r2.ebuild
+1501211825 ./app-doc/doxygen/doxygen-1.8.9.1.ebuild
 1412261331 ./app-doc/doxygen/doxygen-1.8.8.ebuild
 1103091016 ./app-doc/linux-gazette-base/linux-gazette-base-182.ebuild
 1501151731 ./app-doc/selfhtml/selfhtml-8.1.2.ebuild
@@ -6800,7 +6800,7 @@
 1407171101 ./games-engines/love/love-9999.ebuild
 1501071231 ./games-engines/love/love-0.8.0.ebuild
 1407171101 ./games-engines/love/love-0.7.2-r1.ebuild
-1501210801 ./games-engines/openxcom/openxcom-1.0.0.ebuild
+1501210901 ./games-engines/openxcom/openxcom-1.0.0.ebuild
 1304201331 ./app-admin/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.1.1.ebuild
 1309101831 ./app-admin/newsyslog/newsyslog-1.1.ebuild
 1307092231 ./app-admin/apachetop/apachetop-0.12.6-r1.ebuild
@@ -7035,7 +7035,7 @@
 1408182358 ./app-admin/389-ds-console/389-ds-console-1.2.6-r1.ebuild
 1408261401 ./app-admin/killproc/killproc-2.13-r1.ebuild
 1408011501 ./app-admin/killproc/killproc-2.13.ebuild
-1501040301 ./app-admin/eselect-opengl/eselect-opengl-1.3.1-r1.ebuild
+1501211132 ./app-admin/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild
 1412100701 ./app-admin/eselect-opengl/eselect-opengl-1.2.7.ebuild
 1408040901 ./app-admin/eselect-package-manager/eselect-package-manager-20110108.ebuild
 0712192131 ./app-admin/grubconfig/grubconfig-1.26.ebuild
@@ -7161,7 +7161,7 @@
 1303181350 ./app-admin/bcfg2/bcfg2-1.2.3-r1.ebuild
 1412150815 ./app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild
 1304211156 ./app-admin/bcfg2/bcfg2-1.2.4.ebuild
-1412292031 ./app-admin/logrotate/logrotate-3.8.8.ebuild
+1501211631 ./app-admin/logrotate/logrotate-3.8.8.ebuild
 1411021101 ./app-admin/logrotate/logrotate-3.8.7.ebuild
 1301251531 ./app-admin/eselect-lcdfilter/eselect-lcdfilter-1.ebuild
 1403171231 ./app-admin/eselect-lcdfilter/eselect-lcdfilter-2.ebuild
@@ -10287,6 +10287,7 @@
 1208161801 ./app-misc/pwsafe/pwsafe-0.2.0-r2.ebuild
 1501091701 ./app-misc/wcd/wcd-5.2.5.ebuild
 1312241701 ./app-misc/wcd/wcd-5.2.4.ebuild
+1501211121 ./app-misc/wcd/wcd-5.2.6.ebuild
 1308281531 ./app-misc/pdfpc/pdfpc-3.1.1.ebuild
 1301141126 ./app-misc/realpath/realpath-1.18.ebuild
 1301012331 ./app-misc/realpath/realpath-1.17.ebuild
@@ -11292,8 +11293,8 @@
 1408110101 ./dev-libs/libdivecomputer/libdivecomputer-0.4.1.ebuild
 1408291301 ./dev-libs/libdivecomputer/libdivecomputer-9999.ebuild
 1205042301 ./dev-libs/d0_blind_id/d0_blind_id-0.5.ebuild
-1407231931 ./dev-libs/folks/folks-0.9.7.1.ebuild
 1412191701 ./dev-libs/folks/folks-0.10.0.ebuild
+1501211313 ./dev-libs/folks/folks-0.10.1.ebuild
 1408110101 ./dev-libs/iniparser/iniparser-3.1.ebuild
 1410111631 ./dev-libs/iniparser/iniparser-3.1-r1.ebuild
 1205180331 ./dev-libs/libmowgli/libmowgli-9999.ebuild
@@ -11536,10 +11537,8 @@
 1209200301 ./dev-libs/libaio/libaio-0.3.109-r2.ebuild
 1004061319 ./dev-libs/libaio/libaio-0.3.107.ebuild
 1211300131 ./dev-libs/libx86emu/libx86emu-1.1.ebuild
-1412150137 ./dev-libs/glib/glib-2.42.1.ebuild
+1501211301 ./dev-libs/glib/glib-2.42.1.ebuild
 1304301831 ./dev-libs/glib/glib-1.2.10-r5.ebuild
-1410270501 ./dev-libs/glib/glib-2.40.0-r1.ebuild
-1407171931 ./dev-libs/glib/glib-2.38.2-r1.ebuild
 1501021531 ./dev-libs/glib/glib-2.40.2.ebuild
 1408110101 ./dev-libs/mpc/mpc-1.0.1.ebuild
 1408110101 ./dev-libs/mpc/mpc-1.0.2.ebuild
@@ -11691,6 +11690,7 @@
 1408110101 ./dev-libs/libmcrypt/libmcrypt-2.5.8-r3.ebuild
 1408110101 ./dev-libs/libmcrypt/libmcrypt-2.5.8-r2.ebuild
 1412191701 ./dev-libs/libgweather/libgweather-3.12.3.ebuild
+1501211317 ./dev-libs/libgweather/libgweather-3.14.3.ebuild
 1412222110 ./dev-libs/libgweather/libgweather-3.14.2.ebuild
 1403151426 ./dev-libs/userspace-rcu/userspace-rcu-0.8.4.ebuild
 1403151426 ./dev-libs/userspace-rcu/userspace-rcu-0.7.12.ebuild
@@ -12612,7 +12612,7 @@
 1412191701 ./gnome-base/gnome-extra-apps/gnome-extra-apps-3.12.0-r1.ebuild
 1410111631 ./gnome-base/libgnomeprintui/libgnomeprintui-2.18.6-r1.ebuild
 1410111601 ./gnome-base/dconf/dconf-0.20.0.ebuild
-1412230016 ./gnome-base/dconf/dconf-0.22.0.ebuild
+1501211101 ./gnome-base/dconf/dconf-0.22.0.ebuild
 1412270501 ./gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.3.ebuild
 1412270501 ./gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.2.ebuild
 1402230201 ./gnome-base/libgnomekbd/libgnomekbd-3.6.0.ebuild
@@ -13511,6 +13511,7 @@
 1412191701 ./sys-libs/libosinfo/libosinfo-0.2.11.ebuild
 1407232001 ./sys-libs/libosinfo/libosinfo-0.2.10.ebuild
 1001050354 ./sys-libs/readline/readline-5.2_p14.ebuild
+1501211450 ./sys-libs/readline/readline-6.3_p8-r2.ebuild
 1412291101 ./sys-libs/readline/readline-6.3_p8-r1.ebuild
 1410270501 ./sys-libs/readline/readline-6.2_p5-r1.ebuild
 0910040338 ./sys-libs/readline/readline-4.3_p5.ebuild
@@ -13922,7 +13923,8 @@
 1403191801 ./dev-python/pyzor/pyzor-0.5.0-r2.ebuild
 1408201701 ./dev-python/pyzor/pyzor-0.7.0.ebuild
 1007272049 ./dev-python/pyzor/pyzor-0.5.0-r1.ebuild
-1501171731 ./dev-python/graph-tool/graph-tool-9999.ebuild
+1501212001 ./dev-python/graph-tool/graph-tool-9999.ebuild
+1501211937 ./dev-python/graph-tool/graph-tool-2.2.36-r1.ebuild
 1501171731 ./dev-python/graph-tool/graph-tool-2.2.36.ebuild
 1411110512 ./dev-python/python-keystoneclient/python-keystoneclient-0.11.2.ebuild
 1409220126 ./dev-python/python-keystoneclient/python-keystoneclient-0.11.0.ebuild
@@ -14009,9 +14011,6 @@
 1411281301 ./dev-python/aplpy/aplpy-0.9.14.ebuild
 1404010131 ./dev-python/tempita/tempita-0.5.1-r1.ebuild
 1406061731 ./dev-python/tempita/tempita-0.5.3.ebuild
-1404010131 ./dev-python/tempita/tempita-0.5.2_pre20130828.ebuild
-1302242201 ./dev-python/tempita/tempita-0.5.1.ebuild
-1012261846 ./dev-python/tempita/tempita-0.4.ebuild
 1412011839 ./dev-python/python-ptrace/python-ptrace-0.8.1-r1.ebuild
 1304031108 ./dev-python/traitsui/traitsui-4.3.0.ebuild
 1202221931 ./dev-python/traitsui/traitsui-4.1.0.ebuild
@@ -14053,8 +14052,8 @@
 1404142319 ./dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-0.1.1-r1.ebuild
 1404010031 ./dev-python/oauth/oauth-1.0.1-r1.ebuild
 1306291849 ./dev-python/oauth/oauth-1.0.1.ebuild
-1501201201 ./dev-python/cliapp/cliapp-1.20140315.ebuild
-1501201201 ./dev-python/cliapp/cliapp-1.20130808.ebuild
+1501211331 ./dev-python/cliapp/cliapp-1.20140315.ebuild
+1501211331 ./dev-python/cliapp/cliapp-1.20130808.ebuild
 1411241801 ./dev-python/cement/cement-2.0.2.ebuild
 1501181225 ./dev-python/git-python/git-python-0.3.5.ebuild
 1501121016 ./dev-python/git-python/git-python-0.3.4.ebuild
@@ -14297,7 +14296,7 @@
 1411251401 ./dev-python/python-social-auth/python-social-auth-0.1.26.ebuild
 1410232001 ./dev-python/pycurl/pycurl-7.19.0.ebuild
 1407050042 ./dev-python/pycurl/pycurl-7.19.0-r4.ebuild
-1412272231 ./dev-python/pycurl/pycurl-7.19.3.1-r2.ebuild
+1501211631 ./dev-python/pycurl/pycurl-7.19.3.1-r2.ebuild
 1407301831 ./dev-python/Djblets/Djblets-0.7.30.ebuild
 1409211223 ./dev-python/Djblets/Djblets-0.7.31.ebuild
 1311231359 ./dev-python/cliff-tablib/cliff-tablib-1.1.ebuild
@@ -14591,9 +14590,6 @@
 1105281752 ./dev-python/mechanize/mechanize-0.2.5.ebuild
 1412210531 ./dev-python/requests-mock/requests-mock-0.5.1.ebuild
 1411251601 ./dev-python/timelib/timelib-0.2.4-r1.ebuild
-1202201901 ./dev-python/timelib/timelib-0.2.2.ebuild
-1202201901 ./dev-python/timelib/timelib-0.2.3.ebuild
-1210091707 ./dev-python/timelib/timelib-0.2.4.ebuild
 1403040401 ./dev-python/stomper/stomper-0.2.7.ebuild
 1410151618 ./dev-python/stomper/stomper-0.3.0.ebuild
 1410151631 ./dev-python/stomper/stomper-0.2.8.ebuild
@@ -14914,8 +14910,8 @@
 1212082001 ./dev-python/egenix-mx-base/egenix-mx-base-3.2.4.ebuild
 1411251331 ./dev-python/pygpgme/pygpgme-0.3-r1.ebuild
 1412071701 ./dev-python/jdcal/jdcal-1.0.ebuild
-1501201201 ./dev-python/ttystatus/ttystatus-0.23.ebuild
-1501201201 ./dev-python/ttystatus/ttystatus-0.22.ebuild
+1501211331 ./dev-python/ttystatus/ttystatus-0.23.ebuild
+1501211331 ./dev-python/ttystatus/ttystatus-0.22.ebuild
 1307060501 ./dev-python/pyenchant/pyenchant-1.6.5.ebuild
 1307060501 ./dev-python/pyenchant/pyenchant-1.6.5-r1.ebuild
 1501021531 ./dev-python/pyenchant/pyenchant-1.6.6.ebuild
@@ -14923,8 +14919,8 @@
 1412041201 ./dev-python/serpent/serpent-1.7.ebuild
 1407270532 ./dev-python/flask-whooshalchemy/flask-whooshalchemy-0.56.ebuild
 1309111325 ./dev-python/flask-whooshalchemy/flask-whooshalchemy-0.55a.ebuild
-1501201201 ./dev-python/CoverageTestRunner/CoverageTestRunner-1.10.ebuild
-1501201201 ./dev-python/CoverageTestRunner/CoverageTestRunner-1.9-r1.ebuild
+1501211331 ./dev-python/CoverageTestRunner/CoverageTestRunner-1.10.ebuild
+1501211331 ./dev-python/CoverageTestRunner/CoverageTestRunner-1.9-r1.ebuild
 1412222127 ./dev-python/pyatspi/pyatspi-2.14.0.ebuild
 1411241301 ./dev-python/pyatspi/pyatspi-2.12.0.ebuild
 1407011431 ./dev-python/yolk-portage/yolk-portage-0.1-r1.ebuild
@@ -15421,10 +15417,7 @@
 1412111231 ./dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild
 1410251001 ./dev-python/pycrypto/pycrypto-2.6.1.ebuild
 1411281601 ./dev-python/transmissionrpc/transmissionrpc-0.11.ebuild
-1110180647 ./dev-python/transmissionrpc/transmissionrpc-0.8.ebuild
 1411281601 ./dev-python/transmissionrpc/transmissionrpc-9999.ebuild
-1404010131 ./dev-python/transmissionrpc/transmissionrpc-0.9.ebuild
-1404010131 ./dev-python/transmissionrpc/transmissionrpc-0.10.ebuild
 1312020407 ./dev-python/larch/larch-1.20131130.ebuild
 1308091912 ./dev-python/larch/larch-1.20130808.ebuild
 1501160701 ./dev-python/flask-uploads/flask-uploads-0.1.3.ebuild
@@ -15650,11 +15643,7 @@
 1404010131 ./dev-python/doit/doit-0.20.0.ebuild
 1411242031 ./dev-python/doit/doit-0.23.0-r1.ebuild
 1501040819 ./dev-python/pyml/pyml-0.7.13.2-r1.ebuild
-1408110131 ./dev-python/setproctitle/setproctitle-1.1.6-r1.ebuild
-1408110131 ./dev-python/setproctitle/setproctitle-1.1.3.ebuild
 1411241331 ./dev-python/setproctitle/setproctitle-1.1.8.ebuild
-1408110131 ./dev-python/setproctitle/setproctitle-1.1.6.ebuild
-1408110131 ./dev-python/setproctitle/setproctitle-1.1.7.ebuild
 1404220801 ./dev-python/python-saharaclient/python-saharaclient-0.7.0.ebuild
 1410111601 ./dev-python/libwnck-python/libwnck-python-2.32.0-r1.ebuild
 1411242001 ./dev-python/diff-match-patch/diff-match-patch-20121119.ebuild
@@ -15971,7 +15960,7 @@
 1501010431 ./dev-python/cython/cython-0.21.1.ebuild
 1412281331 ./dev-python/chameleon/chameleon-2.16.ebuild
 1501111113 ./dev-python/chameleon/chameleon-2.19.ebuild
-1412071134 ./dev-python/chameleon/chameleon-2.18.ebuild
+1501211210 ./dev-python/chameleon/chameleon-2.20.ebuild
 1402111023 ./dev-python/pykit/pykit-0.1.0.ebuild
 1409020731 ./dev-python/pykit/pykit-0.2.0.ebuild
 1112270917 ./dev-python/python-musicbrainz/python-musicbrainz-0.7.4.ebuild
@@ -16437,6 +16426,7 @@
 1301040329 ./sys-devel/llvm/llvm-3.0-r2.ebuild
 1306110226 ./sys-devel/llvm/llvm-2.9-r2.ebuild
 1301040329 ./sys-devel/llvm/llvm-3.1-r2.ebuild
+1501211801 ./sys-devel/llvm/llvm-3.5.1.ebuild
 1501020001 ./sys-devel/llvm/llvm-3.5.0.ebuild
 1309052308 ./sys-devel/llvm/llvm-3.2.ebuild
 1501112331 ./sys-devel/llvm/llvm-3.4.2.ebuild
@@ -16463,9 +16453,7 @@
 1207230037 ./sys-devel/prelink/prelink-20111012.ebuild
 1305112033 ./sys-devel/prelink/prelink-20120628.ebuild
 1401180717 ./sys-devel/patch/patch-2.7.1-r3.ebuild
-0803181534 ./sys-devel/patch/patch-2.5.9-r1.ebuild
-1102061437 ./sys-devel/patch/patch-2.5.9.ebuild
-1401180717 ./sys-devel/patch/patch-2.7.1-r2.ebuild
+1501211032 ./sys-devel/patch/patch-2.7.2.ebuild
 1401180717 ./sys-devel/patch/patch-2.6.1.ebuild
 1412291231 ./sys-devel/native-cctools/native-cctools-2.ebuild
 1412291231 ./sys-devel/native-cctools/native-cctools-1.ebuild
@@ -16496,6 +16484,7 @@
 1408281301 ./sys-devel/bmake/bmake-20140214.ebuild
 1304191328 ./sys-devel/bmake/bmake-20130330.ebuild
 1208090023 ./sys-devel/ac-archive/ac-archive-2007.0205.ebuild
+1501211226 ./sys-devel/dragonegg/dragonegg-3.5.1.ebuild
 1409180331 ./sys-devel/dragonegg/dragonegg-9999.ebuild
 1409180313 ./sys-devel/dragonegg/dragonegg-3.5.0.ebuild
 1411231901 ./sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
@@ -16518,6 +16507,7 @@
 1501080026 ./sys-devel/automake/automake-1.15.ebuild
 1411150930 ./sys-devel/automake/automake-1.10.3-r1.ebuild
 1404010120 ./sys-devel/clang/clang-9999.ebuild
+1501211226 ./sys-devel/clang/clang-3.5.1-r100.ebuild
 1501020001 ./sys-devel/clang/clang-3.5.0-r100.ebuild
 1310280425 ./sys-devel/clang/clang-9999-r100.ebuild
 1301040336 ./sys-devel/clang/clang-2.9-r1.ebuild
@@ -16804,8 +16794,8 @@
 1310132036 ./net-wireless/irda-utils/irda-utils-0.9.18-r4.ebuild
 1304191751 ./net-wireless/lorcon-old/lorcon-old-9999.ebuild
 1501081737 ./net-wireless/gnuradio/gnuradio-3.7.5.2.ebuild
-1501081801 ./net-wireless/gnuradio/gnuradio-9999.ebuild
-1501081737 ./net-wireless/gnuradio/gnuradio-3.7.6.ebuild
+1501211601 ./net-wireless/gnuradio/gnuradio-9999.ebuild
+1501211601 ./net-wireless/gnuradio/gnuradio-3.7.6.ebuild
 1408150501 ./net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
 1212161749 ./net-wireless/orinoco-fwutils/orinoco-fwutils-0.3.ebuild
 1207062331 ./net-wireless/orinoco-fwutils/orinoco-fwutils-0.1.ebuild
@@ -16840,7 +16830,7 @@
 1501182331 ./net-wireless/iw/iw-3.17.ebuild
 1401310446 ./net-wireless/iw/iw-3.13.ebuild
 1309012140 ./net-wireless/iw/iw-3.10-r1.ebuild
-1411031831 ./net-wireless/uhd/uhd-3.8.0.ebuild
+1501211531 ./net-wireless/uhd/uhd-3.8.0.ebuild
 1408222042 ./net-wireless/uhd/uhd-3.7.2.ebuild
 1408301601 ./net-wireless/chillispot/chillispot-1.1.0.ebuild
 1408110101 ./net-wireless/madwimax/madwimax-0.1.1-r1.ebuild
@@ -17138,7 +17128,7 @@
 1501020743 ./media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.4.5.ebuild
 1410111731 ./media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.2.4-r1.ebuild
 1409151231 ./media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-0.10.31-r1.ebuild
-1401240904 ./media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild
+1501211631 ./media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild
 1401081720 ./media-plugins/vdr-live/vdr-live-0.2.0.ebuild
 1401021735 ./media-plugins/vdr-rssreader/vdr-rssreader-2.0.0.ebuild
 1501190028 ./media-plugins/vdr-rssreader/vdr-rssreader-2.0.1.ebuild
@@ -17278,6 +17268,7 @@
 1408311301 ./media-plugins/vdr-epgsync/vdr-epgsync-1.0.1.ebuild
 1407261331 ./media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.5.8-r1.ebuild
 1501131527 ./media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.5.9.ebuild
+1501211205 ./media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.5.9-r1.ebuild
 1408311301 ./media-plugins/vdr-remotetimers/vdr-remotetimers-1.0.0.ebuild
 1412270401 ./media-plugins/vdr-remotetimers/vdr-remotetimers-1.0.1.ebuild
 1410111731 ./media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4.ebuild
@@ -18766,8 +18757,7 @@
 1501081412 ./dev-lang/swi-prolog/swi-prolog-7.1.28.ebuild
 1501091631 ./dev-lang/swi-prolog/swi-prolog-6.6.6.ebuild
 1405072052 ./dev-lang/swi-prolog/swi-prolog-6.6.5.ebuild
-1412181731 ./dev-lang/swi-prolog/swi-prolog-7.1.27.ebuild
-1411091755 ./dev-lang/swi-prolog/swi-prolog-7.1.26.ebuild
+1501211307 ./dev-lang/swi-prolog/swi-prolog-7.1.29.ebuild
 1501041831 ./dev-lang/ekopath/ekopath-5.0.1_pre20131115.ebuild
 1501090001 ./dev-lang/go/go-1.4.ebuild
 1501200731 ./dev-lang/go/go-9999.ebuild
@@ -19046,13 +19036,9 @@
 1412301501 ./x11-wm/mutter/mutter-3.14.3.ebuild
 1408110001 ./x11-wm/plwm/plwm-2.7_rc1.ebuild
 1408110001 ./x11-wm/plwm/plwm-2.5-r1.ebuild
-1208140443 ./x11-wm/windowmaker/windowmaker-0.95.3-r1.ebuild
-1409040130 ./x11-wm/windowmaker/windowmaker-0.95.6.ebuild
-1309140343 ./x11-wm/windowmaker/windowmaker-0.95.5.ebuild
-1111121436 ./x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild
-1301101441 ./x11-wm/windowmaker/windowmaker-0.95.4.ebuild
-1307280022 ./x11-wm/windowmaker/windowmaker-0.95.4-r1.ebuild
-1405171806 ./x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild
+1501211301 ./x11-wm/windowmaker/windowmaker-0.95.6.ebuild
+1501211301 ./x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild
+1501211301 ./x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild
 1407021401 ./x11-wm/marco/marco-1.8.0.ebuild
 1412090330 ./x11-wm/marco/marco-1.8.2.ebuild
 1408011601 ./x11-wm/sawfish/sawfish-1.9.1-r2.ebuild
@@ -20699,7 +20685,7 @@
 1401262301 ./dev-php/PEAR-SOAP/PEAR-SOAP-0.13.0.ebuild
 1306231801 ./dev-php/PHP_Timer/PHP_Timer-1.0.2.ebuild
 1411071812 ./dev-php/PHP_Timer/PHP_Timer-1.0.5.ebuild
-1501201101 ./dev-php/ZendFramework/ZendFramework-1.12.9.ebuild
+1501211331 ./dev-php/ZendFramework/ZendFramework-1.12.9.ebuild
 1408110101 ./dev-php/ZendFramework/ZendFramework-1.11.12.ebuild
 1501141825 ./dev-php/YAML/YAML-1.0.6-r1.ebuild
 1408110101 ./dev-php/YAML/YAML-1.0.6.ebuild
@@ -21513,8 +21499,8 @@
 1501021531 ./dev-util/gtk-doc/gtk-doc-1.21.ebuild
 1404211431 ./dev-util/gtk-doc/gtk-doc-1.20.ebuild
 0909012135 ./dev-util/ccmalloc/ccmalloc-0.4.0-r2.ebuild
-1501201201 ./dev-util/cmdtest/cmdtest-0.10.ebuild
-1501201201 ./dev-util/cmdtest/cmdtest-0.6.ebuild
+1501211331 ./dev-util/cmdtest/cmdtest-0.10.ebuild
+1501211331 ./dev-util/cmdtest/cmdtest-0.6.ebuild
 0910130042 ./dev-util/csup/csup-20060318.ebuild
 1412231251 ./dev-util/rebar/rebar-2.3.1.ebuild
 1501171719 ./dev-util/rebar/rebar-2.4.0.ebuild
@@ -24715,6 +24701,7 @@
 1408052101 ./kde-misc/fsrunner/fsrunner-0.7.5.ebuild
 1412081601 ./kde-misc/kcm-touchpad/kcm-touchpad-1.1.ebuild
 1403210231 ./kde-misc/kgtk/kgtk-0.11.0.ebuild
+1501211018 ./kde-misc/kio-mtp/kio-mtp-0.75_p20141221.ebuild
 1401060617 ./kde-misc/kio-mtp/kio-mtp-0.75_p20131020.ebuild
 1408052101 ./kde-misc/redshift-plasmoid/redshift-plasmoid-1.0.ebuild
 1403212331 ./kde-misc/takeoff/takeoff-1.0.ebuild
@@ -27161,6 +27148,7 @@
 1408171431 ./dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-1.2.6.ebuild
 1412071000 ./dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-2.2.3.ebuild
 1408171431 ./dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-2.1.0.ebuild
+1501211013 ./dev-ruby/msgpack/msgpack-0.5.10.ebuild
 1410171004 ./dev-ruby/msgpack/msgpack-0.5.9.ebuild
 1408020601 ./dev-ruby/msgpack/msgpack-0.5.8.ebuild
 1405261001 ./dev-ruby/amqp/amqp-1.1.8.ebuild
@@ -28929,7 +28917,7 @@
 1309252130 ./media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild
 1302022322 ./media-gfx/sfftobmp/sfftobmp-3.1.2.ebuild
 1309201835 ./media-gfx/exiv2/exiv2-0.23-r1.ebuild
-1501210040 ./media-gfx/exiv2/exiv2-0.24-r1.ebuild
+1501211431 ./media-gfx/exiv2/exiv2-0.24-r1.ebuild
 1412202001 ./media-gfx/exiv2/exiv2-0.24.ebuild
 1406182324 ./media-gfx/exiv2/exiv2-0.23-r2.ebuild
 1206080611 ./media-gfx/brlcad/brlcad-7.18.4.ebuild
@@ -31829,10 +31817,11 @@
 1305080331 ./games-roguelike/scourge/scourge-0.21.1.ebuild
 1410271931 ./games-roguelike/tomenet/tomenet-4.5.5.ebuild
 1406051031 ./games-roguelike/rogue/rogue-5.4.4.ebuild
+1501210930 ./games-roguelike/angband/angband-3.5.1.ebuild
 1409192331 ./games-roguelike/angband/angband-3.4.1.ebuild
 1410151501 ./games-roguelike/adom/adom-1.1.1-r1.ebuild
 0909250303 ./games-roguelike/ivan/ivan-0.50.ebuild
-1003040352 ./games-roguelike/zangband/zangband-2.7.4c.ebuild
+1501211031 ./games-roguelike/zangband/zangband-2.7.4c.ebuild
 1411241201 ./games-roguelike/mazesofmonad/mazesofmonad-1.0.9-r2.ebuild
 1411020501 ./games-roguelike/moria/moria-5.5.2.ebuild
 1410270601 ./games-roguelike/stone-soup/stone-soup-0.14.1.ebuild
@@ -31954,7 +31943,7 @@
 1403191750 ./sys-apps/grep/grep-2.16.ebuild
 1410162333 ./sys-apps/grep/grep-2.20-r1.ebuild
 1411240751 ./sys-apps/grep/grep-2.21.ebuild
-1501202131 ./sys-apps/grep/grep-2.21-r1.ebuild
+1501211331 ./sys-apps/grep/grep-2.21-r1.ebuild
 1406040915 ./sys-apps/grep/grep-2.20.ebuild
 1403191747 ./sys-apps/gptfdisk/gptfdisk-0.8.8.ebuild
 1409191301 ./sys-apps/gptfdisk/gptfdisk-0.8.10.ebuild
@@ -32545,13 +32534,10 @@
 1303180001 ./mail-mta/esmtp/esmtp-1.2.ebuild
 1501021531 ./mail-mta/postfix/postfix-2.11.3.ebuild
 1412281901 ./mail-mta/postfix/postfix-2.10.4.ebuild
-1412291024 ./mail-mta/postfix/postfix-2.12_pre20141228.ebuild
-1412281901 ./mail-mta/postfix/postfix-2.11.1.ebuild
+1501211347 ./mail-mta/postfix/postfix-2.12_pre20150120.ebuild
 1412281901 ./mail-mta/postfix/postfix-2.10.3.ebuild
-1412281901 ./mail-mta/postfix/postfix-2.11.1-r1.ebuild
 1412281901 ./mail-mta/postfix/postfix-2.10.5.ebuild
 1412281901 ./mail-mta/postfix/postfix-2.10.2.ebuild
-1412281901 ./mail-mta/postfix/postfix-2.11.2.ebuild
 1403191919 ./mail-mta/msmtp/msmtp-1.4.31-r1.ebuild
 1403100207 ./mail-mta/msmtp/msmtp-1.4.32.ebuild
 1501041004 ./mail-mta/msmtp/msmtp-1.6.0.ebuild
@@ -34447,7 +34433,7 @@
 1407252131 ./dev-perl/regexp-common/regexp-common-2013031301.0.0.ebuild
 1403032201 ./dev-perl/File-HomeDir/File-HomeDir-1.0.0-r1.ebuild
 1408230422 ./dev-perl/RadiusPerl/RadiusPerl-0.220.0-r1.ebuild
-1501132031 ./dev-perl/Test-TCP/Test-TCP-2.60.0.ebuild
+1501211931 ./dev-perl/Test-TCP/Test-TCP-2.60.0.ebuild
 1402161801 ./dev-perl/Test-TCP/Test-TCP-1.210.0.ebuild
 1408051531 ./dev-perl/Term-ReadLine-TTYtter/Term-ReadLine-TTYtter-1.4.ebuild
 1408262258 ./dev-perl/Feed-Find/Feed-Find-0.70.0-r1.ebuild
@@ -35521,7 +35507,7 @@
 1412101847 ./net-proxy/squid/squid-3.4.10.ebuild
 1501151632 ./net-proxy/squid/squid-3.4.11.ebuild
 1411211331 ./net-proxy/squid/squid-3.3.13-r1.ebuild
-1501180855 ./net-proxy/squid/squid-3.5.1.ebuild
+1501211001 ./net-proxy/squid/squid-3.5.1.ebuild
 1305261956 ./net-proxy/adzapper/adzapper-20110915-r2.ebuild
 1005040108 ./net-proxy/3proxy/3proxy-0.6.1.ebuild
 0810170020 ./net-proxy/3proxy/3proxy-0.5.3k.ebuild
@@ -37298,6 +37284,7 @@
 1501150223 metadata/md5-cache/sci-astronomy/galaxy-2.2
 1501150223 metadata/md5-cache/sci-astronomy/casa-data-99999
 1501150223 metadata/md5-cache/sci-astronomy/stellarium-0.13.1
+1501211906 metadata/md5-cache/sci-astronomy/stellarium-0.13.2
 1501150223 metadata/md5-cache/sci-astronomy/cpl-6.3.1
 1501150223 metadata/md5-cache/sci-astronomy/xfitsview-2.2-r1
 1501150223 metadata/md5-cache/sci-astronomy/sofa_c-20120301a
@@ -37809,7 +37796,7 @@
 1501150219 metadata/md5-cache/kde-base/sweeper-4.14.3
 1501150218 metadata/md5-cache/kde-base/kaddressbook-4.14.3
 1501150219 metadata/md5-cache/kde-base/rocs-4.14.3
-1501210036 metadata/md5-cache/kde-base/kwalletd-4.14.3-r1
+1501211336 metadata/md5-cache/kde-base/kwalletd-4.14.3-r1
 1501150219 metadata/md5-cache/kde-base/nepomuk-4.12.5
 1501150218 metadata/md5-cache/kde-base/kdetoys-meta-4.14.3
 1501150219 metadata/md5-cache/kde-base/pairs-4.12.5
@@ -38164,7 +38151,7 @@
 1501150209 metadata/md5-cache/dev-db/pgxnclient-1.2-r1
 1501150209 metadata/md5-cache/dev-db/redis-2.8.17-r1
 1501150209 metadata/md5-cache/dev-db/percona-toolkit-2.2.11
-1501170036 metadata/md5-cache/dev-db/phpmyadmin-4.1.14.8
+1501211406 metadata/md5-cache/dev-db/phpmyadmin-4.1.14.8
 1501150209 metadata/md5-cache/dev-db/vsqlite++-0.3.12
 1501150209 metadata/md5-cache/dev-db/virtuoso-odbc-6.1.6
 1411010839 metadata/md5-cache/dev-db/spatialite-2.4.0_rc4
@@ -38259,7 +38246,7 @@
 1501150208 metadata/md5-cache/dev-db/mysql-cluster-7.3.6
 1501150209 metadata/md5-cache/dev-db/pgadmin3-1.18.1
 1501150208 metadata/md5-cache/dev-db/mysql++-2.3.2
-1501170036 metadata/md5-cache/dev-db/phpmyadmin-4.2.13.1
+1501211406 metadata/md5-cache/dev-db/phpmyadmin-4.2.13.1
 1501150208 metadata/md5-cache/dev-db/libzdb-3.0
 1501150208 metadata/md5-cache/dev-db/mysql-workbench-5.2.47
 1212031106 metadata/md5-cache/dev-db/m17n-db-1.5.2
@@ -38866,7 +38853,7 @@
 1403091706 metadata/md5-cache/media-libs/libdvbpsi-1.1.2
 1211091745 metadata/md5-cache/media-libs/quvi-0.2.19
 1501150220 metadata/md5-cache/media-libs/libgltf-0.0.2
-1501150220 metadata/md5-cache/media-libs/schroedinger-1.0.11-r1
+1501211506 metadata/md5-cache/media-libs/schroedinger-1.0.11-r1
 1408110137 metadata/md5-cache/media-libs/celt-0.5.1.3
 1501150220 metadata/md5-cache/media-libs/libquvi-0.4.1-r1
 1501150220 metadata/md5-cache/media-libs/fontconfig-2.8.0-r1
@@ -40559,7 +40546,6 @@
 1501150217 metadata/md5-cache/games-kids/cubetest-0.9.4
 1501150217 metadata/md5-cache/games-kids/lletters-0.1.95-r2
 1501150208 metadata/md5-cache/app-shells/ksh-93.20120229
-1501150208 metadata/md5-cache/app-shells/bash-4.3_p30-r1
 1501150208 metadata/md5-cache/app-shells/rrs-1.70
 1501150208 metadata/md5-cache/app-shells/zsh-completions-9999
 1501150208 metadata/md5-cache/app-shells/mksh-50d
@@ -40604,6 +40590,7 @@
 1501150208 metadata/md5-cache/app-shells/gentoo-bashcomp-20121024
 1308280036 metadata/md5-cache/app-shells/bashish-2.2.4
 1501150208 metadata/md5-cache/app-shells/bash-4.0_p44
+1501211506 metadata/md5-cache/app-shells/bash-4.3_p33-r1
 1501150208 metadata/md5-cache/app-shells/rust-zshcomp-9999
 1501150208 metadata/md5-cache/app-shells/zsh-5.0.5
 1501150208 metadata/md5-cache/app-shells/localshell-1.3.1
@@ -40625,7 +40612,6 @@
 1501150208 metadata/md5-cache/app-shells/ksh-93.20140606
 1501150208 metadata/md5-cache/app-shells/pdmenu-1.3.2-r1
 1501150208 metadata/md5-cache/app-shells/bash-4.3_p33
-1501150208 metadata/md5-cache/app-shells/bash-4.3_p30
 1411010838 metadata/md5-cache/app-shells/bash-completion-2.1-r2
 1411010838 metadata/md5-cache/app-shells/ccsh-0.0.4-r3
 1501150208 metadata/md5-cache/app-shells/ksh-93.20110208
@@ -43356,7 +43342,6 @@
 1408101506 metadata/md5-cache/app-doc/phrack-16
 1211091734 metadata/md5-cache/app-doc/linux-gazette-36
 1211091734 metadata/md5-cache/app-doc/linux-gazette-145
-1501150206 metadata/md5-cache/app-doc/doxygen-1.7.6.1
 1211091734 metadata/md5-cache/app-doc/linux-gazette-112
 1408101506 metadata/md5-cache/app-doc/phrack-14
 1408101506 metadata/md5-cache/app-doc/phrack-53
@@ -43377,6 +43362,7 @@
 1211091734 metadata/md5-cache/app-doc/linux-gazette-24
 1408101506 metadata/md5-cache/app-doc/phrack-66
 1501150206 metadata/md5-cache/app-doc/root-docs-5.34.18
+1501211836 metadata/md5-cache/app-doc/doxygen-1.8.9.1
 1501150206 metadata/md5-cache/app-doc/casting-spels-emacs-19-r1
 1211091734 metadata/md5-cache/app-doc/linux-gazette-65
 1211091734 metadata/md5-cache/app-doc/linux-gazette-86
@@ -43914,7 +43900,7 @@
 1501150217 metadata/md5-cache/games-engines/solarus-1.3.0
 1501150217 metadata/md5-cache/games-engines/renpy-6.18.3
 1501150217 metadata/md5-cache/games-engines/renpy-6.15.7
-1501210806 metadata/md5-cache/games-engines/openxcom-1.0.0
+1501210906 metadata/md5-cache/games-engines/openxcom-1.0.0
 1501150217 metadata/md5-cache/games-engines/zoom-1.1.5
 1501150217 metadata/md5-cache/games-engines/odamex-0.6.2
 1501150217 metadata/md5-cache/games-engines/scummvm-1.7.0-r2
@@ -43931,7 +43917,7 @@
 1301140236 metadata/md5-cache/app-admin/hwreport-0.11.0
 1501150206 metadata/md5-cache/app-admin/rex-0.56.1
 1411010836 metadata/md5-cache/app-admin/lnav-0.7.0
-1501150206 metadata/md5-cache/app-admin/logrotate-3.8.8
+1501211636 metadata/md5-cache/app-admin/logrotate-3.8.8
 1501150206 metadata/md5-cache/app-admin/lib_users-0.6-r1
 1408100606 metadata/md5-cache/app-admin/logcheck-1.3.15-r2
 1501150206 metadata/md5-cache/app-admin/localepurge-0.5.4-r1
@@ -44045,7 +44031,6 @@
 1501150206 metadata/md5-cache/app-admin/cancd-0.1.0-r2
 1403162236 metadata/md5-cache/app-admin/python-updater-0.12
 1501150206 metadata/md5-cache/app-admin/eselect-unison-0.2
-1501040306 metadata/md5-cache/app-admin/eselect-opengl-1.3.1-r1
 1501150206 metadata/md5-cache/app-admin/apachetop-0.12.6-r1
 1501150206 metadata/md5-cache/app-admin/gkrellm-2.3.5-r2
 1403241936 metadata/md5-cache/app-admin/eselect-wxwidgets-20131230
@@ -44310,6 +44295,7 @@
 1501150206 metadata/md5-cache/app-admin/webalizer-2.23.08
 1501150206 metadata/md5-cache/app-admin/showconsole-1.08
 1211091733 metadata/md5-cache/app-admin/stow-2.2.0
+1501211206 metadata/md5-cache/app-admin/eselect-opengl-1.3.1-r2
 1501150206 metadata/md5-cache/app-admin/ansible-1.8.2
 1304091136 metadata/md5-cache/app-admin/logstalgia-1.0.3-r1
 1501130236 metadata/md5-cache/app-admin/integrit-4.1
@@ -47337,6 +47323,7 @@
 1411010838 metadata/md5-cache/app-misc/cdspeed-0.4-r1
 1501150208 metadata/md5-cache/app-misc/mmv-1.01b_p15
 1501150207 metadata/md5-cache/app-misc/gtypist-2.8.5-r1
+1501211136 metadata/md5-cache/app-misc/wcd-5.2.6
 1411010838 metadata/md5-cache/app-misc/delay-1.6-r1
 1211091734 metadata/md5-cache/app-misc/enum-1.0.1-r1
 1501150207 metadata/md5-cache/app-misc/delay-1.6-r2
@@ -47750,7 +47737,6 @@
 1501150212 metadata/md5-cache/dev-libs/libebml-1.2.1
 1501150211 metadata/md5-cache/dev-libs/MicroJSON-0.3.2
 1501150212 metadata/md5-cache/dev-libs/m17n-lib-1.6.4
-1501150211 metadata/md5-cache/dev-libs/glib-2.38.2-r1
 1501150212 metadata/md5-cache/dev-libs/libverto-0.2.5-r1
 1501150212 metadata/md5-cache/dev-libs/qof-0.8.7
 1501150211 metadata/md5-cache/dev-libs/json-c-0.10-r1
@@ -47806,6 +47792,7 @@
 1501150211 metadata/md5-cache/dev-libs/icu-53.1-r2
 1501150211 metadata/md5-cache/dev-libs/fribidi-0.19.5-r1
 1501150211 metadata/md5-cache/dev-libs/boehm-gc-7.4.0
+1501211336 metadata/md5-cache/dev-libs/folks-0.10.1
 1501150212 metadata/md5-cache/dev-libs/libsodium-1.0.1
 1501150212 metadata/md5-cache/dev-libs/openssl-0.9.8z_p1-r2
 1501150211 metadata/md5-cache/dev-libs/json-c-0.11-r1
@@ -47872,7 +47859,7 @@
 1501150211 metadata/md5-cache/dev-libs/389-adminutil-1.1.15
 1501150212 metadata/md5-cache/dev-libs/libical-1.0-r2
 1501150212 metadata/md5-cache/dev-libs/libe-0.6.0
-1501150211 metadata/md5-cache/dev-libs/glib-2.42.1
+1501211306 metadata/md5-cache/dev-libs/glib-2.42.1
 1501150212 metadata/md5-cache/dev-libs/libtecla-1.6.1-r2
 1501150212 metadata/md5-cache/dev-libs/tntnet-1.6.3
 1501150212 metadata/md5-cache/dev-libs/m17n-lib-1.5.3
@@ -47914,7 +47901,6 @@
 1501150211 metadata/md5-cache/dev-libs/ecore-1.7.8
 1501150211 metadata/md5-cache/dev-libs/fstrm-0.2.0-r1
 1501150211 metadata/md5-cache/dev-libs/bitset-2.8.4-r1
-1501150211 metadata/md5-cache/dev-libs/glib-2.40.0-r1
 1501150212 metadata/md5-cache/dev-libs/nettle-2.7.1
 1501150212 metadata/md5-cache/dev-libs/xxl-1.0.1-r1
 1501150211 metadata/md5-cache/dev-libs/clearsilver-0.10.5-r2
@@ -48231,6 +48217,7 @@
 1501150211 metadata/md5-cache/dev-libs/check-0.9.13
 1501150212 metadata/md5-cache/dev-libs/ucl-1.03-r1
 1501150211 metadata/md5-cache/dev-libs/bglibs-1.106-r1
+1501211336 metadata/md5-cache/dev-libs/libgweather-3.14.3
 1501150212 metadata/md5-cache/dev-libs/libflatarray-0.1.1
 1501150211 metadata/md5-cache/dev-libs/jsoncpp-0.5.0-r1
 1501150212 metadata/md5-cache/dev-libs/libpeas-1.12.1
@@ -48346,7 +48333,6 @@
 1501150212 metadata/md5-cache/dev-libs/redland-bindings-1.0.14.1-r1
 1411201906 metadata/md5-cache/dev-libs/mongo-c-driver-0.7.1
 1501150212 metadata/md5-cache/dev-libs/starpu-1.1.1
-1501150211 metadata/md5-cache/dev-libs/folks-0.9.7.1
 1501150212 metadata/md5-cache/dev-libs/libpeas-1.10.1
 1501130237 metadata/md5-cache/dev-libs/wayland-0.95.0
 1501150212 metadata/md5-cache/dev-libs/libgcrypt-1.5.4-r100
@@ -49674,7 +49660,7 @@
 1501150223 metadata/md5-cache/net-print/cups-filters-1.0.53
 1312260436 metadata/md5-cache/net-print/cups-windows-6.0-r1
 1501150218 metadata/md5-cache/gnome-base/libgnomeprintui-2.18.6-r1
-1501150218 metadata/md5-cache/gnome-base/dconf-0.22.0
+1501211106 metadata/md5-cache/gnome-base/dconf-0.22.0
 1501150218 metadata/md5-cache/gnome-base/gnome-shell-3.14.3
 1501150218 metadata/md5-cache/gnome-base/gnome-vfs-2.24.4-r2
 1501150218 metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0
@@ -50559,6 +50545,7 @@
 1501150227 metadata/md5-cache/sys-libs/timezone-data-2013i
 1501150227 metadata/md5-cache/sys-libs/lrmi-0.10-r1
 1501150227 metadata/md5-cache/sys-libs/e2fsprogs-libs-1.41.7
+1501211506 metadata/md5-cache/sys-libs/readline-6.3_p8-r2
 1501150227 metadata/md5-cache/sys-libs/libtermcap-compat-2.0.8-r2
 1501150227 metadata/md5-cache/sys-libs/zlib-1.2.5.1-r2
 1501150227 metadata/md5-cache/sys-libs/freeipmi-1.4.6-r1
@@ -51027,7 +51014,7 @@
 1411201907 metadata/md5-cache/dev-python/subvertpy-0.8.10
 1501150215 metadata/md5-cache/dev-python/tagpy-2013.1
 1501150215 metadata/md5-cache/dev-python/xmpppy-0.5.0_rc1
-1501150214 metadata/md5-cache/dev-python/pycurl-7.19.3.1-r2
+1501211636 metadata/md5-cache/dev-python/pycurl-7.19.3.1-r2
 1501150213 metadata/md5-cache/dev-python/basemap-1.0.7
 1411201907 metadata/md5-cache/dev-python/pyrtf-0.45
 1501150214 metadata/md5-cache/dev-python/libvirt-python-9999
@@ -51133,7 +51120,7 @@
 1501150214 metadata/md5-cache/dev-python/soappy-0.12.5-r2
 1411201907 metadata/md5-cache/dev-python/suds-0.4
 1501150213 metadata/md5-cache/dev-python/genshi-0.7
-1501201206 metadata/md5-cache/dev-python/cliapp-1.20140315
+1501211336 metadata/md5-cache/dev-python/cliapp-1.20140315
 1501150214 metadata/md5-cache/dev-python/redis-py-2.10.1
 1501161506 metadata/md5-cache/dev-python/bottle-0.12.7
 1501150214 metadata/md5-cache/dev-python/mako-0.7.3-r2
@@ -51187,7 +51174,6 @@
 1501150213 metadata/md5-cache/dev-python/autopep8-9999
 1501150213 metadata/md5-cache/dev-python/gevent-1.0.1
 1501150213 metadata/md5-cache/dev-python/args-0.1.0
-1411201907 metadata/md5-cache/dev-python/timelib-0.2.4
 1411201907 metadata/md5-cache/dev-python/snappy-0.5
 1501150213 metadata/md5-cache/dev-python/eunuchs-20050320.1
 1411201907 metadata/md5-cache/dev-python/python-musicbrainz-0.7.3
@@ -51384,9 +51370,8 @@
 1501150215 metadata/md5-cache/dev-python/sudsds-1.0.1-r1
 1501150214 metadata/md5-cache/dev-python/python-uinput-0.10.2
 1501150214 metadata/md5-cache/dev-python/pytest-2.6.4
-1501201206 metadata/md5-cache/dev-python/cliapp-1.20130808
+1501211336 metadata/md5-cache/dev-python/cliapp-1.20130808
 1411201907 metadata/md5-cache/dev-python/pyasn1-modules-0.0.4
-1411201907 metadata/md5-cache/dev-python/setproctitle-1.1.6
 1501150214 metadata/md5-cache/dev-python/pycdf-0.6.3-r1
 1501150214 metadata/md5-cache/dev-python/hachoir-core-1.3.3-r1
 1501150214 metadata/md5-cache/dev-python/rax-default-network-flags-python-novaclient-ext-9999
@@ -51414,7 +51399,7 @@
 1501150214 metadata/md5-cache/dev-python/shortuuid-0.4.2
 1501150215 metadata/md5-cache/dev-python/twitter-1.14.3
 1501150214 metadata/md5-cache/dev-python/python-geoclue-0.1.0-r1
-1501201206 metadata/md5-cache/dev-python/ttystatus-0.23
+1501211336 metadata/md5-cache/dev-python/ttystatus-0.23
 1501150213 metadata/md5-cache/dev-python/astor-0.4
 1501150213 metadata/md5-cache/dev-python/flask-0.10.1-r1
 1501150214 metadata/md5-cache/dev-python/nose-1.3.3
@@ -51536,7 +51521,7 @@
 1501150215 metadata/md5-cache/dev-python/testscenarios-0.4-r2
 1501150214 metadata/md5-cache/dev-python/pygeocoder-1.2.5
 1501150213 metadata/md5-cache/dev-python/django-openid-auth-0.5
-1501171736 metadata/md5-cache/dev-python/graph-tool-9999
+1501212006 metadata/md5-cache/dev-python/graph-tool-9999
 1501150214 metadata/md5-cache/dev-python/hgtools-6.0
 1501150214 metadata/md5-cache/dev-python/oauthlib-0.7.2
 1411201907 metadata/md5-cache/dev-python/pyode-1.2.0_p20100322
@@ -51556,7 +51541,6 @@
 1501150214 metadata/md5-cache/dev-python/pyaudio-0.2.8
 1501150214 metadata/md5-cache/dev-python/pexpect-3.1
 1501150213 metadata/md5-cache/dev-python/fixtures-0.3.14
-1411201907 metadata/md5-cache/dev-python/timelib-0.2.2
 1501150214 metadata/md5-cache/dev-python/llvmpy-0.12.6
 1411201907 metadata/md5-cache/dev-python/pyyaml-3.10
 1501150214 metadata/md5-cache/dev-python/setuptools-9999
@@ -51630,7 +51614,6 @@
 1501150213 metadata/md5-cache/dev-python/cgkit-2.0.0_alpha9-r1
 1411201907 metadata/md5-cache/dev-python/oauthlib-0.3.0
 1501150214 metadata/md5-cache/dev-python/librsvg-python-2.32.0-r1
-1501150215 metadata/md5-cache/dev-python/transmissionrpc-0.10
 1501150214 metadata/md5-cache/dev-python/repoze-who-2.2
 1501150214 metadata/md5-cache/dev-python/google-api-python-client-1.1
 1501150214 metadata/md5-cache/dev-python/gst-python-1.2.1
@@ -51718,7 +51701,7 @@
 1501150214 metadata/md5-cache/dev-python/matplotlib-1.4.0
 1501150214 metadata/md5-cache/dev-python/pyelftools-0.21-r4
 1501150214 metadata/md5-cache/dev-python/pylzma-0.4.5
-1501201206 metadata/md5-cache/dev-python/CoverageTestRunner-1.9-r1
+1501211336 metadata/md5-cache/dev-python/CoverageTestRunner-1.9-r1
 1501150214 metadata/md5-cache/dev-python/redis-py-2.10.3
 1501150214 metadata/md5-cache/dev-python/ipython-0.10.2
 1501150214 metadata/md5-cache/dev-python/pyside-1.1.2-r1
@@ -51749,7 +51732,6 @@
 1411201906 metadata/md5-cache/dev-python/foolscap-0.6.4
 1501150214 metadata/md5-cache/dev-python/pylibpcap-0.6.4-r1
 1501150214 metadata/md5-cache/dev-python/sh-1.08
-1411201907 metadata/md5-cache/dev-python/tempita-0.4
 1501150215 metadata/md5-cache/dev-python/twisted-web-13.2.0
 1501150215 metadata/md5-cache/dev-python/sphinxcontrib-plantuml-0.4
 1501150214 metadata/md5-cache/dev-python/netlib-0.11.2
@@ -52058,7 +52040,6 @@
 1501150214 metadata/md5-cache/dev-python/lp_solve-5.5.2.0
 1501150214 metadata/md5-cache/dev-python/pycountry-1.8
 1305100206 metadata/md5-cache/dev-python/python-docs-3.3.1
-1501150215 metadata/md5-cache/dev-python/tempita-0.5.2_pre20130828
 1501150215 metadata/md5-cache/dev-python/storm-0.20
 1501150214 metadata/md5-cache/dev-python/pandas-0.15.1
 1501150214 metadata/md5-cache/dev-python/ipcalc-1.1.2
@@ -52137,7 +52118,6 @@
 1501150213 metadata/md5-cache/dev-python/flask-wtf-0.10.2
 1501150214 metadata/md5-cache/dev-python/pyid3lib-0.5.1-r2
 1501150215 metadata/md5-cache/dev-python/waitress-0.8.9
-1411201907 metadata/md5-cache/dev-python/setproctitle-1.1.3
 1501150215 metadata/md5-cache/dev-python/translate-toolkit-1.12.0
 1501150213 metadata/md5-cache/dev-python/expects-0.5.0
 1501150214 metadata/md5-cache/dev-python/numpy-1.8.2
@@ -52215,6 +52195,7 @@
 1411201907 metadata/md5-cache/dev-python/subunit-0.0.10
 1501150214 metadata/md5-cache/dev-python/requests-oauthlib-0.3.3
 1501150214 metadata/md5-cache/dev-python/pyds-0.7.3-r1
+1501212006 metadata/md5-cache/dev-python/graph-tool-2.2.36-r1
 1501150214 metadata/md5-cache/dev-python/inotifyx-0.2.0-r1
 1501150214 metadata/md5-cache/dev-python/pymysql-0.6.2
 1501150214 metadata/md5-cache/dev-python/pyamg-2.1.0
@@ -52276,7 +52257,6 @@
 1501150214 metadata/md5-cache/dev-python/pyparsing-2.0.1
 1501150214 metadata/md5-cache/dev-python/pywcs-1.11-r1
 1411201906 metadata/md5-cache/dev-python/mygpoclient-1.7
-1411201907 metadata/md5-cache/dev-python/tempita-0.5.1
 1501150214 metadata/md5-cache/dev-python/jinja-2.7.3
 1501150214 metadata/md5-cache/dev-python/python-prctl-1.5.0-r1
 1501150214 metadata/md5-cache/dev-python/pyatspi-2.12.0
@@ -52319,7 +52299,6 @@
 1411201906 metadata/md5-cache/dev-python/envoy-0.0.2
 1406111336 metadata/md5-cache/dev-python/pydb-1.26
 1501150215 metadata/md5-cache/dev-python/twisted-names-14.0.0
-1501150214 metadata/md5-cache/dev-python/setproctitle-1.1.7
 1411201907 metadata/md5-cache/dev-python/polygon-2.0.4
 1501150214 metadata/md5-cache/dev-python/numpy-1.8.1
 1411201906 metadata/md5-cache/dev-python/decorator-3.3.3
@@ -52342,7 +52321,6 @@
 1501150214 metadata/md5-cache/dev-python/joblib-0.8.3
 1501150214 metadata/md5-cache/dev-python/gnuplot-py-1.8-r1
 1501150214 metadata/md5-cache/dev-python/mysql-python-1.2.3-r1
-1501150215 metadata/md5-cache/dev-python/transmissionrpc-0.9
 1501150214 metadata/md5-cache/dev-python/notify-python-0.1.1-r3
 1501150215 metadata/md5-cache/dev-python/wtf-peewee-0.2.3
 1501150214 metadata/md5-cache/dev-python/reportlab-3.1.44-r1
@@ -52498,7 +52476,6 @@
 1501150214 metadata/md5-cache/dev-python/pygui-2.5.3-r1
 1501150214 metadata/md5-cache/dev-python/nose-1.3.0
 1501150214 metadata/md5-cache/dev-python/pychart-1.39-r1
-1411201907 metadata/md5-cache/dev-python/transmissionrpc-0.8
 1409081236 metadata/md5-cache/dev-python/python-docs-2.7.7
 1501150214 metadata/md5-cache/dev-python/pygments-1.6_p20140324-r1
 1501150215 metadata/md5-cache/dev-python/versiontools-1.9.1-r1
@@ -52748,7 +52725,6 @@
 1501150215 metadata/md5-cache/dev-python/venusian-1.0_alpha8
 1501150214 metadata/md5-cache/dev-python/hgtools-4.0
 1411201906 metadata/md5-cache/dev-python/cheetah-2.4.4
-1411201907 metadata/md5-cache/dev-python/timelib-0.2.3
 1501150215 metadata/md5-cache/dev-python/subunit-0.0.21-r1
 1501150215 metadata/md5-cache/dev-python/webhelpers-1.3-r1
 1501150214 metadata/md5-cache/dev-python/python-swiftclient-2.2.0
@@ -52827,7 +52803,7 @@
 1501150213 metadata/md5-cache/dev-python/expects-0.6.1
 1501150214 metadata/md5-cache/dev-python/pycxx-6.2.5
 1501150213 metadata/md5-cache/dev-python/gnome-python-base-2.28.1-r1
-1501201206 metadata/md5-cache/dev-python/CoverageTestRunner-1.10
+1501211336 metadata/md5-cache/dev-python/CoverageTestRunner-1.10
 1501150215 metadata/md5-cache/dev-python/turbolift-2.0.5
 1501150214 metadata/md5-cache/dev-python/jedi-0.6.0
 1501150214 metadata/md5-cache/dev-python/psycopg-2.4.6
@@ -53065,7 +53041,6 @@
 1501150214 metadata/md5-cache/dev-python/pbr-0.5.23-r2
 1501150213 metadata/md5-cache/dev-python/dicttoxml-1.5.6
 1501150214 metadata/md5-cache/dev-python/pytz-2014.9
-1501150213 metadata/md5-cache/dev-python/chameleon-2.18
 1501150215 metadata/md5-cache/dev-python/xcffib-0.1.8
 1501150214 metadata/md5-cache/dev-python/pyutil-2.0.0
 1409040736 metadata/md5-cache/dev-python/python-docs-2.7.6-r1
@@ -53157,7 +53132,7 @@
 1501150213 metadata/md5-cache/dev-python/blinker-1.2-r1
 1501150214 metadata/md5-cache/dev-python/pyparsing-1.5.6
 1501150215 metadata/md5-cache/dev-python/unittest2-0.5.1-r1
-1501201206 metadata/md5-cache/dev-python/ttystatus-0.22
+1501211336 metadata/md5-cache/dev-python/ttystatus-0.22
 1501150214 metadata/md5-cache/dev-python/python-novaclient-2.20.0
 1501150215 metadata/md5-cache/dev-python/twisted-words-13.0.0-r1
 1501150214 metadata/md5-cache/dev-python/rtf2xml-1.33-r1
@@ -53180,7 +53155,6 @@
 1501150215 metadata/md5-cache/dev-python/ujson-1.33
 1501150214 metadata/md5-cache/dev-python/pyh2o-9999
 1501150213 metadata/md5-cache/dev-python/flask-whooshalchemy-0.56
-1501150214 metadata/md5-cache/dev-python/setproctitle-1.1.6-r1
 1501150214 metadata/md5-cache/dev-python/milk-0.5.1
 1501150214 metadata/md5-cache/dev-python/pythondialog-3.2.1
 1501150214 metadata/md5-cache/dev-python/pywebkitgtk-1.1.8-r1
@@ -53197,6 +53171,7 @@
 1501150214 metadata/md5-cache/dev-python/socketpool-0.5.2
 1501150214 metadata/md5-cache/dev-python/jsmin-2.0.9
 1411201907 metadata/md5-cache/dev-python/pyflakes-0.6.1
+1501211236 metadata/md5-cache/dev-python/chameleon-2.20
 1501150214 metadata/md5-cache/dev-python/jsonpickle-0.6.1
 1501150213 metadata/md5-cache/dev-python/Babel-1.3-r1
 1411201907 metadata/md5-cache/dev-python/soappy-0.12.5
@@ -53508,7 +53483,6 @@
 1411010901 metadata/md5-cache/sys-devel/automake-wrapper-6
 1501150226 metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r1
 1501150226 metadata/md5-cache/sys-devel/gcc-config-1.5-r2
-1501150226 metadata/md5-cache/sys-devel/patch-2.7.1-r2
 1501172136 metadata/md5-cache/sys-devel/gcc-4.9.1
 1501150226 metadata/md5-cache/sys-devel/bc-1.06.95-r1
 1501150226 metadata/md5-cache/sys-devel/binutils-2.24-r3
@@ -53562,6 +53536,7 @@
 1412131210 metadata/md5-cache/sys-devel/clang-3.3-r100
 1501150226 metadata/md5-cache/sys-devel/gcc-4.5.3-r2
 1501150226 metadata/md5-cache/sys-devel/binutils-apple-4.2
+1501211236 metadata/md5-cache/sys-devel/dragonegg-3.5.1
 1501150226 metadata/md5-cache/sys-devel/binutils-2.23.2
 1501150226 metadata/md5-cache/sys-devel/kgcc64-4.5.3
 1501150226 metadata/md5-cache/sys-devel/gdb-apple-1752
@@ -53655,7 +53630,6 @@
 1501150226 metadata/md5-cache/sys-devel/gdb-7.2.50.20101117.4.15
 1501150226 metadata/md5-cache/sys-devel/smatch-1.57-r1
 1501150226 metadata/md5-cache/sys-devel/kgcc64-4.4.6
-1501150226 metadata/md5-cache/sys-devel/patch-2.5.9-r1
 1501150226 metadata/md5-cache/sys-devel/kgcc64-4.7.4
 1501150226 metadata/md5-cache/sys-devel/gcc-4.0.4
 1211091751 metadata/md5-cache/sys-devel/crossdev-20120721
@@ -53683,6 +53657,7 @@
 1501150226 metadata/md5-cache/sys-devel/clang-3.1-r5
 1501150226 metadata/md5-cache/sys-devel/bc-1.06.95
 1501150226 metadata/md5-cache/sys-devel/gcc-config-1.5.1-r1
+1501211806 metadata/md5-cache/sys-devel/llvm-3.5.1
 1411201908 metadata/md5-cache/sys-devel/smatch-9999
 1501150226 metadata/md5-cache/sys-devel/bmake-20130123
 1501150226 metadata/md5-cache/sys-devel/flex-2.5.35_p10
@@ -53753,6 +53728,7 @@
 1501150226 metadata/md5-cache/sys-devel/m4-1.4.16
 1501150226 metadata/md5-cache/sys-devel/byfl-9999
 1501150226 metadata/md5-cache/sys-devel/gcc-4.8.3
+1501211106 metadata/md5-cache/sys-devel/patch-2.7.2
 1501182336 metadata/md5-cache/sys-devel/gettext-0.19.3
 1501150226 metadata/md5-cache/sys-devel/clang-2.8-r3
 1501150226 metadata/md5-cache/sys-devel/gdb-6.7.1-r3
@@ -53770,6 +53746,7 @@
 1211091751 metadata/md5-cache/sys-devel/crossdev-20120529
 1501150226 metadata/md5-cache/sys-devel/gcc-3.4.6-r2
 1411201908 metadata/md5-cache/sys-devel/crossdev-99999999
+1501211236 metadata/md5-cache/sys-devel/clang-3.5.1-r100
 1401170909 metadata/md5-cache/sys-devel/automake-wrapper-9
 1501150226 metadata/md5-cache/sys-devel/gdb-7.6
 1501150226 metadata/md5-cache/sys-devel/clang-9999
@@ -53797,7 +53774,6 @@
 1501150226 metadata/md5-cache/sys-devel/gdb-7.4.1
 1501150226 metadata/md5-cache/sys-devel/gdb-apple-768-r1
 1501150226 metadata/md5-cache/sys-devel/make-3.82-r4
-1501150226 metadata/md5-cache/sys-devel/patch-2.5.9
 1501150226 metadata/md5-cache/sys-devel/gcc-4.6.3
 1501150226 metadata/md5-cache/sys-devel/autogen-5.17.3
 1501150226 metadata/md5-cache/sys-devel/gcc-apple-4.0.1_p5493
@@ -53817,7 +53793,7 @@
 1501150223 metadata/md5-cache/net-wireless/bladerf-9999
 1501150223 metadata/md5-cache/net-wireless/airtraf-1.1-r2
 1501150223 metadata/md5-cache/net-wireless/bluez-5.25
-1501150223 metadata/md5-cache/net-wireless/uhd-3.8.0
+1501211536 metadata/md5-cache/net-wireless/uhd-3.8.0
 1411010858 metadata/md5-cache/net-wireless/b43-fwcutter-019
 1501150223 metadata/md5-cache/net-wireless/ndiswrapper-1.58
 1501150223 metadata/md5-cache/net-wireless/wpa_supplicant-2.3
@@ -53864,7 +53840,7 @@
 1501150223 metadata/md5-cache/net-wireless/ubertooth-9999
 1501130239 metadata/md5-cache/net-wireless/osmobts-9999
 1407250806 metadata/md5-cache/net-wireless/bladerf-firmware-1.7.1
-1501150223 metadata/md5-cache/net-wireless/gnuradio-9999
+1501211606 metadata/md5-cache/net-wireless/gnuradio-9999
 1501150223 metadata/md5-cache/net-wireless/uhd-3.7.2
 1501150223 metadata/md5-cache/net-wireless/bluedevil-2.0
 1501150223 metadata/md5-cache/net-wireless/wavemon-0.7.5
@@ -53872,7 +53848,7 @@
 1411010858 metadata/md5-cache/net-wireless/spectools-2011.08.1-r2
 1411010858 metadata/md5-cache/net-wireless/kismet-ubertooth-2012.10.1-r1
 1309222336 metadata/md5-cache/net-wireless/neard-0.13
-1501150223 metadata/md5-cache/net-wireless/gnuradio-3.7.6
+1501211606 metadata/md5-cache/net-wireless/gnuradio-3.7.6
 1411010858 metadata/md5-cache/net-wireless/bcm43xx-fwcutter-006
 1501150223 metadata/md5-cache/net-wireless/wpa_supplicant-2.2-r1
 1501150223 metadata/md5-cache/net-wireless/chirp-0.4.1
@@ -54281,6 +54257,7 @@
 1211091745 metadata/md5-cache/media-plugins/gmpc-mdcover-0.20.0
 1501150220 metadata/md5-cache/media-plugins/gst-plugins-vaapi-0.5.9
 1501150220 metadata/md5-cache/media-plugins/gst-plugins-lame-0.10.19
+1501211236 metadata/md5-cache/media-plugins/gst-plugins-vaapi-0.5.9-r1
 1501150221 metadata/md5-cache/media-plugins/vdr-autosort-0.1.3
 1501150221 metadata/md5-cache/media-plugins/vdr-spider-0.2.2
 1501150220 metadata/md5-cache/media-plugins/gst-plugins-libmms-1.2.4-r1
@@ -54371,7 +54348,7 @@
 1501150220 metadata/md5-cache/media-plugins/gst-plugins-neon-1.2.4
 1501150220 metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.2.3
 1211091745 metadata/md5-cache/media-plugins/gmpc-extraplaylist-0.20.0
-1501150221 metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r1
+1501211636 metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r1
 1501150220 metadata/md5-cache/media-plugins/gst-plugins-vp8-0.10.23-r2
 1501150220 metadata/md5-cache/media-plugins/audacious-plugins-2.5.4
 1501150220 metadata/md5-cache/media-plugins/banshee-community-extensions-2.2.0
@@ -55794,6 +55771,7 @@
 1501150211 metadata/md5-cache/dev-lang/maude-2.6-r1
 1302190306 metadata/md5-cache/dev-lang/inform-6.32.1
 1501150211 metadata/md5-cache/dev-lang/spidermonkey-1.7.0-r1
+1501211336 metadata/md5-cache/dev-lang/swi-prolog-7.1.29
 1501150211 metadata/md5-cache/dev-lang/vala-0.22.1
 1501150211 metadata/md5-cache/dev-lang/lua-5.1.5-r1
 1501151606 metadata/md5-cache/dev-lang/scala-2.11.4
@@ -55931,7 +55909,6 @@
 1501150211 metadata/md5-cache/dev-lang/mono-3.2.3
 1501150211 metadata/md5-cache/dev-lang/idb-14.0.0.080
 1501150211 metadata/md5-cache/dev-lang/mlton-20100608
-1501150211 metadata/md5-cache/dev-lang/swi-prolog-7.1.27
 1501150211 metadata/md5-cache/dev-lang/tk-8.5.16
 1501151606 metadata/md5-cache/dev-lang/scala-2.11.2
 1501150211 metadata/md5-cache/dev-lang/rust-bin-0.12.0
@@ -56038,7 +56015,6 @@
 1501150211 metadata/md5-cache/dev-lang/julia-0.2.0-r1
 1501150211 metadata/md5-cache/dev-lang/icc-13.0.1.117
 1501150211 metadata/md5-cache/dev-lang/idb-13.0.1.117-r1
-1501150211 metadata/md5-cache/dev-lang/swi-prolog-7.1.26
 1501150211 metadata/md5-cache/dev-lang/tinycobol-0.65.9
 1501150211 metadata/md5-cache/dev-lang/nqp-2014.12
 1412310806 metadata/md5-cache/dev-lang/swig-3.0.3
@@ -56097,7 +56073,7 @@
 1501150211 metadata/md5-cache/dev-lang/erlang-17.3
 1501150229 metadata/md5-cache/x11-wm/notion-9999
 1501150229 metadata/md5-cache/x11-wm/matchbox-desktop-0.9.1
-1501150229 metadata/md5-cache/x11-wm/windowmaker-0.95.5-r1
+1501211306 metadata/md5-cache/x11-wm/windowmaker-0.95.5-r1
 1501150229 metadata/md5-cache/x11-wm/mate-window-manager-1.6.2
 1501150229 metadata/md5-cache/x11-wm/mutter-3.14.3
 1501150229 metadata/md5-cache/x11-wm/xpra-0.12.7
@@ -56119,14 +56095,12 @@
 1501150229 metadata/md5-cache/x11-wm/i3-4.8
 1501150229 metadata/md5-cache/x11-wm/compiz-0.8.8-r3
 1501150229 metadata/md5-cache/x11-wm/xmonad-0.11-r1
-1501150229 metadata/md5-cache/x11-wm/windowmaker-0.95.3-r1
 1501150229 metadata/md5-cache/x11-wm/twm-1.0.8
 1501150229 metadata/md5-cache/x11-wm/awesome-3.5.4
 1411010905 metadata/md5-cache/x11-wm/lwm-1.2.2
 1501150229 metadata/md5-cache/x11-wm/i3-9999
 1501150229 metadata/md5-cache/x11-wm/windowlab-1.34
 1501150229 metadata/md5-cache/x11-wm/enlightenment-1.0.11
-1501150229 metadata/md5-cache/x11-wm/windowmaker-0.95.4-r1
 1501150229 metadata/md5-cache/x11-wm/subtle-0.11.3224
 1411010905 metadata/md5-cache/x11-wm/evilwm-1.1.0
 1501150229 metadata/md5-cache/x11-wm/jwm-2.1.0
@@ -56153,8 +56127,6 @@
 1501150229 metadata/md5-cache/x11-wm/openbox-3.5.2-r1
 1501150229 metadata/md5-cache/x11-wm/spectrwm-2.1.1
 1501150229 metadata/md5-cache/x11-wm/spectrwm-2.3.0
-1501150229 metadata/md5-cache/x11-wm/windowmaker-0.95.4
-1501150229 metadata/md5-cache/x11-wm/windowmaker-0.95.5
 1501150229 metadata/md5-cache/x11-wm/awesome-3.5.2
 1501150229 metadata/md5-cache/x11-wm/stumpwm-9999
 1211091754 metadata/md5-cache/x11-wm/vtwm-5.4.6a
@@ -56187,7 +56159,7 @@
 1501150229 metadata/md5-cache/x11-wm/enlightenment-1.0.13
 1501191436 metadata/md5-cache/x11-wm/musca-0.9.24_p20100226-r3
 1501150229 metadata/md5-cache/x11-wm/awesome-3.5.2-r1
-1501150229 metadata/md5-cache/x11-wm/windowmaker-0.92.0-r11
+1501211306 metadata/md5-cache/x11-wm/windowmaker-0.92.0-r11
 1501150229 metadata/md5-cache/x11-wm/xpra-0.14.12
 1501150229 metadata/md5-cache/x11-wm/plwm-2.7_rc1
 1501201906 metadata/md5-cache/x11-wm/qtile-9999
@@ -56200,7 +56172,7 @@
 1501150229 metadata/md5-cache/x11-wm/enlightenment-0.16.9999
 1501150229 metadata/md5-cache/x11-wm/muffin-2.2.6
 1501150229 metadata/md5-cache/x11-wm/fluxbox-1.3.6
-1501150229 metadata/md5-cache/x11-wm/windowmaker-0.95.6
+1501211306 metadata/md5-cache/x11-wm/windowmaker-0.95.6
 1501150229 metadata/md5-cache/x11-wm/afterstep-2.2.9
 1501150229 metadata/md5-cache/x11-wm/bspwm-0.8.8-r1
 1501150229 metadata/md5-cache/x11-wm/wmii-3.9.2-r4
@@ -57886,7 +57858,7 @@
 1501150213 metadata/md5-cache/dev-php/pecl-memcache-2.2.6-r2
 1411010844 metadata/md5-cache/dev-php/PEAR-HTML_Table_Matrix-1.0.10
 1408110136 metadata/md5-cache/dev-php/smarty-docs-3.0
-1501201106 metadata/md5-cache/dev-php/ZendFramework-1.12.9
+1501211336 metadata/md5-cache/dev-php/ZendFramework-1.12.9
 1411010844 metadata/md5-cache/dev-php/PEAR-HTML_Javascript-1.1.2
 1411062136 metadata/md5-cache/dev-php/PEAR-Net_Ping-2.4.5-r1
 1501150217 metadata/md5-cache/games-board/gnuchess-book-1.02
@@ -58131,7 +58103,7 @@
 1411010849 metadata/md5-cache/dev-util/objconv-2.32_pre20131127
 1211091741 metadata/md5-cache/dev-util/lcov-1.7
 1501150217 metadata/md5-cache/dev-util/webcpp-0.8.4
-1501201206 metadata/md5-cache/dev-util/cmdtest-0.6
+1501211336 metadata/md5-cache/dev-util/cmdtest-0.6
 1501150217 metadata/md5-cache/dev-util/systemtap-2.4
 1211091741 metadata/md5-cache/dev-util/android-ndk-8b
 1501150217 metadata/md5-cache/dev-util/sgb-20030623
@@ -58196,7 +58168,7 @@
 1501150217 metadata/md5-cache/dev-util/ketchup-0.9.8
 1211091741 metadata/md5-cache/dev-util/shtool-2.0.3
 1411010849 metadata/md5-cache/dev-util/usb-robot-0.2.0
-1501201206 metadata/md5-cache/dev-util/cmdtest-0.10
+1501211336 metadata/md5-cache/dev-util/cmdtest-0.10
 1408130836 metadata/md5-cache/dev-util/checkbashisms-2.0.0.2
 1211091741 metadata/md5-cache/dev-util/rej-0.16
 1501150217 metadata/md5-cache/dev-util/xdelta-3.0.6
@@ -61803,6 +61775,7 @@
 1501150219 metadata/md5-cache/kde-misc/krecipes-2.0_beta2-r1
 1501150219 metadata/md5-cache/kde-misc/kdiff3-0.9.98
 1501150219 metadata/md5-cache/kde-misc/kookie-0.1.1
+1501211036 metadata/md5-cache/kde-misc/kio-mtp-0.75_p20141221
 1501150219 metadata/md5-cache/kde-misc/kscreen-1.0.71
 1501150219 metadata/md5-cache/kde-misc/krename-4.0.9-r3
 1501150219 metadata/md5-cache/kde-misc/kgrubeditor-0.8.5
@@ -64294,6 +64267,7 @@
 1501150216 metadata/md5-cache/dev-ruby/timers-4.0.1
 1501150215 metadata/md5-cache/dev-ruby/acts_as_list-0.5.0
 1501150215 metadata/md5-cache/dev-ruby/journey-1.0.4-r1
+1501211036 metadata/md5-cache/dev-ruby/msgpack-0.5.10
 1501150215 metadata/md5-cache/dev-ruby/http-0.6.2
 1501150216 metadata/md5-cache/dev-ruby/rake-remote_task-2.2.1-r1
 1501150216 metadata/md5-cache/dev-ruby/rbtree-0.4.2
@@ -66011,7 +65985,7 @@
 1501150220 metadata/md5-cache/media-gfx/opcion-1.1.1-r2
 1501150220 metadata/md5-cache/media-gfx/splash-themes-livecd-2007.0-r1
 1501150220 metadata/md5-cache/media-gfx/iscan-plugin-esdip-1.0.0.5-r1
-1501210106 metadata/md5-cache/media-gfx/exiv2-0.24-r1
+1501211436 metadata/md5-cache/media-gfx/exiv2-0.24-r1
 1501150219 metadata/md5-cache/media-gfx/fim-0.4_rc1
 1501150220 metadata/md5-cache/media-gfx/mypaint-1.1.0
 1501150220 metadata/md5-cache/media-gfx/zbar-0.10-r3
@@ -68937,7 +68911,7 @@
 1501150218 metadata/md5-cache/games-roguelike/crossfire-client-1.70.0
 1501150218 metadata/md5-cache/games-roguelike/tome-2.3.5
 1501150218 metadata/md5-cache/games-roguelike/tomenet-4.5.5
-1501150218 metadata/md5-cache/games-roguelike/zangband-2.7.4c
+1501211036 metadata/md5-cache/games-roguelike/zangband-2.7.4c
 1501150218 metadata/md5-cache/games-roguelike/crossfire-client-1.70.0-r1
 1501150218 metadata/md5-cache/games-roguelike/angband-3.4.1
 1501150218 metadata/md5-cache/games-roguelike/stone-soup-0.14.2
@@ -68958,6 +68932,7 @@
 1501150218 metadata/md5-cache/games-roguelike/ivan-0.50
 1501150218 metadata/md5-cache/games-roguelike/FTL-1.5.13
 1501150218 metadata/md5-cache/games-roguelike/stone-soup-0.14.1
+1501210936 metadata/md5-cache/games-roguelike/angband-3.5.1
 1501150218 metadata/md5-cache/games-roguelike/nethack-3.4.3-r1
 1501150225 metadata/md5-cache/sys-apps/more-2.12r
 1501150226 metadata/md5-cache/sys-apps/usermode-utilities-20070815-r3
@@ -69455,7 +69430,7 @@
 1501150225 metadata/md5-cache/sys-apps/acl-2.2.52-r1
 1501150225 metadata/md5-cache/sys-apps/razercfg-0.29
 1501150225 metadata/md5-cache/sys-apps/net-tools-1.60_p20130513023548-r1
-1501202136 metadata/md5-cache/sys-apps/grep-2.21-r1
+1501211336 metadata/md5-cache/sys-apps/grep-2.21-r1
 1501150225 metadata/md5-cache/sys-apps/s390-tools-1.10.0
 1501150225 metadata/md5-cache/sys-apps/lmctfy-0.2.0
 1411010901 metadata/md5-cache/sys-apps/usbmon-6-r1
@@ -69664,26 +69639,23 @@
 1501150219 metadata/md5-cache/mail-mta/opensmtpd-5.4.4_p1
 1501150219 metadata/md5-cache/mail-mta/courier-0.71
 1501150219 metadata/md5-cache/mail-mta/exim-4.85
-1501150219 metadata/md5-cache/mail-mta/postfix-2.12_pre20141228
 1501150219 metadata/md5-cache/mail-mta/netqmail-1.06-r2
 1501150219 metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2
 1501150219 metadata/md5-cache/mail-mta/nullmailer-1.13-r5
 1501150219 metadata/md5-cache/mail-mta/qpsmtpd-9999
 1501150219 metadata/md5-cache/mail-mta/msmtp-1.4.32
 1501150219 metadata/md5-cache/mail-mta/netqmail-1.06-r1
-1501150219 metadata/md5-cache/mail-mta/postfix-2.11.1
 1501150219 metadata/md5-cache/mail-mta/exim-4.84
 1501041036 metadata/md5-cache/mail-mta/msmtp-1.6.0
 1501150219 metadata/md5-cache/mail-mta/postfix-2.10.2
 1501150219 metadata/md5-cache/mail-mta/netqmail-1.06
 1501150219 metadata/md5-cache/mail-mta/mini-qmail-1.06
 1501151206 metadata/md5-cache/mail-mta/courier-0.74.1
+1501211406 metadata/md5-cache/mail-mta/postfix-2.12_pre20150120
 1501150219 metadata/md5-cache/mail-mta/mini-qmail-1.05-r1
-1501150219 metadata/md5-cache/mail-mta/postfix-2.11.2
 1501150219 metadata/md5-cache/mail-mta/postfix-2.10.3
 1501151206 metadata/md5-cache/mail-mta/courier-0.74.0
 1501150219 metadata/md5-cache/mail-mta/ssmtp-2.64-r2
-1501150219 metadata/md5-cache/mail-mta/postfix-2.11.1-r1
 1303180006 metadata/md5-cache/mail-mta/esmtp-1.2
 1501150219 metadata/md5-cache/mail-mta/postfix-2.10.4
 1501150219 metadata/md5-cache/mail-mta/mini-qmail-1.05
@@ -72590,7 +72562,7 @@
 1501150212 metadata/md5-cache/dev-perl/HTTP-Message-6.30.0-r1
 1501150213 metadata/md5-cache/dev-perl/YAML-LibYAML-0.410.0
 1501150212 metadata/md5-cache/dev-perl/DateTime-TimeZone-1.810.0
-1501150213 metadata/md5-cache/dev-perl/Test-TCP-2.60.0
+1501211936 metadata/md5-cache/dev-perl/Test-TCP-2.60.0
 1501150212 metadata/md5-cache/dev-perl/Clone-0.370.0
 1501150213 metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r1
 1501181206 metadata/md5-cache/dev-perl/Clone-0.360.0
@@ -72625,7 +72597,7 @@
 1501150223 metadata/md5-cache/net-proxy/mitmproxy-0.11.1
 1501150223 metadata/md5-cache/net-proxy/haproxy-1.5.4
 1501150223 metadata/md5-cache/net-proxy/dante-1.1.19-r4
-1501180906 metadata/md5-cache/net-proxy/squid-3.5.1
+1501211006 metadata/md5-cache/net-proxy/squid-3.5.1
 1501150223 metadata/md5-cache/net-proxy/torsocks-2.0.0-r1
 1501150223 metadata/md5-cache/net-proxy/dnsproxy-1.16-r1
 1501150223 metadata/md5-cache/net-proxy/torsocks-1.2-r2
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 90c247ed820b..ffcb5ff39ead 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 21 Jan 2015 06:00:01 +0000
+Wed, 21 Jan 2015 18:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f41387f96ea0..da3e128054e6 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1421818501 Wed 21 Jan 2015 05:35:01 AM UTC UTC
+1421861701 Wed 21 Jan 2015 05:35:01 PM UTC UTC
diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index a937be6ad4c5..593b7d2b607b 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-proxy/squid
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.504 2015/01/18 05:55:02 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.505 2015/01/21 06:49:51 eras Exp $
+
+  21 Jan 2015; Eray Aslan <eras@gentoo.org> squid-3.5.1.ebuild:
+  Fix gnutls dependency - bug #537076
 
 *squid-3.5.1 (18 Jan 2015)
 
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index e8a8b90e2f93..8ac27a4b21b8 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -15,25 +15,25 @@ DIST squid-3.5.1.tar.xz 2281248 SHA256 3a3bc6b424149da5a4816786100f32e47b45e1391
 EBUILD squid-3.3.13-r1.ebuild 7758 SHA256 504dc84402101a79f200e5ffded9c116536d8cc2f279a820e384680a9c2f66c0 SHA512 9ea2ac08743d1666d9f6af10142994fef9c47020a1183d87899c4813eb598584885fa3507a0829b94292e0f251a9895128592b37fd0d6816a4da09e001faefe4 WHIRLPOOL c3e6b5081f8078b629548e49454725a85124544d6169b65ab174a08196419964cfc91cbf1a2503d27b8ce303be3641b9b249ab959127743d6314da1cd85e8045
 EBUILD squid-3.4.10.ebuild 7957 SHA256 ae31160052f47cfc0586a54eb5ed6f4122ee000cc61fac25d800d2a30ed27985 SHA512 0fd413cf062d7a20b16d890137188c6f3ebfa5349ccc6d0e60730a7ea0d01bd0ab8cafd35795b7a48c918fa0fdd52ac59f033a48b3c2dbb68349e3a8c57463e7 WHIRLPOOL 102cb4b3ec0c311bbe464718f1a6149177f3b360d03379e96dc7615254d8f6c497230d7450ddd174570a451061f901e66ce9e400f4f57c13d44b4c986c4cc00c
 EBUILD squid-3.4.11.ebuild 7938 SHA256 5fac61a6c47aa563e9429e7b55405bde3c7a691a5d2c5940f543fb96e8dd69f4 SHA512 6a7d2e6233176215b6b1c806a6bab47f8687e6bf4109e31dfa0590958f9b280ac2e6ae72dc077fc338ceaafd546ec39c5de591a9354d1606e36a58d044838c57 WHIRLPOOL dd3f11a7909d1835daa564f6b50da48aec8f185d499618e549b124861b74468d93fa6d895243b4c3c36bbcf99b11d5e7c16f354ae8fa1a532e21d358b5134769
-EBUILD squid-3.5.1.ebuild 7633 SHA256 1f0ebc8380797b004b5e7c32abcf395d99e6d2a9115c4b59b9f002fd1fba8440 SHA512 4858dda9d7072c4a075796e63ccac9488416336b6f9f56bf853067c2b3fe0e76aefe41044cc201cb5b54539a3d4ba940e62f62f8e006e9050a9d6cd8c2231c4a WHIRLPOOL 193a9bb5e4bf01de210b1a0dbb7a95b0c1cf2f1b321a92af0e03fdf12448b507341eab33530a0470f235867b6545094bae83a70290fd1a8f79da5033b7d86a10
-MISC ChangeLog 92491 SHA256 118d03ecd97580c2b6162d873130d9fb0fe9de48b885f1a1be7169eb70d14783 SHA512 516ec7014dda42d06274478dfebcd092584fb30b304f1c579744bf425ba233f2768f286636e2226f904bbf447a43f1d6511d0af5df2b35c7094ac2c39e2294d8 WHIRLPOOL 75a285b6f58d0fedf989ec1e5fb316ab514121bf8439f0d67a7c15235011aa8aff2665bdbf44f10f254df44c51183ebc5d7591463f4315f9953d05e89120b661
+EBUILD squid-3.5.1.ebuild 7623 SHA256 63d74d8f6acc5bcb5537a8dbc1adf0e00b4cde2eba7bbbe9f96743bf7c1bd621 SHA512 9b48fbcd4b1b4d0b2602aa10abc32d2ba75da5ddbf5d1364467dd4133a818e92637572ac641fe458586ef9a58f7ac97caa9f82a0b2230bf3d7a3aff27c1a9ba2 WHIRLPOOL 329a8743846e901b0ef88c1c9f4a7377852e6f6f18154f92361494084f9485d5439e0325cf984f2e6232a421de143367842c8df3b50bf9b8b9ac71adb5c87ec2
+MISC ChangeLog 92594 SHA256 43e7e5c4d0f9868a223e97e5ece08fab1c08d2e854e9cfe2043701557eaad431 SHA512 c48ee0d95ac90f65ef878ab9cb95e329ebbd4a5ed6f44a517cc8218dd7a6cad809665cdace32d962da2ed411ba92ff2fcc60369dbe9f044ac8b674cb73c8cecc WHIRLPOOL a9621c16348a45d588afe40ad349490fe33af5a2d32fc35447ce3f28211ea8cf299e7bef2f2310f504ac1a6b2cf215d8e81944139d144bad809464fda8ce8b8c
 MISC metadata.xml 1545 SHA256 72b1cd3b3476500f50f936459a522eca2fabcad046cc2647662bf18b75d57edf SHA512 20c78e621a6a58697108ae3e0a543a3ead301ccb50ba54266fa9775ef66fc24590ccc7a24d20883af656b8a295fac26527c65d236d4d46ae0e0df0c2d15c993d WHIRLPOOL 90a2470ab97b9d56e0b73410741194f30b1bed09f99ab71940ded398d3796ff8d87250ccfe419c544b2e85cebd8706d0c4beed926870f290694074c34317be90
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUu0rAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUv0wbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBQjk1NkM0NUMxNzFCRTY4Rjk4NENDMDk3
-N0YxRjE3NTU4NkEzQjFGAAoJEHfx8XVYajsfmLkP/Ryb9xedRgygrWB06az70tvP
-kOF2jHpjfQ+TS7xSUzzW3V84zjm056TGep+axgAyvbEPUYJU3/yAIN4XcLZw4/Lm
-sTXRTZwYLsVRbadQVDqpCw8lHlCWZLRf9oRKjT6i1V37Dit2Eeu9B6/nw0/aF1I/
-XdQeLozPxQiuU/hwQbOd5GLLS5/qM13at5tlukb4CUM0t8CCFtP45P+v83Lep6th
-W10TiYYC4UCP7tG2WPDELosyuA8528hR9D+bq5FqHSvt6Y7UY/yCgTROwdjI7nDn
-xnNxJTBF6ZwCGO99RJVYf3bQQCc/0mY5DHFnaYdpIYawskHxlLp/dXkqorkZ7DIN
-SkZytt71FGEKd4fVZnwh3zZKmPGiYgRyEeLW782+lANizyXRvZ0/jBuR2U2YdHFB
-U5lG9DVVhH7mmD84zkTSm0BkPQ9z4p7fZMj5YaPqrXMryl9Xg7FcLAdhZRHVqNpI
-fQXuZK7d5vCyo9VY9VJ9kclnLUu37nnNBzm+yp1Ve08et/dw4Z0WYLqrS1+MS6qV
-Oe+yOEnKMKd6FrEzED7LyWQtkl12ncY0t1kKRNDvujFJuJv0MSP/6Xo+wBS1SH9v
-XTWqCBNp6jCaJLGGS3/OKA27LrYkT6oTxb5g+pYlvrvGahJjFc0YxhxIo0z0qeSv
-pI06c7XuxtCmV4WYsINa
-=J/8q
+N0YxRjE3NTU4NkEzQjFGAAoJEHfx8XVYajsf7/MP/119wwuqstnbN5z8+u6ewiLY
+YoLPzXmLznXHMjlcSYQEo6b3AP69uiRH8yXXYSOp8EgRcXafbkvNmEAEAn/zD9MV
+uLVfP2EuK7WTbSnhYZPt7o7pQUT3eBCb+RpuRxYJUQ4PxWCENT2S7Vi0stHzt/6M
+ildWC79Lg7XR3dCYgPAyG0AE/fqFoxDJ/yX0qh0uiT7p1IeQGGPbJaI4CqndNqDx
+6qOAmz5F30yLPeOhDgvKSywE99fO9/G/OWXgLgQb39RaDAmALWaJzK+hjWZ17v97
+mqTaVzKMb+opKzphLhnpNiSDK6BRyBIcJcLVAamWJX+K7mQFv1slFeQjS519szwo
+JboGZ0EWxNP6rwDe4Bpfhs7vPrDoxtlryPtTqY5AfsmfjjL/FCNpZNxG2C2fPbnM
+4aqOj8uG+GfILdc4SXo2q+UySFZdxezxilFseJtPbDou7YLZqR0yYvQtKG4CR22o
+5NqN3ipScaiKDk5bPJ9UeKSKHXRSA+ew3/PZCIJUvNQ4IKZZ3FQIwHL3pvP7zkW6
+IvHPQWOxw72g0PGENKyXZ8HrxsU1cOTW2ZBFbK/Sfn0YxGc7wPGrGvfgmprMqYGu
+G4lZeiWZvQ7yOr5XUZ74KJzRIALnVZ3s6svuCcymYHAc30XNgtO9ptWtRC6l+P8M
+JKkhGuMPAwWeaWJCgP6Y
+=bofv
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/squid-3.5.1.ebuild b/net-proxy/squid/squid-3.5.1.ebuild
index a41e76333e0f..57de10c40d88 100644
--- a/net-proxy/squid/squid-3.5.1.ebuild
+++ b/net-proxy/squid/squid-3.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.5.1.ebuild,v 1.1 2015/01/18 05:55:02 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.5.1.ebuild,v 1.2 2015/01/21 06:49:51 eras Exp $
 
 EAPI=5
 inherit autotools eutils linux-info pam toolchain-funcs user versionator
@@ -25,7 +25,7 @@ COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
 	ldap? ( net-nds/openldap )
 	kerberos? ( virtual/krb5 )
 	qos? ( net-libs/libnetfilter_conntrack )
-	ssl? ( dev-libs/openssl dev-libs/nettle net-libs/gnutls )
+	ssl? ( dev-libs/openssl dev-libs/nettle >=net-libs/gnutls-3.1.5 )
 	sasl? ( dev-libs/cyrus-sasl )
 	ecap? ( net-libs/libecap:1 )
 	esi? ( dev-libs/expat dev-libs/libxml2 )
@@ -165,7 +165,6 @@ src_configure() {
 		--enable-removal-policies="lru,heap" \
 		--enable-storeio="${storeio_modules}" \
 		--enable-disk-io \
-		--enable-auth \
 		--enable-auth-basic="${basic_modules}" \
 		--enable-auth-digest="${digest_modules}" \
 		--enable-auth-ntlm="${ntlm_modules}" \
diff --git a/net-wireless/gnuradio/ChangeLog b/net-wireless/gnuradio/ChangeLog
index 9726acbdf468..48d32fba2366 100644
--- a/net-wireless/gnuradio/ChangeLog
+++ b/net-wireless/gnuradio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/gnuradio
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.60 2015/01/09 17:56:48 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.61 2015/01/21 12:32:44 pacho Exp $
+
+  21 Jan 2015; Pacho Ramos <pacho@gentoo.org> gnuradio-3.7.6.ebuild,
+  gnuradio-9999.ebuild:
+  Fix sandbox violations, #534582
 
 *gnuradio-3.7.6 (08 Jan 2015)
 *gnuradio-3.7.5.2 (08 Jan 2015)
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 22d9399f522e..3a57bcbcaaac 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -9,24 +9,14 @@ DIST gnuradio-3.7.5.2.tar.gz 3550717 SHA256 e91bea1e4354358fc55d8fce0868fdc5f22d
 DIST gnuradio-3.7.6.tar.gz 3579734 SHA256 07390ec36b1718c2e73b2933b3b6d3b0af8251d61ce06a37231700e65fac14a2 SHA512 7f005e3dbdfe8f67aea04f7a055b1a354c92c5cb138a7228908602b334cf5b3b3c690b31eb171064918e9878a241a6402763cf6a65291ba0a4a86e1cae420e86 WHIRLPOOL 922734733c1239eec6a19cb9d2b8b5259ded811369ace0241a6f107cf3d9128ffa724fee7213997f57fe32cf7b5e64cdfa9efe6885af548699ea39a6dc757cd8
 EBUILD gnuradio-3.6.5.1-r2.ebuild 5601 SHA256 93cf9a2d92ecf28f7147343279ce2b8a8a66aa27fed53099f9d9873106a2159d SHA512 fe77be87f2f17ed2d28a311f0c8c16147c790b04e92c36ab9e2b181b94c535afe3d3122a15531277049384dac17c83cd0d9fe47a4e007f899ee608a5f1a5abaa WHIRLPOOL de62e59571dfdd082b545a4ec90541f2db9971f586b95f74c2af48076e96c51c9a249ce4ce9ef30c191be631fe23574559a7e230c98466af9529a7d69ecb0ac5
 EBUILD gnuradio-3.7.5.2.ebuild 7013 SHA256 bf80fd15a4914b4f4ca3a651e93613c82a213c46ce34fdd7753ab6057b3396c4 SHA512 a04ccb82ddf936ce1da16378e0169525632de1a4ca66baef2a036ba6e25759467853d2782d1224103dcd573e37624f7dcf92e694dc4539f9c28032df58bac73c WHIRLPOOL 6b99f48df3779dffdebfaec052cb9e38399e166913d4352dc288493b258c7947478c628d7e5b46451cf22c9f6226d53afbf0ed7a171b477314989144b5e2d766
-EBUILD gnuradio-3.7.6.ebuild 7011 SHA256 dcb79f7a051de65ac8ffa1c82496a969bbf613cb754896ec00bdda0b6660011e SHA512 2ae5c6fe321fd1cdcaf43e6f604af9985c2f1484c4a7d05640e749787345a487eab1689daa9cb7abf9bd9648cf1ad4a0d999c8999a257d2beac68dfe34448cfe WHIRLPOOL 36892417e5426f397fa9cfd08a1a121d03399a41c45c4c4ca382c3c932c95c323fc126979c868b0797080725b71c1d55ac200f40c2591ad3e6818758a97a4f57
-EBUILD gnuradio-9999.ebuild 7018 SHA256 59d18111abc238e851e44eed9808ac3544b097c42b1cd8d4b0551e9d28445a44 SHA512 757001a5e62fab1908d20d17acb5aa985958c025d793d5e77934cd410854027d567261469b4969c1794cf089f126fa39ad851ebaae49f296c7172a8d18612540 WHIRLPOOL e97de9cd4f93a3ee03e0f28eeceb35d131906364c4c1e19ec20b56a280c7ef7aa5fc9106016d3999c772ff4cfc9e7d4ddcac9c28f1d2b374ee5e97fed4326e83
-MISC ChangeLog 11368 SHA256 3c4f0b1dadaab44cebbfdd9cef26154e9b775ab0a5533e9ff52596216f685959 SHA512 80be410bd5f522a570227a465e73918ba20065d9f02de67171fd97fc7befc6efa2194d5ae06f5187395614b4b6d16f0d2e2585a5518c38a05f3d274eb39ee672 WHIRLPOOL 4f4fad0645df39186366f6da981f6eadd0ef2cdbe8c3172bec08210c23a24c680524b17157f69bf9ee68bec15400e2bed03e1ddedad77ba88f34343d5c6133bf
+EBUILD gnuradio-3.7.6.ebuild 7055 SHA256 5b977199ade27b45cf160d69945e418727e6c0ff79ecfe6a66ae017955fbaf17 SHA512 5e9bc005e9a6e520e80bfaa94eb1cfc9c046501afa7fff6cfe14149926359483e9ba3edda82726d12f858beed47ed293d761b8997c06b9f66de630e4d031feba WHIRLPOOL 12d7e8612db297fce658cd421ed750792277b77d7d4712eaf8f27cf89f898e9a20f6bfcd71e351d0bfdcafed1cbb1cdeaf988c06f95a7b74751563309d7ae3f2
+EBUILD gnuradio-9999.ebuild 7062 SHA256 b8bd6e45fb4c08a5f206f93a7de4f3e1b67e7ab4b5393552f16904fbf0dc5dfc SHA512 5453d9b63970de14a14eb0064b5329a38b87de6ef716e6b879f96652cf20bd7083e91e6d1b621c9a8e9bf547969c51b5c642b4cf98011b4a430edbace56b3e4f WHIRLPOOL b14c32f3ed901e2268cd882fe3765923065e5472e9f3e2f6853f62d3c324f142727b7444bbbd24fbf097c352eac211ad9f30e09d7b50b879afb509292f1165d7
+MISC ChangeLog 11492 SHA256 366d0714260999bc10185b257beaa6343852eb82dffb1e391034390e4ba0174d SHA512 859f4c2bec9182a5854011e6b921745e8acf76a5e39464d1c27167961e3048b2826d3a405eeac4e74bdb61ddc03c7432d85ac0d77d2432c267e3164a78a50229 WHIRLPOOL d213db853fdb734e062157de7a83b8ad9c578b0f57680af67457455ed579ed45a719b42ed109227ed9a978f95872b82ae1ced027e8a9c707ca9ef2d86ab0745e
 MISC metadata.xml 1750 SHA256 d8fc5305ded243faf3b60e63f3e36779d6ba44238cf6a3ec6ab605413f3a5b13 SHA512 598b4cd9d9090906f039f1d90e2c5f6cea5b5d0faca0dd3cb5e71adf6597c997d3bc36d21a92d532968be9885af96291e8a5ad6b67f1c41e5a2e89fb015481fc WHIRLPOOL 5b5cea4f525c11540f7c91fcf23c8fa01e50b14f879c0e8480b2a96ccd308e22aea9dda61f72ad5ceb5dc82922e4d6b5acc823a890e5aaa1cfbc5b0c8883a122
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUsBZmAAoJEKXdFCfdEflKJ00QAJBViMA/uFLodeQ37SOfEPzy
-gMlzG0sazAdyOGyiQ2u13SW26fTE3dOJul7XnAWsCKkea3LRswo5crdAf7IPoOtw
-NsZa/gsfCbJYguTFjYaHgXi1/fGcul0YnXZ7FZ0F35KQMouR8lRP++0LVXvHUL6K
-9/IyU9UuBR3eHFgoN3ttse2+CAq/v+3LzDpt0koBlwtrqSaf4Pwd51pEVP+xs93p
-0w2DMnI6BSDM1NWgnkQF6nbpYa/kM4VrjQg5ZjnKG0j0aKTc0wdpRkrpKSnn2caL
-f898RC6xrLhT+edqxTe39BikZymkr+kP2813+4avk5hIwZqdlz1C3Fu8wVF2glcn
-j+7tJ03Z897SeFPD/gZBVXichVOciFNsEgA4m5dEqD2xtRAIyoWDn2cGOWmFgDcJ
-+db9Md+kv6GHR2G+Euxdjft81oao9fMhlIYVo5egDFp/6JyISwRNt00T2ex17H3L
-SiPvUrvgYT82xaJUuYZMnYJ7CDs6FI728QqCEzEs0nL2UFBedm79XEwbxnao38gp
-WfMo02FNspSBRIKk/j2oCOKePVNn/ioU4UG8D5rMkE12CV8GjOkR0GLh2gymg1uG
-a66EPbXx7i9Dr/oiZOpsqdLGiexGYSEygHMLu0Wl9LMJB6t6uh+80wq+8/tBDYr0
-qzfI7+VQLbs8QuLn8I0g
-=dfBv
+iEYEAREIAAYFAlS/nHEACgkQCaWpQKGI+9SBzwCfQqnepNGIzlYrsBbhzuO0aDf9
+2XEAnA0rNsPSOOUJmpVTFr6iPnlsszRm
+=xLo8
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/gnuradio/gnuradio-3.7.6.ebuild b/net-wireless/gnuradio/gnuradio-3.7.6.ebuild
index 4c14fc759ac0..6b79e76cef63 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.6.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.6.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.7.6.ebuild,v 1.1 2015/01/08 14:37:41 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.7.6.ebuild,v 1.2 2015/01/21 12:32:44 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
 CMAKE_BUILD_TYPE="None"
-inherit cmake-utils fdo-mime python-single-r1
+inherit cmake-utils fdo-mime gnome2-utils python-single-r1
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
 HOMEPAGE="http://gnuradio.org/"
@@ -107,6 +107,8 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+	gnome2_environment_reset #534582
+
 	# Useless UI element would require qt3support, bug #365019
 	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
 	#epatch "${FILESDIR}"/${PN}-3.6.1-automagic-audio.patch
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 9ef6cfeaed0c..5a686d36e4e7 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild,v 1.27 2015/01/08 14:37:41 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild,v 1.28 2015/01/21 12:32:44 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
 CMAKE_BUILD_TYPE="None"
-inherit cmake-utils fdo-mime python-single-r1
+inherit cmake-utils fdo-mime gnome2-utils python-single-r1
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
 HOMEPAGE="http://gnuradio.org/"
@@ -107,6 +107,8 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+	gnome2_environment_reset #534582
+
 	# Useless UI element would require qt3support, bug #365019
 	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
 	#epatch "${FILESDIR}"/${PN}-3.6.1-automagic-audio.patch
diff --git a/net-wireless/uhd/ChangeLog b/net-wireless/uhd/ChangeLog
index 9dde2d751566..cca8a05b601b 100644
--- a/net-wireless/uhd/ChangeLog
+++ b/net-wireless/uhd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-wireless/uhd
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/uhd/ChangeLog,v 1.16 2014/11/03 15:05:03 zerochaos Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/uhd/ChangeLog,v 1.17 2015/01/21 12:09:21 pacho Exp $
+
+  21 Jan 2015; Pacho Ramos <pacho@gentoo.org> uhd-3.8.0.ebuild:
+  Fix sandbox violations, #534582
 
   03 Nov 2014; Rick Farina <zerochaos@gentoo.org> uhd-3.8.0.ebuild:
   switching to upstream zip file
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 87055d052d32..d74f7601f9b0 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,28 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST EttusResearch-UHD-3.7.2.tar.gz 86463974 SHA256 b72990dcedfa8334767ab5d1ab62890f1d296bc24f53ecfabc46417740e7008a SHA512 5476c95412c8a452a5e41f54b0e096a2617feb653c674d2392cbbf7d575f59f7480779b555f7d953dd5173c2db25b51bb5769995f137b9bdc87ea3aa01f54f81 WHIRLPOOL 890c5e479610a4272189d0b2575f7951f112e3219f7150203d4c5ec137f2c3ed9aa8450ff9a714f84500d54470afa4d30b77e1641db014d8447f7d4f606fd754
 DIST EttusResearch-UHD-3.8.0.tar.gz 2145612 SHA256 29b4921b67412a62195861769dbd6a4cddbf40037f729a4c45130d2f8abaa482 SHA512 29eff35ef2252bccbccc7a7237d44426f251297b443d18003eb3d671682428fe8346ca21e94ff14dfacd18e6f6abcd678f1bfde158389e7f35a16bbfe0f8c72b WHIRLPOOL 8ddff7bc75a45f1ba15ba7f7377700a518f795dcdf08036ecca3a10608404a43418dc594b0b747ddd1b83b7d7eb3969c5c08cbb2b6ef385d1f1d9988fb8e2745
 DIST uhd-images_003.007.002-release.tar.gz 23856513 SHA256 201aadbdd34406e96ad3d9a38a56034da603677e84f80fed4580889034df66b4 SHA512 89d0bb51a465d54d4beb77c1d25eca7200f2d6e017b38e555a79616337c5b7eb8bee938fc16ec0b8ea0e87e7a89a97911d5a817f237b681bbc52884c49a221fe WHIRLPOOL 1348053af681627dedea0c619fb3f0c57c8fae498219ee2a9cdde8bd958749a99071cd6deffe798e7db799fdcfcbff174de827dbe8fa5e4c38eb164b52071398
 DIST uhd-images_003.008.000-release.zip 24786568 SHA256 b012bd7f12fbe23c97f8ac43813c96fd72d28521dbd2f181cadb2b5c538b3080 SHA512 bc3bbe7d21182f6112a4495fee877a5549d41bb294d17f76d8b519a34b10587ffcb608c9f00cc15b16796e3f503925c3e3989652de7f17ce4c1deee9203dd6a8 WHIRLPOOL 5e7ae5cd606b5a76bd9eeb20a9ebdd4335db8f164603a178e245cad2789ba36969f908bd0d324499e85da9759b93ba6c654758dc471c66f23418e94062afa516
 EBUILD uhd-3.7.2.ebuild 1797 SHA256 4f5245baba047ff4cf798aa538897a8ebfaed9d785c0c3db708ec644492a7cf2 SHA512 09b575f08736d8a237dc9ec9f72d88d91c1fe326434fdc24031084d5581fcf94406e0ebe249587026e0bf9b030d04efc69fe9528c13e5fb6cc1b0f23d87480ff WHIRLPOOL 5d3085f3279cf9608f05161ba82c4d9f8cb0261a8aa9179dbc41eb8f6ff3a6fcc0d26f1d75bf512e9474a171e8f221277b19cb0e2f57c5ddf7f32be6b1251574
-EBUILD uhd-3.8.0.ebuild 1816 SHA256 34ae1f8f1ecec973476a6e86c1ee6c3d9cfa4bb228664a092e0000705f343e4c SHA512 360bccc2cad7924db7afb5fcb44566fce21dbd90945515ca90b0bf7bb174de1df6ba8fdbfc063cdf1c8c0a8347d62c0b3a4dbb31ed33ade02f89ad04189e116c WHIRLPOOL e56ab9d7e41222a37ad5bcc3fa33a5706c5f43397fae310262a7104dd23d08f877491c10d8f0d7d685712953d9cd8fbd920bf54c4d75d7a868a0208b98d1c24a
-MISC ChangeLog 2480 SHA256 1acd201f61bb77ea69dea3dba1fc46a70528525f117a7bf926ae95114c75c07b SHA512 37f6190baf7af4bb86de1e1a90cf358cecff49ffcb7b0ee9a969e58336f208adc9140d507448d54645376b45ed8db67737a8525095a2b17feda64bd31db3fd96 WHIRLPOOL 46a2431e654db821977d7274d41b348ace8c87c35d42ca6e3424f68eee1f81240af95ac251ac12d07a30e9c24bf5165480dc6734e8c30087f643b950c034d7b1
+EBUILD uhd-3.8.0.ebuild 1860 SHA256 3cc92e36d75159642071cf20c2f92a5af51e417a515ad1609aa6ac2fbacc7a3d SHA512 923b2a493d603d8c08187b7cf7c839e0722e16bc98eaae25168aafdd871adc4f50e8d7fd4901ed82bfc2b305260d7cf45894aad1c115f60ef8236898da4613a8 WHIRLPOOL d45bea6d7ae9abea1bbda400fc8bd0025367607c3173fd2c53616cf656b9258bb9e5fe1d27addd1a352e3e0f9c38ef5aa816db034704e01cc1f83f7c25d4a5c3
+MISC ChangeLog 2575 SHA256 52c6c8cfc36f16b98ab5bc679b3f94dfdac2801336abc87e03ae9825f08aeaf5 SHA512 bcbd0a65f3323603bdbc1c6f9428a39b0d0677e078cfb69a510b09d0fe0084b279107e063954dd1a88507e380d9bf11b34fb3de414c915fff6de81fa867390fa WHIRLPOOL 52aab8095bac616c02e1e47c81e53801c9082c9625efaed4951f7620cba56d9e956467561ebc2ff69c07c5b8c8cfbef7e40a70bfcad997c2e74aa0df1b1a7114
 MISC metadata.xml 389 SHA256 00dd105ce49c5a82196b733655d9935cb5121058d97b48ade1713ce9f1179c13 SHA512 b020e500023f5a6a76d1a0401ef2ca2194eff56aa7050387920bc6733c8fe7e8e1c8e146262df0a41c715379b1ca184f7177a834b682719e95dc761ba60a34bf WHIRLPOOL c095e843e87863ae399362a595e1c26df20cbfa15856525d135f2ec83cb5f1a996b7ea57222c3c958ba9d749ced46af93285ff078c1724dc0931c5c48df93909
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCgAGBQJUV5pGAAoJEKXdFCfdEflK9mYP/iWkUHfaVuTVCC02ViJIDwzr
-XQ7IOYUam57YV5FBUvYKg6xUStBJxkBsiDc2+o4xfUp1piMDL2Rt9bxOeDQ2gDqT
-VqE/GggV/KzT9Ka15CawkkQEegfpkpUc/slsTkFN+FPjK77MDxPJISxHWRIxqFXS
-69iUKKX0JEfXPTafuOGKAQZA83hgViDTfDX071RM6neb3t8voSL6BrP/Qz9I3sDp
-tzDjUN7JgK4pp1Bkh3L603ixWVhwg9GkZOAzm+4rpprc1Jv6xU0Vqu32Z0qGxMKM
-EEKa58JHFq2RtlEF+t6O7VVU9i0wxwXCsIUlIqOSCUyNGLNYxIgQEsU2Q3OjeDjb
-cRZxg82l4av/Y9T1skCKsjEy77nskAZEykHKSZepel+fzU7E75aAitNL0xp1fjVm
-3r4pE7DExX4P6EtUZG7kORMF0VksVSLSOk+ry0kJWaZE4blBQUi/i/enIlDpGEJA
-3n0KFC2vmDBvjzJW1Y61HO6ocheWrFmQmRuHPDeBBAylnCeOveQlC29nZM2mTrAV
-sCBXRXTqmFDzIjFClUWh4HmA7iXh8DlveXbbbWf6cyk2ClRz7wUag3oESRtNyzG7
-NtTeZDRey8MGbQMyDnTNFtF66oOQcLVt10yrHGLw7WTEe+QIOfHvg0WGCCAPen2o
-kTPTRlIELh1Fq+WSgmlj
-=RfkM
+iEYEAREIAAYFAlS/lv4ACgkQCaWpQKGI+9RpjACfVNpIpZguRFyeJk9m5QZ4KVso
+u7cAoIgAesU/5+PpV1Z3Qd1xP06KreGc
+=yfms
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/uhd/uhd-3.8.0.ebuild b/net-wireless/uhd/uhd-3.8.0.ebuild
index 59a1373b78a5..244d10e83931 100644
--- a/net-wireless/uhd/uhd-3.8.0.ebuild
+++ b/net-wireless/uhd/uhd-3.8.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/uhd/uhd-3.8.0.ebuild,v 1.3 2014/11/03 15:05:03 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/uhd/uhd-3.8.0.ebuild,v 1.4 2015/01/21 12:09:21 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
-inherit versionator python-single-r1 cmake-utils multilib
+inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
 
 DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
 HOMEPAGE="http://code.ettus.com/redmine/ettus/projects/uhd/wiki"
@@ -30,6 +30,8 @@ DEPEND="${RDEPEND}
 	app-arch/unzip"
 
 src_prepare() {
+	gnome2_environment_reset #534582
+
 	#this may not be needed in 3.4.3 and above, please verify
 	sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die
 }
diff --git a/sci-astronomy/stellarium/ChangeLog b/sci-astronomy/stellarium/ChangeLog
index 228867697636..9ef4ef8a9e60 100644
--- a/sci-astronomy/stellarium/ChangeLog
+++ b/sci-astronomy/stellarium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-astronomy/stellarium
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/ChangeLog,v 1.124 2014/10/25 07:42:32 mr_bones_ Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/ChangeLog,v 1.125 2015/01/21 15:38:37 mr_bones_ Exp $
+
+*stellarium-0.13.2 (21 Jan 2015)
+
+  21 Jan 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +stellarium-0.13.2.ebuild:
+  version bump
 
 *stellarium-0.13.1 (25 Oct 2014)
 
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index a66b2829ad34..74834e63b19d 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -5,7 +5,9 @@ DIST stars_7_2v0_0.cat 348268348 SHA256 730ca2d9182af5ebd4efcc5f87461ad9156caf79
 DIST stars_8_2v0_0.cat 706781416 SHA256 91b79dcf97464b4ca0f6c604e745dac2c6ca02e25ed986dbec2de5f6d6e8a1f9 SHA512 f94360e8cca9a3261017adbddf1cb74878771d16d1d6062cead8e9343ad28d26bcfa2b23cdd0a182bc1d5fa0a000ac96f722510118b0ad38886f548f4595f03b WHIRLPOOL cf1c37274bc9ebc99d5021fccdfba92ee17509e60b708eaa47ee5cdef2ada9424bda1543c454670207e29e6cadbc178460adbfc45480bee1caebfeee95a7e211
 DIST stellarium-0.12.4.tar.gz 79343617 SHA256 0fae1b6e2231ccfaba8fd00abf816a88bd89b5dc61387ac84edf479b363c6684 SHA512 324a8c930281e26e91d45356cf3aab89cf708c7e64636b7e89de95af3f6d2569830caf05fb44ebef88f65dda55cb6dd18dcf4ee54d46da3910c456dc2daac478 WHIRLPOOL 8bce980d157904c4032368da335263a9afd2136386b0fd19d27e10f1c8b33712780130ed6845f26b3bac43f00d2de4aee80c47a0648a6cf6b4741bf69301f110
 DIST stellarium-0.13.1.tar.gz 118068062 SHA256 ceb69e058545236e46406adbb8e2cbb0a26078eae471a945df09131f61cc3278 SHA512 a50489bcfda54b7f555194644c10874e2b8677db2ee19dd89bb8455fafe48bf4286a1efa843f98f18472185b1557c5ebe3c222e995aca0d08643a65848394e75 WHIRLPOOL 2965b3ee3b03e2bd3e9e107fa898becc8539bdbfc5b2af04b812263abe463ec418f1c72b6e4c5fc4954fe2552214e05922aef9c90407599d8e2bf3226fb217b1
+DIST stellarium-0.13.2.tar.gz 120652788 SHA256 e5718e28d484b6f16e13f334fe91c3611557b46b7989f4bf68fdcb6d76c059ab SHA512 b27e8e1149cab1a4484ee4f66447d4345ebdcd70d0934b266f0702c0c6d2fbc8823ce16cc7294e59daa56e40cd2fb5fa2c4710b988632eb01ce95da2ea43142a WHIRLPOOL a265b92c51e13501182b94d9a9a956408be23f8c3e654ec54278b65a21414966e5ed63a3f4606001273d42033c1fa156e5803a290570258f8c40792a67867f41
 EBUILD stellarium-0.12.4.ebuild 2769 SHA256 a461e3b7dd2b49acaa7d47eb59add78fdc0dec713074d4850751096f7e72ee39 SHA512 cd4f6263d88bb5fcd983e91eb9427069acb9def42d38d25a54af1a92cdceb2781df088b3137b12951948a0f8546d8f497ac79c26883bc9a9b1bd60400e5c6a21 WHIRLPOOL 1ee9a13bd7dccbed2194707d5fd3171c524050e5f9d51f8c8b69f77df0ca5b8dc79d59fc15fcfbfe905ae36a060154c471bb65b4e5d76594e2a7d1c8b5977ebb
 EBUILD stellarium-0.13.1.ebuild 2777 SHA256 a280c901a9c1b3fd2f2c1d78c675271d64ae5320748abda5c8a2104bd708481e SHA512 a7631b0a4f7f370196f3b1e11683ed117f1a2355d4efef660324fd5bac56b1f5373f37689c0b245db53e6bb9f7891a192585f60f478e1ee536e42ac55c515f4d WHIRLPOOL 48f5eb6e7820f02bde6628075c80ca821274015472e3b260e654619e2434e2a13878f3d15d8c8a1a0759c5e8cf5259fbc8690754b17238dba9d80d9c3ac8e30a
-MISC ChangeLog 18093 SHA256 005e54ede0a8d7ea847ba329bae671c70e279b4712173a6cfd7209d18495bf05 SHA512 9e1e5f693855644c7a0c80e9b25bfc6be51ae397319891253d0bd9d711467de7220b94c1dfa598c88dcb0d8597931b51104778f436e99addd507c842f511433c WHIRLPOOL 654db5396db47bf7b545ca04eedecc308e453253f1310d881527d1014e7209bf8cc23253a9a5660274f06d53efb3b846a806b5932117a2892bf3abc3307b00a7
+EBUILD stellarium-0.13.2.ebuild 2777 SHA256 0f573a28a6719ebabd40a2d245b54838a23e35fe2378a5d2c1e4b641e0c5977a SHA512 84efb7fd39baf545b8bed5439d8ed95103ddc5ebc52283687416dcfa5c2ef2302b6660d4a5091cbe005b072ac84073c28ce161fa0616ef330be84b8af7d64755 WHIRLPOOL a13a20f542020383be12dad2e5e261c90bf0d4845ad305c16344d465a68fc66f935f20f3a5358d836c255f7693b07e4a38d854dc743362ce791e0e514d28831f
+MISC ChangeLog 18227 SHA256 405ec875d2ea41c16e2a7e0b23a26aa95474115679d9f2cae2c799b586ef9742 SHA512 78b4e825fdc38088090650c4d3789e0bf95953cf92dc99f13c18ddedb850cd7352e86b4a0b3a0e76123e395ceb976b3ca1879c94756192ca5d80e8d39459506e WHIRLPOOL e887aa90f7e3db5a3d1b6cb8ee2ed565ed3ed275961d29dfe0223805853788349a3619a769bb1ffb4f1401db35b3b293afcb5b18369d46bf395434af1a7d9e4e
 MISC metadata.xml 632 SHA256 66b3310d2a759e0f92f434f607aaf780713576d470b635d2c137d6cc4acb2ec0 SHA512 4aa84cb185c4dae0667e9321bf5cdecb11615f64124eefa2accbdb3ab5d2e4307d0d31a13f834a562af8bd8538ec5165d5d265952b18b49af75e6a376f259449 WHIRLPOOL 041c748c3267d8504765a4edf1deafb46d0fc4cdf890b9265a3d2cda76cd0a19d9c1ec49c72475ec343670d4a4c307f4ba3c64d74a3c6cdfcdc3a92f198c4e5b
diff --git a/sci-astronomy/stellarium/stellarium-0.13.2.ebuild b/sci-astronomy/stellarium/stellarium-0.13.2.ebuild
new file mode 100644
index 000000000000..cb8f0cf51b3b
--- /dev/null
+++ b/sci-astronomy/stellarium/stellarium-0.13.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/stellarium-0.13.2.ebuild,v 1.1 2015/01/21 15:38:37 mr_bones_ Exp $
+
+EAPI=5
+inherit cmake-utils eutils flag-o-matic gnome2-utils
+
+DESCRIPTION="3D photo-realistic skies in real time"
+HOMEPAGE="http://www.stellarium.org/"
+SRC_URI="
+	mirror://sourceforge/stellarium/${P}.tar.gz
+	stars? (
+		mirror://sourceforge/stellarium/stars_4_1v0_0.cat
+		mirror://sourceforge/stellarium/stars_5_2v0_0.cat
+		mirror://sourceforge/stellarium/stars_6_2v0_0.cat
+		mirror://sourceforge/stellarium/stars_7_2v0_0.cat
+		mirror://sourceforge/stellarium/stars_8_2v0_0.cat
+	)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="" # until qt5 is unmasked
+IUSE="debug nls sound stars"
+
+RESTRICT="test"
+
+RDEPEND="
+	media-fonts/dejavu
+	dev-qt/qtcore:5
+	dev-qt/qtquick1:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5
+	virtual/opengl
+	sound? ( dev-qt/qtmultimedia:5[widgets] )"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+	nls? ( dev-qt/linguist-tools:5 )"
+DOCS=( AUTHORS ChangeLog README )
+
+LANGS=(
+	af ak am ar as ast az be bg bn bo br bs ca cs
+	cy da de el en en_CA en_GB en_US eo es et eu fa fi fil fr
+	ga gd gl gu he hi hr hu hy ia id is it ja ka kk kn ko ky
+	la lb lo lt lv mk ml mn mr ms mt nan nb nl nn oc pa pl pt pt_BR ro
+	ru se si sk sl sq sr sv sw ta te tg th tl tr tt uk uz vi zh
+	zh_CN zh_HK zh_TW zu
+	)
+
+for X in "${LANGS[@]}" ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+src_prepare() {
+	if [[ -n ${LINGUAS} ]] ; then
+		sed -i \
+			-e '/aa ab ae/d' \
+			-e "/GETTEXT_CREATE_TRANSLATIONS/a \ ${LINGUAS}" \
+			po/stellarium{,-skycultures}/CMakeLists.txt || die #403647
+	fi
+	sed -i \
+		-e '/^Actions/s/Safemode;//' \
+		-e '/^OnlyShowIn/d' \
+		data/stellarium.desktop || die
+	sed -i -e '/SimpleDrawLine/s: 0 : 1 :g' CMakeLists.txt || die
+	use debug || append-cppflags -DQT_NO_DEBUG #415769
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_enable nls NLS)
+		$(cmake-utils_use_enable sound SOUND)
+	)
+	CMAKE_IN_SOURCE_BUILD=1 cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# use the more up-to-date system fonts
+	rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
+	dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
+	dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
+
+	if use stars ; then
+		insinto /usr/share/${PN}/stars/default
+		doins "${DISTDIR}"/stars_[45678]_[12]v0_0*.cat
+	fi
+	newicon doc/images/stellarium-logo.png ${PN}.png
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/sys-apps/grep/ChangeLog b/sys-apps/grep/ChangeLog
index 091b0d16a237..4c62a63d7f04 100644
--- a/sys-apps/grep/ChangeLog
+++ b/sys-apps/grep/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/grep
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.151 2015/01/20 18:16:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.153 2015/01/21 10:20:17 ago Exp $
+
+  21 Jan 2015; Agostino Sarubbo <ago@gentoo.org> grep-2.21-r1.ebuild:
+  Stable for x86, wrt bug #537046
+
+  21 Jan 2015; Agostino Sarubbo <ago@gentoo.org> grep-2.21-r1.ebuild:
+  Stable for amd64, wrt bug #537046
 
   20 Jan 2015; Jeroen Roovers <jer@gentoo.org> grep-2.21-r1.ebuild:
   Stable for HPPA (bug #537046).
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 63dd62353020..d18d729e6ded 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -8,14 +8,24 @@ DIST grep-2.21.tar.xz 1261548 SHA256 5244a11c00dee8e7e5e714b9aaa053ac6cbfa27e104
 EBUILD grep-2.16.ebuild 1430 SHA256 ea8ff2e9633f76015b4a9cafedfefdd9712ab04745685b1f177065aa0e434ce6 SHA512 33f8982aa2d607aa5309c24688beda0c5b1e4baf9c2d61739e8367f61c10ab910d4992175b82d0a19924099bd3350991fb0dac5ab8095b0b8763750891a30898 WHIRLPOOL a53df626b3ca0b79764231b1dc59ec8194cf564e76f0b8a526c02691b718897c3f69711675515d7d632e16f3ba17d54a2766893eae72fc7d4569054716dddfe4
 EBUILD grep-2.20-r1.ebuild 1546 SHA256 d8a2ef753972c851cc4a4bead9879023f05b26279b576fea631a146a425950bb SHA512 028dde99d80edb972e4e58588fc66d6f6b0f810ba53314f2917b8148bb77981ae808cfff850fb3cd48627729c183167bd4291e6eb0f950d9a4301ea919512392 WHIRLPOOL a92844a5ab584a4308109970b6f2ef0cbbd74bffe3fee109903c67e4e6bed8d705f9416afa6a6ee7ceabd4ee87b4a32a31760f912352f5b4ae340878e9e8da78
 EBUILD grep-2.20.ebuild 1448 SHA256 bd87b842fc0e6612602e231eed6f5cb24eedefd990a68720d1a9df3b8248df51 SHA512 1f3046f133ea84d990112034618fba3e2ef3540e6cc3e3f89cfdaa210bd7a233fc8879e5cfbe3900c294afd31b2b7f38c8a1f64f62c0ff1e803400e5431f2bd8 WHIRLPOOL 98284ccd0ce6a651a935dfa81bd45eb60c9b1582c52ab3d48537f8e90e482fb54389b206dfa60cd4884a9c8a7ec171a4d9bc8940fb212c96c5d9c52b1bc83d3f
-EBUILD grep-2.21-r1.ebuild 1670 SHA256 920725bc60f757259e770408008caf639496fddaf81e4ca303d90a861647504a SHA512 6897df8b95cd0236736279c807161c254842772a3022a47f8fe77b6ee84906d1b3c836cbcd20189246adc77adee6a6440455c7751a291e35a5fd9c45ba934286 WHIRLPOOL e87e918a42d8bf64a9366b711f73f77e96767a583beac3c556c657a7819e9e1779b47983490a613b4bfcd44240925131dbe12c5e4eaf85844a2a1fbdba5bb918
+EBUILD grep-2.21-r1.ebuild 1668 SHA256 4e7a61942496b2be1f2de5257ab3150fb87e8fed4d3cd9e60f702dc71988684b SHA512 faf984144a2ee4c6ce457448aad6337ff93841df05c82ce26690b18a1eb33e05ffa6fa2d99082a087db33e16f511688a79628749bc3d22c94952b675f6f89b0c WHIRLPOOL 667447ff027d87c64db1ebc98e5c173ee7eb55b30fc53480341be6096832a0147ec99837373103d17859b4cd175b1a87afd4f80f309d857b2042af17c9ea95b3
 EBUILD grep-2.21.ebuild 1546 SHA256 ca1ed78d6146af15110fa7425bcda570890766fdf8eab30a5800434ac003a31f SHA512 6499425d1ad1534f6a2e0d0149d10e3768fbaaf2fcba4adf0ed9ba36053bae040db89c9a60971ed9d0131199e7afcf316685868c22fb8fbf659cb5e4a443f796 WHIRLPOOL b0657490c09ae42859d7f686bc18a096e21d12187d6e0a2afec70ba45c024886bed0f217c773145cbad617c4a5a36de67bc6dbf01b327877db0aacbd0211c4fe
-MISC ChangeLog 20611 SHA256 fb3577164ac4acc92fcd926f12faed2f938a25db86d41c411e8d45508b2d2bbb SHA512 6704b5c3a0c3f7806c19bc763c86a0088511cc0e5680f16a938f4e6ca7e4bc3bc5e4c0373d96949c8b9769222915735f8f02d1571f89828958458009e69ab971 WHIRLPOOL c11adb57649a196d8196f2faed4e65ed32fa5bb5b5318e0dc4b4fbe97f99b45033611e4bda10dd8cb037927ce284d62f73d3b0758a40a2a774ab1b061a331178
+MISC ChangeLog 20823 SHA256 ee8bff75dd92d5c437747c0ad0270701f83ec70099748ecd3a5ae96d1a9f77a9 SHA512 c446c7f99be8cb8bd136d73b72e79c013a50e33b70b05d527903215d40c2f667b97fe4f2cfd12768ae37db5c499cf40dd7166cdf28faca06cbf6a0ddc6ba4bb2 WHIRLPOOL e1c11780076967c699f516bba1d577ac111925cdeff41e6643f3168652ecb3dfe5ab7956c78b80cb92b3c377cf405409d47ef37d1169f7010d262bfba5f21296
 MISC metadata.xml 239 SHA256 81e2263e85947bfea9b25bba8e5e5ee4c8926035903d4a603b0b89a9727eb754 SHA512 63460f39b4c7c948542e78143e0a2965b0915d4e6312a18799a6c8120c97625ee926f18f62e70caf2748a2136ce5848de387b537a12ed882fdca1aab326f0111 WHIRLPOOL 2e280afad5417d07550f36f74114cee1a02df44540ee65d7bfd1028d571dd35d5d6358f792ffc79f172f161ac4f17f38093963e5148c315b35b49bec0bc8397d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlS+m4AACgkQVWmRsqeSphM9LQCdFmoIt7XWKEacPRPTsEWv/hZz
-V4oAn26mTlag338IxSZxmePoIyYgIQq5
-=dPqv
+iQIcBAEBCAAGBQJUv31iAAoJELp701BxlEWfXoIP/jJNIzk2hJVkL8nzq6WGXJ/H
+lIFWpd+E/42fWmULSxT/Ckok71JvuAu0tDGIZ1lcEef7vqkgJ+lGjW5s7RhQ+vq2
+vk5uFXjk4LD3ukUsHErUdZDVNWab416f+1VyPit6VK6eJE4HZS2wIXeNdhghJZRa
+AXK9y8po3r06n+Nxiil8G8ghP5XkrVY2O16KBxjy1k7+apoBtPOph1t+5t34vElW
+LEL9pyQJH5v+Cv5HUuxJjyEOD5WivoqXbcddgn/ETApD29xeBEvEnudPQ3b4ZM45
+TPQUW/68WGKs6NPSK/aHDY2lHc8VNBpmQdgOoAF2qyvjCc2YGMU9NUt4bzGWXP2Z
+shm8Ca4pp1oNoIYGg/Ox8oy2VavRnvxltGaYcUk6iS/WjLxmUGpfcUetlVRQxBXg
+k9yGOpmO9MQT9x8N0qwws/VfUAUYCYp3EZnr/xxCfa9Cd7ALZhGYRMfYghZKagte
+TbEqpmMc8ZQ8C43MvqFf5bzk5PwxT7SMbQYbpQeXo5tUWLm5Gek1dZUh/iye6YVx
+a4o3D08+xNGbgLYTApjwVtCLT08Xld4GeTRnGbdRFbC6dIK79lIEwxlo3O/kSbt4
+2bPk73Xtg1fLPUFzSxCoR27JGHpMOwW7HuSyTAPa+/Qqvwt25FEr3wEhVFDz+6EH
+RdUy/rmPUu6xLLv0UdRK
+=VT10
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/grep/grep-2.21-r1.ebuild b/sys-apps/grep/grep-2.21-r1.ebuild
index 92ccb33c93ba..ed62d34d6c84 100644
--- a/sys-apps/grep/grep-2.21-r1.ebuild
+++ b/sys-apps/grep/grep-2.21-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.21-r1.ebuild,v 1.2 2015/01/20 18:16:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.21-r1.ebuild,v 1.4 2015/01/21 10:20:17 ago Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls pcre static"
 
 LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
diff --git a/sys-devel/clang/ChangeLog b/sys-devel/clang/ChangeLog
index 67abfce324c5..8793ec453476 100644
--- a/sys-devel/clang/ChangeLog
+++ b/sys-devel/clang/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/clang
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.116 2015/01/01 20:52:48 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.117 2015/01/21 09:26:47 voyageur Exp $
+
+*clang-3.5.1-r100 (21 Jan 2015)
+
+  21 Jan 2015; Bernard Cafarelli <voyageur@gentoo.org>
+  +clang-3.5.1-r100.ebuild:
+  Version bump
 
   01 Jan 2015; Markus Meier <maekke@gentoo.org> clang-3.5.0-r100.ebuild:
   arm stable, bug #530882
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 577b1c06bc2b..ee2f0dc5c824 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -41,14 +41,15 @@ EBUILD clang-3.2.ebuild 6522 SHA256 795a7e1e2fbdb0f09cd02584cbe5e7a45c5da5351494
 EBUILD clang-3.3-r100.ebuild 1245 SHA256 131ec94b63ca98b5bc7946ed7bbc653d1448f0be8094c5f04b25d56dad591589 SHA512 f963c85f35138cb95e0fab0c3c575d970855521e9d4855a774107a03762f2ce9723cbd0f54bd9f12f99505bc6b6e71599544c8afa14ee1118d76637b1ddb12de WHIRLPOOL c01519b962c25117cfebc59292738246f14eccac064da93a0772c809e32f11520b84d714bc4a56a37d136cf52ed2c2f2f62b444c36e0e780998c8423edbb8c85
 EBUILD clang-3.4.2-r100.ebuild 1253 SHA256 ab26bd84f4af9df8ecf2c1d33f7dc7b06ff87da24f8a961e09657bc308f43be1 SHA512 1be2f14b79ad90fc4f957fff7f9733416944750a79ad5989481c31d2f9e22465f4b6ec7ce22e7c30b9332dedd72780cf214c193c61f2770b3cf032ca01fa56b5 WHIRLPOOL ff1f69cd17ad1cf313a59f70890bc43881afe2cdd5e4c3a32a15c493e7da4240b09700665475d400f7eaa793562f4972eef2392cbb6b962bf58bf9d778bcae5d
 EBUILD clang-3.5.0-r100.ebuild 1247 SHA256 ba003508c0bf840b74f19dc3a82237efdab47be1e8883c109330ae2badcc0f35 SHA512 700ccbc21dc18045912f662a57f3fa585d6d3d1f18da6b6db1d5b19cfe9f980aaf650d22169906020c3d424d9c0ec5a0eb12eb690e380095a0bcb1269db06eda WHIRLPOOL 9345a2a047c4825d90a46643639ac343d5991449fcec971249ee092b35233c4bcc2c5319265664bf826514b9f0934532fa0baa6897e460bb20f8393e452ec7d1
+EBUILD clang-3.5.1-r100.ebuild 1253 SHA256 4a2bbc2a0f7177fe9ec11d16efed49c16c4dea3891bf192d197c4798b36753df SHA512 4dd0b0db3781d8877c79b1e67c245b796b438721225245459e254df9fb566c183e7a3bb93e141d4b876b3842369f5baca288fafee9f83667ff056a055ac1af51 WHIRLPOOL 2686d4948fadaa65e388dd4ea7a87c7ccaf0365a910096ff1a044513a22c31fba4b121b643ca715ef00b5f3ef41948bea55ddf918a512ec4a27fe5db588319fb
 EBUILD clang-9999-r100.ebuild 1139 SHA256 d7d4078b16c78d7e0ab6bd91a3ad6e1c54f815439e14d4e41a2724b108e68d51 SHA512 6c4985c89701ff3550a84d1e9cce4fb14d494ef2f5a11c891f1802f42bc958df1e344965851a2b0ba40d60096bbaa2a848a8131a7ea39c0b660eb2d986bfaeb7 WHIRLPOOL a708b44763db1b505b9b390acb40463b1fdaba9d837567a7b125124bee9ef701f6d219a27825bb35ffd937ff7751aa9d2c518c7ec0f155c126ea62281a0e1d25
 EBUILD clang-9999.ebuild 5992 SHA256 ccd346a9e3a61aabefb861eb81cbceafbda9fc96ee50e1a1d685b62c79c269c7 SHA512 42666495c287cec9b86b0cc213efa4f7d945df38ac2159b33684a73543f0138455903f6fa861822fdea1099616dfb83975d0cea220e93f38fb4f7329232ccc25 WHIRLPOOL 964fbdce41fb19711d1435356da996022f0d69f62799c29a77b202d63f0ef5eaa4eb2270052c0525aae7e8b4a3e57e4bfaec57ee67642bdfc55796aa941fa5d4
-MISC ChangeLog 21313 SHA256 79856f61ba9981d89941dc75aa3083452f87d6a5ff2878a2eb717def5fee47d2 SHA512 3de8958b1665fa346d20dcfa63d628c3f238abaab7e1934fc4a5eec651a1f4076f5fef2228ae45055ccdefdcf29136c26135bf329109a5db4c55db7a6b1517c0 WHIRLPOOL 94456c2685fdf9a3f09508072ead264af356e0b170b1242fe182c59485f7b9945780ec41ff2d3e914d9d41c57cb3397d11f7109aa2ef1ab49303d4a1251c5cb2
+MISC ChangeLog 21447 SHA256 d27b7e89ee4589f532ecd35eb5f2861c6ebbe56b356b366309db135c02c83935 SHA512 6f0ca25ae8ae56ab17aae737522b7f1096bca666b0c45033b84906cc40bcaa35a3d4d24fe16aef7b14e2e02fae5e67325addca062f39ca6edb27c14b52fbaad9 WHIRLPOOL 6fcfb1db73e2771c5584876023232366a821b9f07be4058b63f390979360451cfe3f0201aa43432274b4a37a032b8214fdae166df2a44b33fcb402227aaff72a
 MISC metadata.xml 1347 SHA256 ac44c316696ae0c3b3b10dd9b1529e4bad85b0a3d5f6ac2b0ec6b657f559451c SHA512 faf5c07813f2556cdca2967741dc68ad53d56584bf1570fd2d25289b889f9ce3c4fe503b7b0a7f0f2145f6244c7ae33ad0e7b24762c5de2794b1c7d565f36968 WHIRLPOOL 3fcc87924c756e6ffe507caacc112b7a1507bdd5dca1cc2e4f5b3251d9f34fd6bdfb28c76ada06ecf58abea8be5b41e19cf2d412e4b84c68b508e2d0758e008b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSls6cACgkQkKaRLQcq0GIr/QCeLgqqMv4/A+1f6WFFFRX9EPjX
-tdQAnjXXwSQUdKSXgLAtnFvFWNb0lMlL
-=l/0n
+iF4EAREIAAYFAlS/cNgACgkQFYEBGcdFJfK6wwD/ZOdl2ytJz06OsycGLa51rN88
+Fd1rloEprFSMzuIGVfgA/1sGGIgcaVtSOd0eODpGfO9IR9wSpeR9AdoclZRdlSP/
+=wbZX
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/clang/clang-3.5.1-r100.ebuild b/sys-devel/clang/clang-3.5.1-r100.ebuild
new file mode 100644
index 000000000000..41f0a84ab614
--- /dev/null
+++ b/sys-devel/clang/clang-3.5.1-r100.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.5.1-r100.ebuild,v 1.1 2015/01/21 09:26:47 voyageur Exp $
+
+EAPI=5
+
+inherit multilib-build
+
+DESCRIPTION="C language family frontend for LLVM (meta-ebuild)"
+HOMEPAGE="http://clang.llvm.org/"
+SRC_URI=""
+
+LICENSE="UoI-NCSA"
+SLOT="0/3.5"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="debug multitarget python +static-analyzer"
+
+RDEPEND="~sys-devel/llvm-${PV}[clang(-),debug=,multitarget?,python?,static-analyzer,${MULTILIB_USEDEP}]"
+
+# Please keep this package around since it's quite likely that we'll
+# return to separate LLVM & clang ebuilds when the cmake build system
+# is complete.
+
+pkg_postinst() {
+	if has_version ">=dev-util/ccache-3.1.9-r2" ; then
+		#add ccache links as clang might get installed after ccache
+		"${EROOT}"/usr/bin/ccache-config --install-links
+	fi
+}
+
+pkg_postrm() {
+	if has_version ">=dev-util/ccache-3.1.9-r2" && [[ -z ${REPLACED_BY_VERSION} ]]; then
+		# --remove-links would remove all links, --install-links updates them
+		"${EROOT}"/usr/bin/ccache-config --install-links
+	fi
+}
diff --git a/sys-devel/dragonegg/ChangeLog b/sys-devel/dragonegg/ChangeLog
index 3d13fe90e98c..2e8888e552e1 100644
--- a/sys-devel/dragonegg/ChangeLog
+++ b/sys-devel/dragonegg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/dragonegg
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/dragonegg/ChangeLog,v 1.20 2014/09/17 23:13:12 voyageur Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/dragonegg/ChangeLog,v 1.21 2015/01/21 09:26:42 voyageur Exp $
+
+*dragonegg-3.5.1 (21 Jan 2015)
+
+  21 Jan 2015; Bernard Cafarelli <voyageur@gentoo.org> +dragonegg-3.5.1.ebuild:
+  Version bump
 
 *dragonegg-3.5.0 (17 Sep 2014)
 
diff --git a/sys-devel/dragonegg/Manifest b/sys-devel/dragonegg/Manifest
index 4c280f1eaf79..0d3d760ae9c8 100644
--- a/sys-devel/dragonegg/Manifest
+++ b/sys-devel/dragonegg/Manifest
@@ -2,15 +2,18 @@
 Hash: SHA256
 
 DIST dragonegg-3.5.0.src.tar.xz 373932 SHA256 591133384cbdf329fa12975689e108e8b7c6272333749da6a6633a2b606234ec SHA512 10d8a59442c4469c34e3314de3a7dfba0afe6c7fbedb2a5d8550f2e0b91d3e040585b1467c18944a7cb08bbdd4250681f080f3d932c6ea9ae0e29e593f6527f6 WHIRLPOOL eabbc8fdd6f9aa8f027f95f71eaa3d55c676f3ae61ba38537ddb5e24319ae090f80db62e9e85957ee9225c39ffa5cb228e4184b6676dcd72857455d002158996
+DIST dragonegg-3.5.1.src.tar.xz 374928 SHA256 65e7974a34406463cdfb8c0badd4dfe293ebe771a3d00c4d674d73c8007706e6 SHA512 546bef95aeea39e677b7e20a6d3085e3acac199dbebac12aa38b0991dc6420a07dd4e80466fd5a91285411095b33b0a23a4973dc911667fb4cc3461ef3af5a22 WHIRLPOOL f389644ad8829fb4be37ec1472ef6f5e2ee0f5a52e61395180ba97b70d624c5480463a77d1b4899a9472ec9771bb9789f1d5521e65edc2a9e3ff4eba4fb41b99
 DIST llvm-3.5.0.src.tar.xz 11735940 SHA256 28e199f368ef0a4666708f31c7991ad3bcc3a578342b0306526dd35f07595c03 SHA512 b4d0f325dbdb0a8f10e5fd031954ef4b1971d8f99f4e4b53834801a2b74a7acde3f77c655c8355b407424b363edfb10f71d85fc370356dc52af5c636a1bba197 WHIRLPOOL 561520823468b61c63df8e13f876b7ac586eb1e52c256e9a36370e5d46e8cef3937655c36fbb51eebd3680fab67412e7c777479477fc728e7a8f35420e573ef1
+DIST llvm-3.5.1.src.tar.xz 11869356 SHA256 bf3275d2d7890015c8d8f5e6f4f882f8cf3bf51967297ebe74111d6d8b53be15 SHA512 a643ff173627e813b26077829b1af801b75daa5dcea540c4f05366ed57ef6aeafaf8b3fe4208d4c1b303a048a90ddac48a23488480c165637ae9218de140ae55 WHIRLPOOL 798ad46bc21570d8e5b0caadf2c0b434382fd78bfea5a08097fa001019b749b828e56ffe330435e5f3556700e8b0bee29e4139a7ff6b2824bb83dcc8caba2606
 EBUILD dragonegg-3.5.0.ebuild 1346 SHA256 0de93fedb9af7a55379601f0d6473beddfcdc331d5b30ca567e223571b2ecd51 SHA512 05b81644969223c69f195c4d36a42dc10c0e612ad0ae1ea63212782fbcdb35d07ec97601a56fd3e2baf540be44b07bd0267694ec4385866ed2b54429a47c9cfe WHIRLPOOL c37b8bea123c98f7629ef73c1ea7b0c79811a9bb7a9479e369efcdc5b80a2f51dc944cd6e6c45fb86d9c17923758bb586bcb721aeeefafd45b878551a749ad0b
+EBUILD dragonegg-3.5.1.ebuild 1346 SHA256 6c0e7c51ac9b22cf7b3da4a157c96d1a66fd1c64d6cefab2827ccb1140104596 SHA512 01c8ef1ccb7a4d12c40c67244b7cfc816568a26f6eb2e9e1cbc7b1f252f735f5a952ae7d87458d8153db710f20cf1e06a8aa3908874ce7f70f15f1c444743c99 WHIRLPOOL 1639933ed0102bca759c4b58c003f6d23bcd91b1d931f41a25bcac8a1cd7e662ca16c0040bd80d3529996fe2debaadbd3b6e52500df4faad1c0c69ad4326ad0b
 EBUILD dragonegg-9999.ebuild 1444 SHA256 1292f7a40858cf03807c2b48506554e2e55272c350f265798afd08221297af06 SHA512 a226d9a76f3294856e8535380fa74fbb518b12bea79e4d7f3bfb4af48a196e0ed47bd7002046e2eb8cf1b56c62c826a419fbab2ecbb4d7050ee0ef3f6ed779c7 WHIRLPOOL 7647d408f455ef43f7b038b9fc8a1e201ec22d0dc043de3c4f08a6d8dcd5e36411e9bd326a3f41344ddad2d7c3004130d170bd3b42d4247b260d8e3c71332ab0
-MISC ChangeLog 3736 SHA256 438e15613374b186d860c6e48d6abe654dfe8af5d82e88b41aeea8954c891e81 SHA512 90c17e52fa8f926e37fa8d337ba20a5919a838b466eb04a475d1cfeced64c506141add71fd23e8dc07b2b9778b2c2e8c047ebcf9c036ea419574d18ffaa792e1 WHIRLPOOL fb1a719ca8b98b0d3c64e4481cd99069eea75b6fe7d54603fd6e9257168145fc6c6ddd03659d1af817afad9a61f0d16854a640545b60e043186065fac04b4c14
+MISC ChangeLog 3864 SHA256 e07276870cd2bdc0637817a138c6fc20779ea29da0a99884b209607a947f60c3 SHA512 8151b3583abe57982d354450ce2b90eee1d27213e69ad39fda0c378c77df8b8c6521182c5a57c12814f391f92aa8371cb2be07738c135d6a167721d40bf4b99a WHIRLPOOL a185edd7b142166cee809174c01108e2002f337104880f55b3225d0614289e6800a3bd60f3903e91542baefa63f1f7c5b53b5af53ee5c4c69011f2134fa90434
 MISC metadata.xml 492 SHA256 30b11ba6c1fb003706253651ad24ef789018d994e3e1d452e6639133a5a0b6f2 SHA512 6bf3c7b000bb563c104894cea43dad7f603155af8ffdfa2f90deac59c300429f28f34675f4c30e927626dd7cf037951cca497d48ddcf5da1e3f7bd07acbe14de WHIRLPOOL 8ead3c6d688f4037bce4901e464d19c425f9357658de2527113172dcc771806b0c52c2a0485e62f05c341b5c15c345b30122ca5decee233b3cf9807ff0158fda
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlQaFY4ACgkQFYEBGcdFJfJJEQEAqMWg9vakhPAz0IxYLCq0BCqt
-1ln1MNkZhUrR3a4kE48BAJcwm9hDNsE9YZP7yW3PCtDdZ9CqxyfbjQkzJBV9LDdM
-=xbQT
+iF4EAREIAAYFAlS/cNMACgkQFYEBGcdFJfIJEQD+OW92rmIC0QPYp+huYtv1v2hV
+xIIaZCJjn9UjJ+NenlkA/1ki0QgVjPny8QSKcl3N89ty/ovbLADA5RW9MrU4zglW
+=VNtz
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/dragonegg/dragonegg-3.5.1.ebuild b/sys-devel/dragonegg/dragonegg-3.5.1.ebuild
new file mode 100644
index 000000000000..98ae5a6cde88
--- /dev/null
+++ b/sys-devel/dragonegg/dragonegg-3.5.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/dragonegg/dragonegg-3.5.1.ebuild,v 1.1 2015/01/21 09:26:42 voyageur Exp $
+
+EAPI=5
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="GCC plugin that uses LLVM for optimization and code generation"
+HOMEPAGE="http://dragonegg.llvm.org/"
+SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz
+	test? ( http://llvm.org/releases/${PV}/llvm-${PV}.src.tar.xz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="test"
+
+DEPEND=">=sys-devel/gcc-4.5
+	=sys-devel/llvm-${PV}*"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P}.src
+
+src_compile() {
+	# GCC: compiler to use plugin with
+	emake CC="$(tc-getCC)" GCC="$(tc-getCC)" CXX="$(tc-getCXX)" VERBOSE=1
+}
+
+src_test() {
+	# GCC languages are determined via locale-dependant gcc -v output
+	export LC_ALL=C
+
+	emake LIT_DIR="${WORKDIR}"/llvm-${PV}.src/utils/lit check
+}
+
+src_install() {
+	exeinto /usr/$(get_libdir)
+	doexe dragonegg.so
+
+	dodoc README
+}
+
+pkg_postinst() {
+	elog "To use dragonegg, run gcc as usual, with an extra command line argument:"
+	elog "	-fplugin=/usr/$(get_libdir)/dragonegg.so"
+	elog "If you change the active gcc profile, or update gcc to a new version,"
+	elog "you will have to remerge this package to update the plugin"
+}
diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 90a2cca9c4e2..41b5668d3fd9 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.218 2015/01/11 20:05:43 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.220 2015/01/21 14:59:19 voyageur Exp $
+
+  21 Jan 2015; Bernard Cafarelli <voyageur@gentoo.org> llvm-3.5.1.ebuild:
+  Fix installation with USE=-doc
+
+*llvm-3.5.1 (21 Jan 2015)
+
+  21 Jan 2015; Bernard Cafarelli <voyageur@gentoo.org> +llvm-3.5.1.ebuild:
+  Version bump
 
   11 Jan 2015; Fabian Groffen <grobian@gentoo.org>
   +files/clang-3.4-darwin_old_linker.patch, llvm-3.4.2.ebuild:
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 3b7402cbe43d..bc946228d18f 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -43,11 +43,14 @@ AUX llvm-3.6-gentoo-install.patch 3169 SHA256 318288e667623e22c441f7a1da8c3e27b3
 DIST cfe-3.3.src.tar.gz 9425539 SHA256 b1b55de4ab3a57d3e0331a83e0284610191c77d924e3446498d9113d08dfb996 SHA512 06773f43f7d3529f06edb029f7de398f06a700a0f2476e00c4727e70c291028221bfac23625dfd2c220d6ac91a21670848187a934b99a21801c695127371afcc WHIRLPOOL 8b97b527f19015dd3283b9e174615170e639793f64c635ccc4ee4d8216f8de759fd0121a8ef3513fa1c6ad19b31aa3529091ffb44a01ee858edfef400881596a
 DIST cfe-3.4.2.src.tar.gz 10612313 SHA256 5ba6f5772f8d00f445209356a7daf83c5bca2da5acd10de517ad2359ae95bc10 SHA512 e01fa8e312e9b3b7b3cb572ac21349161aaa50078ecfe7bded273b75db4a0c44acde524f8fdfcbeec54c61eeeb8339e9917d1f205a8fda18e34fe7ccbe89c36d WHIRLPOOL 153208b1a60bb5fbe92a7162cb26bbe70d591e7db9dcf06fcd54efc539bbff0403ec88e64236969c9f256e5586bc333840bd6178fd158577d6fe228d9edd4dcd
 DIST cfe-3.5.0.src.tar.xz 8233432 SHA256 fc80992e004b06f6c7afb612de1cdaa9ac9d25811c55f94fcf7331d9b81cdb8b SHA512 b26a5e2cd81c150607c23b22fafc0d9c7f12b83b45e476b8e75bf5e99d42be7c98ffeac7349df664f01b00900864a01429860b298e48961861377a4b2daf3e49 WHIRLPOOL 5dd8b6fe97933b74f1668b1d753c16cd3bcd05ccf72aac1283aa449caf93f5ba88ae79e7668f7e79b554e1421549a87af21c86cf92657c1b4d77744165718ce7
+DIST cfe-3.5.1.src.tar.xz 8268140 SHA256 6773f3f9cf815631cc7e779ec134ddd228dc8e9a250e1ea3a910610c59eb8f5c SHA512 bd904586f6155c05d2f7ddd05b86c28feae883cdc60e2cb3b48d4ae0ce55916064bcea414a46518d0fb73618f18a3f3fca6cc4cad81083428a2221299f5c5c7f WHIRLPOOL eca619b84ae6dfbca4b3d46601419d2c5a0cd77d643336c560d4bc358f4a2b0f7123d3e87248119c3e447143859da20b9b2e94721ebb14053627f0a158d843f5
 DIST clang-tools-extra-3.4.src.tar.gz 230729 SHA256 ba85187551ae97fe1c8ab569903beae5ff0900e21233e5eb5389f6ceab1028b4 SHA512 9656678acea490fd5674b2d47ad30ec69e5aedb450924e566a90418c94ce6483faa254e7dde0d5163cb0643153113d27b6b000fea7bba08f0ba55741b35873b1 WHIRLPOOL c41ec11d0b88678c56d77d285c4383a39cabab16aae8a4457666014e0927aa4b04cf77e73af0275e6bfc603a9531598eca98ab61d5d81288e2920682088d9eaf
 DIST clang-tools-extra-3.5.0.src.tar.xz 216256 SHA256 2981beb378afb5aa5c50ed017720a42a33e77e902c7086ad2d412ef4fa931f69 SHA512 5ff2cc5d143b78fbe6645486f02e50f738a92aaf6b8e85cfc6f91e659684686b12e61fc8f00b814b4372c5ed2c2b1be5eca61ea696fbe074b815877b799534ee WHIRLPOOL 10b5afc550fa6a8c33739fbf9268e934732b2892842d398152676e66ab90aed3c6e1bae02bc1b8aa0a9a917b6b450f60950317a9eda3f9e377971cbe00164b11
+DIST clang-tools-extra-3.5.1.src.tar.xz 215776 SHA256 e8d011250389cfc36eb51557ca25ae66ab08173e8d53536a0747356105d72906 SHA512 eefacd6857584c9a3186815a7d015a595f32cd926f6c221245d388b8cb9266c52e0980a8e94f01f49c452510fdd42e659b02f116619d3d0e35170566f0704712 WHIRLPOOL a3d14e21f201cc02649833edd67ba04f17c88486fbf399327dbb76d21e151b956a4f58cd7446b8563f72fa1cee06a8bd4abbc53234761a3a69fc1afc99ced87d
 DIST compiler-rt-3.3.src.tar.gz 1568034 SHA256 0e2f3180d6316e6c43f064fdd406c5c6515e682c5f31c57c28335b68c7525423 SHA512 3e86aa8ab9810b4fbac54a40fc93a717a55c642520858c0db215a5324c1e495b4d8fcec9620251cca8e4e5f9afa34bc14364d7f785880a0700469d0201827929 WHIRLPOOL fcfd06bc860dfd901a7576cd4309f863e9d4363e36ab4c67e9e08fe3c8a37d627ee95eb96b9ed53eb6047dec06e73181b3c3e1555b1b49f1e893e6382f21ddc1
 DIST compiler-rt-3.4.src.tar.gz 1858593 SHA256 f37c89b1383ce462d47537a0245ac798600887a9be9f63073e16b79ed536ab5c SHA512 70efffaf12ff7c15befa87ce808489c6f6b6eb421d0ab5d8ecd525239efc8aab850c7ed34b31a993ff5e499657b72598619945cc4461fe3e5359e9a94aaac0c8 WHIRLPOOL ad558b5877a01e476d30d2757959ab04be0c385b2fe3442bcc578bf36c6f3214cd78b4adda24fcb1f3b2b84353db213b82e8d7d4c40e66c3f57aed3a49322dbc
 DIST compiler-rt-3.5.0.src.tar.xz 1088352 SHA256 a4b3e655832bf8d9a357ea2c771db347237460e131988cbb96cda40ff39a8136 SHA512 862cce2d6b398bd1a8399496a547e6ab976a31f676528beebfbea5fd7dc54aa72e1c25deefa12f6167096521eba74090565b0168806451da02ddac04e922fc48 WHIRLPOOL 248acf997d70d7904aa79bf83e0c02ba4e5f8c2812c03f44a8e1e31b845a654f250c09ec6a123f9245d0db8713e8cc5a4087b9ce785af4f5eb7e55d9dbd362a2
+DIST compiler-rt-3.5.1.src.tar.xz 1092452 SHA256 adf4b526f33e681aff5961f0821f5b514d3fc375410008842640b56a2e6a837a SHA512 3a4f093972b080f439c81c8b08793c311cea71afeda7ba7b4e32f19378b1cb420da7b594fa9f6a6f7826570438f67d42d3243c4b3503e1cf8a7dcedf52e8e590 WHIRLPOOL edbf11837139b48207fc6f82ecad39fbc6983cf5bd1441cbe6d50e5e484566b63c5afa2fc64cd29fb8560f07015a98c00b58c926ca7e9af47b7eea92133d0db4
 DIST llvm-2.8-r1.tgz 9112527 SHA256 25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b SHA512 8688d5cf415e8aef74cca6a14587af36234a6347e2238ac2c0d66805c42926b9399f36390e1a58a4081e902b0904adb818c1a360d5df572dfa893d6f79f5e35a WHIRLPOOL 0da9250e31242b55586c9138089e742aab5d414d5f3412ebf917ae8b9506f984c6134a932be93ec7e4c01c79f6c21d508cb0b2e0ec283419bd4ae4db745430ae
 DIST llvm-2.9.tgz 9574781 SHA256 661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779 SHA512 9cb0fa0bb8ac02661fd6f926001a15e0ad4a9660683421dc86b03f1cf5184142c5815f9f9283ee7cdf8d474e01177f83406122253342e0e95ddc878821660070 WHIRLPOOL f7b445b6b5d455f29ca68c342511b8b5e6eedec525af1cc60440c4de544df2332aa241bffca29eda5d2428a3f518e093a626bd45c7f8a9e0656d0f68aef5d9d1
 DIST llvm-3.0.tar.gz 10350539 SHA256 519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477 SHA512 602bb5590b70cb9138bc19d8c630c62bbabdcb2132215c921fe4bce4e3f74dfc66440b9dcd458ff55a86047cc9cc0417c6563715c133e0db222e4b88f07c13bb WHIRLPOOL 6f4ece3ec747352cd78b08d25c5b1cda91140eb6957d509161e45395e47c074f8d2102bfcaeabcdef8c1f6672f2cf06d88e290667666122da029391b3528d440
@@ -60,6 +63,7 @@ DIST llvm-3.4-manpages.tar.bz2 33753 SHA256 dc2616104cf333dd9ef56b2d31f9a36e8130
 DIST llvm-3.4.2.src.tar.gz 15938155 SHA256 17038d47069ad0700c063caed76f0c7259628b0e79651ce2b540d506f2f1efd7 SHA512 6c1453f7d9d9110257db3574cc4f6227fed8938705cbb09851ac09a868089b48f1556a1b6e758aff6d97520b08b5605d3ed20411ad9dd22cdc573d62176905f0 WHIRLPOOL f8b4d5167469e6f350ec41aede04e7b756e18f3d8e78b3270beb5791310a7b9b13c69e57c8bcfefbd0a78efc0c40e3b75a9a158eac72c025b7c77146e8dfaf7c
 DIST llvm-3.5.0-manpages.tar.bz2 35314 SHA256 724e752a60016dce8cc536658906d3646c600e977374e0ea692a5d0fe2d4a021 SHA512 d99d6096d7f21a81923297584fe5eeb23e0d83d4538fe376615c92fffc8aff3189999f7ab3c537b5aa5d6bc2c22c53eb05717d48c7ab99c42315b8665bac62c3 WHIRLPOOL 68ced06ee6678c5333c662eb1cc0da744c5a184b12dd059c1b77ec200b1d3cc231f270b9d9b6e177d728776894277b3f9061338aa55620c90474eb97915b7819
 DIST llvm-3.5.0.src.tar.xz 11735940 SHA256 28e199f368ef0a4666708f31c7991ad3bcc3a578342b0306526dd35f07595c03 SHA512 b4d0f325dbdb0a8f10e5fd031954ef4b1971d8f99f4e4b53834801a2b74a7acde3f77c655c8355b407424b363edfb10f71d85fc370356dc52af5c636a1bba197 WHIRLPOOL 561520823468b61c63df8e13f876b7ac586eb1e52c256e9a36370e5d46e8cef3937655c36fbb51eebd3680fab67412e7c777479477fc728e7a8f35420e573ef1
+DIST llvm-3.5.1.src.tar.xz 11869356 SHA256 bf3275d2d7890015c8d8f5e6f4f882f8cf3bf51967297ebe74111d6d8b53be15 SHA512 a643ff173627e813b26077829b1af801b75daa5dcea540c4f05366ed57ef6aeafaf8b3fe4208d4c1b303a048a90ddac48a23488480c165637ae9218de140ae55 WHIRLPOOL 798ad46bc21570d8e5b0caadf2c0b434382fd78bfea5a08097fa001019b749b828e56ffe330435e5f3556700e8b0bee29e4139a7ff6b2824bb83dcc8caba2606
 EBUILD llvm-2.8-r2.ebuild 6305 SHA256 0d3960a19619eaa4c532ec703afda259851e40649ddec4133148459bc7e667a2 SHA512 d397e3a098bcbf9ec91bcb0520d73fc188a00c68ef2392f66bdfa5ee7902f0e3d76bf2263c499f336489eb91391fd5f52ca1918e9e6e27a009c8d87c4058db70 WHIRLPOOL d8049c39b65046a93e10016c7b12cd49246228e032258e78726f74a4471873fba7dabf57db02d7d4a99539465cad653d02efeae54dd3aaeac4bf3a03a6a5a99b
 EBUILD llvm-2.9-r2.ebuild 6380 SHA256 e95d4d6c0fefb602a04197b10d31fff3c4ef997ff7351deeb2b170033d4048a9 SHA512 afffc1450d8c6b45f88180187e13894aceb1cb8d62ba5ee3467d7d891e34259a29173db6596c43ad9f082430d75e5ce89612ef9de6c48716a410b69d05d62ea3 WHIRLPOOL 4659745840411d9787087d38368181054acab9ef5bd7359c56e96269ab8d169783ccb65b1a5948a9a2d35c401c91f46d61d3717730ce71d67bba6832286bc990
 EBUILD llvm-3.0-r2.ebuild 5767 SHA256 62fca1169c63516f29102a3a1bb4ea74408dfd151d97a9edbfb165a2def317c3 SHA512 f7ee2bbf8b31d86c11ab07f530278e3240ec21f3c58144a9e627aef3c1fb7690935786f33368a6f56062b5daf501adebfc164fd6712985a91076897b89cdd85f WHIRLPOOL be1a6edd697e2504df033705c2cb8e37f6c17a13d77558d231172c00f91ec247785469b6e1265e25c42eb3f6f394614cf516e0e422cb54094d9ba25669c8406c
@@ -68,13 +72,14 @@ EBUILD llvm-3.2.ebuild 6534 SHA256 eb16cc91887fdb035722d268caaa3e4843825403786fc
 EBUILD llvm-3.3-r3.ebuild 14190 SHA256 d16d933d6791ef7dbe08aa43340bb9924e063af11fa9e13ca8230509240d2c15 SHA512 c986e970f489f7ff79188043db397383e3c567735c8f4a1e8a13b89ef6a3a9f4b8550218444eadd04ef3a14143ab05dc839b3dbe935128f5437157d3aaec02cf WHIRLPOOL 910f7d65902548270835371a5076c746534c0b57487fb8fb149a893454e86e942beed284d6b7491cfb2f043a6e19554f97aec829067938192e75f64bd0fd7a7c
 EBUILD llvm-3.4.2.ebuild 15684 SHA256 bf48165569f4e1d74e59315ad96183c2275a4ebd909460e9478ea5ece021da23 SHA512 0885736fb3e33aa6aa76c8f83e9280e66482e4748722f9ebb767e1ca47fa94e00ab2007702c7aa35a36c06103fa41ce00fa3a8123e9adc14bcc0778edc211cad WHIRLPOOL a659c1f8dc8452299ce98e7b9d7e66515b1c8fcf8922d97888bc761acbe4e6d40412c635e5bbee9207c68cdf9c46d13b3c8e4012f38abb54c930a1b2eab5348d
 EBUILD llvm-3.5.0.ebuild 15104 SHA256 f3f8698353f9c5d2c9e28ade63b4573e6efb5cbace7da0ee400cfcd7e3e486b6 SHA512 a3434a4ef8050300f9e7309e35693c0b928bb5b438d95c54cf76298f29669b16466711f341ef0d37a3b6817342667f18130d106a2e839fcac0855a0db519758a WHIRLPOOL 4f662cdf9fb8b53d17c6c958b9734e91a7d085bcba0d7ad32c8a21e079adc57f62ef925ae1d1016e1642452e62d2cba1e8a9e39241d783cca8baad43bf9045e5
+EBUILD llvm-3.5.1.ebuild 15074 SHA256 dd3aa18c262f7ce59a03c3d87d64c1cec8272bbe449f5a8c1bc98f225fc494ca SHA512 1c3d82c3e8a00b31b739abf9bafe3bf29555bb55cd4bbb40c3232ee2d95eb6b7bafbe4940d1cd56b197eb54d4d5d069d5af0265c859075a167fa6e007610cd92 WHIRLPOOL 8e72d26b095c73268858eeb6476790ef0112ba8198d543fafcf213be30945910fb5fd576a77d957806ba42b59d2171e91d30d7b4d0971889eb7e04006ddb25f0
 EBUILD llvm-9999.ebuild 13914 SHA256 96c731cfe077bec0da28a5dc82179e6e70bda7fc77c8c25ed4d64eca845738f8 SHA512 ed6a18ae0a1c59c3327d118d478a03e4a73953d9a5a3b2c0953ce80076f2d07db9e83e078a7af00e094191d2dc1c3372640340a63ccb7bac77a9756f679c5f98 WHIRLPOOL e70e3977d37f1dcbda3541f028c1d45065453f23ec280bba2aaab69386f390a2a2fea5cbfc7050ae16ef5beb0ff3336839e988b6cf8d95235097713d627fba8b
-MISC ChangeLog 36623 SHA256 a1108a138848d014a912f723b56f8d0eeadd83e69d1cf2a1184ea34a78fcda8e SHA512 f84c418730416b6d98205569b19bc785da6db4a3b2a133baf1f161a729eb322d236be6d3b3051587364675c987bc1a9eaa63e6f04b845776acf239f25c71ac73 WHIRLPOOL f1c950813fdabbcb0f787286ba3b6a859e317850ccab2bf7f70f55dfe02083a09294f5b1ddb983f63935a981006e52144d00d1a00606f4d644ce631172300b49
+MISC ChangeLog 36850 SHA256 dfd8577ee60c7438fdb9c1576838218ba5ba2a51a7d18c2bb95dcea13411fbc2 SHA512 4d3d23cd631e6987e8c2c90090444d4d932ff1dd2c1a878fd0bfb9e023bdf816a0e8060242fb99b0357beb396075d628900107c9c2118eaf0fb3d59b7be3d26d WHIRLPOOL 3d6a725587fc13fca8a72f6482fced44758cb1ab75c74c7bc05f5f4ef270e6a46971f960791f8b8c0f96a7a15aa208835982e68544e75ac29126e2d501ea24cc
 MISC metadata.xml 2787 SHA256 22dc7b91c98fb4258271cc9cd4bd99f214b30f258bbdfea83dc37ac74df8d498 SHA512 4fca0d2551a889e7800c688077adf405697d05730bf66621ac53fdefeeeaddb7a8d868973edc9a6fe48e9a07734f1d43fd88229bae693fe181a7dbb95eeb9481 WHIRLPOOL 6284033d40bef02510f924ec1e6a9d3e1072bf26945fdedde0ddaf1d6d35c3d30971cdefa583a8e4d9db3da67bee04145ace15ded4cee63f534588b66633c76b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSy15gACgkQX3X2B8XHTomntwCfVZV45AJNM38X/2JAWimDDZ8I
-oN8AoKF+OlmWFey20yKClAzAexi7Vea4
-=pVzl
+iF0EAREIAAYFAlS/vs0ACgkQFYEBGcdFJfKF+AD9HoG/larin0PAsECs+BiSyL/r
+YVOFClitDRHB/NHMRBMA93kCDl5UGldQpKq4U7/mrUls4qfCOmI9IF1aOPZKPAA=
+=SASH
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/llvm-3.5.1.ebuild b/sys-devel/llvm/llvm-3.5.1.ebuild
new file mode 100644
index 000000000000..540bf02035c2
--- /dev/null
+++ b/sys-devel/llvm/llvm-3.5.1.ebuild
@@ -0,0 +1,524 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.1.ebuild,v 1.2 2015/01/21 14:59:19 voyageur Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit eutils flag-o-matic multibuild multilib \
+	multilib-minimal python-r1 toolchain-funcs pax-utils check-reqs prefix
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="http://llvm.org/"
+SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz
+	clang? ( http://llvm.org/releases/${PV}/compiler-rt-${PV}.src.tar.xz
+		http://llvm.org/releases/${PV}/cfe-${PV}.src.tar.xz
+		http://llvm.org/releases/${PV}/clang-tools-extra-${PV}.src.tar.xz )
+	!doc? ( http://dev.gentoo.org/~voyageur/distfiles/${PN}-3.5.0-manpages.tar.bz2 )"
+
+LICENSE="UoI-NCSA"
+SLOT="0/3.5"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="clang debug doc gold libedit +libffi multitarget ncurses ocaml python
+	+static-analyzer test xml video_cards_radeon
+	kernel_Darwin kernel_FreeBSD"
+
+COMMON_DEPEND="
+	sys-libs/zlib:0=
+	clang? (
+		python? ( ${PYTHON_DEPS} )
+		static-analyzer? (
+			dev-lang/perl:*
+			${PYTHON_DEPS}
+		)
+		xml? ( dev-libs/libxml2:2= )
+	)
+	gold? ( >=sys-devel/binutils-2.22:*[cxx] )
+	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:5=[${MULTILIB_USEDEP}] )
+	ocaml? ( dev-lang/ocaml:0= )"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	dev-lang/perl
+	>=sys-devel/make-3.81
+	>=sys-devel/flex-2.5.4
+	>=sys-devel/bison-1.875d
+	|| ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1
+		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
+	)
+	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 )
+	clang? ( xml? ( virtual/pkgconfig ) )
+	doc? ( dev-python/sphinx )
+	libffi? ( virtual/pkgconfig )
+	!!<dev-python/configparser-3.3.0.2
+	${PYTHON_DEPS}"
+RDEPEND="${COMMON_DEPEND}
+	clang? ( !<=sys-devel/clang-${PV}-r99
+		!>=sys-devel/clang-9999 )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
+
+# pypy gives me around 1700 unresolved tests due to open file limit
+# being exceeded. probably GC does not close them fast enough.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	test? ( || ( $(python_gen_useflags 'python*') ) )"
+
+S=${WORKDIR}/${P}.src
+
+# Some people actually override that in make.conf. That sucks since
+# we need to run install per-directory, and ninja can't do that...
+# so why did it call itself ninja in the first place?
+CMAKE_MAKEFILE_GENERATOR=emake
+
+pkg_pretend() {
+	# in megs
+	# !clang !debug !multitarget -O2       400
+	# !clang !debug  multitarget -O2       550
+	#  clang !debug !multitarget -O2       950
+	#  clang !debug  multitarget -O2      1200
+	# !clang  debug  multitarget -O2      5G
+	#  clang !debug  multitarget -O0 -g  12G
+	#  clang  debug  multitarget -O2     16G
+	#  clang  debug  multitarget -O0 -g  14G
+
+	local build_size=550
+	use clang && build_size=1200
+
+	if use debug; then
+		ewarn "USE=debug is known to increase the size of package considerably"
+		ewarn "and cause the tests to fail."
+		ewarn
+
+		(( build_size *= 14 ))
+	elif is-flagq -g || is-flagq -ggdb; then
+		ewarn "The C++ compiler -g option is known to increase the size of the package"
+		ewarn "considerably. If you run out of space, please consider removing it."
+		ewarn
+
+		(( build_size *= 10 ))
+	fi
+
+	# Multiply by number of ABIs :).
+	local abis=( $(multilib_get_enabled_abis) )
+	(( build_size *= ${#abis[@]} ))
+
+	local CHECKREQS_DISK_BUILD=${build_size}M
+	check-reqs_pkg_pretend
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		echo 'int main() {return 0;}' > "${T}"/test.cxx || die
+		ebegin "Trying to build a C++11 test program"
+		if ! $(tc-getCXX) -std=c++11 -o /dev/null "${T}"/test.cxx; then
+			eerror "LLVM-${PV} requires C++11-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++11 option. Please upgrade your compiler"
+			eerror "to gcc-4.7 or an equivalent version supporting C++11."
+			die "Currently active compiler does not support -std=c++11"
+		fi
+		eend ${?}
+	fi
+}
+
+pkg_setup() {
+	pkg_pretend
+}
+
+src_unpack() {
+	default
+
+	rm -f "${S}"/tools/clang "${S}"/projects/compiler-rt \
+		|| die "symlinks removal failed"
+
+	if use clang; then
+		mv "${WORKDIR}"/cfe-${PV}.src "${S}"/tools/clang \
+			|| die "clang source directory move failed"
+		mv "${WORKDIR}"/compiler-rt-${PV}.src "${S}"/projects/compiler-rt \
+			|| die "compiler-rt source directory move failed"
+		mv "${WORKDIR}"/clang-tools-extra-${PV}.src "${S}"/tools/clang/tools/extra \
+			|| die "clang-tools-extra source directory move failed"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch
+	epatch "${FILESDIR}"/${PN}-3.5-gcc-4.9.patch
+	epatch "${FILESDIR}"/${PN}-3.5-gentoo-install.patch
+
+	if use clang; then
+		# Automatically select active system GCC's libraries, bugs #406163 and #417913
+		epatch "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
+
+		epatch "${FILESDIR}"/clang-3.5-gentoo-install.patch
+		epatch "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch
+		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
+	fi
+
+	if use prefix && use clang; then
+		sed -i -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
+			projects/compiler-rt/make/platform/clang_*.mk || die
+	fi
+
+	local sub_files=(
+		Makefile.config.in
+		Makefile.rules
+		tools/llvm-config/llvm-config.cpp
+	)
+	use clang && sub_files+=(
+		tools/clang/lib/Driver/Tools.cpp
+		tools/clang/tools/scan-build/scan-build
+	)
+
+	# unfortunately ./configure won't listen to --mandir and the-like, so take
+	# care of this.
+	# note: we're setting the main libdir intentionally.
+	# where per-ABI is appropriate, we use $(GENTOO_LIBDIR) make.
+	einfo "Fixing install dirs"
+	sed -e "s,@libdir@,$(get_libdir),g" \
+		-e "s,@PF@,${PF},g" \
+		-e "s,@EPREFIX@,${EPREFIX},g" \
+		-i "${sub_files[@]}" \
+		|| die "install paths sed failed"
+
+	if use clang; then
+		# constantly fails for a long time, likely due to our patches
+		rm tools/clang/test/Driver/cross-linux.c || die
+	fi
+
+	# User patches
+	epatch_user
+
+	python_setup
+}
+
+multilib_src_configure() {
+	# disable timestamps since they confuse ccache
+	local conf_flags=(
+		--disable-timestamps
+		--enable-keep-symbols
+		--enable-shared
+		--with-optimize-option=
+		$(tc-is-static-only && echo --disable-shared)
+		$(use_enable !debug optimized)
+		$(use_enable debug assertions)
+		$(use_enable debug expensive-checks)
+		$(use_enable libedit)
+		$(use_enable ncurses terminfo)
+		$(use_enable libffi)
+	)
+
+	# well, it's used only by clang executable c-index-test
+	if multilib_is_native_abi && use clang && use xml; then
+		conf_flags+=( XML2CONFIG="$(tc-getPKG_CONFIG) libxml-2.0" )
+	else
+		conf_flags+=( ac_cv_prog_XML2CONFIG="" )
+	fi
+
+	local targets bindings
+	if use multitarget; then
+		targets='all'
+	else
+		targets='host,cpp'
+		use video_cards_radeon && targets+=',r600'
+	fi
+	conf_flags+=( --enable-targets=${targets} )
+
+	if multilib_is_native_abi; then
+		use gold && conf_flags+=( --with-binutils-include="${EPREFIX}"/usr/include/ )
+		# extra commas don't hurt
+		use ocaml && bindings+=',ocaml'
+	fi
+
+	[[ ${bindings} ]] || bindings='none'
+	conf_flags+=( --enable-bindings=${bindings} )
+
+	if use libffi; then
+		local CPPFLAGS=${CPPFLAGS}
+		append-cppflags "$(pkg-config --cflags libffi)"
+	fi
+
+	# llvm prefers clang over gcc, so we may need to force that
+	tc-export CC CXX
+
+	ECONF_SOURCE=${S} \
+	econf "${conf_flags[@]}"
+}
+
+set_makeargs() {
+	MAKEARGS=(
+		VERBOSE=1
+		REQUIRES_RTTI=1
+		GENTOO_LIBDIR=$(get_libdir)
+	)
+
+	# for tests, we want it all! otherwise, we may use a little filtering...
+	# adding ONLY_TOOLS also disables unittest building...
+	if [[ ${EBUILD_PHASE_FUNC} != src_test ]]; then
+		local tools=( llvm-config )
+		use clang && tools+=( clang )
+
+		if multilib_is_native_abi; then
+			tools+=(
+				opt llvm-as llvm-dis llc llvm-ar llvm-nm llvm-link lli
+				llvm-extract llvm-mc llvm-bcanalyzer llvm-diff macho-dump
+				llvm-objdump llvm-readobj llvm-rtdyld llvm-dwarfdump llvm-cov
+				llvm-size llvm-stress llvm-mcmarkup llvm-profdata
+				llvm-symbolizer obj2yaml yaml2obj lto bugpoint
+			)
+
+			# the build system runs explicitly specified tools in parallel,
+			# so we need to split it into two runs
+			if [[ ${1} != -1 ]]; then
+				# those require lto
+				tools+=( llvm-lto )
+				use gold && tools+=( gold )
+
+				# those require clang :)
+				# we need to explicitly specify all its tools
+				# since we're passing BUILD_CLANG_ONLY
+				use clang && tools+=(
+					clang/tools/{clang-check,clang-format,extra}
+				)
+			fi
+		fi
+
+		MAKEARGS+=(
+			# filter tools + disable unittests implicitly
+			ONLY_TOOLS="${tools[*]}"
+
+			# this disables unittests & docs from clang
+			BUILD_CLANG_ONLY=YES
+		)
+	fi
+}
+
+multilib_src_compile() {
+	local MAKEARGS
+	set_makeargs -1
+	emake "${MAKEARGS[@]}"
+
+	if multilib_is_native_abi; then
+		set_makeargs
+		emake -C tools "${MAKEARGS[@]}"
+
+		if use doc; then
+			emake -C "${S}"/docs -f Makefile.sphinx man
+			use clang && emake -C "${S}"/tools/clang/docs/tools \
+				BUILD_FOR_WEBSITE=1 DST_MAN_DIR="${T}"/ man
+			emake -C "${S}"/docs -f Makefile.sphinx html
+		fi
+	fi
+
+	if use debug; then
+		pax-mark m Debug+Asserts+Checks/bin/llvm-rtdyld
+		pax-mark m Debug+Asserts+Checks/bin/lli
+		pax-mark m Debug+Asserts+Checks/bin/lli-child-target
+	else
+		pax-mark m Release/bin/llvm-rtdyld
+		pax-mark m Release/bin/lli
+		pax-mark m Release/bin/lli-child-target
+	fi
+}
+
+multilib_src_test() {
+	local MAKEARGS
+	set_makeargs
+
+	# build the remaining tools & unittests
+	emake "${MAKEARGS[@]}"
+
+	pax-mark m unittests/ExecutionEngine/JIT/Release/JITTests
+	pax-mark m unittests/ExecutionEngine/MCJIT/Release/MCJITTests
+	pax-mark m unittests/Support/Release/SupportTests
+
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	emake "${MAKEARGS[@]}" check
+	use clang && emake "${MAKEARGS[@]}" -C tools/clang test
+}
+
+src_install() {
+	local MULTILIB_CHOST_TOOLS=(
+		/usr/bin/llvm-config
+	)
+
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/config.h
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	if use clang; then
+		# note: magic applied below
+		MULTILIB_CHOST_TOOLS+=(
+			/usr/bin/clang
+			/usr/bin/clang++
+			/usr/bin/clang-${PV}
+			/usr/bin/clang++-${PV}
+		)
+
+		MULTILIB_WRAPPED_HEADERS+=(
+			/usr/include/clang/Config/config.h
+		)
+	fi
+
+	multilib-minimal_src_install
+
+	# Remove unnecessary headers on FreeBSD, bug #417171
+	use kernel_FreeBSD && use clang && rm "${ED}"usr/lib/clang/${PV}/include/{std,float,iso,limits,tgmath,varargs}*.h
+}
+
+multilib_src_install() {
+	local MAKEARGS
+	set_makeargs
+
+	local root=${D}/_${ABI}
+
+	emake "${MAKEARGS[@]}" DESTDIR="${root}" install
+	multibuild_merge_root "${root}" "${D}"
+
+	if ! multilib_is_native_abi; then
+		# Backwards compat, will be happily removed someday.
+		dosym "${CHOST}"-llvm-config /usr/bin/llvm-config.${ABI}
+	else
+		# Install docs.
+		if use doc; then
+			doman "${S}"/docs/_build/man/*.1
+			use clang && doman "${T}"/clang.1
+			dohtml -r "${S}"/docs/_build/html/
+		else
+			if ! use clang; then
+				rm "${WORKDIR}"/${PN}-3.5.0-manpages/clang.1 || die
+			fi
+			doman "${WORKDIR}"/${PN}-3.5.0-manpages/*.1
+		fi
+
+		# Symlink the gold plugin.
+		if use gold; then
+			dodir /usr/${CHOST}/binutils-bin/lib/bfd-plugins
+			dosym ../../../../$(get_libdir)/LLVMgold.so \
+				/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so
+		fi
+	fi
+
+	# apply CHOST and PV to clang executables
+	# they're statically linked so we don't have to worry about the lib
+	if use clang; then
+		local clang_tools=( clang clang++ )
+		local i
+
+		# append ${PV} and symlink back
+		# TODO: use alternatives.eclass? does that make any sense?
+		# maybe with USE=-clang on :0 and USE=clang on older
+		for i in "${clang_tools[@]}"; do
+			mv "${ED%/}/usr/bin/${i}"{,-${PV}} || die
+			dosym "${i}"-${PV} /usr/bin/${i}
+		done
+
+		# now prepend ${CHOST} and let the multilib-build.eclass symlink it
+		if ! multilib_is_native_abi; then
+			# non-native? let's replace it with a simple wrapper
+			for i in "${clang_tools[@]}"; do
+				rm "${ED%/}/usr/bin/${i}-${PV}" || die
+				cat > "${T}"/wrapper.tmp <<-_EOF_
+					#!${EPREFIX}/bin/sh
+					exec "${i}-${PV}" $(get_abi_CFLAGS) "\${@}"
+				_EOF_
+				newbin "${T}"/wrapper.tmp "${i}-${PV}"
+			done
+		fi
+	fi
+
+	# Fix install_names on Darwin.  The build system is too complicated
+	# to just fix this, so we correct it post-install
+	local lib= f= odylib= ndylib= libpv=${PV}
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		eval $(grep PACKAGE_VERSION= configure)
+		[[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION}
+		for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_osx_dynamic.dylib; do
+			# libEnhancedDisassembly is Darwin10 only, so non-fatal
+			# + omit clang libs if not enabled
+			[[ -f ${ED}/usr/lib/${lib} ]] || continue
+
+			ebegin "fixing install_name of $lib"
+			install_name_tool \
+				-id "${EPREFIX}"/usr/lib/${lib} \
+				"${ED}"/usr/lib/${lib}
+			eend $?
+		done
+		for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib*.dylib "${ED}"/usr/lib/clang/${libpv}/lib/darwin/*.dylib ; do
+			# omit clang libs if not enabled
+			[[ -f ${ED}/usr/lib/${lib} ]] || continue
+
+			scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | \
+			while read odylib ; do
+				ndylib=
+				case ${odylib} in
+					*/libclang.dylib)
+						ndylib="${EPREFIX}"/usr/lib/libclang.dylib
+						;;
+					*/libLLVM-${libpv}.dylib)
+						ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib
+						;;
+					*/libLTO.dylib)
+						ndylib="${EPREFIX}"/usr/lib/libLTO.dylib
+						;;
+				esac
+				if [[ -n ${ndylib} ]] ; then
+					ebegin "fixing install_name reference to ${odylib} of ${f##*/}"
+					install_name_tool \
+						-change "${odylib}" "${ndylib}" \
+						"${f}"
+					eend $?
+				fi
+			done
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	insinto /usr/share/vim/vimfiles/syntax
+	doins utils/vim/*.vim
+
+	if use clang; then
+		cd tools/clang || die
+
+		if use static-analyzer ; then
+			dobin tools/scan-build/ccc-analyzer
+			dosym ccc-analyzer /usr/bin/c++-analyzer
+			dobin tools/scan-build/scan-build
+
+			insinto /usr/share/${PN}
+			doins tools/scan-build/scanview.css
+			doins tools/scan-build/sorttable.js
+		fi
+
+		python_inst() {
+			if use static-analyzer ; then
+				pushd tools/scan-view >/dev/null || die
+
+				python_doscript scan-view
+
+				touch __init__.py || die
+				python_moduleinto clang
+				python_domodule __init__.py Reporter.py Resources ScanView.py startfile.py
+
+				popd >/dev/null || die
+			fi
+
+			if use python ; then
+				pushd bindings/python/clang >/dev/null || die
+
+				python_moduleinto clang
+				python_domodule __init__.py cindex.py enumerations.py
+
+				popd >/dev/null || die
+			fi
+
+			# AddressSanitizer symbolizer (currently separate)
+			python_doscript "${S}"/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py
+		}
+		python_foreach_impl python_inst
+	fi
+}
diff --git a/sys-devel/patch/ChangeLog b/sys-devel/patch/ChangeLog
index 0bbe9de03366..336dbfd520e3 100644
--- a/sys-devel/patch/ChangeLog
+++ b/sys-devel/patch/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-devel/patch
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/patch/ChangeLog,v 1.66 2014/01/18 03:17:14 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/patch/ChangeLog,v 1.67 2015/01/21 07:32:08 polynomial-c Exp $
+
+*patch-2.7.2 (21 Jan 2015)
+
+  21 Jan 2015; Lars Wendler <polynomial-c@gentoo.org> -patch-2.5.9.ebuild,
+  -patch-2.5.9-r1.ebuild, -patch-2.7.1-r2.ebuild, +patch-2.7.2.ebuild,
+  -files/patch-2.5.9-cr-stripping.patch,
+  -files/patch-2.7.1-Fix-removing-empty-directories-automake.patch:
+  Security bump (bug #536614). Removed old.
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> patch-2.6.1.ebuild,
   patch-2.7.1-r2.ebuild, patch-2.7.1-r3.ebuild:
diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest
index 1de2622da4ef..f5632751ec1e 100644
--- a/sys-devel/patch/Manifest
+++ b/sys-devel/patch/Manifest
@@ -2,36 +2,32 @@
 Hash: SHA256
 
 AUX gnulib_strnlen.c 1221 SHA256 12b0328a3d341cb1bad06d84b50b05d28ad44ca6644c62cf52e63d2c3c12f981 SHA512 5b25a72b881482573721601b5f20c448a2cb61c6147d8f7f7eba30d9b5d9953fa7956f947f3779797e83d7de7126c67a4c715292fac475d36b1ee42c794fed74 WHIRLPOOL 7bcf22073d260ebd6594299d213eb8f1af2b49205f299bb255b2f66131329bc367feefb38ebb3c670d902c98185b755ae981fc2bfa86356d0ad86c4f6e3e8197
-AUX patch-2.5.9-cr-stripping.patch 1355 SHA256 d148aa25b3fd9059d04b7d40061c13145fd6fc561bd2ccaefa2a4ccf5b9786b9 SHA512 e57d3d8bd33c61b2dd3dbb7dc1450757333c681d9400f0ac8c69822488650f04b3a4ff4e4e157224cea78404b88f73a1094816876ada8e74c3354cc19602614e WHIRLPOOL 2fe87c0acb7b247b4e84c7de01ceda471a4b1b3808cfa16843071588379e63ee3987b3f2c97103ea6b698ed7f30a28527b661ec35fa91654a0d6c3701d027d2c
-AUX patch-2.7.1-Fix-removing-empty-directories-automake.patch 977 SHA256 662ff35280d1dd1f3aba1c914b441abead037091c7d27fd5b558db3bce965f56 SHA512 eb95233b6368921a56ee7225ff1f5ecdc50e0b73e7da3e34f04cd3463168cfe804f73b5975e380abf23c74e4e04cf6c222ca4dc8f61ebcbd5c204e638f1f41a1 WHIRLPOOL ce2a59c262ae714f376a14c406b12d4ea506bb52e560d4f4240a4a4574282d0a383f6eb2ea0d7f149b4c76db72bbdc3dd9591dcbe378b39daa01ee146411f9ed
 AUX patch-2.7.1-Fix-removing-empty-directories.patch 2094 SHA256 9e1a576fedac307346048f5047c4cf9d6af7c00704a60c4dc15a44526da46526 SHA512 445fd2e50f536e9d5c06bf129e700e2854d445d83286b450519d9d7909922023ce976d9d5cda4f87e0ddc19ea00a1567af17c314cce2338cb2b6b574150c1112 WHIRLPOOL f84f9c8e8dc924b8ebf2e895a0d8aa772389a99be710f1e929213c09762a3b57ecbf33ece7bc62ed72a536ca6568e11655dd0183d06e74a47cce2c814d657da8
 AUX patch-2.7.1-dry-run-mode-create-temp-files-in-temp-dir.patch 815 SHA256 1b9c214bb21ce98e0205161110b27ce7c3fade80f1c5af799ee064b33f3cd1e8 SHA512 fbb7adfafedda770c4662c31004b87c1184bc52025d71f0500af8494fccdceb9a21ebdf9d4bfb7429318a3b3d4766c74f26bca250cba88242e5624618a83e058 WHIRLPOOL 67d7adfb7a1ebcb889801942c504c1f1d17e1729d5e791a70010b5969712e313671c6c9617b576294d699572baed487a435d70419100fdd6c3d94cb469e8a012
 AUX patch-2.7.1-initialize_data_structures_early_enough.patch 2148 SHA256 62aacb522251df87f4882533f68d09a42022461c76491e0560aa4e25ddcdbab0 SHA512 57ffb7a22056b1e37d442b63aff2df7df041c6950b7d437b726c3021224bf81035fbbee88a815ba98d9449229a5426f1aa7cbf9265f8fb8ef6e9b608b0f9841a WHIRLPOOL 083ac9efb2445afbfb645da86873a13a06b869c77499d6870e332175c33d7d89de03e85bcae749c5755b9b888592604e4f894eeb1b998ddd856f4ad32f346858
 AUX patch-2.7.1-prevent_depend_on_autotools.patch 1602 SHA256 0988b3e0bb9d192fe3e6923c4d8e3550e6f290dac8d44bddcc0505b6bd2d67d0 SHA512 ec639c2a21216501822b49395596e2139ad2f7570bb75a393f4591501d56ae05c3376a712c0ad4984d715a3410da4113298bca5a571a005762d73069cc45bfca WHIRLPOOL 9a197ba472f08e5978b81c1ee04318ef367bb5bc9f439c97d511aa7653429a1da8e0967e55ab243a1003f786cd79f7939f1cc6aba7e5540b2fd09b0353e37bec
-DIST patch-2.5.9.tar.gz 201926 SHA256 ecb5c6469d732bcf01d6ec1afe9e64f1668caba5bfdb103c28d7f537ba3cdb8a SHA512 660341c9ace986fd7849ea75b50be0fa0a174bbad1381690f70d9ea90161fe88faeb51bb866eae14324b7e0a8b67526d5bfb6331e043f17315a33f79f278f0dc WHIRLPOOL 20e150f479160ae3fdb53b31305086c04ba71f22a2ffda284a3b85ec6f24498a97e352b03e32fd5ed66fd4f6962d2b3bf4870f1f92c9d7d56b69788265b6a5a7
 DIST patch-2.6.1.tar.bz2 253719 SHA256 1d1441380c92ed8572049411406964a0a987aefd228be3abb8623eca1f3ced8a SHA512 a751bd9d14c82e047c9e914bf03f3296f76e2ebc3f9fb4c3f480590c303d492235a6b340056c612afef6c6b2c8d8de794189b5ba933f53687effb6acb2c5b187 WHIRLPOOL c93833d02d981fa417f5389638ec4731b5addfc0314f92709deb992ad6bab86e67b68b5ee704ed46627944469f1c4e58df51b316c1f4539e196077639013c600
 DIST patch-2.7.1.tar.xz 675896 SHA256 9124ba46db0abd873d0995c2ca880e81252676bb6c03e0a37dfc5f608a9b0ceb SHA512 e10274bd59875d4ec5b02960d23f54e5b2a94ac19554c4a013fdb1df48f01012ce418627c74f7a6bd0a416527dd2ead347642878a057048ede9ee2d9c76a51b0 WHIRLPOOL 5e9d4f2f3ea0fe6d4c9ca577a1ca9103b78d7429e7f67cce4eb2cdea00c71cb9bfe9882101c04be3a5fa6a9ad5e05ff3f1d851a5ef2ae4b80f03696d1c13c6f9
-EBUILD patch-2.5.9-r1.ebuild 1158 SHA256 a5a3d19cbf56ee7f212f9186a4dc684104644d74f695b81e140e5855107e0820 SHA512 29865130b667d35ebd3d28b2acc24551d39c31e95d0bf168db8f19a66ee374db7f48672e65755f00007e2867c1f8e521556fd62d3c671cfd40aa32a0fcc3b98c WHIRLPOOL 5d0f67f0135eea9360be0fa5354f4a2b9004c94b841089beb0fa18decb56db1d5784342053e6f003d5d531099e2c6035a91d648dd1aedd65bc8da8d3aac9bfb8
-EBUILD patch-2.5.9.ebuild 970 SHA256 b236062faaf1a10172f50ddfa99dd5cb4a622d64127a7f4ee6519f7b70baddd4 SHA512 01cb916d45f5660b0076bb8b2332de98a3e4c66acaa59c57c3962600c5f304646201ffbf3cad2e7831bbb7f202f6586df14be8b7e8e8c6dc19a62defc787e196 WHIRLPOOL 2ea911121bcbc511f32900514f65d7671becfc930422d0744e8899f49b0fa6b3a75c4812f033041107ab49cc35908f2a3556e1f5ef75596ca17318b72f8e8e82
+DIST patch-2.7.2.tar.xz 684108 SHA256 9a55c7e7415fa789acc45dbe78fe4675b1fa12c1ccb19f1513f69fca3f798a9a SHA512 dcfcc06e0503236b05a9202906116a5ec039b30d8d4ad0eddd63601a2ba37b81cd4ebf71749ff69c0e05d49ae4fe8a01332d5c6c6499ab5eb1eea9176b374ede WHIRLPOOL 66e019eef0b33709357a5ffcdf43f43ad41673c64368644676ab82407611e905f201446042c824c30e690424f5db218ad4903785431bbd479c1be249c5e72732
 EBUILD patch-2.6.1.ebuild 1013 SHA256 56f327dfdcf34f638721dc42e60f682121799b1e5dc9f2d585387178df97031a SHA512 1415b53b21f48dddac43c761b9fec24a0ae008510b3c014122c6e60dfe99497dba0677f49e169dc6266c5059e8730e561ba206c4be50c951c4716378f8e53eda WHIRLPOOL b7f2a2413775d201b4bdace89792aa0044a4847375044ea00a140c85c4153a0aadd5831f6782f49ad621b9b8284b5d49d08dc597fe057c03819f16ea2444a3b0
-EBUILD patch-2.7.1-r2.ebuild 1339 SHA256 1eb5e7fb4a412aad0134e6fa1800f06d55cb52d72a882cd80687e9fc01568229 SHA512 dac7dad0845da903ee80a3d65f9847edf71f585d6a1188095d3066b54ca88e789962f6e051ee062e2b08bfea42151ecce4763c0a34e23f37f28cc7c917c51582 WHIRLPOOL 37856145303c25e5d775a19b188836d5d6f4f0704578b7c1680534a5e0c5008035a6a7dd878d8289836c4e5c52ddf2c19e2e62532f47efef7a1855fba0439b84
 EBUILD patch-2.7.1-r3.ebuild 1388 SHA256 b59edda27f1c76d18fa3130cca5d5c3af0a6556ead06698ce0e6f510cf38ef63 SHA512 7192e4fd2f7856f2a9d599af1d9dfe13629c731d1b5d9da72cfa1f4c619b47131620656c859aece426ef64160741cbe8b3c3433a2164d49e49a5a5894a3cde72 WHIRLPOOL 7fe063706978f7831d30a691d0e082c16727a91a50ba5700b5ae2f583cf82b9460ebdeb8609f2a5f8545e7eb858699888b4d3f983202cf2412b487a90b7de306
-MISC ChangeLog 7849 SHA256 b5345d6c805f0b42acd0b7b65bb40c23f29ce52554e3e520689dc99ded010c2d SHA512 bd31725347f9e80a1f32a14151f4e37d0ac306e84b092727b25d40b9f1624a940be5f5ac2a3064fcfca1119abd25d8292c4a86ae3129ef0cac0684fba25baabf WHIRLPOOL 1fdf4808092438ad545f433f6898d8dc68cad8b43c090bf7bc7410354224bf9d11e22575c6c79e995ca4c5d2342b30ba61d1679e5d96ade88516a880a3b4ff57
+EBUILD patch-2.7.2.ebuild 1110 SHA256 52fde29093c1bc3627472f332ad14304c5a40bc09260aa06cae9d6054f0c8cf9 SHA512 52c50725ef3376ae9ed81c8056ef20fb1b58f21228e7a3118483aa7546406f3b30343ee5d7b0b91720992c5b46086e9388a6db434f53e3a258ac606576e9571e WHIRLPOOL 9e9d55448c84410f756553da9c576caa3df591837c262ab0086b07e0d27ca4d44ae4a19a24492b6c234c5842a8e12bf78c6d7ba659739dcf2ace1cad8850d86d
+MISC ChangeLog 8183 SHA256 971ff350c67566c28758075e9bcaa642dae89b6a546ce7005bfff6b57de17d70 SHA512 800fb367092bfc16ffa6b1fadc52db31bdcbbc1533534bc1a5fdf0f5d78186eb420a3545cc5f414a75736d310abfbf11104d8747b6135c7e4a62f93fef6a4606 WHIRLPOOL 8c4ea51d6651c227d6e43e9a3d8ee33ed006538d5cdf4a6edc1fb0f1e10abf7d86fc5e9b49a17377296009af3fad0a3bdd6c353ed6f609c4c909f1fd6b9fe3df
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJS2fJBAAoJEPGu1DbS6WIAu9AQAIDYK9JnpFVRf+X0u8c+mnDG
-dlbEBp7FOexqIfBc8ulBVMR3+oZ5uw9+5Wukp/hvI4dFX7K/4rK81k3YLN0H43QK
-KDNxJF2xcNDM8ljhTxBSUMCZFvKRI37z6vuBsrT0fezZj0Pw8JE6+R1SmAvX1KLq
-kvumzCMTr96fWfqzN2X+JfmK2JhQd5qymL4x3v8ug/GIiTLQtWa9r5QR3rgZOEx5
-EeWE6IoQIE6fJXLnt6gVG2qVW/CfwJEZ1GEyDvts89YCVAToahufpexZPceLXwJx
-UbYlnPFf8HogtmzbYmFv1cw7fbkum6AU4wHjIG0f8oGRVA07QO+FFkQ7fLZjm3E3
-/BLda1dBMw3+CYu7ssLHcCf4u8+JZ9naQ83CSVxnztjHNBijuxUDaH8hrLH0MQ1Z
-tREAcjMVa4qbeOcUEai/v0Xa1xT59JMugFo3+bELSUOCD3HELfSU0rzzQGSJ6ol8
-gnbU/HHMxoNnyI5AC+DASyxXQKIMXo+nxRWjVEPD9fAJcx9O+dmJcWMATttTPWXq
-GH9S5UM+/j1LfY3DNWVZNhn1gPqaakhSY10fZfgUqe1MIandEr2/AWlZbv4/2OI3
-V9MiaazS1+a80vVNekM+OfdmC+cZl2iy2FOWgwCtnymaEqVMtQO4vTiJqWE0Uu9r
-GRHJE4y0PUXUrP8UJ20S
-=hdk/
+iQIcBAEBCAAGBQJUv1X5AAoJEPiazRVxLXTFA2gP/1EMYjsfnxDg8/Tj8mMynzG+
+YJ4Yut/iPfQDfDr4TPrNaN51CUjMwI95ZLYk1V7D+LF51p8X/8+c/YqDqNAVKxSq
+4jTqkdLlvJyNpz78oJE2Sdvk+8z8xTGAmk4l05LotpTTkzPy3Ndm9KcTKyeTCa4Q
+U27PSBKgUY4E8rEzrr5f8e1ptX6MBSYPWkl2rtXdQXwYBIz4hb6CbSXmgkym+Lec
+mg9Iv2K9EVkSA8+vCa7bMho1iuMBkdSDGedj8/+gA30RK3D2eaIz+ZBYX3GuI9eB
+Lud2RdPIH5BpFKnBSgJ/itzs2Dr1B5cJ17MsH7T1DeHFHeltlHhsuCwy/K2h0TbM
+8aJK1Vmm40ctN/uSOO6C6BtvNR2sP2rwmTYf8cbjUKBV4xcpExEz2DqSClnB08VB
+xmGz1TI08vBM/yisxJsyORzCK7Jq1Dyl8Q5AZbf000inXIt66Ru3Aarv77malcRd
+jokKe2pBSn+s3qvWagY5yjmju59CjAd06u4Kp56i5K3zbTSLycdilQjssBuFJZq8
+PsghpIVd0uAcZiUPuymxtAfQ2vglqo6aqoFZJXQmD74AnDFRNY60so/LIZp7cuL2
+6CPLkXxjSOBCyFKLWIFkqzu1H3VVD4v77mYLhs4uLYf5I3G2fE9LuYZ67pf3BA0r
+EXv+UAZVhPbz5Wdipdyg
+=ncdp
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/patch/files/patch-2.5.9-cr-stripping.patch b/sys-devel/patch/files/patch-2.5.9-cr-stripping.patch
deleted file mode 100644
index ccb676c53637..000000000000
--- a/sys-devel/patch/files/patch-2.5.9-cr-stripping.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-         From: Paul Eggert
-      Subject: Re: patch2.5.9 fails on some dos generated patches
-         Date: Thu, 05 May 2005 17:46:30 -0700
-   User-agent: Gnus/5.1006 (Gnus v5.10.6) Emacs/21.4 (gnu/linux)
-
-This should fix your problem:
-
-2003-07-02  Paul Eggert  <address@hidden>
-
-        * pch.c (intuit_diff_type): If a unified-diff header line contains
-        trailing CR, strip CR from each body line.  This corrects a bug
-        introduced in the 2003-05-18 patch.  Bug reported by Andreas
-        Gruenbacher.
-
---- pch.c
-+++ pch.c
-@@ -366,10 +366,16 @@
- 	if (!stars_last_line && strnEQ(s, "*** ", 4))
- 	    name[OLD] = fetchname (s+4, strippath, &p_timestamp[OLD]);
- 	else if (strnEQ(s, "+++ ", 4))
-+	  {
- 	    /* Swap with NEW below.  */
- 	    name[OLD] = fetchname (s+4, strippath, &p_timestamp[OLD]);
-+	    p_strip_trailing_cr = strip_trailing_cr;
-+	  }
- 	else if (strnEQ(s, "Index:", 6))
-+	  {
- 	    name[INDEX] = fetchname (s+6, strippath, (time_t *) 0);
-+	    p_strip_trailing_cr = strip_trailing_cr;
-+	  }
- 	else if (strnEQ(s, "Prereq:", 7)) {
- 	    for (t = s + 7;  ISSPACE ((unsigned char) *t);  t++)
- 	      continue;
-@@ -409,6 +415,7 @@
- 		    p_timestamp[NEW] = timestamp;
- 		    p_rfc934_nesting = (t - s) >> 1;
- 		  }
-+		p_strip_trailing_cr = strip_trailing_cr;
- 	      }
- 	  }
- 	if ((diff_type == NO_DIFF || diff_type == ED_DIFF) &&
diff --git a/sys-devel/patch/files/patch-2.7.1-Fix-removing-empty-directories-automake.patch b/sys-devel/patch/files/patch-2.7.1-Fix-removing-empty-directories-automake.patch
deleted file mode 100644
index 8a6578e7f7cb..000000000000
--- a/sys-devel/patch/files/patch-2.7.1-Fix-removing-empty-directories-automake.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Simple patch to prevent sys-devel/patch needing to depend on autotools to
-be built, which would likely make stage1 people unhappy.
-
-By: Doug Goldstein <cardoe@gentoo.org>
-Ref: bug #478548
----
---- a/tests/Makefile.in	2012-09-28 11:41:32.000000000 -0500
-+++ b/tests/Makefile.in	2013-07-31 07:55:44.879904245 -0500
-@@ -1104,6 +1104,7 @@
- 	reject-format \
- 	remember-backup-files \
- 	remember-reject-files \
-+	remove-directories \
- 	symlinks \
- 	unmodified-files
- 
-@@ -1352,6 +1353,8 @@
- 	@p='remember-backup-files'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
- remember-reject-files.log: remember-reject-files
- 	@p='remember-reject-files'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
-+remove-directories.log: remove-directories
-+	@p='remove-directories'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
- symlinks.log: symlinks
- 	@p='symlinks'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
- unmodified-files.log: unmodified-files
diff --git a/sys-devel/patch/patch-2.5.9-r1.ebuild b/sys-devel/patch/patch-2.5.9-r1.ebuild
deleted file mode 100644
index 936261539d95..000000000000
--- a/sys-devel/patch/patch-2.5.9-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/patch/patch-2.5.9-r1.ebuild,v 1.18 2008/03/18 12:34:29 vapier Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Utility to apply diffs to files"
-HOMEPAGE="http://www.gnu.org/software/patch/patch.html"
-#SRC_URI="mirror://gnu/patch/${P}.tar.gz"
-#Using own mirrors until gnu has md5sum and all packages up2date
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" # dont stabilize
-IUSE="static"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	if type -p patch > /dev/null ; then
-		epatch "${FILESDIR}"/patch-2.5.9-cr-stripping.patch
-	fi
-}
-
-src_compile() {
-	strip-flags
-	append-flags -DLINUX -D_XOPEN_SOURCE=500
-	use static && append-ldflags -static
-
-	local myconf=""
-	[[ ${USERLAND} != "GNU" ]] && myconf="--program-prefix=g"
-	ac_cv_sys_long_file_names=yes econf ${myconf} || die
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall || die
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/sys-devel/patch/patch-2.5.9.ebuild b/sys-devel/patch/patch-2.5.9.ebuild
deleted file mode 100644
index c87ec181670a..000000000000
--- a/sys-devel/patch/patch-2.5.9.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/patch/patch-2.5.9.ebuild,v 1.27 2011/02/06 11:37:50 leio Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="Utility to apply diffs to files"
-HOMEPAGE="http://www.gnu.org/software/patch/patch.html"
-#SRC_URI="mirror://gnu/patch/${P}.tar.gz"
-#Using own mirrors until gnu has md5sum and all packages up2date
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd"
-IUSE="static"
-
-DEPEND=""
-
-src_compile() {
-	strip-flags
-	append-flags -DLINUX -D_XOPEN_SOURCE=500
-	use static && append-ldflags -static
-
-	local myconf=""
-	[[ ${USERLAND} != "GNU" ]] && myconf="--program-prefix=g"
-	ac_cv_sys_long_file_names=yes econf ${myconf} || die
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall || die
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/sys-devel/patch/patch-2.7.1-r2.ebuild b/sys-devel/patch/patch-2.7.2.ebuild
similarity index 71%
rename from sys-devel/patch/patch-2.7.1-r2.ebuild
rename to sys-devel/patch/patch-2.7.2.ebuild
index b3c76e3722a4..b4b474d404b7 100644
--- a/sys-devel/patch/patch-2.7.1-r2.ebuild
+++ b/sys-devel/patch/patch-2.7.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/patch/patch-2.7.1-r2.ebuild,v 1.3 2014/01/18 03:17:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/patch/patch-2.7.2.ebuild,v 1.1 2015/01/21 07:32:08 polynomial-c Exp $
 
 EAPI=4
 
@@ -19,12 +19,6 @@ RDEPEND="xattr? ( sys-apps/attr )"
 DEPEND="${RDEPEND}
 	test? ( sys-apps/ed )"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-Fix-removing-empty-directories.patch"
-	epatch "${FILESDIR}/${P}-Fix-removing-empty-directories-automake.patch"
-	epatch "${FILESDIR}/${P}-dry-run-mode-create-temp-files-in-temp-dir.patch"
-}
-
 src_configure() {
 	use static && append-ldflags -static
 
diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index 3718186660b8..77ae408e87f7 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/readline
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.219 2014/12/29 07:42:08 polynomial-c Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.220 2015/01/21 11:50:44 polynomial-c Exp $
+
+*readline-6.3_p8-r2 (21 Jan 2015)
+
+  21 Jan 2015; Lars Wendler <polynomial-c@gentoo.org>
+  +readline-6.3_p8-r2.ebuild, +files/readline-6.3-read-eof.patch:
+  Added a fix from upstream.
 
   29 Dec 2014; Lars Wendler <polynomial-c@gentoo.org> -readline-6.2_p1.ebuild,
   -readline-6.3_p8.ebuild, readline-6.3_p8-r1.ebuild:
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index c414953e6007..5da6005dd4d3 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -5,6 +5,7 @@ AUX readline-5.0-no_rpath.patch 363 SHA256 59df6107772d1a93550bacc267a2c00f9dfd6
 AUX readline-5.2-no-ignore-shlib-errors.patch 688 SHA256 2c585c4e2d69d6b91157f378a3dd11cb49beefab808eef3350cf1b8357b2efc6 SHA512 23f88aee11a9ebe15406293695f3de2a7a6c52b8b138c199c64f9dbb9b59d9063f12f8693656e61611e72f6298f7d919016cd240434e78ea2232876690a8b738 WHIRLPOOL ae87d544fa32dbd2b6f27f164dd4e6d0e8a3f399d4a9bde81bcb631985c6e69db11705dc372c21a4f9d3a26cf4279023aeae97fd0d243ca8e1c0e547b59084a4
 AUX readline-6.2-rlfe-tgoto.patch 379 SHA256 6bd5db93cba1cdf751b424a25a1f08c87bae2b42ff59c6c0aa34d659115cbfc1 SHA512 1d2c3aafc949d92fdf6abbee60a60c80f0327f81694d5d8f3a166f1c24d37346caca3e72c9971106b96b2758a9a01269346954fe20bc381eb9da2e6a2737fc3c WHIRLPOOL daab79312136fa728ea77839d6ad663554055e2acd7acff036b8d168f4a0791d57503aa196be4f834caf32ba72ec73c3125adb9b11b5d6898bb796016e83175a
 AUX readline-6.3-fix-long-prompt-vi-search.patch 669 SHA256 787f9ed371c550aeecfe5c57e250aa9bfc101dfccb19437fbca135e19610ef9b SHA512 19e8a342c305e6f68e13bf3eec619971a5bb8f2a542838a28f72e77f672f5e8e9f501f446facae3528e14646e6e41a29546837f0407a1ddaddf20244914d6d9d WHIRLPOOL 5636b9d0638be1b214b1710d42b7b812e8b8714e9aa0546be6d187992e6c0dc0fe513a11dd9386c1d8949c792775fc26c8d8cbe0b44ca5cba6854089332f4513
+AUX readline-6.3-read-eof.patch 1913 SHA256 508323403e752296a63619e9a3fe4fdcd233f368f0f9944ccdc2c6bd69eebc2c SHA512 99728e35d64b466e2bea570412eec719c70841d205a5190c0000bcae55cf3ac2d659ae18e57b4c332525261d83e160054800cd89f4009ce3c76d1c3b4ac27223 WHIRLPOOL beda5876ea05f69f0b2e8005c60dca8290cc7943475352b6c26ab656273290d06a07ae62f28e3fc21c3c31ae628c744a6e5a8ebbc5328fa896f215d419dea270
 DIST readline-4.3.tar.gz 961662 SHA256 eeaf6f050b9f515b0636e5b4f2c153f9ef78e9061ee5dd74f612fab54c77bf88 SHA512 4dbc4d9f16a453f8cf6adefb5723b0f35ef79b8db7dcdfcdd2d6465cb62ca961035e5e9547bfa46d4cb1370d738b042e0e10f9233c3751925c6bccab41e7d182 WHIRLPOOL bad0852f5a97b747c79923bbef29dc48bb7730b96ba86dd444f63d9ee78fe0dda3edd249607dbaf98b3a8932b69cbcf0f79592cfc3757887791e38673dccb352
 DIST readline-5.2.tar.gz 2037705 SHA256 12e88d96aee2cd1192500356f0535540db499282ca7f76339fb4228c31249f45 SHA512 74318b32c56e888716bda2507228ecc374a24e85b2faeec4778227a9f04eb19de1fc8468c78746954c84f9e616a06dd0f8a4332ba4b438fefb7e222699baa379 WHIRLPOOL 8641abf42316ab278207c0a25d9155d4d4fddaf0e704255b40708875b9f31bd3e6caf903550783c15b160bd2b86ffc129b2eb7a1fb4a641d8d58edc3b53145c3
 DIST readline-6.2.tar.gz 2277926 SHA256 79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381 SHA512 fa5b4f1b6f81bc0b3be0739adb06dab0668603ff256fe62b59ebfe21d5a9e340a758a8eef569df8c4c4ecb86cdd9698a6dabc2ee8c70a769de2bd5930c32ff59 WHIRLPOOL 5d92645085f253206c16533e3cb35bb382d6fe616bf2144feb06f9ffb9b4d7cc25ceaa846b98f17aa442552a0e80642a62d57fe20982e0ed8fdefb75c2f9bbf0
@@ -45,22 +46,23 @@ EBUILD readline-4.3_p5.ebuild 1591 SHA256 a0f153f8c647359666a214d47647514853a17c
 EBUILD readline-5.2_p14.ebuild 1905 SHA256 170279df1909b218b3c9ff6b9cc3e315b1a72b8f1a6b5615010e903d67c65259 SHA512 1ad3ccb540e9a50c5bcc6e37689b6534371d4038db57cefb826eb112cf8a28ac1b647cead266dbf5b13a14b0da541a4a3e42343ac67461eefae5670adfec947f WHIRLPOOL 9a72cccb826deffed24f144ec1aeceb3b2c5194a0f072bffba1de42eba0708931d9eb75482847316803796ddc6afa5bd0ca1ce71edd4aef0fc0d2cecc9be1a30
 EBUILD readline-6.2_p5-r1.ebuild 4138 SHA256 5dd233e4e9e1d66aabdba6631551eaa174af1af70c5d0110ac8c9784150085ec SHA512 c281c67b15a590a9c9aa0c3a84bdb151ff7fdf3efe33f4a30d4e63ea6cbb29b48c820fbd0b2a233aa8b2349379b464c119b5c793854e36c4b012b53ba986a87d WHIRLPOOL 588bac8a9c53fce242166a6c89644aa42396b2d5922cdcf0de03decdd13d1ce9f1ec4b97259a642edf5f2d520366ef72f088ff5abdc9fa410e02c8054b96836d
 EBUILD readline-6.3_p8-r1.ebuild 4562 SHA256 d77fcecf028f4bbf80e976675051d2401e91af11848d37ebf3630dccebeec397 SHA512 a4c021c3339ac6b34212dcfd19d5abd4028c28aba2e9d0c15c9313832e14aefe1f63545a1e86405fa7ff7f89be08a02e7cdc325b1d4d116a85fc17187d7ef5ad WHIRLPOOL 5f7abb327b5cee3af7db5683dac9956e6c0e633602ec0483ac50e68418b185af7f19b78e6118956111a17891f857819910dfd593f9aecb4c5fdaf370eca756df
-MISC ChangeLog 29530 SHA256 934e1aca1b358253405e04ea357af52e97b1fdcc284179be08f44a585f0d289f SHA512 45d496ac65642d7939578295c4cb6abc3284dee9475bd3e187018c6bfa5d2f24f3476995ddebe65b21a186816d5db0aee6cc15fee4860a8c0b550790408ca39f WHIRLPOOL 34c40c3df42ba3787964681ccf2934d0172329c2e01905f889057de3695bcc61e8f5a80def73b59c0a9d75d351f287054c8d251498c9ffacf7f72f7693e3f939
+EBUILD readline-6.3_p8-r2.ebuild 4609 SHA256 af02922367f70fbb051d5e601c71916e7a880d050e643dfabe46ea605b764dc0 SHA512 1822c8d0de6217bdc96487b73b9c46de79617685dbf42b53334004b3e39c1faa9239fbee19955bd5cc704b57126a25b164897f0a8281043474b59e6b698bb615 WHIRLPOOL fda8e77e7b6aa3368f958c71f753db5002800c509a2f2d2347707d89ece4bb364b97dc6cd350ec0c071224df0f309f37533713a08134da029d950ced9d8c06a5
+MISC ChangeLog 29715 SHA256 7002988928a858554f228a4714e2994e897ea7c9ccc549192a54c6b489e61ace SHA512 dd94ad1d76510455e786da2f65a08ddc216db02709f79b5e3700e9ddcc807db3feee7e2de2fcebd37d04dd318ea8dc2e68b0a1073939788bec8f898eebfa547e WHIRLPOOL 252d2254f13e93cd3d3481f0fc4736fcce0139ff9c35c108bdebccdbe86e661164637de9cd95e739e5c16a6152090a696138a3d645bc5a3f2e9533fb16e40c1f
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUoQXRAAoJEPiazRVxLXTFMFYQALcXfaZlAs5P95m4bAGuSAW7
-O/5kfZHnzmYvAzyGm62pqivR88bWZ/qdHTQgpDN2H9hLuzWRCreidxwQThec/cKw
-eNEhnGq4XJR8QbHObIlci3jogeqf7h0HbMFq0mzQZ0GcxJifFfRcHe2z2tpPNkQV
-AOVef0DQep4Ft8rev78e+b+8ukGD4x7yQkDwZS/chnK5ucPOrVgQgxuGdPa2nMI3
-j3clgJSj4nCwFjkPdgXGCvMnToR2bpls+H2ZaS+lFbQdbRyIbbS4rxEu1g4lO18Q
-SmRJo9q34eulzai+fAXxjQxIE3COpOhPZEJN+/1jdXYqBLAm4xd/3YIMD4peiROE
-IDKTgKTnHVCYPe1H7t6omz/rJ1gQOIs12xu/L1Pr1Mm6oZ8DCoJ++VOiwLEVpgfe
-vvyABCk6NaSAZRMwljhedzfEtzpcxHSAJbXFVR0UGSJSerM6tCyi0tEfouzrFkgR
-AAXoefLhXgRZURE9bkP04JZ+5xth+CDSgMJOUWkoW78rQ8n964a58wmqpXRphwtc
-LeBM7vkjEuayWIzCXU4p+npcBQtyjDnox+aqedYxmi6aHYMIXZjIYKnZc/DR0LMw
-g8mHrG4c56FCqmG95LTqw0baioYPSos1oM7gb7eNn1nIeNKUbT7xwr4mIjRhzGLL
-J+Njkapj5XZAjK0/yMM5
-=RNEF
+iQIcBAEBCAAGBQJUv5KVAAoJEPiazRVxLXTFMAYP/jlQfaKzUHALx9X5YIj0jJlZ
+1t1AYdxRv7TYZQVGhg5RRcyP/CNT0JRnZv8A1y6DNzSve1oQ1JThPsa663WvYvZS
+5prkyozNPU+pYCSP9uJ1T3uJfv+EH7pjihLn9KGwWFu7vcx4q7D+IrTMlWzSu7mz
+McBSDcdQ3Tic1/tmlMMdGQ6wVwAfxEHnX04vy6cN1Gaa2/AsVZhmdmWwgPJFXwcF
+yQQ1Mc/856+R/b+/PBbmTfYhRAyMxH/LZSPv5Wxeoml7mvki0yHWZqYQp0FwUOgq
+dzANZDltoC1CEnEOzQ/bS9dlr4z2qvFPxmxSqRjdBUB54WcTWugLzXy0DcCrdkHa
+nEa/+QSlKbXlTQ5uUQ6nnM+AmH0s5A2QhEO2VrnnPi7FKutiY0tUlAQOcCuedKYG
+CmTBdueGkGh6GQ1U8DH8snVSD7hNcRi/+dv7R95B+U634Paits7R7XelmyB7T5FE
+UWim7FhAO3VrhyuxXO+FyymKYkkPF8nA6BAGntn8jTu4703zkBx9nEKgmdwXBefI
+kBaiBMDJfjQ4V8o8jRXMluZ7NlVptDHA2Wy9RAkBKEkcJPAPbjNNvz9mcKrM4TtX
+Awy3zW2EzEVJchuX4jLw92c36dFyaoj+ehuV7uscWkrRGAfFnGGp6EMUZguQ7oVu
+RE1iey1ac73THi4qNMaM
+=IRq5
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/files/readline-6.3-read-eof.patch b/sys-libs/readline/files/readline-6.3-read-eof.patch
new file mode 100644
index 000000000000..f74aad63be1f
--- /dev/null
+++ b/sys-libs/readline/files/readline-6.3-read-eof.patch
@@ -0,0 +1,54 @@
+http://lists.gnu.org/archive/html/bug-bash/2014-12/msg00152.html
+
+*** ../bash-4.3-patched/lib/readline/readline.c	2014-10-01 13:08:28.000000000 -0400
+--- lib/readline/readline.c	2014-12-20 22:37:28.000000000 -0500
+***************
+*** 580,592 ****
+  	}
+  
+!       /* EOF typed to a non-blank line is a <NL>.  If we want to change this,
+! 	 to force any existing line to be ignored when read(2) reads EOF,
+! 	 for example, this is the place to change. */
+        if (c == EOF && rl_end)
+! 	c = NEWLINE;
+  
+        /* The character _rl_eof_char typed to blank line, and not as the
+! 	 previous character is interpreted as EOF. */
+!       if (((c == _rl_eof_char && lastc != c) || c == EOF) && !rl_end)
+  	{
+  #if defined (READLINE_CALLBACKS)
+--- 587,620 ----
+  	}
+  
+!       /* EOF typed to a non-blank line is ^D the first time, EOF the second
+! 	 time in a row.  This won't return any partial line read from the tty.
+! 	 If we want to change this, to force any existing line to be returned
+! 	 when read(2) reads EOF, for example, this is the place to change. */
+        if (c == EOF && rl_end)
+! 	{
+! 	  if (RL_SIG_RECEIVED ())
+! 	    {
+! 	      RL_CHECK_SIGNALS ();
+! 	      if (rl_signal_event_hook)
+! 		(*rl_signal_event_hook) ();		/* XXX */
+! 	    }
+! 
+! 	  /* XXX - reading two consecutive EOFs returns EOF */
+! 	  if (RL_ISSTATE (RL_STATE_TERMPREPPED))
+! 	    {
+! 	      if (lastc == _rl_eof_char || lastc == EOF)
+! 		rl_end = 0;
+! 	      else
+! 	        c = _rl_eof_char;
+! 	    }
+! 	  else
+! 	    c = NEWLINE;
+! 	}
+  
+        /* The character _rl_eof_char typed to blank line, and not as the
+! 	 previous character is interpreted as EOF.  This doesn't work when
+! 	 READLINE_CALLBACKS is defined, so hitting a series of ^Ds will
+! 	 erase all the chars on the line and then return EOF. */
+!       if (((c == _rl_eof_char && lastc != c) || c == EOF) && rl_end == 0)
+  	{
+  #if defined (READLINE_CALLBACKS)
diff --git a/sys-libs/readline/readline-6.3_p8-r2.ebuild b/sys-libs/readline/readline-6.3_p8-r2.ebuild
new file mode 100644
index 000000000000..22aef253cbc7
--- /dev/null
+++ b/sys-libs/readline/readline-6.3_p8-r2.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.3_p8-r2.ebuild,v 1.1 2015/01/21 11:50:44 polynomial-c Exp $
+
+EAPI=4
+
+inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal
+
+# Official patches
+# See ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/
+PLEVEL=${PV##*_p}
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+	[[ ${PLEVEL} -eq 0 ]] && return 1
+	local opt=$1
+	eval set -- {1..${PLEVEL}}
+	set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
+	if [[ ${opt} == -s ]] ; then
+		echo "${@/#/${DISTDIR}/}"
+	else
+		local u
+		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
+			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
+		done
+	fi
+}
+
+DESCRIPTION="Another cute console display library"
+HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND=">=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}]
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r7
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+	epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
+	epatch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
+	epatch "${FILESDIR}"/${PN}-6.3-fix-long-prompt-vi-search.patch
+	epatch "${FILESDIR}"/${PN}-6.3-read-eof.patch
+
+	# Force ncurses linking. #71420
+	# Use pkg-config to get the right values. #457558
+	local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs)
+	sed -i \
+		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
+		support/shobj-conf || die
+	sed -i \
+		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
+		examples/rlfe/configure || die
+
+	# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
+	# objformat for years, so we don't want to rely on that.
+	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
+
+	ln -s ../.. examples/rlfe/readline # for local readline headers
+}
+
+src_configure() {
+	# fix implicit decls with widechar funcs
+	append-cppflags -D_GNU_SOURCE
+	# http://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
+	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
+
+	# Make sure configure picks a better ar than `ar`. #484866
+	export ac_cv_prog_AR=$(tc-getAR)
+
+	# Force the test since we used sed above to force it.
+	export bash_cv_termcap_lib=ncurses
+
+	# Control cross-compiling cases when we know the right answer.
+	# In cases where the C library doesn't support wide characters, readline
+	# itself won't work correctly, so forcing the answer below should be OK.
+	if tc-is-cross-compiler ; then
+		export bash_cv_func_sigsetjmp='present'
+		export bash_cv_func_ctype_nonascii='yes'
+		export bash_cv_wcwidth_broken='no' #503312
+	fi
+
+	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
+	# so we can re-use the config cache file between the two.
+	append-ldflags -L.
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--cache-file="${BUILD_DIR}"/config.cache \
+		--docdir=/usr/share/doc/${PF} \
+		--with-curses \
+		$(use_enable static-libs static)
+
+	if multilib_is_native_abi && ! tc-is-cross-compiler ; then
+		# code is full of AC_TRY_RUN()
+		mkdir -p examples/rlfe || die
+		cd examples/rlfe || die
+		ECONF_SOURCE=${S}/examples/rlfe \
+		econf --cache-file="${BUILD_DIR}"/config.cache
+	fi
+}
+
+multilib_src_compile() {
+	emake
+
+	if multilib_is_native_abi && ! tc-is-cross-compiler ; then
+		# code is full of AC_TRY_RUN()
+		cd examples/rlfe || die
+		local l
+		for l in readline history ; do
+			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname)
+			ln -sf ../../lib${l}.a lib${l}.a
+		done
+		emake
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi ; then
+		gen_usr_ldscript -a readline history #4411
+
+		if ! tc-is-cross-compiler; then
+			dobin examples/rlfe/rlfe
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc USAGE
+	dohtml -r doc/.
+	docinto ps
+	dodoc doc/*.ps
+}
+
+pkg_preinst() {
+	preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5} #29865
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5}
+}
diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index 21a8874f19c6..bb715369ce86 100644
--- a/x11-wm/windowmaker/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-wm/windowmaker
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.149 2014/09/03 21:30:00 voyageur Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.150 2015/01/21 09:59:33 voyageur Exp $
+
+  21 Jan 2015; Bernard Cafarelli <voyageur@gentoo.org>
+  windowmaker-0.92.0-r11.ebuild, -windowmaker-0.95.3-r1.ebuild,
+  -windowmaker-0.95.4.ebuild, -windowmaker-0.95.4-r1.ebuild,
+  -windowmaker-0.95.5.ebuild, windowmaker-0.95.5-r1.ebuild,
+  windowmaker-0.95.6.ebuild:
+  Fix libXpm dependency (conditional in latest package), bug #533912 by Toralf
+  Förster <toralf.foerster@gmx.de>. Also remove some versions
 
   03 Sep 2014; Bernard Cafarelli <voyageur@gentoo.org>
   windowmaker-0.95.6.ebuild, metadata.xml:
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 97b9bf785170..9ede5d42ad02 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -5,25 +5,19 @@ AUX windowmaker-0.95.3-fix_underlinking.patch 355 SHA256 ae4bc0f40edb8fc38084051
 AUX windowmaker-0.95.5-bsd_crash.patch 963 SHA256 189bde88d72d65b0412bf7f08d2bddc8f952d942d7a0cab49d3391292dcd47ba SHA512 66611ecb7b8aa43c8884734472bd41f2912a5a86c93ad908313171041a2665d08e9131270b21d3466dd3c844dab09faa099bf01e2fa2a4a81bb3910073490c3e WHIRLPOOL 78ec84ed9c61b6ece3db15bc0e5137c66d37335c9e64494bc1cd82f4a157c8e26e73796d0fb7c2706dc2cb3b9bd84b759d8570a1a3a17eb9d7d6ac9a623803ae
 AUX wmaker.desktop 221 SHA256 40359d3c61117f0dbc5eb547e4c369982427e8bc3174c95002d34eb30f9a4a84 SHA512 1c1b24001e47a2af8f18a5f90675d095ba7f929ad9273ca82f61fd13ad35ff22dc9b777eec24fc3fd984790a5d494949d1dd5e0ca39780920017ea7971a3289d WHIRLPOOL 68ea31480ba1796e4243184deff38270963841c2bdb54bc85a606ecad0cdccc6815b11fa67158cbcc527ae3a17488b97a209283289922323ed42ea37a062ac2b
 DIST WindowMaker-0.92.0.tar.gz 2758524 SHA256 9edaa8d9ee6e6beb06f4c391c0aec5cd0e5b5494456cae2cdcfd49656177afc6 SHA512 3db6d7128d49ecd87d46893c63efcdda07f841bdfd5961462c0c9247d4f3937835f637dc7f4fa7169f6999595afca914c611f4249915700a461130c5a3c865d2 WHIRLPOOL 8d9395c79cdb23d4d6011dc5a1383852890f2d02fa0038a80cf81e2135b4a904065b4051fd1be07818136442f5ac792459f5cc81bc75ba090c1728aa4e4ef4cd
-DIST WindowMaker-0.95.3.tar.gz 2780245 SHA256 b5eb88eccbf9a196a617594717797aa38f5c38d13d2ee40e914e153d09c9975a SHA512 7a70f6eb9de03c466d9de6a84febc59d46edee82c789287caa3a67012ab40c9b9a029ee46236f79dc80daeecab2313999a72f4d90caa77a464876116bd48ad16 WHIRLPOOL 056adcc7fd532aca611dd3699584aef793b5a86f66f051b571f4a0c247e33a37871e775389f7449d0357d3133a75ba3a7cd862a6cc2a243e447959b977d8a731
-DIST WindowMaker-0.95.4.tar.gz 2789390 SHA256 2bea97f00570f05ff115d147457c16abefe496a4fc882a027152ce592d768e45 SHA512 d170ee79f927c1eb70d6fe7e324bf3a5ab4eb206496b5d4182ba92fab5a3968ed00d465e69adad3b7d71e9d4d5ea333f78bee28a68510228baa8ce33de156dc3 WHIRLPOOL 8341be33680b69e984214efdfd3617dfb50fa3ea11d663ac91b3f3763b690de9f34986afa4862006d0fc1281ac52b7f9a2f2c37447085617e26ada0ba678ff75
 DIST WindowMaker-0.95.5.tar.gz 2927995 SHA256 4b25f474fde032a060c93fbc50f1ce04729ab17ea963ca3eb8dbb82f49af70d0 SHA512 0a6eb7c3ffee1d09dbc2408be4d2c04f6647cd1195366047083b5c5c89b61e92a5c7d5d134e43775fc371ea27ac8645ad0a7cbae86ebd53f2eae20066ac56703 WHIRLPOOL eb41cffab165af4efb66b28aacbc0e4695d57a426565554f20566b02bb0f428c31e23ec50af36759992a9a18f1598a727f98168d6bde7443f58821101d1653da
 DIST WindowMaker-0.95.6.tar.gz 3004856 SHA256 435b0b4a318a3a00e8267f02cdbd826ad547b1f54259d193ce43e9a77ce06dc4 SHA512 259db96b44058fde21b7efe65419b7f7ae149029dcfbf5cf480f920d68f906cd15345105ab67d8539be44d6f1b30e62accf68fc009d53af8c12e047c01154a11 WHIRLPOOL 6f27180cc4439b4b19c3f249fc9c5577463187c741c2e04112bb70feb8e052ad1093e0a5103f1772b59ee7b2549f7b126ac621165f94483e22fd756a969e0e3c
 DIST WindowMaker-extra-0.1.tar.gz 238018 SHA256 acd6e1fb790485b107daf2b710da372367b41383c55d9c8bdfdac521d850edc4 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8 WHIRLPOOL f2c61b318f64a2debb727ae79dfa1bb8101888bc9492633a96ace0e704c731c383e92882c871622987d5971b919359c066638fba05c5dade330fe3bee21bb034
 DIST windowmaker-0.92.0-patchset-5.tar.bz2 226417 SHA256 3298be8a2f1eb8130c249df790ed2a35a230c337f2d12fd426e14df9652a9adc SHA512 9edc25386658e5ddeaee2e3c7f396adbe16e9fdccde906f7b69bca95b1e0b33a2b2481fa445f5cf5b8e6b2492ca1b8409615e7a66f7d039d449d099523c4c779 WHIRLPOOL 62b42d533f2c2c22259aa0004ab995472e455997ccb6074e3f5b599b22cdd1c640003b6903c104e8663e62be312254afbc4d4147366af72eb16227b36eacd77c
-EBUILD windowmaker-0.92.0-r11.ebuild 6343 SHA256 09979ec2a7e3ecbbebd54be27ba6b9662abcb1ad8f44aaf0baf73aa68e415d9a SHA512 45af454a20c5f7cfd22b9a71e7c44dd080a7fe9d4a3697dfc988ebf3363a6ed8d7adf2d319e861bdb5bf1c351f83e4d668f8e802ea032b8a8422422dd68eee55 WHIRLPOOL ba513ee2b7e8a602ccc8a44f63a4ede9720d16bd5d54f4d94991b29d77e2aa3329a915f2c9360a1dc05ca5421c3df51731de4e7f7fdeec7522b541eb0df284b1
-EBUILD windowmaker-0.95.3-r1.ebuild 2982 SHA256 0776a28212eff71a353591e2fab0f392a1ad4459b430ef831b03c4f221365e85 SHA512 540523d33406d47c2ea9597a367de36ebe20c031058f6f6f3f9c36e30577513309cab8d497a40b02070ff9688fdbf59a89db98dbfea8269528b5365c2a351959 WHIRLPOOL e726b98478d645b14293b8891bd4404b8282ae328cd1177f4ce6d182a8053c736dbde660cb60bd818e48126aa12ad531672b8e14b8f0bfb624569c68e7ceab76
-EBUILD windowmaker-0.95.4-r1.ebuild 3003 SHA256 d7b38fbfd7a1786f84b6e1cc8811342035824ac52f2388f32e94cbf0e87044e2 SHA512 256b601419152b468d584e38860fe4c4ecd5586f6f5ea7c1905f258c4c15a3951ec677c4233a6fe268ec14662c08011d8da35c35cb98d24946ed46e7632ea2af WHIRLPOOL e728233f588cd6a029881b77d3bb505d5cc6288dfe9988be7b86a7b4f8d950f3f68160aeca688c2c5c0f8f01cc3d4a24a5ff41673fe8567790fc606344f5863b
-EBUILD windowmaker-0.95.4.ebuild 2987 SHA256 f74e8ad2c77578ae54c2796e35009f04a728965b6af0b0f27147ced9588c3fff SHA512 e46deff68ab3a1b926f0ee2ccdff50fea93d840eca4901fac4e5ab5a688e7f44931376228d230bab70e427267f3e2dfeb2c9857107b5cb28491f1f49190ddb5b WHIRLPOOL c3f86b7ea3805df8d08b192141f85633c8ca899003c8b5153a5f0b6b0f588c7f5bbce5a6fefb0ba1ea8ef344ca59f8927eb95438cded869fd66a53e8ce503fb5
-EBUILD windowmaker-0.95.5-r1.ebuild 3035 SHA256 45360d307cdd2308b242f886ddaf291778b532947c3806d27c81e4cd1c812434 SHA512 459221b8dacfd9136d6b3ddf54accc0a15baddce679c2bb08d5cdededea9b01a2e95153b173a78d9620c5b2c1fe92d09dc3125064224bcafec8272d822d6273f WHIRLPOOL 9d1788472aacf7f9f8b385d3bee2850392d37ab72e958455cfd07605ef1c67bcd4950d7ed10d7e038a5b2e4fa4c8c7f92c3b4a20f486de5c9a4741f4036ddf09
-EBUILD windowmaker-0.95.5.ebuild 3000 SHA256 c650aaf158a890df4ff4f42f51bcb03e632183da2ec1db76778c645d5d1eb641 SHA512 114d42c81b7576eab8c3ee65ee1a3b4d5641c43be451aa1304e0a83e248c5048d031e8894c67b122d723d8bff0b0035a17e579bcedb43ce0150b5b2200de3a99 WHIRLPOOL 472f8c00945e8c9792cd6dbc1085a8af2630da4aa1d52ea4c6c72a241146180d6f499c7d587c594c47019e322b0ff4266584eaefd6720f48cb1f8844d2b1a3da
-EBUILD windowmaker-0.95.6.ebuild 3145 SHA256 325a1f4e280e14fc92ebbf1dc42b9f6263c66ec00495160008e7e61dd688d2fc SHA512 efc71a0f247a16fe367f223704a802687ee55082c202a7cfa6fec01b9488ff38f0b382085fc08b84126fcace081624d1f7bb95b29d3cf513abbb360c13a54fa8 WHIRLPOOL 60088dca9c74cf41f68e6548934e950fe4bf612ce809b7716b791e586be241fdf9b334aeb595df565e5db272f016ec9f4618deb36328b1b8d5f0171d98515fa3
-MISC ChangeLog 30335 SHA256 e9e93c724df5df579941e2688569de116538f6c746bb941839a784cea3690155 SHA512 0d1a9334dce43db60103b4827db2b90ae27e7c903ae73e7d0fcb9aa0fd03c74562ef9914560eebd34e2da25e8abfad21e197a8de52d879a39c7b5070d717220c WHIRLPOOL 9bba2d322dd9c0b643c1fcf270f28e8006d43cb420d2b7dedfde848fbe9f64f12b6011f745e0004262a94aab85e2227fc787e593912cb0f589bbea9f495c0dbe
+EBUILD windowmaker-0.92.0-r11.ebuild 6334 SHA256 0ceefd4d41b7b50ae6aed6e78b6b3eeb142f33d310d03017046f580711310b72 SHA512 ec73ab2a357ea8957e5692ff3a823ec3dbeec1492ea71229bbc0e6344b044e5957d241f735bdda79519a1c0b756f8ff642f53029922386efa6bfcfef2e84b6a2 WHIRLPOOL 392cd74ecb34fc3c424020b9900e8e56592cb39af969a8bc4c621150e44d98051d2df54880c00beb49bee8feb43ae50b7bf3878210a785809e0d0cdb5ac49026
+EBUILD windowmaker-0.95.5-r1.ebuild 3026 SHA256 59857274e47be506e5970c20ac91632bd422c970beb22749c24f686883c1b8a6 SHA512 cd3cdaf31a2bc6ebd1b31f5b2aebcfced0fc3cd1a84d4f8b3a7607e7b30c0e63d79141f5e77dbf8f31b8a13f2f2d379da0a3b6bc9c8c40c4715fd8aebae58071 WHIRLPOOL 141078c578746fbad61e9f40158d37cabd07610e5cb839230241609cd8b5bd976c19e6dcc25d48f8db6fc1bb742d48c8bd799ac944e8c01b47fc31dec227c129
+EBUILD windowmaker-0.95.6.ebuild 3141 SHA256 104914243ce17296a20fbcbd1ad7f8b8e043c643cf904aeaca1689d7b66f93b5 SHA512 6dd3e14ce8df38ac60a55e884eb8d5dce2fa96d89f60eb8ad330d39b542ce1155dc23bfb729244cb0a49153119c29e46d17b5ad0b12c937dccb6b0a6490403fe WHIRLPOOL dc533c0dfd29d28ca8d66a2d9e8291d592d8e04588850070c01f245d6696e8347c2bcf23b0255ac69faf6bb7d685bc79907989219b30f549879f2e657834c4df
+MISC ChangeLog 30747 SHA256 aa8acc72e2d5259bf64dba51c9be91128c7585853588bce00e0d8fdb2c9ea542 SHA512 d8fc8375e2561d9dbe33927aaac46a165742c8d111e1ae2ac06c338a71e57467db9a5b2115deb4f1841f9eac8c106b3da90855aee2a0b086715496fcde68b8d3 WHIRLPOOL c31da5e74ae5c12589d928717bb9e062acda1704a34627dba458859ffd2922a14642a68f02c6738c8a249c150c6b6f4667e9459ae33cc7ef448c0e69f52f8408
 MISC metadata.xml 620 SHA256 0ed7b6436038ef56a72ed6b7aaa6b90a89712e783673f28a725637fd257c1943 SHA512 fbb6a93b3ea2d0264ab6b423b90d26094c2e4b8afe97306c642e3ef7c54e58118bf417cd4e5c44425ce89fca73a9d2889986f779cbad8645a016abdaf60d2397 WHIRLPOOL c3bebfecf2ab99b90f2501185bab2641c44d55e59537eb887a23c8f19cc0779c5440c4e502dde27eba938da6078375093b1756bb4589d5355e27384e2bea1f2c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlQHiF8ACgkQFYEBGcdFJfL5uQD/auLJjR0VbXIonbbq6I1Pl37V
-QtMGJ9xKBRtoRp2zGwABAJHEHkYlk9JFJ8le6jd1VskSJ7390XzfXaCtP4elmRvs
-=iHyv
+iF4EAREIAAYFAlS/eIYACgkQFYEBGcdFJfLddAEAnJfkG4SWakC1yLl7IPzLBwAa
+RlCTo9NJujhqXrIi6D4A/24yZIs+EAfzUJZv2HhNa5UALDxKlQ1esF/wbG3DGdXc
+=DPtI
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild b/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild
index 4e774df0716f..5f4afeb2f221 100644
--- a/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild,v 1.9 2011/11/12 10:36:45 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild,v 1.10 2015/01/21 09:59:33 voyageur Exp $
 EAPI=3
 
 inherit autotools eutils flag-o-matic
@@ -23,6 +23,7 @@ KEYWORDS="alpha amd64 hppa ~mips ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-interix ~am
 DEPEND="
 	media-libs/fontconfig
 	>=x11-libs/libXft-2.1.0
+	x11-libs/libXpm
 	x11-libs/libXt
 	x11-libs/libXv
 	gif? ( >=media-libs/giflib-4.1.0-r3 )
@@ -123,7 +124,6 @@ src_configure() {
 	replace-flags "-O3" "-O2"
 
 	# image format types
-	# xpm is provided by X itself
 	myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)"
 
 	# non required X capabilities
diff --git a/x11-wm/windowmaker/windowmaker-0.95.3-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.95.3-r1.ebuild
deleted file mode 100644
index 00393ef21deb..000000000000
--- a/x11-wm/windowmaker/windowmaker-0.95.3-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.95.3-r1.ebuild,v 1.2 2012/08/14 00:43:00 chithanh Exp $
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="The fast and light GNUstep window manager"
-HOMEPAGE="http://www.windowmaker.org/"
-SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
-	http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="gif jpeg nls png tiff modelock xinerama xrandr"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="media-libs/fontconfig
-	>=x11-libs/libXft-2.1.0
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXv
-	gif? ( >=media-libs/giflib-4.1.0-r3 )
-	png? ( media-libs/libpng:0 )
-	jpeg? ( virtual/jpeg )
-	tiff? ( media-libs/tiff:0 )
-	xinerama? ( x11-libs/libXinerama )
-	xrandr? ( x11-libs/libXrandr )"
-RDEPEND="${DEPEND}
-	nls? ( >=sys-devel/gettext-0.10.39 )"
-
-S=${WORKDIR}/${P/windowm/WindowM}
-
-src_prepare() {
-	# Fix some paths
-	for file in WindowMaker/*menu* util/wmgenmenu.c; do
-		if [[ -r $file ]] ; then
-			sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die
-			sed -i -e "s:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
-			sed -i -e "s:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
-		fi;
-	done;
-
-	epatch "${FILESDIR}"/${P}-fix_underlinking.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# image format types
-	# xpm is provided by X itself
-	myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)"
-
-	# non required X capabilities
-	myconf="${myconf} $(use_enable modelock) $(use_enable xrandr) $(use_enable xinerama)"
-
-	if use nls; then
-		[[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
-	else
-		myconf="${myconf} --disable-locale"
-	fi
-
-	# default settings with $myconf appended
-	econf \
-		--sysconfdir="${EPREFIX}"/etc/X11 \
-		--with-x \
-		--enable-usermenu \
-		--with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
-		--with-nlsdir="${EPREFIX}"/usr/share/locale \
-		${myconf}
-
-	cd ../WindowMaker-extra-0.1
-	econf
-}
-
-src_compile() {
-	emake
-
-	# WindowMaker Extra Package (themes and icons)
-	cd ../WindowMaker-extra-0.1
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \
-		  README* NEWS TODO
-
-	# WindowMaker Extra
-	cd ../WindowMaker-extra-0.1
-	emake DESTDIR="${D}" install
-
-	newdoc README README.extra
-
-	# create wmaker session shell script
-	echo "#!/usr/bin/env bash" > wmaker
-	echo "${EPREFIX}/usr/bin/wmaker" >> wmaker
-	exeinto /etc/X11/Sessions/
-	doexe wmaker
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/wmaker.desktop
-	make_desktop_entry /usr/bin/wmaker
-}
diff --git a/x11-wm/windowmaker/windowmaker-0.95.4-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.95.4-r1.ebuild
deleted file mode 100644
index dd2ab3100f9e..000000000000
--- a/x11-wm/windowmaker/windowmaker-0.95.4-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.95.4-r1.ebuild,v 1.2 2013/07/27 20:22:05 aballier Exp $
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="The fast and light GNUstep window manager"
-HOMEPAGE="http://www.windowmaker.org/"
-SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
-	http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="gif jpeg nls png tiff modelock xinerama xrandr"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="media-libs/fontconfig
-	>=x11-libs/libXft-2.1.0
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXv
-	gif? ( >=media-libs/giflib-4.1.0-r3 )
-	png? ( media-libs/libpng:0= )
-	jpeg? ( virtual/jpeg )
-	tiff? ( media-libs/tiff:0 )
-	xinerama? ( x11-libs/libXinerama )
-	xrandr? ( x11-libs/libXrandr )"
-RDEPEND="${DEPEND}
-	nls? ( >=sys-devel/gettext-0.10.39 )"
-
-S=${WORKDIR}/${P/windowm/WindowM}
-
-src_prepare() {
-	# Fix some paths
-	for file in WindowMaker/*menu* util/wmgenmenu.c; do
-		if [[ -r $file ]] ; then
-			sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die
-			sed -i -e "s:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
-			sed -i -e "s:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
-		fi;
-	done;
-
-	epatch "${FILESDIR}"/${PN}-0.95.3-fix_underlinking.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# image format types
-	# xpm is provided by X itself
-	myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)"
-
-	# non required X capabilities
-	myconf="${myconf} $(use_enable modelock) $(use_enable xrandr) $(use_enable xinerama)"
-
-	if use nls; then
-		[[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
-	else
-		myconf="${myconf} --disable-locale"
-	fi
-
-	# default settings with $myconf appended
-	econf \
-		--sysconfdir="${EPREFIX}"/etc/X11 \
-		--with-x \
-		--enable-usermenu \
-		--with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
-		--with-nlsdir="${EPREFIX}"/usr/share/locale \
-		${myconf}
-
-	cd ../WindowMaker-extra-0.1
-	econf
-}
-
-src_compile() {
-	emake
-
-	# WindowMaker Extra Package (themes and icons)
-	cd ../WindowMaker-extra-0.1
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \
-		  README* NEWS TODO
-
-	# WindowMaker Extra
-	cd ../WindowMaker-extra-0.1
-	emake DESTDIR="${D}" install
-
-	newdoc README README.extra
-
-	# create wmaker session shell script
-	echo "#!/usr/bin/env bash" > wmaker
-	echo "${EPREFIX}/usr/bin/wmaker" >> wmaker
-	exeinto /etc/X11/Sessions/
-	doexe wmaker
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/wmaker.desktop
-	make_desktop_entry /usr/bin/wmaker
-}
diff --git a/x11-wm/windowmaker/windowmaker-0.95.4.ebuild b/x11-wm/windowmaker/windowmaker-0.95.4.ebuild
deleted file mode 100644
index b12a343a8bb7..000000000000
--- a/x11-wm/windowmaker/windowmaker-0.95.4.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.95.4.ebuild,v 1.1 2013/01/10 10:41:46 voyageur Exp $
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="The fast and light GNUstep window manager"
-HOMEPAGE="http://www.windowmaker.org/"
-SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
-	http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="gif jpeg nls png tiff modelock xinerama xrandr"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="media-libs/fontconfig
-	>=x11-libs/libXft-2.1.0
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXv
-	gif? ( >=media-libs/giflib-4.1.0-r3 )
-	png? ( media-libs/libpng:0 )
-	jpeg? ( virtual/jpeg )
-	tiff? ( media-libs/tiff:0 )
-	xinerama? ( x11-libs/libXinerama )
-	xrandr? ( x11-libs/libXrandr )"
-RDEPEND="${DEPEND}
-	nls? ( >=sys-devel/gettext-0.10.39 )"
-
-S=${WORKDIR}/${P/windowm/WindowM}
-
-src_prepare() {
-	# Fix some paths
-	for file in WindowMaker/*menu* util/wmgenmenu.c; do
-		if [[ -r $file ]] ; then
-			sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die
-			sed -i -e "s:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
-			sed -i -e "s:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
-		fi;
-	done;
-
-	epatch "${FILESDIR}"/${PN}-0.95.3-fix_underlinking.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# image format types
-	# xpm is provided by X itself
-	myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)"
-
-	# non required X capabilities
-	myconf="${myconf} $(use_enable modelock) $(use_enable xrandr) $(use_enable xinerama)"
-
-	if use nls; then
-		[[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
-	else
-		myconf="${myconf} --disable-locale"
-	fi
-
-	# default settings with $myconf appended
-	econf \
-		--sysconfdir="${EPREFIX}"/etc/X11 \
-		--with-x \
-		--enable-usermenu \
-		--with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
-		--with-nlsdir="${EPREFIX}"/usr/share/locale \
-		${myconf}
-
-	cd ../WindowMaker-extra-0.1
-	econf
-}
-
-src_compile() {
-	emake
-
-	# WindowMaker Extra Package (themes and icons)
-	cd ../WindowMaker-extra-0.1
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \
-		  README* NEWS TODO
-
-	# WindowMaker Extra
-	cd ../WindowMaker-extra-0.1
-	emake DESTDIR="${D}" install
-
-	newdoc README README.extra
-
-	# create wmaker session shell script
-	echo "#!/usr/bin/env bash" > wmaker
-	echo "${EPREFIX}/usr/bin/wmaker" >> wmaker
-	exeinto /etc/X11/Sessions/
-	doexe wmaker
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/wmaker.desktop
-	make_desktop_entry /usr/bin/wmaker
-}
diff --git a/x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild
index 3b1fdc60575f..0f20ba61d7fc 100644
--- a/x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild,v 1.7 2014/05/17 14:06:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild,v 1.8 2015/01/21 09:59:33 voyageur Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -18,6 +18,7 @@ KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 DEPEND="media-libs/fontconfig
 	>=x11-libs/libXft-2.1.0
 	x11-libs/libXmu
+	x11-libs/libXpm
 	x11-libs/libXt
 	x11-libs/libXv
 	gif? ( >=media-libs/giflib-4.1.0-r3 )
@@ -50,7 +51,6 @@ src_configure() {
 	local myconf
 
 	# image format types
-	# xpm is provided by X itself
 	myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)"
 
 	# non required X capabilities
diff --git a/x11-wm/windowmaker/windowmaker-0.95.5.ebuild b/x11-wm/windowmaker/windowmaker-0.95.5.ebuild
deleted file mode 100644
index 70fb619eead1..000000000000
--- a/x11-wm/windowmaker/windowmaker-0.95.5.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.95.5.ebuild,v 1.1 2013/09/13 23:43:48 voyageur Exp $
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="The fast and light GNUstep window manager"
-HOMEPAGE="http://www.windowmaker.org/"
-SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
-	http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="gif jpeg nls png tiff modelock xinerama xrandr"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="media-libs/fontconfig
-	>=x11-libs/libXft-2.1.0
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXv
-	gif? ( >=media-libs/giflib-4.1.0-r3 )
-	png? ( media-libs/libpng:0= )
-	jpeg? ( virtual/jpeg )
-	tiff? ( media-libs/tiff:0 )
-	xinerama? ( x11-libs/libXinerama )
-	xrandr? ( x11-libs/libXrandr )"
-RDEPEND="${DEPEND}
-	nls? ( >=sys-devel/gettext-0.10.39 )"
-
-S=${WORKDIR}/${P/windowm/WindowM}
-
-src_prepare() {
-	# Fix some paths
-	for file in WindowMaker/*menu* util/wmgenmenu.c; do
-		if [[ -r $file ]] ; then
-			sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die
-			sed -i -e "s:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
-			sed -i -e "s:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
-		fi;
-	done;
-
-	epatch "${FILESDIR}"/${PN}-0.95.3-fix_underlinking.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# image format types
-	# xpm is provided by X itself
-	myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)"
-
-	# non required X capabilities
-	myconf="${myconf} $(use_enable modelock) $(use_enable xrandr) $(use_enable xinerama)"
-
-	if use nls; then
-		[[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
-	else
-		myconf="${myconf} --disable-locale"
-	fi
-
-	# default settings with $myconf appended
-	econf \
-		--sysconfdir="${EPREFIX}"/etc/X11 \
-		--with-x \
-		--enable-usermenu \
-		--with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
-		--with-nlsdir="${EPREFIX}"/usr/share/locale \
-		${myconf}
-
-	cd ../WindowMaker-extra-0.1
-	econf
-}
-
-src_compile() {
-	emake
-
-	# WindowMaker Extra Package (themes and icons)
-	cd ../WindowMaker-extra-0.1
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \
-		  README* NEWS TODO
-
-	# WindowMaker Extra
-	cd ../WindowMaker-extra-0.1
-	emake DESTDIR="${D}" install
-
-	newdoc README README.extra
-
-	# create wmaker session shell script
-	echo "#!/usr/bin/env bash" > wmaker
-	echo "${EPREFIX}/usr/bin/wmaker" >> wmaker
-	exeinto /etc/X11/Sessions/
-	doexe wmaker
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/wmaker.desktop
-	make_desktop_entry /usr/bin/wmaker
-}
diff --git a/x11-wm/windowmaker/windowmaker-0.95.6.ebuild b/x11-wm/windowmaker/windowmaker-0.95.6.ebuild
index b4bf46ad693e..45e1dcc258b3 100644
--- a/x11-wm/windowmaker/windowmaker-0.95.6.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.95.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.95.6.ebuild,v 1.2 2014/09/03 21:30:00 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.95.6.ebuild,v 1.3 2015/01/21 09:59:33 voyageur Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -12,12 +12,13 @@ SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama xrandr"
+IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="media-libs/fontconfig
 	>=x11-libs/libXft-2.1.0
 	x11-libs/libXmu
+	x11-libs/libXpm
 	x11-libs/libXt
 	x11-libs/libXv
 	gif? ( >=media-libs/giflib-4.1.0-r3 )
@@ -51,8 +52,7 @@ src_configure() {
 	local myconf
 
 	# image format types
-	# xpm is provided by X itself
-	myconf="--enable-xpm $(use_enable imagemagick magick) $(use_enable jpeg) $(use_enable gif) $(use_enable png) $(use_enable tiff) $(use_enable webp)"
+	myconf="$(use_enable imagemagick magick) $(use_enable jpeg) $(use_enable gif) $(use_enable png) $(use_enable tiff) $(use_enable webp) $(use_enable xpm)"
 
 	# non required X capabilities
 	myconf="${myconf} $(use_enable modelock) $(use_enable xrandr randr) $(use_enable xinerama)"