diff --git a/app-admin/lxqt-admin/Manifest b/app-admin/lxqt-admin/Manifest
deleted file mode 100644
index 3ce44d27a0ff..000000000000
--- a/app-admin/lxqt-admin/Manifest
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST lxqt-admin-0.8.0.tar.xz 19216 SHA256 f2c17f9a9f3628db53b6cfeee64de8500b35b13c37bc4bc8d12302f856362a8e SHA512 aace62c3c0e69e098afd3ddf2af1ec98e185018c4ae9a15718484032857bc6f4fa792dee42c2c4079420fbac91bedaaf8dc9fa89730d0c03029bf0b767be5461 WHIRLPOOL cf72acb4a649cc990b1fba8ad9ea421db007ee3f97ecb69876f5006106d9a7c626d218a6fc763f483ada6122adb9d3ee978613afad69c2f8e39aecd83b204326
-EBUILD lxqt-admin-0.8.0.ebuild 884 SHA256 db1ce6f1a4e0fa27082bea97e1bc4447f8fa8ee3923740d89c9a7de27091256e SHA512 f28e6d7703153e14bd7b40210921a399b9f2a55f648fcae4294a813fb32cba6d9ddef911a40fd7da90032f2781a14206e447bb7098276305a78c4c808119b3c4 WHIRLPOOL f039119b6fe125790298c89e3b5f542ab9029fb7e8d524dd21150ba211071f13a519cc5adcb68774acf3ba6f83da80d8e35235ec22164bda280a20186926e265
-MISC ChangeLog 381 SHA256 1983abe24c9bba44f375525b8d1ed8a3fc86248176142dca07ff6c0bca4c7e45 SHA512 0dbe0684f05dbef6b9ffbc9c60144ebaaccd520830455119e8ee8605af109cdc906eac8cb717dbd9f5030eef46fa5939ef1870a99c4294288f204f636ea3cb02 WHIRLPOOL e62196969561b00cc17d381a1e6997b8d12d1a1e39d59812b17ebfe43cb64f3d89d4e49c0f37f4074f8ae0ea9441afc09e579de887a06d64342f492251a62911
-MISC metadata.xml 263 SHA256 d23df106b61ed123144d9d24eea822badfbe6cb7d8d4ec61215af73b4c8f1fc6 SHA512 9f99b13f568e1cfda82dc35cd0b95fba565d5f18909db7b0d7dff75273cf4076a68288768ee5f65a70485833971fb3e511919a9e80d09e0d96f3a38744435d3a WHIRLPOOL 6bfa4c8737764e7450195f3ffd2e8fe8531ad44dfa02b0d7819678eeb7898280f07ed13ac87e0158abb6d9b804ee617b7683f73a4cd17db822419eba55fa62c6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJUaJr3AAoJELvuk32y76HU5GYQAIfrzn4WffHifeT88phaakg8
-IrQieGtTPQFnS/9Sl+lJk1brJgQACR0V/StiQt8wqxEQ16ICjvFgw5FcBYjYYoS9
-P2CXVp01NF6l6ndFHuu1UWzXDqWtXTGedTsAJq0bdqL4mcZX7QUcLVAwMbxZuWAi
-/2HB0/FgoZ4C2lDQZzoKxU6+JRto0/48QtmJW3w6L4qaEpxM/zjQL1NQH7XdRhhM
-P0hcQ4BHdgHyXddje9GWcDuAvKn4GFoLf+yh3TEMY+4OhXqzCp0soUnlIV/NVqfK
-J3BfewKd+d7q6KvZ1J2WWZyukDfScx2l2dKrxJHH04iqMRKxPQNjcJvuAJBqpgoF
-B8n3gSGbkUCCEh5hlyKqPqDfRckG29NEv2O+eZFmrY8yzRHV0dXShAB41BAgiICD
-g17A9a801ME9WT3ZIEPBTTc+LAGlgAjt2Xo3z62FURw9fd9WCLUhdYb/C+vVlwnT
-JTprSy9bC9OrHGczyB+djlj4Vv4QukzQ8lN367eRdWyg+kfQgf+Qusvbh05s8tDo
-pUDneZg1Q8VoxmWHsjcdIggvtpbDmqKYjuC8lCqINUU/nHiDbPC2srqFB2UxAS5W
-ScuTmNtw2+ChQkDWyh6BJhaH40qmWO/7LAN+Yu2A4JI9htvGxPhV8/LkaYswI0cL
-DYuwIHjRf5VOnJU088K/
-=AxzE
------END PGP SIGNATURE-----
diff --git a/app-editors/bluefish/ChangeLog b/app-editors/bluefish/ChangeLog
index c7591beced14..9a02fadb9a7e 100644
--- a/app-editors/bluefish/ChangeLog
+++ b/app-editors/bluefish/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/bluefish
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/ChangeLog,v 1.96 2015/02/10 10:12:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/ChangeLog,v 1.97 2015/02/10 12:31:27 kensington Exp $
+
+  10 Feb 2015; Michael Palimaka <kensington@gentoo.org> -bluefish-2.2.2.ebuild,
+  -bluefish-2.2.3-r1.ebuild, -bluefish-2.2.3.ebuild:
+  Remove old.
 
   10 Feb 2015; Agostino Sarubbo <ago@gentoo.org> bluefish-2.2.6.ebuild:
   Stable for x86, wrt bug #539214
diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest
index c14e4fc45eb9..db640bcb75bc 100644
--- a/app-editors/bluefish/Manifest
+++ b/app-editors/bluefish/Manifest
@@ -1,29 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST bluefish-2.2.2.tar.bz2 3548284 SHA256 1e9f171657cd7d34e31d7ff8608b10dded56dcb4831bc75d6ab75cd826f97b84 SHA512 da256577489796cc963757c2f97a7bdf1ed34bc240fc09e74e27f1ed009dcca4e46785d0359230edac0a87d677195f23c7af3ad92d0e90c2e2912c3600a41c73 WHIRLPOOL 097bc3238f7adc15f16c5b21ddee60dc1f7ce12e4bcc128be81cfafca68f121994458bc4ca88b91f9e5ae9fb7fc74494e137ae8c891619369d79bd12661accfe
-DIST bluefish-2.2.3.tar.bz2 3635489 SHA256 be284cd972d82b56a55f9b9588b3c0ff18702318822f45c7598c336de8a4d6ea SHA512 92fc251728a4fc0404b27c52f6d8f143158d6e6625001d645ffa18c4c8e18a83826ca399deb966a7cdc0bd145c3c21eac6c0fdba5a84dd90c388985aabfa8538 WHIRLPOOL a1cba1ea85b9f8cfcfb04a07d4f44dab52a8dcedeea8c319ec62878be4615d995987a4587eb27eab8eaed32547a2302ba768afdd6091bb744ac624b6f1b38040
 DIST bluefish-2.2.6.tar.bz2 3793018 SHA256 54c2892c317eb2287c9fb0a3e29c3f19bef51d9ab0353bfb158e52a1cdae4216 SHA512 39dee296ec6bbe1a946f9fb1c54e7143363da4bb6ce52aee14c9bef906d2eb82e5e58f78680810357c0bfcb11c21f982756a9199fec2f454c2816005a4d9d83e WHIRLPOOL b0847ea74fdc388e9ddccf1a23e8802379d149b85c5010ff9a64b3e061b0c1999e1f1a5872404b8bad2b0024fcdb09db964dae2177092d770f56aca50628d146
-EBUILD bluefish-2.2.2.ebuild 2313 SHA256 ab8df06e554f4fd12972034e8221ece924225999f93b4bf2893f0ea734aaeea7 SHA512 782ae7f6d2c8d4da7a2338589241bc803d0fc580e4f15184da5312b003d4d2dad84b126b7b840765659a50ef4b4ef0c77635a028472698288b5552843fba3de7 WHIRLPOOL dca1ac5677c1533b328b68853cbaaa7b1540c39d558b615ba4f0c7348026c8bee139b63f4a8c5378a46eb52cd9a9a41eccaa501f19e5da5c3f4f69b536f948f0
-EBUILD bluefish-2.2.3-r1.ebuild 2324 SHA256 b805ebcb65f75e6ce295c476cadf6dd53f0488ddb7211a2c1dd00670ad0d432a SHA512 12733914bad5745599b52ea9aac2fc907e08a33372045d29ee80d6e51293be173521b73b01b6794e187ec8a8d314f3e94c43ba37d252eddb49d9fca9898e528d WHIRLPOOL 752dd021fa906fa86a6db9ebfcc5aa8d0d3f01bfff3a8074d79a73ddc4b04ad98e3b1fcf263b01b5f2aaa25723c2bd6b822720d655718e874d76f9498ebfd00f
-EBUILD bluefish-2.2.3.ebuild 2314 SHA256 c68a45c12c32778f6c3c218ca1c5e1618c28916dacd6023b62ed9f6fe65da22c SHA512 72e215ffe984e20eb08c22edf70a43f25f012005c903bda14b2afae9468a6428a6192a703b1f48db0793f3d6808d10ed584bf3e1c71aa59fe5f9192f51c04547 WHIRLPOOL 386d0fd069e1f4b25da110c3ccccbf772d36c1ecc4a63ac14e0f382c63e37d8b354b6b374e22c06f7d4fdddd5e991aba14a19c668b16b811fc613c15f40b03ea
 EBUILD bluefish-2.2.6.ebuild 2316 SHA256 b14404b3bb0e478c6d4bf9eaca80d8a73fedcc716f445598192c32c25af89ed5 SHA512 7ee8a3b65d5cff0e40fa7ca6ac1b1883e0e821eba1df6f60575ff68ac6dffb2564047187ceddd6b7c617840b7171c83cfc683fb6c67d22b050828a8e09bad410 WHIRLPOOL c5abbee5b05f5fe277474331b3fba6a019bd1a946eeb9d7a19aa1b91d99131e146e11fca82700b183169a3a31f2630bdb01cabb84b2240f7c7e266c56a703785
-MISC ChangeLog 12889 SHA256 93f94bd5e2e82323cdaaadb54b415fefd032f8f239027711887ad92e8c49cc02 SHA512 7617546616365c11b591a73d788fc64f2df72f392591cc5f9d71a76bf450090225732f700787db288389b4d3623ca3f3f864eb92df639bbdf1c4c2bf1914029a WHIRLPOOL 93f4b066c07da91abd78be7dc9d74863a630a87e303ed55ba72ec8ba24858e84faac36a669efac8a27c57662d98da72f7d6bade10f238908ec22821b61d4dcf6
+MISC ChangeLog 13044 SHA256 4696b0c0c1435157ac75ecd80f4fa60858bc65963bde020cc379a82bd93f089e SHA512 019a90d43a915b0af135352f402a0be9752b789287ed5b63d08f9042e926f46690da73103d7e94c8aaf5592732ff3bd88180abe0a944aa62cb6c9ecaacb9dccc WHIRLPOOL a86d9016b1cc18f3a0428cb18b967cceefaebc78555a792560415b123f5f96f0c87c33b71fa2f5bd10aa3e9dd12854e653e4cf4f4e72a8e80e2f9f40cd1c0fa0
 MISC metadata.xml 209 SHA256 e960d152444d4763c1d732d2cb4a78be4e1eaf429559cd0f95c35a868c31a8b0 SHA512 dcd1f8d1dee5ffa9b55aa789e5bef1db55321f0c40d02805625f92290f22b400467b02504150d663e77fc2a8970074650875b49517ed221a4a00f15310e502b1 WHIRLPOOL 2594ccedfd3c8ae1458635abd0d47d86599a79a05e90fcccbbdec3e3d628f97fb4a1788fb3e6a86fb468c94545c5f7f89ec311b81700b9a6f8ba3d40f7922bc7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU2dmIAAoJELp701BxlEWf2zEP/3pFMuaD2gZxZp+y3KT/BKxv
-ZsS63dQvHTpqHKiWgbIs7N+TlL9tRwct5S2g9RxZv6NUANeOhEFibfdQwM9T0zig
-POupLf42/fDJcrJwE2xvv2eSUXe0OqXelMAt95Rw+88snuMBLXHoTgzVLUgtdDHf
-yqE9q9j9zX9WFxH7Sna/+LNkk6wEpNJeuF9O1uBFqqDMik96LBtUiULNnB8mc5V7
-IPexNVwZv5c/Ro6OmPNtmOznJPBK6HAjs2h81R/+n2gCo6BEWrpjKwCqvGOlwd+R
-0SsAwI627MZ3BY6xUOv58kte1tCNcw2J/J3IgMCxcEM5QZJVlDBPKCF50iYZoV0r
-+9+idFFXtIxAKk3aptAjSpZJnzdM7B7a2c0+ntDZMDMpxMuikPsk+ocKFH2i/JYj
-8JpdjlhaiprMbwsjyRUSPNWG1s7OFeDjtAAHJAbgHPvdcpjJwXvX3s3uVdRXBqJp
-3kzINuwqjoKvV4MdNktO4EgqTtbAlH1lQYP8Y56UEI+BomrdiiKMlYpgeUJ4mh4j
-ZL4i/Dpj+vkQ63IAMQ1q2bjO0hxbpfHyE3GhtubsTX6MR0L07n+2X5L2hFqrxHXf
-cW247JbTgYuufjsKsAilWnnwALhZ5dud5nxdvXa16E3Zn3TSJTKc1ggttlgEW/II
-LDA4ppFV6eqJm8qWvAeY
-=b9Yl
+iQJiBAEBCABMBQJU2foiRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7BN8D/9444ThAQq/EOZoRFrs/MRY1/WCVTB/gTaIjnZYPZ6QtX4y6Q51Zha7ebv1
+75Ef+FNAKfaY2is2hRGb9cc5oVnlySACtbrQL1xkOOVeBiByj8Ek/hZ7eMmj7r+L
+dvjoo1wRQQHIR5X9Ka/pdMiiOfhR3L2BCDAmbbHMFOom8OCIfd8sOFgHQt3pb9JF
+31Kuw+aLc6bFJzesemnDA6QgVgR2mEiCBppTdfUb2+lvFdVk0tz3vkt69Rex8Rpf
++FKs4PQAQlRin8RRsGUhp/35xjvttI6qeza2zQoH8UoeX/g+WPDMJe0TtwtBTKWt
+hdszfvoYPis2qN2VhHiHU4b65KHBdjYUz3YafrOqI25slVvNVUwkyWHWnWdRm/Kk
+PJRrsSZmz5yEnalOO9eJ9i9et8ZP5EtvLzbrGSV6DSw5F4nUBCitugUtNs+xVxJr
+iDCexggYlKeun3jyQuIqai0jgCiOyMX+K9HOeSTHChWHCI2VAAPtOMnCvqul+Xj6
+qOi9d3GTBHH2ZDI6WMu4HXn9p+s1aMYxPVwaIujYgy8Uxv7zu1L04SRzENTcuhYY
+wQXG9zdNZvvaQ3BytTY0Qpcg+kXmWbK85Y6Js9swvShUicH6eEbUqXW+PZofQVoJ
+VabdpsAbY6+Ku2i4xNZQndRzq8xy/9KjoqiE4vZmQuOnMPTWXg==
+=rRvW
 -----END PGP SIGNATURE-----
diff --git a/app-editors/bluefish/bluefish-2.2.2.ebuild b/app-editors/bluefish/bluefish-2.2.2.ebuild
deleted file mode 100644
index 694a820b6f88..000000000000
--- a/app-editors/bluefish/bluefish-2.2.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/bluefish-2.2.2.ebuild,v 1.11 2014/08/10 17:40:30 slyfox Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="python? 2"
-
-inherit eutils fdo-mime python
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer"
-SRC_URI="http://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"
-HOMEPAGE="http://bluefish.openoffice.nl/"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-SLOT="0"
-IUSE="nls python spell"
-
-RDEPEND="
-	x11-libs/gtk+:3
-	gnome-extra/gucharmap:2.90
-	sys-libs/zlib
-	spell? ( app-text/enchant )"
-DEPEND="${RDEPEND}
-	>=dev-libs/glib-2.16:2
-	dev-libs/libxml2:2
-	virtual/pkgconfig
-	x11-libs/pango
-	nls? (
-		sys-devel/gettext
-		dev-util/intltool
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-# there actually is just some broken manpage checkup -> not bother
-RESTRICT="test"
-
-pkg_setup() {
-	if use python ; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-# Never eautoreconf this package as gettext breaks completely (no translations
-# even if it compiles afterwards)!
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--disable-dependency-tracking \
-		--disable-update-databases \
-		--disable-xml-catalog-update \
-		$(use_enable nls) \
-		$(use_enable spell spell-check) \
-		$(use_enable python)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-
-	einfo "Adding XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
-		--add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \
-		--add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \
-		--add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \
-		/etc/xml/catalog \
-		|| ewarn "Failed to add XML catalog entries."
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	einfo "Removing XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
-		--del 'Bluefish/DTD/Bflang' \
-		--del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \
-		--del 'http://bluefish.openoffice.nl/DTD' \
-		/etc/xml/catalog \
-		|| ewarn "Failed to remove XML catalog entries."
-}
diff --git a/app-editors/bluefish/bluefish-2.2.3-r1.ebuild b/app-editors/bluefish/bluefish-2.2.3-r1.ebuild
deleted file mode 100644
index 21af45efc358..000000000000
--- a/app-editors/bluefish/bluefish-2.2.3-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/bluefish-2.2.3-r1.ebuild,v 1.1 2014/12/26 22:35:55 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils fdo-mime python-single-r1
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer"
-SRC_URI="http://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"
-HOMEPAGE="http://bluefish.openoffice.nl/"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-IUSE="nls python spell"
-
-RDEPEND="
-	x11-libs/gtk+:3
-	gnome-extra/gucharmap:2.90
-	sys-libs/zlib
-	python? ( ${PYTHON_DEPS} )
-	spell? ( app-text/enchant )"
-DEPEND="${RDEPEND}
-	>=dev-libs/glib-2.16:2
-	dev-libs/libxml2:2
-	virtual/pkgconfig
-	x11-libs/pango
-	nls? (
-		sys-devel/gettext
-		dev-util/intltool
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-# there actually is just some broken manpage checkup -> not bother
-RESTRICT="test"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-# Never eautoreconf this package as gettext breaks completely (no translations
-# even if it compiles afterwards)!
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--disable-dependency-tracking \
-		--disable-update-databases \
-		--disable-xml-catalog-update \
-		$(use_enable nls) \
-		$(use_enable spell spell-check) \
-		$(use_enable python)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-
-	einfo "Adding XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
-		--add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \
-		--add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \
-		--add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \
-		/etc/xml/catalog \
-		|| ewarn "Failed to add XML catalog entries."
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	einfo "Removing XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
-		--del 'Bluefish/DTD/Bflang' \
-		--del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \
-		--del 'http://bluefish.openoffice.nl/DTD' \
-		/etc/xml/catalog \
-		|| ewarn "Failed to remove XML catalog entries."
-}
diff --git a/app-editors/bluefish/bluefish-2.2.3.ebuild b/app-editors/bluefish/bluefish-2.2.3.ebuild
deleted file mode 100644
index 1012c2ff9dec..000000000000
--- a/app-editors/bluefish/bluefish-2.2.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/bluefish-2.2.3.ebuild,v 1.2 2014/08/10 17:40:30 slyfox Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="python? 2"
-
-inherit eutils fdo-mime python
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer"
-SRC_URI="http://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"
-HOMEPAGE="http://bluefish.openoffice.nl/"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-IUSE="nls python spell"
-
-RDEPEND="
-	x11-libs/gtk+:3
-	gnome-extra/gucharmap:2.90
-	sys-libs/zlib
-	spell? ( app-text/enchant )"
-DEPEND="${RDEPEND}
-	>=dev-libs/glib-2.16:2
-	dev-libs/libxml2:2
-	virtual/pkgconfig
-	x11-libs/pango
-	nls? (
-		sys-devel/gettext
-		dev-util/intltool
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-# there actually is just some broken manpage checkup -> not bother
-RESTRICT="test"
-
-pkg_setup() {
-	if use python ; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-# Never eautoreconf this package as gettext breaks completely (no translations
-# even if it compiles afterwards)!
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--disable-dependency-tracking \
-		--disable-update-databases \
-		--disable-xml-catalog-update \
-		$(use_enable nls) \
-		$(use_enable spell spell-check) \
-		$(use_enable python)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-
-	einfo "Adding XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
-		--add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \
-		--add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \
-		--add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \
-		/etc/xml/catalog \
-		|| ewarn "Failed to add XML catalog entries."
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	einfo "Removing XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
-		--del 'Bluefish/DTD/Bflang' \
-		--del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \
-		--del 'http://bluefish.openoffice.nl/DTD' \
-		/etc/xml/catalog \
-		|| ewarn "Failed to remove XML catalog entries."
-}
diff --git a/app-text/paperwork/ChangeLog b/app-text/paperwork/ChangeLog
index dc027ad64da1..1ea39aeb756e 100644
--- a/app-text/paperwork/ChangeLog
+++ b/app-text/paperwork/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/paperwork
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/paperwork/ChangeLog,v 1.3 2015/01/20 16:13:27 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/paperwork/ChangeLog,v 1.4 2015/02/10 16:38:58 voyageur Exp $
+
+  10 Feb 2015; Bernard Cafarelli <voyageur@gentoo.org> paperwork-0.2.ebuild,
+  paperwork-0.2.1.ebuild, paperwork-0.2.2.ebuild:
+  Remove unneeded dependency on dev-python/wxpython, spotted by René Neumann
+  <gentoo@necoro.eu> in bug #539620. Also tighten dependency on
+  dev-python/pygobject
 
 *paperwork-0.2.2 (20 Jan 2015)
 
diff --git a/app-text/paperwork/Manifest b/app-text/paperwork/Manifest
index 559b9ae6e227..4e2372915a7e 100644
--- a/app-text/paperwork/Manifest
+++ b/app-text/paperwork/Manifest
@@ -4,15 +4,15 @@ Hash: SHA256
 DIST paperwork-0.2.1.tar.gz 163417 SHA256 300e185608eec55162b657e1ae1dae4d1deab0cf168415fb8471dc413847dee4 SHA512 863af1ba16c101527a5ddd8544dbba2ead4f41d997b04b41b486719ce923d3219ca428e079cce3df25a5e35f3ff020618731fccae5617327df90f5e47bd7f2b0 WHIRLPOOL adc1c66c4cceb655d403f259176278f6b0e4e9fb9548cf11157556714f96f7719794e00f1d21c498e662a81ec53e0e553ca0cf443880e6443ed149f3141e4d50
 DIST paperwork-0.2.2.tar.gz 164026 SHA256 ea663b6bf528ce653fa15496a133a4899efe25b78565a8d3c3512350abfe5d6f SHA512 21726a3e916a2a4b94a1fe84bbe04ed7c901e9ac9ae2b7f3e94fc84255b83c6b65a07485bfc899a28f1d66456aa2fdb58758e36aea1083a89f9c739c496c62bd WHIRLPOOL ecd844267094f9d9033f1922a08b310fd0c72e97f992aa879d46faf1b2987b66bde5e5b5d5f1fb440c8a665e3c8f10c187fa86ea878284f46f43cd327a7c83ea
 DIST paperwork-0.2.tar.gz 161800 SHA256 81fcbfc04bc640c1a432864e74365cb170fb52198f3149773577641a37f4afee SHA512 8fc5d08844a5a21ee04cb98d18f5eaafe3bac6ab7919f347d5f837473b0c083bd2cdb7c54966a2d4e4790f8bb8df931bd2104a606fa3a14371224b3933e5763d WHIRLPOOL f45f0204fd939b383b9566cd945739cf78736e1d23ad09aab9d6d07fdcfc14d34ac09c6b45f29e9b5d8de12ccf7df46e8d37d95320001086a6ce24a2a9452c04
-EBUILD paperwork-0.2.1.ebuild 1396 SHA256 4d86dcc6382c14b2d9cc28966152905b04b6921f0234836ce96f8cc406198073 SHA512 c24c040756a09f9d9130300da3fbf691fea6292f0b5a91f47663a827f89c589a97ae145c5af612baae09f4b9a49fa411d21d3494eb57fe2aaa2e2340bde7ad2b WHIRLPOOL 2275fa3ace2647cdf38894b49bb9c95ea809275ccdae6a92fe16bbef487dac98b4d26edba48ae64858f875272576ea002b02a8173105bb7d43ceae9a7c7cc1b8
-EBUILD paperwork-0.2.2.ebuild 1396 SHA256 fcc4f29ce4747c0e29b44794bfb4cdcea0f53e38ab60c94466de465f961098c1 SHA512 7e70a15da1915b460f39958e64065f727cf2b2c435e479d551b07ae8ba4f48f2daf22df13c75876c50298905b5178c3b2f8001b29e40440b4735275e004c9d65 WHIRLPOOL a25c0e3957e2ed9f8c2661901476d26a3777de83aba5c035a9b1e53b2bb795390fe64057021b5e1ca46f55ccacf55924c71fc356f1fa69f0737d99cecc723947
-EBUILD paperwork-0.2.ebuild 1354 SHA256 3a279ebd9764b88b7f918118328f59746196dec5eee17791c77d61988edf2e52 SHA512 9c502b73346702f00d47d34ceeb12806223059cca057f0f445e7494ca02b33a37d08e356149960f5de169a96c8ee92b9ebb463d4ec5e7db312953ceac7675f2e WHIRLPOOL 76cbae3e40015c69d27319795c0fffd3577fede3f812b9a1e5a4a121cf32f4d838d12650e7a314bcb1d4e905d2c96d6e7b855221dca6b49f6709e0d4b96d7b0e
-MISC ChangeLog 673 SHA256 4d4883d6698d42f622eda617e2f834cbb03948e9e750f36fbdc4f762b47eb5de SHA512 0defe97bf4319239e27aee75603d1b25bdbd19fdc642d0b8408c3509bd98625c2bfa7b0621f026992a0991a922837f65f54535cec789c6855442efe6cb488051 WHIRLPOOL ff11d86f79c0f4292b6c28fb4ae3229ef1a97b070547c5899defb3a2433322a972c22a39a2b668e0d3469710a97d7031939bfff491ffafcaa0c1f55fdce4215c
+EBUILD paperwork-0.2.1.ebuild 1359 SHA256 985d69c6f543e3f1f8b1d65378ac1751ee94cbfffa4c229d6964831c08d37203 SHA512 942aa98383f0e4789ec76aaaf308e413649aca7350ee32558fcf811877a62fc02491c2b237f021e9e4f5bf8870e8194d35975a852727f353e6faca50eab998a3 WHIRLPOOL 2640a74675dd09d4794b2ae5bea781c56d37e1e5a30f3be9999833017ffd5aee69003b5efa65c92b4dd565abc3c649e58bf8c1c3fee4ebfcd6d3f7b5d49efce4
+EBUILD paperwork-0.2.2.ebuild 1359 SHA256 9076a8f855e175bd8b2dd6be2d8aa6f14ad69e5ab4134a8d42cd59b9db01accf SHA512 3190d92c19c7161ce4a6ac511cdc61718c978b16a21ff318b938f9ff876e3ad9c6449ae0ebdcfe3f8edb61e03a57af54972875586119c6af8a6418e4ae94f7ba WHIRLPOOL 01432359be8d10608bc746df85752249ecdf474188be18dbef14b064f1b0b9951772f623ffaaf382d39772e692d51c5581d059475ce1f604cacdb6ac24dd4668
+EBUILD paperwork-0.2.ebuild 1317 SHA256 7db2df39e5cab55ed0cdbc1ac7b3fe281d2290d6df7fe6d5e93c708b232e73e5 SHA512 fab69ce22510a0279a69194feabb24840d2cdfff2bfe8055c999e00e30a44fdbd2aebab866a73f2228297ee311f1c345310e5c26074fa026e82089758679ea97 WHIRLPOOL c35275d74d272164f6e62584b396ce52a2d70a39ef5e556b5fc8e56fd0c4e353ecf8134df7256d080d0e7fed41fc7d4554669817b22be20fc805ae58fc44fc95
+MISC ChangeLog 966 SHA256 de9418723f4d1eebad9e75748a41d56d074bb34c2ca26441b094c712c1010351 SHA512 3c14150e6a6a63b2de218e9312f7a75fdda8538d841328291b39b953548abde74519c14077dda530545a8a6d1dfd8373e04b5411491ab13250259f37d9d624f4 WHIRLPOOL 1ba535ca62f01fb05869d1460c165ea50e403a6375aad00617d77526f5f5ae12e0d5d63e9304a251b7899ab69b900ec4127610f7dea66d8cb250f6d9e8a15925
 MISC metadata.xml 614 SHA256 5cbb8190013cb96307a31703af30ea3080191553a681a4bb0d74dac7d90c445b SHA512 793ab70d133d0717172e02857aa95f3db484e82440cd89433bbbc03639eab4bc1db7383661c3e4c6ed039ceaf2b3b3d32a57576d400f374429b1179803ea0617 WHIRLPOOL a74b60b90742f46c1fc0000b9de824dd9cf2307b612ccbe57f3953dd3eaf290a8e77340a57eadfce8a8a45cbffa766a14e94b7cc5861ae1ad1376d4b90f20f80
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlS+fqgACgkQFYEBGcdFJfKoPgD/V4oJet3VWu3RFipE6vl35dMo
-bFqmVOZ5ZTVQD0AwYWMA/iA6xq3f8sSRITcxZFLlqLU4afqMc14ulEGCBI+zufYk
-=w1vv
+iF4EAREIAAYFAlTaNCkACgkQFYEBGcdFJfIhXAD8D7xcUfXsrcF4Oo3OOnGhbfIT
+zF4UpPbpPISjiR/pwxcA/3fSuNStMC5aA4zLugqbYzg/Fdc5c1PpnkUnqsrxssc0
+=fukR
 -----END PGP SIGNATURE-----
diff --git a/app-text/paperwork/paperwork-0.2.1.ebuild b/app-text/paperwork/paperwork-0.2.1.ebuild
index 7cd82c844f29..eee6b6514f6a 100644
--- a/app-text/paperwork/paperwork-0.2.1.ebuild
+++ b/app-text/paperwork/paperwork-0.2.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/app-text/paperwork/paperwork-0.2.1.ebuild,v 1.1 2015/01/06 12:26:30 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/paperwork/paperwork-0.2.1.ebuild,v 1.2 2015/02/10 16:38:58 voyageur Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -21,13 +21,12 @@ RDEPEND="app-text/poppler[introspection]
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pycountry[${PYTHON_USEDEP}]
 	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	>=dev-python/pyinsane-1.3.8[${PYTHON_USEDEP}]
 	>=dev-python/pyocr-0.2.3[${PYTHON_USEDEP}]
 	dev-python/python-levenshtein[${PYTHON_USEDEP}]
 	dev-python/termcolor[${PYTHON_USEDEP}]
 	dev-python/whoosh[${PYTHON_USEDEP}]
-	dev-python/wxpython[${PYTHON_USEDEP}]
 	dev-util/glade[introspection,python]
 	sci-libs/scikits_learn[${PYTHON_USEDEP}]
 	sci-libs/scikits_image[${PYTHON_USEDEP}]
diff --git a/app-text/paperwork/paperwork-0.2.2.ebuild b/app-text/paperwork/paperwork-0.2.2.ebuild
index d2f076cb80cb..33587dfd6cb6 100644
--- a/app-text/paperwork/paperwork-0.2.2.ebuild
+++ b/app-text/paperwork/paperwork-0.2.2.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-text/paperwork/paperwork-0.2.2.ebuild,v 1.1 2015/01/20 16:13:27 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/paperwork/paperwork-0.2.2.ebuild,v 1.2 2015/02/10 16:38:58 voyageur Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -21,13 +21,12 @@ RDEPEND="app-text/poppler[introspection]
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pycountry[${PYTHON_USEDEP}]
 	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	>=dev-python/pyinsane-1.3.8[${PYTHON_USEDEP}]
 	>=dev-python/pyocr-0.2.3[${PYTHON_USEDEP}]
 	dev-python/python-levenshtein[${PYTHON_USEDEP}]
 	dev-python/termcolor[${PYTHON_USEDEP}]
 	dev-python/whoosh[${PYTHON_USEDEP}]
-	dev-python/wxpython[${PYTHON_USEDEP}]
 	dev-util/glade[introspection,python]
 	sci-libs/scikits_learn[${PYTHON_USEDEP}]
 	sci-libs/scikits_image[${PYTHON_USEDEP}]
diff --git a/app-text/paperwork/paperwork-0.2.ebuild b/app-text/paperwork/paperwork-0.2.ebuild
index 92deeefc8c23..550804fff123 100644
--- a/app-text/paperwork/paperwork-0.2.ebuild
+++ b/app-text/paperwork/paperwork-0.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/app-text/paperwork/paperwork-0.2.ebuild,v 1.1 2014/09/30 11:45:41 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/paperwork/paperwork-0.2.ebuild,v 1.2 2015/02/10 16:38:58 voyageur Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -21,12 +21,11 @@ RDEPEND="app-text/poppler[introspection]
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pycountry[${PYTHON_USEDEP}]
 	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	>=dev-python/pyinsane-1.3.8[${PYTHON_USEDEP}]
 	>=dev-python/pyocr-0.2.3[${PYTHON_USEDEP}]
 	dev-python/python-levenshtein[${PYTHON_USEDEP}]
 	dev-python/whoosh[${PYTHON_USEDEP}]
-	dev-python/wxpython[${PYTHON_USEDEP}]
 	dev-util/glade[introspection,python]
 	sci-libs/scikits_learn[${PYTHON_USEDEP}]
 	sci-libs/scikits_image[${PYTHON_USEDEP}]
diff --git a/dev-python/argcomplete/ChangeLog b/dev-python/argcomplete/ChangeLog
index 7a26761f6488..46f460ede000 100644
--- a/dev-python/argcomplete/ChangeLog
+++ b/dev-python/argcomplete/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/argcomplete
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/argcomplete/ChangeLog,v 1.8 2014/12/01 14:56:19 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/argcomplete/ChangeLog,v 1.9 2015/02/10 12:41:32 grobian Exp $
+
+  10 Feb 2015; Fabian Groffen <grobian@gentoo.org> argcomplete-0.8.1.ebuild:
+  Fix double Prefix
 
   01 Dec 2014; Justin Lecher <jlec@gentoo.org> ChangeLog:
   Version Bump
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index ab9ed5501ae6..a0bb388d79ad 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,29 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST argcomplete-0.6.5.tar.gz 23881 SHA256 25b89c43460af96d4b204f3745b5054a5ab1b1486d70416185f00c23a568291e SHA512 64a144748cc3f2021bc3a5f0d220eb5932c5f1b0ad8327fe7b20fff106a0fd9365dbb169294fa5a93ead14d03a33e2aff12275d38b12bbeaa9d5206eff36f282 WHIRLPOOL 184a953af4e0c0b1444964a5abb850df47466a9b38858de6dde2f4eb5a0bb717b50b6061b75a8d11ac4efa80b130e374c4e32da9f330c9dc456d4f03b0162c5c
 DIST argcomplete-0.8.1.tar.gz 30272 SHA256 12e36f784160547ca855a2c9d753cf60cd3f87cab72b1e4993ceffb6ba51443b SHA512 faf37f5a5c3f619066503b6fb53570e8c084d2f28895da6bfe38db58b06447dd3aee00d6073a33000486ba9c3c12b784276a57c625ed02f4bfcc78319bee0ea4 WHIRLPOOL 7c55337ca8bafb2779ee4e5cd3c42b0df0e3953bef548ceed516bc65c64870ea62c29914b9ad140dbab446bcec286e611ea82356b0a9c0e6c92a020986f4b161
 EBUILD argcomplete-0.6.5-r1.ebuild 822 SHA256 3b1ce19d81df789ec821584bffd24e2a2de2520fe92b7c2cab9e5bc77e298eae SHA512 e767769911d4901bcaef2b6e2273dc084109c564c6e76e8359846f8d059fa18c5dd59e667872e39a382a19b2d3fecb055e9b7554b7fbb70a6e824c6ff0da6a75 WHIRLPOOL 74114d0a4cc4439bd8c98fbf08acbc7fa79c96ddf4425e8309919bc22beeabaade1f70b4fe43b00b2856fabe01d681d5bfccac089276aef1938ded66a678a167
 EBUILD argcomplete-0.6.5.ebuild 625 SHA256 2251008f86a40e82694002682f03a4194077b0999e08405375c2627fe061b131 SHA512 e5f25e63527f86d06e9a0a3d10962daf3369d4a882b398d3a666dcc271a2979d8b7f620b6fd17e4bdb7e8309bd6029e5d696b5dab35d14586cb321587ece79ed WHIRLPOOL 8c8771b45cb15b66f1b767b864ef37ed79dc455f85e29de48592e8444594d5408b06cfc38f9ff782449bed7d5acad087fad9856535c04c4218e90b67f20d272c
-EBUILD argcomplete-0.8.1.ebuild 1124 SHA256 a1f47fdf79c43891bd70dfe86957cc8f0236f986a1904c07d05e410f6792ee02 SHA512 8514e94dbf8e97dccc56a6491ff6550c1b2faa6c420796e7f88f882a1ad15f38652bd2e7b3711ed5a87baf166387302c96fec417f6734f5d2e6aa18f3c6f1bf1 WHIRLPOOL d558ff54954c589bcb2e066115b5e073163a1848d3498770b1d3f8f85eb704a1010e319ba767187944570f799a945f0fa73d96d3d665073101c4f78920e54e21
-MISC ChangeLog 1362 SHA256 2bca0c75e76db95d1ee89b4b749701f1f610704e56b10ee9cf569bdffaa74059 SHA512 3806a3485360930275e3ee0e00f8aafd1f73237422fe4852603314b0947e3f10c0cca3a67d564bccffb2bce2f917d0973d401f0c1d16f8773a04b20c548f1f15 WHIRLPOOL e29ead2c0fad6654a36e750e921a20d1937bb3fd9ac1e9b97fda71efb61e65fbb6aa9da7c91be45747aaa896a295e5663aaedc0177f1d0e0ece690771ac59cf0
+EBUILD argcomplete-0.8.1.ebuild 1149 SHA256 545a6344ed277ca13e257e70bf9e1a6d8679bb78b9d2db255c72d22099b5b21b SHA512 3fb093f30509121a8fb5184db208c35e9d9e515fcb23c2e22e19df3dd2efd0084222894e5f9b12285c6085c1454441ea0c10fd5f8d99b4b1c2626effd69365f8 WHIRLPOOL ea6c7b3e6407b930ff9420ee75dc363f65b22c483162d442209f0903c06c73acbb168399485c94122efbfaf3c81a8f24f18d1d03d09c5be5b4363a49cfb1aedb
+MISC ChangeLog 1463 SHA256 7276575717c51cc0f8a59ebdf4de7f2e476d2715efaadf972273f5199fb88ffb SHA512 3773705dad5818b9f367652f4b774b945c797bfcda0eb22ca89beef11b55d7f82bcaea4d48a7a86e69223f8d49de97f93be5b5f5215481b2ea96d1ffacfe9f2b WHIRLPOOL 421e054a1d42a734e8f43763f90431c51bc9fdd2bcb03997d020cd2e360effff8850b139b9f8db6905169f8f3bb892f08a8930b3a673b3a883051c6d7ab5f274
 MISC metadata.xml 227 SHA256 aef43758cae524923aefea72b3a1f2896b3dcca8d0135dc75a08149549388105 SHA512 40677314811b092252949d13d1d07aaf721f7e8ba47da28ac21239f881e7c919bcad9384d2f0bf0eff95e11912443aa1f2bab7e94e1a3029c9aa97a3654795dc WHIRLPOOL 1ce8a3cc4ae9ce91daa6bd030e5be25fdbee0fc29e14b943024c932cff8d6da58c6d152d02fb8703fc285331f3dd010ec832f8a5ddb18c7cd33c9ae97507dd76
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJUfIGUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirXgoP/2USKEWDHSDOxjVXK2MEsrJf
-FLnL4gmjucgAaOMz3CuOR3a51k08ye4lHPg1k3tJT4IvErbNY9cRBgBz4OEL5vHl
-3SBuTEPyHEjLZ5b4JFTZ6vQa+kLWFoMp43HASGDBCgKk/O7KlUWPyNOLi2/r9Zpe
-t7myZGVrdCBbMB2JqG1Lmk+kkZid2LXSyvEa8gRrI3Va250WKHTiuEJa1FcNSLHU
-EKj0CZ2LJrJH/L4FXuKzRMGn02xtnS29bnVJMBuOcZSmQTYPjMeyi9Tmj5T74/wf
-0VV4xWbYhknvVy2gDTYefNGdeGtekxL7C5m0debVl0/D+JiIz1XBnHbOfZM5Zkz/
-BexL3xdH8iUJ8JwgT9ITnnXaaM+Liy+NAD5eSMIYLbY6e3Iij9yE3XmYkEy4Wowl
-IalBErLMoFgttllppFZTrCoGz1hxrFgwXMV4YcWuzRhkAuqjk+PsvS2oULCpzvv/
-SUa2vmQX0fbqtd728JihDgpsQ6gdkZmBmxW3w/jnqelh4os23VVKCZ+I1bqJbNOt
-HxH3+nOvHqzeEPCfD1MvJp3OZvZU2elplKiDkmsXxVrEKcDBNfHfcbthwlk51D7j
-5g8n2n6mVT1DqihwakFg10/h8fylzCVB0+ql9QftKP0E3widoctPFS7cjapTPPUU
-i4ZOeVeKHT0BBjscQxIJ
-=PlCt
+iEYEAREIAAYFAlTZ/H0ACgkQX3X2B8XHTom2eACfeIc7zixLCMklI22TiVlSMo0n
+4rcAnjv8LbMurHYpg8034drOAhzVx1Yb
+=jLDL
 -----END PGP SIGNATURE-----
diff --git a/dev-python/argcomplete/argcomplete-0.8.1.ebuild b/dev-python/argcomplete/argcomplete-0.8.1.ebuild
index 619aae089847..31d577b71ab0 100644
--- a/dev-python/argcomplete/argcomplete-0.8.1.ebuild
+++ b/dev-python/argcomplete/argcomplete-0.8.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-python/argcomplete/argcomplete-0.8.1.ebuild,v 1.1 2014/12/01 13:52:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/argcomplete/argcomplete-0.8.1.ebuild,v 1.2 2015/02/10 12:41:32 grobian Exp $
 
 EAPI=5
 
@@ -35,7 +35,7 @@ python_install_all() {
 	sed \
 		-e "/complete /d" \
 		-i argcomplete/bash_completion.d/python-argcomplete.sh || die
-	insinto $(get_bashhelpersdir)
+	insinto "$(_bash-completion-r1_get_bashhelpersdir)"
 	doins argcomplete/bash_completion.d/python-argcomplete.sh
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/pyringe/ChangeLog b/dev-python/pyringe/ChangeLog
index b4e377bfb884..c37b4fda8e44 100644
--- a/dev-python/pyringe/ChangeLog
+++ b/dev-python/pyringe/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pyringe
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyringe/ChangeLog,v 1.1 2014/04/16 16:30:50 dastergon Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyringe/ChangeLog,v 1.2 2015/02/10 14:02:16 dastergon Exp $
+
+*pyringe-1.0.2 (10 Feb 2015)
+
+  10 Feb 2015; Pavlos Ratis <dastergon@gentoo.org> +pyringe-1.0.2.ebuild,
+  -pyringe-1.0.ebuild:
+  Version bump, remove old
 
 *pyringe-1.0 (16 Apr 2014)
 
diff --git a/dev-python/pyringe/Manifest b/dev-python/pyringe/Manifest
index b0814f9f980b..307bb102ec94 100644
--- a/dev-python/pyringe/Manifest
+++ b/dev-python/pyringe/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST pyringe-1.0.tar.gz 41297 SHA256 5c2ded6d9734abc7776ce9f09baf9a689937e548862976bab52a7ab73a13fd3c SHA512 441580295fd236862d0b6b7add1c05448ee26db432af1f9f197cb5344c1bcd919965ff4d00d10f90da484190726d07c5b324abbd0d7a017ccdae019556e5a965 WHIRLPOOL 3c00ecc95f26a693f5d583658240f5aaaf9a08b2dcf0f0cc43dbcade9152a79b4974eb5d504bbd3635173d795c6669a6a1061c134c5641a83e4976d1483d7e63
-EBUILD pyringe-1.0.ebuild 592 SHA256 95e5c2d26fe1ecdc2ac98392c5aa31fa9cf6d291037ab5cb6d9cf7b92d44340b SHA512 0300446a3967e579691e62696a39484293624d77f1713c2b0542e4a0b8005a3013d85d0076ce30fafb9f9cde2751bf146270588545d54c8af1bd99daab3471ad WHIRLPOOL b756717ddbc862079688a758ac98d518fed5d1ed10d7955d8ef56630827b33172989110b44e4d2b61000f98e9278bf7ef0c8bdfba1e679ddcb73a100cf14fda8
-MISC ChangeLog 359 SHA256 4e1cea15e699e7046fa1386b0c2b27c5d70574e0b8ecb22322c7f33233965d0f SHA512 a09467fdd678d13c4462794cd81bfc224ac4984abab3af2691b60143ab85d6db1ad4816592f6480da1face68871ac4251303092a23887a6e1803058691033a78 WHIRLPOOL c0d7c32b95135120e85c769c991bd73674e2e4fae84a3ee5d37478faf5d8e94c2ef7e89ea2aa78f9d9f2b3f7d9f5ba8ff564ff0c5e2b89a48bffa98d8d8af867
+DIST pyringe-1.0.2.tar.gz 42804 SHA256 b93f5710c05c8022d04b0145b54825d8748469c04deb7bc6b12fa44174e39324 SHA512 8da1572fda50bd135dc5d49d41a2f5c9cf2f5a7af729aaa9c34cde892a76e5a1b0a6818a6ed67f0f757910eec77f9931daade627141dd9964e9545ccc75a6052 WHIRLPOOL 68b8ed5a93578ed3d688e1d7cbd5d780cdac911b46bc73ea98380dae905e48241d489388ed9caf11d898a5015b8bdf771ab4ef479d7b80013e4d6bec759f30e2
+EBUILD pyringe-1.0.2.ebuild 594 SHA256 a291887f7c93a48626de467a7184af924da378e61be3438bf5b041aefe591385 SHA512 0c40316bd4517694a9020a32af0d67232da922df2df05cae2ad815312e38c72700565171f8804da0de1578fa51e4ebeed8db914de739a412bee59ea459f7dbf2 WHIRLPOOL 98b1ce37e0abd34d564d9f80275828469ec87935e59e97292ea33d6ded02a563d55a370da4531a9d06b29dd041a688b4a8f1db64d5eb67119c38d7b6efafe023
+MISC ChangeLog 514 SHA256 47fc2dac181f35c74ea3128ab0234ca1c6bb099c6e928163a46fb6b838775347 SHA512 ef036794aa743a9a900b19580a4a21957547af0bfea0744387e97f90e11ebee2342032c4fae31901212d2a289370978b249a0d0e7552240db4e3fbcf500b4650 WHIRLPOOL 9108cee8148907c5a537da4f72e3deb7eb3b5b6403d5a5241204fadc870304e6c2b19344826b05074531e4407972a99977cf3a281bf2bc0aee34e7d15e9fdb41
 MISC metadata.xml 304 SHA256 9673f3bb5e76a1c134b22698ab0faea6e6066a59f998042827a17ffdf89f4a11 SHA512 a791b4d054c16ea503dcad1907f5eef03aea60d7fc5dfa06d0d6539a8dacf15afeee2be4fcc0bfeccc67b7e412ca936f334e6849c349d3eb9b2863db6ce42ef4 WHIRLPOOL 0e56ef5d7843c71d09deccd16cd8133a7ef71c7e9bfbdfd832da1ca91039881866da46e297e879fe53c362fb07887be411a25b27841e5cb07fe9d5cadeb8c56a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTTrIRAAoJEKMbvrI6BRdGpUYP/0ponEcc61PjKV2Ayf5O/EKI
-qLD8//EudM54scggjlDhbvH9cUSMxnvpQytTtEPKP1B1f76W7W3QWiprTH1tWDLh
-CpEOG0XYOKzl0Kw+86KnUpkR1I1f01QFwiU/B6Af4pGMTHYWdelMBadWEHukq5JB
-nj598A5XWyaQ1Arorn1Rd/KknTpbPDonPuaxttFASnefEhbYfwx1qh0nnBK97wwh
-2tImAavkw+aBhxoESOVmBIbf0acKP0YMzol9TUw0Zj2BazECr2Xx9BWT1Kq5mnWb
-Utt8mAzKJBX6f08kAJSIFFf7lO50yx+CmFUaAOL12WdFy1pi32gp3rRQr21QdkCi
-SG45OnLnvFlaJTIw/SPxV0fzSKreSeXNAshiUGh8wqGKcgUNTP8G78sprGkSbWTK
-PbLJquCwRSu7pI8GMzRL4Mk8DTauFLO5Nhb+GjmElb8+unDnnAtWc+DHHUmZ52/x
-FtpiZ6yQ7pA3+ukBABh0xgDO/JjUm5OfCF7wqTQZa2+7a9FGq2Rt8zAc6ev/U92D
-RcvNWH532DqwPlAqDcdv0DuXcnzIa7LJ1tvcBW4IOoly1zGpomm02ZAh1a+YDe6p
-Vk8pBaHtiwPgAYYOJ/oI/qJlip3vK1bHxJCrkkbkYQGp/XdCHY2QN8iqkcDBYtvZ
-hJBhNj1Hc1p1cvsimp1q
-=E8Up
+iQIcBAEBCAAGBQJU2g74AAoJEKMbvrI6BRdGnmIP/2x92AQYtq6RX6c1kHqpOrpf
+RUr4gNDMeUS/nX6W1OhLhyUqKn7NAVvoT+rQnGhThh/ilGUdZn9BQOjBi4PDgbm+
+AFWXFjMhB7E0T1Rc8RAVB3zIl8TxQ3vJ8ucXdRV/alJ1ZWoZhUpg+PQR3/d2qX5l
+NH8EQgPdw7TwMZKY13EhkZPnAw2GgPJtFX5wy+qaAOgq8f/SnyZk3EEbd4Hgeqhl
+paAZW+g0wAhVQuonS/4VaLa0W8hX5BlD6yipJkqi9b/C9Yg3Hd66NYJq5ShrU7+a
+SDOFI6x3CNv4jWRqH3Vh0EO47aG9xHNkY1q+V09nTVS58YQXu8egKEVjowOj2z9O
+axqMaG+HJQtEXFvSUI2OiCEVELysLP+jP+CQeIQvIhsN6LvymjlcVZckIpmgzpLc
+v5TPNFL63vFsUCEUfX2qB18mjKD0Iy6q7QHGcvMMDL8pXhcgJnPV9Vq6MoGT1iFr
+YtPGZ4fa7UMt9jSfbKV/4Vk+dddBbt+n+Tk2vHrdtb8KaOGaCGCDBWYsBINfzmDb
+DApJcvf1wjvuDzx8WkFre9n/lm5oJYDU2W1pMdf9WMZW1wkl9ylh6gDTSyAoegZT
+sjWLFkFAu5XsLlb3Y7xYSedGzPVmOfWLZMq25uIGh7UBp5xrW6RYCr5pSl7EGe3x
+u0tfvlMSb2My31vYjruT
+=GNLT
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pyringe/pyringe-1.0.ebuild b/dev-python/pyringe/pyringe-1.0.2.ebuild
similarity index 84%
rename from dev-python/pyringe/pyringe-1.0.ebuild
rename to dev-python/pyringe/pyringe-1.0.2.ebuild
index 83dd142085e9..168f9bb1e206 100644
--- a/dev-python/pyringe/pyringe-1.0.ebuild
+++ b/dev-python/pyringe/pyringe-1.0.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/dev-python/pyringe/pyringe-1.0.ebuild,v 1.1 2014/04/16 16:30:50 dastergon Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyringe/pyringe-1.0.2.ebuild,v 1.1 2015/02/10 14:02:16 dastergon Exp $
 
 EAPI=5
 
diff --git a/dev-python/pyroma/ChangeLog b/dev-python/pyroma/ChangeLog
index 14d9171550b0..cad576fd0179 100644
--- a/dev-python/pyroma/ChangeLog
+++ b/dev-python/pyroma/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pyroma
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyroma/ChangeLog,v 1.3 2014/11/28 11:02:36 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyroma/ChangeLog,v 1.4 2015/02/10 13:53:17 dastergon Exp $
+
+*pyroma-1.7 (10 Feb 2015)
+
+  10 Feb 2015; Pavlos Ratis <dastergon@gentoo.org> +pyroma-1.7.ebuild,
+  -pyroma-1.5.ebuild:
+  Version bump, remove old
 
   28 Nov 2014; Pacho Ramos <pacho@gentoo.org> pyroma-1.5.ebuild:
   Support python 3.4
diff --git a/dev-python/pyroma/Manifest b/dev-python/pyroma/Manifest
index bde381813105..ff5cc93849ae 100644
--- a/dev-python/pyroma/Manifest
+++ b/dev-python/pyroma/Manifest
@@ -1,14 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST pyroma-1.5.zip 357764 SHA256 431013ade84c61f19362da6b89630547ea6b88cd69775907ea1789157042c12b SHA512 bf52494644840eec26a9455ceda66c0531747caa705cbcab272ebdc430caac0e485d6a130ad9fb0a370b6270391772d635ffc0b7f4936b84dae339ce5c583eed WHIRLPOOL a7bdd6f62c73fbd87e7ce0a988cf56690e07630705a8a945f426a4027e49185afb3564bef82cd7fd04599440fd9dd44b6f7a6b41c87e39815a7622034499c489
-EBUILD pyroma-1.5.ebuild 714 SHA256 b4101a66870a2177261f73e700d070086e51c3d9e57557fe6c3d1fe38e72e100 SHA512 c0148ad79133a0092ea03015ca4c568157e78065115e1c8c9914f3de3ecf77da2c4036b2bfae4156e229fe57fb2694e0c4de3e80c71fe28922926e209c38bc0b WHIRLPOOL 0220acf53ca00ced0b4070808a12c2d3b0938400e7efa169c625061c1612903e3064066b98d9b85fce96223c2f780bba35c3bb07dd7c56e887bf700ec2676a82
-MISC ChangeLog 531 SHA256 1c7dd56bc131c6a609e3055d2e2d8e394d51527005afa63e66aa91e089f6eb64 SHA512 e3a2ffa63bbd2d9ad1c522f343ddafaaad659c817d49aad603091b49ad2cc7a4f50797867e7cc587e3fb38242e6b742d1f5a1717b57aaaf3eae3f7d50b0c4e7e WHIRLPOOL 5c34df0bfdea7c6bc7898acc1e3339272e7a5945df3d0ba3dc0718e5cd7f1b13c8e312c9ccb5dea183a4c64777e2c1aeeced1af5f0d4897485324a5319dca625
+DIST pyroma-1.7.zip 359654 SHA256 5498d46cb690404d70351aacaf04e61a709ca48c24c803ab5aac7fd7a1629518 SHA512 d7c95283273befbed6a747a1f3c0aa0af0db5c8d486128bcf5a3439dfe7204e1025afcf22cbdf5b96b6f4302b8d569c60c1eb9c646c035fd8a324e3d69f7195f WHIRLPOOL e5fc4a47c258db50ab2d5bb033e66cc6d589864c8d63bd448ddf491de849dbc87a1c93ccdde8729ff824e437dc8d2fefb05e536eb772507c0239c91983a22dc9
+EBUILD pyroma-1.7.ebuild 718 SHA256 b7d6dc5c08126ee7ea4a8f4ab24406016d50a13a58485495c1724f568974a921 SHA512 0b07162e23a5461e523ea654b3d1b5454c0129f73c7fda0eea38013add47f6532b92d98656afed8aa42587f4dc311232135032518a69addf8c02bc352c86314b WHIRLPOOL d99fb95e10525e8d45316bbff215cd7ae31d5c395d5d2b9eeaf73ba9db7d2354d7f4a2438bd2638df935ca87b4b8b18704c9053c43e0b805328ffc186044949f
+MISC ChangeLog 683 SHA256 a3aabf6b9cc3ddbf9f7989cf47d60fd9070562d0a68a2314c6757147938f8033 SHA512 4f6a75478f2ec71157909c2300f2022beb6b41bba8d1ebb5e183b856b43ba85507a9afae16ec536c1ae0d3ff0a1f037412546b0ad8371e630f8c0669c3e50392 WHIRLPOOL e6ea2a17f182a6bbfbda3eeaa9d5a97a73f2c4033d04e13c6601e114ea361040a29f67ef9d049045f4809043b6537b87a487b77c24919ad623022504af6750f8
 MISC metadata.xml 303 SHA256 c2f8d3fe6aa8b73fe064e76c24949d60d7a3773e60a89a38e5002a6e11335fdf SHA512 29f2a0c7984c11b43cc01e64501ab8e78e16dd762f120a5ee4a8a3ede09cd90cb646a6eb0ff3f8b82fcc1020879df1fe7598d25baf0ee2e705843f463e3d81c3 WHIRLPOOL dd9ee862b533569017b6cc24bb4de93c4561f228986b04b51900b42e4da10a2c107ee97089cbb7383099ad143a4427ef1e20a8ed4c9341877e87635a9628bea3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlR4Vk0ACgkQCaWpQKGI+9RTNwCcDCfZdwWaZquab6sefeFPmObI
-Vi4AnjEctVuTT86ktmLJdaWMvc8/Zcgh
-=o9mW
+iQIcBAEBCAAGBQJU2gzeAAoJEKMbvrI6BRdGEigP/RPfWoyPwtYLJj2kCKQ3uVrr
+ut7sh/02igss5VNvvJmhlzzzxXd5CrIejUXGReK/clRt9TlbBxHUel8xfH8HOLO+
+uwjuexM3lBYOG5OM75+Me1IEI1lmKcktjdvh38dXQuV4Oti/Vm2DJUdlNgn7ScE6
+E3CGP0Xqy/i+SFZcQ7LMlKT+n+e69cS54jbvDVXa2X827A/tYEY2uxr01Ifoq49k
+081+R4bPcL/xM+O04Z/d+YMWAns8dpt0jjhIKV8WKXVU1arO0qXjA1Dx1XrGd0Y1
+Ui6BEQ0mcHc3krFRfORcEPjZrJ6dgnBSFbiI3haJmQ33iK7Qpa8KcTIDhCnMLG9l
+BBPYvOpO91QbsaBlUAaCZyXSBcIr5z/QxYoECP5Nzkjukp//C/0LcsZz84IckEXS
+9L/XeUZssoDNOsDLNgnC1ThCe51sfgBpWfYAFxKT0MIHz/i0dQstWE3RoPAcxmIO
+FwTrnaisnjGj/XzwDoPxPSRtDAuJar/9OWDAe16oDFHO5RSWUakCwKc3/dfFi9+H
+6hoF/kgOhrC/rrExVeBUivwQN4M0/7N8SLtSh+KRPtMDXGtMfFV3RejFRNI7W2oR
+uUyZX8g2ShfuO0ibbliMiMtYBUs6LMylx/yBgyhPCC2F3rWfoHBu6zt584tinUZK
+HmUkNyRT1KuartKBdOdr
+=+3/U
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pyroma/pyroma-1.5.ebuild b/dev-python/pyroma/pyroma-1.7.ebuild
similarity index 78%
rename from dev-python/pyroma/pyroma-1.5.ebuild
rename to dev-python/pyroma/pyroma-1.7.ebuild
index 65a6d5d9cedf..b9ab07c56c86 100644
--- a/dev-python/pyroma/pyroma-1.5.ebuild
+++ b/dev-python/pyroma/pyroma-1.7.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/pyroma/pyroma-1.5.ebuild,v 1.3 2014/11/28 11:02:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyroma/pyroma-1.7.ebuild,v 1.1 2015/02/10 13:53:17 dastergon Exp $
 
 EAPI=5
 
diff --git a/dev-util/jenkins-bin/ChangeLog b/dev-util/jenkins-bin/ChangeLog
index d39d7f2c55ce..8f565601922a 100644
--- a/dev-util/jenkins-bin/ChangeLog
+++ b/dev-util/jenkins-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/jenkins-bin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/ChangeLog,v 1.18 2015/01/27 02:26:49 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/ChangeLog,v 1.19 2015/02/10 15:40:59 mrueg Exp $
+
+*jenkins-bin-1.580.3 (10 Feb 2015)
+
+  10 Feb 2015; Manuel Rüger <mrueg@gentoo.org> +jenkins-bin-1.580.3.ebuild,
+  -jenkins-bin-1.580.2.ebuild:
+  Version bump. Remove old.
 
 *jenkins-bin-1.598 (27 Jan 2015)
 
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index aab08075e733..b7e07694aab6 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -1,11 +1,11 @@
 AUX jenkins-bin.confd 998 SHA256 8cd3e217ae11f47b73f8a3f28beb2f94b14e24da4e822f7209b19a2f14dccb3b SHA512 465ade6325efa05b4a150234f847ad19b9824f667fdc8f783af3d9842afc2815ee3d20dfd9566348701102bf28e1e0627af27ae43d055a9a6279ed638d8ece8b WHIRLPOOL 5c0dee7d648c22c65fcad7ec678ac839d1ab2d61aa52c8e54dccb6a9d58bcda5cca9685e570f0fe5b5f0fd6dd6ce0a47acc616cb9c5f6568758f92125a38f8c8
 AUX jenkins-bin.init2 1781 SHA256 75f8a4dc5c3c03b2f3ac52860b11bf2a245976b4b726b35cfe20ec2acbbb7e08 SHA512 edd83f1d92433441ee2021ab096367ffa17808a4e5564cabec8d9e00276abaec8916bb55bc842ad49ffc9fe6f5b24b8e93a20b247100e96f667fb90f87e6e33c WHIRLPOOL 22735e7b9ad35cec7b7a6e9ba146345786e0d3abf25b8c7d7b93228a779e99458b10831edacc372cef62770687835f7f4096cff3ebdc2b0dfc398e2da6d31996
 AUX jenkins-bin.logrotate 502 SHA256 2c18c2a6757246fe4a1e87191ac6ca529126ab6f0b85c48f6d350c4802a71194 SHA512 86262c89495ed26b4996a55b39bd7f57826010500ef5f668ea28ffcdc3bbce73481158340d24876a3dfc6f7ea6ec872edd40f89bfd9a0bea3aa2d61eeeeddbdd WHIRLPOOL 920b5fe2e776c0a43c964c0c43209c7f2d7cef4bb2a9bfc0a4a4d99797f4be9c78b489b76c3928248ccfeadb10213d643eb12e6ffeb45824ef4f92e9d7924582
-DIST jenkins-bin-1.580.2.war 68035763 SHA256 e41321fdcc4803ff6b1d0b8c68a247527791949338beabbc2eb13586ef7b6fab SHA512 c9371b80ff21986d485e63b0d9f957c18ee4babbe625fa0f4fb9fcd3dfb70d04c86302da37c4670ead1c115deffac88107df43af2541b16ac78a032994ecbbc6 WHIRLPOOL 240833e2aaa84e2f87114a2ef2a0fc858471f0096bfd096010b62ab1177088b8432d76388040b4ebe5c958a40557f951f223cc598ae8b3cf1754a9960577b7f1
+DIST jenkins-bin-1.580.3.war 68035755 SHA256 9033f96268d126ac8e5eb81a6e33e767163ccf5efa58ff987ca745c7ee67380d SHA512 f500cc97ba7365bbc384f6c3ba7624b68506466e875ee0673d341b5d9d79ca58ee0797af78b43cf7fe821a9f38922e5806be40de549469d76e6cad49d63384bd WHIRLPOOL bf33b94b642c9115361cb729188a2b20a2db43f44ffdb514b4eb7dd00ac6a0a6cbeedb9679fc7834fcb363739f2feb0a7d0262e072c4735567ce443bf5805bcc
 DIST jenkins-bin-1.597.war 68210489 SHA256 938857fc3f836cabcbba27924ed6cb02267bb22d51324f884d8757d018c3e807 SHA512 7d4349f5f6861c2f9f3a86c5bbb0629d431bc43f5c223a02c0e98c8c01f6a27990905d08e2e6aaa20eb8ac7845e062eff98885f0211ca0d3d5d0f77c31bea643 WHIRLPOOL 7d9f5c3cdc8c1659acaf5e89c3b09cf849dfd31201c20eddaf7b162f0498a4daa76be82c577a69839443f9acb9ebe7cec6d2f05cd17d0fbca55c538be99d6367
 DIST jenkins-bin-1.598.war 67619385 SHA256 c7c431cf1e305fb19cd47065eaf980d3667df4d587b370508a55403167556e3d SHA512 b059869971dc14db0398fa1727df8ed1446fa21b0ed25697c1eef8fe9044ca720b61cfa3b4a38ba8e3101bb0c34f82ec8cb18516f80c9c2359a7e04fe040cfe2 WHIRLPOOL 9a41684a2cee178ec810d9688b75b077004a5e7e6f859f06418b5e3a0b0b2ab7bac58edb95de5d8d7de09b9fcac9ef53ab5556cda10abdeb8e58868e20b5a814
-EBUILD jenkins-bin-1.580.2.ebuild 1135 SHA256 685f0bc48edfb4152f2453646650a586f45939577d3aaac2bf0a753335372b57 SHA512 cbd341383d6f2894cfff562b4aa887d7d11eb6f5c7bc8f0b5c3f9e6b5d5ebd538325206b9742646fa5c1014ce4979fd994fa1c162bed6e700c832b4d92f08b03 WHIRLPOOL 55dc902934b8da9d4c0a70b4c3f3c1c4be5e684928915b9ebbb020a598201828d75d4100bf1ee637e130c83bbfefab9d2576b485322a217a8776d82877259d33
+EBUILD jenkins-bin-1.580.3.ebuild 1135 SHA256 90c4924701df8ef912e3bbdf364daf3124fb9958b58fc25d1ff8c3d5ec1f0635 SHA512 0ea584401ff517910a50755f9e633d5b58322c561ddca4b30bf5f29ebc65db5f9ab7c15e95d896f35fb25f018db27223ca51e4ce073f55cb92ce2bf546a4128a WHIRLPOOL 1effdb8b07ed4e11bd3025c683146e43c501b5a40d89765028d396dce9587c311b8fae7ff281f556491febdddee8c4f8e4146451b0ff5c0b21b488ff04622cb1
 EBUILD jenkins-bin-1.597.ebuild 1126 SHA256 9cf917f1992bb9147105d839eeaa2c32f39c04f30adc98f0bc82a2061d1acfe0 SHA512 811ba669ef61d9249288e98935c3e3f8bb2af06acdf34a8b9ec31baa255a98659dca1fba356555d6585dcc3d993bbfbfd80d7adfb88679992bd5a45de316fa0e WHIRLPOOL a5e117bbaebe858f6f035fcd37c0618bba33019e2c17caf50855be24623bfbf8a9ddea1fe42229f40fdf18168e49d08d62b4f0bd5f89d9595c7b6709284a21ad
 EBUILD jenkins-bin-1.598.ebuild 1126 SHA256 3ffcc0b3563b7deb91d44766c5b5fc761229a39ce2bef62a64aeb7a9c18ba6cf SHA512 ea9708546c5fb93a284a566c65ae677f57dd075cbb27bae834d4d890f24fb1f2e5b4f4dd8831b8e7950cbfcc2bd4dc7d180c6cd249dbb6ae235fa6abd4e6b60e WHIRLPOOL 22dd3cd161671671ba42c82ae0b8ccbb05d10d33ee9126209870fe68f013ceab7a6100225b6683fcb768a596428b9724fb28784fdf82580025b0851586fc06c2
-MISC ChangeLog 3878 SHA256 52bd930b4cc5285e2d6a291832e6c13d4b666a97b5008d617997e7b9a781e838 SHA512 f1df8f59f17ccb96c6087b3bac53e3a50d081f1d97eb403a737873ebf8ba20c1196940434e350506b1ccc75d23a979083a25f5d7618d893e8b846d411e4cfdf1 WHIRLPOOL 9ebbc0488795e902a144341b58e07d88f947729149f88aa4b527be8fb02d27078f3dd85b8a6a0aaefe941d63de969550d89c7128ee479694fc346b7773f503f4
+MISC ChangeLog 4051 SHA256 3b9412e964b5d410c11c19bab3f28fcd4856b0ff6d4948895ff0787f4139453d SHA512 ace3da441444ff5e4b9c87a41767b582a9dc80fc821a4f6971dd17cd445f5f65054e6511495a6e5bcbe2ad9e0886b96ee361e109beef10b4812d7d52dd89f8e2 WHIRLPOOL 1606c37fe323910bca5eb21c81d1e973b2894953be0b46a64ff3c7b1ef48c9d6f823f9511e4f302557ae2927b3e59d2f564804be85ecd9c35564197ab5bb15e2
 MISC metadata.xml 323 SHA256 1fe2512e65f90ccec2e80123923bdb2c3cb6f597c45754f6c9f8246761234a48 SHA512 3d0a3145eca160f429e10f2b48ae1415143f2175cc06a3569a8d7fb646dd14fab750c8f8df4ad71ae085915bc075fa0e3ed35ee20a84fd04deb9590bed8fd940 WHIRLPOOL 830a0c6f0046034b335756b21f7a00b081254e190e288db88161fc26ceb48f0652b2418b67022ec394489b1e23028e50bef67e808d771518bf4ac2076d7f403b
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.580.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.580.3.ebuild
similarity index 91%
rename from dev-util/jenkins-bin/jenkins-bin-1.580.2.ebuild
rename to dev-util/jenkins-bin/jenkins-bin-1.580.3.ebuild
index 37f1afcbcae3..a02bd6bc9429 100644
--- a/dev-util/jenkins-bin/jenkins-bin-1.580.2.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-1.580.3.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-util/jenkins-bin/jenkins-bin-1.580.2.ebuild,v 1.1 2014/12/18 16:36:07 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/jenkins-bin-1.580.3.ebuild,v 1.1 2015/02/10 15:40:59 mrueg Exp $
 
 EAPI=5
 
diff --git a/games-util/gamepick/ChangeLog b/games-util/gamepick/ChangeLog
index bd4a73b1ab2c..3fd3610bf265 100644
--- a/games-util/gamepick/ChangeLog
+++ b/games-util/gamepick/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-util/gamepick
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/gamepick/ChangeLog,v 1.13 2012/05/03 03:41:15 jdhore Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-util/gamepick/ChangeLog,v 1.14 2015/02/10 15:41:53 mr_bones_ Exp $
+
+  10 Feb 2015; Michael Sterrett <mr_bones_@gentoo.org> gamepick-0.35.ebuild:
+  EAPI=5
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> gamepick-0.35.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/games-util/gamepick/Manifest b/games-util/gamepick/Manifest
index c84c13886b5f..97524e39a72a 100644
--- a/games-util/gamepick/Manifest
+++ b/games-util/gamepick/Manifest
@@ -1,4 +1,4 @@
-DIST gamepick-0.35.tar.gz 156725 RMD160 1aa0286ff50a081481802976d0c14ad790f8b8d0 SHA1 95431fc12942797a1d551583a6fd26fd2baa4cb4 SHA256 82e7e6126bd7917ebf65a561c8170075ae0c34502ef018b1663ad49b5e562039
-EBUILD gamepick-0.35.ebuild 991 RMD160 236bba2047ad87b5d0135407d9653c49bf959172 SHA1 b45a4d8d211eac862eba9264f5ced95ecf404031 SHA256 62c0ffe0cec6aeced8abafec77d7bc5e209a77b201deedcec98a845e9e517264
-MISC ChangeLog 1777 RMD160 fc545e4642338655311401205cb454bf37bdd0d3 SHA1 2e028fe22f7c986b8d24a99a190f6e87b85c2e69 SHA256 90767d493a0dff8574e098a1ee2f5838e055b83bf0f5fe557414c0f5ba96fe07
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+DIST gamepick-0.35.tar.gz 156725 SHA256 82e7e6126bd7917ebf65a561c8170075ae0c34502ef018b1663ad49b5e562039 SHA512 bd77d6584cb9bb5c358179226d20a1995badd7603332bde6692ecca6c30f26fe06e6ea202e04bd40c006e9f43ae8fcd885a09bcb696227be3da823dd68d5053c WHIRLPOOL 485fcba1421fa92039ea35314f28705372af5ed44c0c1caf5c992e71462dd658685b4e371c561c00ea9251ff82c6f5fd1f23415250a96c4432150f9b556fb4db
+EBUILD gamepick-0.35.ebuild 878 SHA256 566e2500d0ab71fa7e365c9ebda0606720310f9b0920ad4ef5e96638ac270997 SHA512 454b68a53f0ffa9b796d24b9c72e1890498d4aa74b8fc50f0b5c86f8e55a371f40c96db08cbc73923805b8a35da66163e5ac8a4c432d3b6df1c72cdc8b57be6e WHIRLPOOL 6a08500575eb9cecf637b9dcb3a6d8f6590fd1cc9cae7dd9c848eec862e3053f4da95cb5b167423bd9f5ceccce5d06a55530452085e136eb498176024492bfe4
+MISC ChangeLog 1867 SHA256 1f14d667ea80863eea9d35da9c8b4226cab058d7aa3d5affd09e6063d9d4e058 SHA512 067be697456d5876c91c59d35e8a2fd96c5fcb88165c7c57fe76dc8030e39d244efec07646012bf1d99009458faf5643e0468eb54012e81167c23cde6c5ad93a WHIRLPOOL 53d6ae4bbf24e1fcfee231f6f683a9f6139a8838e35e2785e0b8192d92ef392328c3d26064e8967997036b3e5e6c9ce2c996f2da94a0c14ef7169d11f5b64d6e
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-util/gamepick/gamepick-0.35.ebuild b/games-util/gamepick/gamepick-0.35.ebuild
index 8afcfff80407..4c6d4e8b8af6 100644
--- a/games-util/gamepick/gamepick-0.35.ebuild
+++ b/games-util/gamepick/gamepick-0.35.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/gamepick/gamepick-0.35.ebuild,v 1.9 2012/05/03 03:41:15 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/gamepick/gamepick-0.35.ebuild,v 1.10 2015/02/10 15:41:53 mr_bones_ Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils games
 
 DESCRIPTION="Launch opengl games with custom graphic settings"
@@ -21,17 +21,15 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	sed -i \
 		-e "s:/etc:${GAMES_SYSCONFDIR}:" \
-		src/gamepick.h \
-		|| die "sed failed"
+		src/gamepick.h || die
 
 	sed -i \
 		-e 's/-O2//' \
-		src/Makefile.in \
-		|| die "sed failed"
+		src/Makefile.in || die
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 
 	dodir "${GAMES_SYSCONFDIR}"
 	touch "${D}/${GAMES_SYSCONFDIR}"/${PN}.conf
@@ -39,6 +37,5 @@ src_install() {
 	newicon gamepick-48x48.xpm ${PN}.xpm
 	make_desktop_entry ${PN} ${PN}
 
-	dodoc AUTHORS ChangeLog README
 	prepgamesdirs
 }
diff --git a/lxqt-base/libsysstat/ChangeLog b/lxqt-base/libsysstat/ChangeLog
index 81b9d32df01f..97a65fa35bbe 100644
--- a/lxqt-base/libsysstat/ChangeLog
+++ b/lxqt-base/libsysstat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for lxqt-base/libsysstat
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxqt-base/libsysstat/ChangeLog,v 1.4 2015/01/30 16:32:20 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxqt-base/libsysstat/ChangeLog,v 1.5 2015/02/10 14:54:29 yngwin Exp $
+
+*libsysstat-0.3.0 (10 Feb 2015)
+
+  10 Feb 2015; Ben de Groot <yngwin@gentoo.org> +libsysstat-0.3.0.ebuild:
+  version bump
 
   30 Jan 2015; Michael Palimaka <kensington@gentoo.org> libsysstat-0.1.0.ebuild,
   libsysstat-0.2.0.ebuild:
diff --git a/lxqt-base/libsysstat/Manifest b/lxqt-base/libsysstat/Manifest
index 1aa522ad29a1..d2526fac0ea4 100644
--- a/lxqt-base/libsysstat/Manifest
+++ b/lxqt-base/libsysstat/Manifest
@@ -1,27 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST libsysstat-0.1.0.tar.xz 16376 SHA256 beafdb971fbe282d7698fb2230024382bc7f100d9af13f2a4bafc97509089d9f SHA512 d5454055a631aa3c66be8f4b24d2eec0b5d86941ccfa80efc3f831558e5fbd06681060a641aad8968590e61274478f6fad80a518150e9461d8dbd9a48faca497 WHIRLPOOL 556201bd21fa2d24e8d1d874657b27352acd13d15552a5083e3dfa4adef6fb5ef2a34d365ce5ac2a82834eaaac941a70c73cfd3ace6f7589796a659a80b4e0f2
 DIST libsysstat-0.2.0.tar.xz 17156 SHA256 f517c89f8e2abdc90f3f602db6cba89d8405a3d86782f77f663d784d0ecc70ad SHA512 fa01a80e11744b3d3c15916162053c0f79c9c57425d9054b14588e710df67d44d2bb73b7d64a8ae438debf2b0b348546840f8325843d21d6c146cf6d7dab0b97 WHIRLPOOL 0d2fb8abe0ba32be2dbb94417e92b2415fc45df45af98b9d8e12201b089e137fafb135ab5aaffb927024acfe780886d576f9235bae11f5e28b248b4c41144e60
+DIST libsysstat-0.3.0.tar.xz 17008 SHA256 ab6405ac1c2e547ab07c03556b356a462caf40bfb8c885f3ff6b6df82f012718 SHA512 41bbc270b5968459a40ce511fb93c9aae8b0d85d603299abc925c52fd38c11f3786d54abea7a8457c9fa869b519cdf47ac445cdff5f275339c6a960fb0e65c38 WHIRLPOOL e55bb621cb01b916f34808a96294114cece23cedd9208bcbb7a7d85fd052348798570921404068626cfab558c233aef18db30e8ed46fa6325374c72a1bef2e01
 EBUILD libsysstat-0.1.0.ebuild 644 SHA256 3992b775c64deae46aaadf2a6097001f48137f3891a5fa44c027c681d409ca8b SHA512 8082b72654e6d720f7ae232832876a8756eb2495c8c7731ff192b13ef4c20ee90b14c45b95f624be6bfb1868664cc3bbd6b36011311c5b673a77119ff46ed5a6 WHIRLPOOL 9c2dd6738e43651cedd536eba6adde73c6519ab203c5dc81868fbf6c7e03dc85e351a017eda585e8e027669b62a10628a08417c753bab6024d1a0fe19c629a1c
 EBUILD libsysstat-0.2.0.ebuild 762 SHA256 1047161dc92cdfbfcafd244a188b7f4e4b9c7186cd2c2fa6e5cebe24cb05c275 SHA512 923f973a6863ac500780b627395640086566c6ae3c87df7d9c93ca2b77b6245ab3adac3785e07910e41d2e104b01155f294588df4308d58ba5bd3e44cb5ef114 WHIRLPOOL 4119ea6a3ca95e8f788efe90783827d0db2211d24bf814490609ca3de41af5e63daa26c787195e419154b99845010dfe6f109ab64888772a636b07d18a536c81
-MISC ChangeLog 856 SHA256 29d564210ca05da5c1a4d0c19d30a07c8a1842854f13937423d08c786fda0bc5 SHA512 065abdb1e185b18c2586c229822c4f12c81169f36947165133f3831c9bad3141fb4fbae8013500c12f1c70276995920c8cb570bd93823abe34900a83631ace1d WHIRLPOOL 821f13939ab101f70297aec800af0d18940942e9adc16c1808496236fe04fd196d549a24f88a11737c549359e20acb37ead32afe36174fa260efe9940bb35400
+EBUILD libsysstat-0.3.0.ebuild 644 SHA256 77f0b8d13d609efe1acd61315e10d759c05e41a5c7869ae792b32764f9d47b18 SHA512 7d1f591e2edbd162c35d4c50b615002692cff30005ed328fc7ec77022f984c906c11334c00fab282b2e31894092000e549f7e75f7f9638ebaa6b43c560f34007 WHIRLPOOL 5a8141d1c59b2b187a1a184e46e532a14521f46ec0fcd2ccf6a9af36c2d408b27fbb38d6222e54713be00fac8cb5caeda424dd1692bf77739ece1f70cc84186a
+MISC ChangeLog 975 SHA256 2ddaddff4c673af6758790d49a3a9f5293e6665169a0c8a605aff1fc2158be94 SHA512 14bf0869e16c267946637ea73170b10da0c0116d2aa12f45aece89c05bf3f396c9cd91ec685426a2e359eaac7938eb79eab095e61cda6610b71a449f266de52c WHIRLPOOL 824256b10040b8c9853c5359986b433cba8821f14d5afa6b7d3c83e6ab6862d1149e341aa826276130aaa6b54d743d8a36bbefddc4bf1ce63ab2ee168772f133
 MISC metadata.xml 263 SHA256 d23df106b61ed123144d9d24eea822badfbe6cb7d8d4ec61215af73b4c8f1fc6 SHA512 9f99b13f568e1cfda82dc35cd0b95fba565d5f18909db7b0d7dff75273cf4076a68288768ee5f65a70485833971fb3e511919a9e80d09e0d96f3a38744435d3a WHIRLPOOL 6bfa4c8737764e7450195f3ffd2e8fe8531ad44dfa02b0d7819678eeb7898280f07ed13ac87e0158abb6d9b804ee617b7683f73a4cd17db822419eba55fa62c6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJiBAEBCABMBQJUy7IdRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7DpREACyWx8FhxnaHDPtyviRKirIqaysdsJalv2MDl249CZzYq7YaWgBofPdiinF
-EjM+fEJ7A4acVIQUeUxZIuY5i8qC86ert+zh5H+oUZ3neu78H5fuw0rh9a0mBsIc
-jqBXNH1506cWrUp5pKSiAwjoMFUP/sficGsesLLEabxMpVt0C0dzbwHahoerwfhR
-EVShmaoiTI/F+z9+NVzn0I4/PiW2GmaCIZ4BwHZvxqz4o6Ald3Kx1qPK56j+b67y
-n6kZDkKLxW3ERB7By1lSDd8l62JYyjpVHR8j/su3ds8zn2NjMoGURucG8fIVt1SR
-//G8DBxaHA7UjLzbzRUvgo8TdjkgRsX8qZgCKjWqQzvWyPKpLif7KSkbbqT/Pmxp
-F0vCO1l2dDOWZbhlToFHGZvfntwHbioFlR232hXuVsiJhUMtZCelJjJBnzgqudy+
-jW/AqKuvc7x0Wb1673akWNwJXyxnpKedOr5udXSaHB2aL+jV3p6umv+wRu7QDslM
-7VBjDj39Hm3V4fWhHoRHJf97l9Oj0ykn2WSfh4Ji2F3+/1uOBrncHsJS8ZslPGBA
-L6oNjZnYa5d4uOtcMGgEzX9o8cGHSFVEz2d48zBEvL1S7ojgPRb/2btGaWpKehwX
-L16LCCEELT3/OqH2dza1PIKISM9eiaXexq6tjankgu41AsUdbw==
-=kF6I
------END PGP SIGNATURE-----
diff --git a/lxqt-base/libsysstat/libsysstat-0.3.0.ebuild b/lxqt-base/libsysstat/libsysstat-0.3.0.ebuild
new file mode 100644
index 000000000000..5322d4080e13
--- /dev/null
+++ b/lxqt-base/libsysstat/libsysstat-0.3.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/lxqt-base/libsysstat/libsysstat-0.3.0.ebuild,v 1.1 2015/02/10 14:54:29 yngwin Exp $
+
+EAPI=5
+inherit cmake-utils
+
+DESCRIPTION="A Qt-based interface to system statistics"
+HOMEPAGE="http://lxqt.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
+else
+	SRC_URI="http://downloads.lxqt.org/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="0"
+
+DEPEND="
+	dev-qt/linguist-tools:5
+	dev-qt/qtcore:5
+"
+RDEPEND="${DEPEND}"
diff --git a/app-admin/lxqt-admin/ChangeLog b/lxqt-base/lxqt-admin/ChangeLog
similarity index 72%
rename from app-admin/lxqt-admin/ChangeLog
rename to lxqt-base/lxqt-admin/ChangeLog
index a277805c025c..d20fb7d9902f 100644
--- a/app-admin/lxqt-admin/ChangeLog
+++ b/lxqt-base/lxqt-admin/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-admin/lxqt-admin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/lxqt-admin/ChangeLog,v 1.1 2014/11/08 17:41:50 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxqt-base/lxqt-admin/ChangeLog,v 1.1 2015/02/10 13:18:56 yngwin Exp $
 
 *lxqt-admin-0.8.0 (08 Nov 2014)
 
diff --git a/lxqt-base/lxqt-admin/Manifest b/lxqt-base/lxqt-admin/Manifest
new file mode 100644
index 000000000000..0fe2e17b167e
--- /dev/null
+++ b/lxqt-base/lxqt-admin/Manifest
@@ -0,0 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST lxqt-admin-0.8.0.tar.xz 19216 SHA256 f2c17f9a9f3628db53b6cfeee64de8500b35b13c37bc4bc8d12302f856362a8e SHA512 aace62c3c0e69e098afd3ddf2af1ec98e185018c4ae9a15718484032857bc6f4fa792dee42c2c4079420fbac91bedaaf8dc9fa89730d0c03029bf0b767be5461 WHIRLPOOL cf72acb4a649cc990b1fba8ad9ea421db007ee3f97ecb69876f5006106d9a7c626d218a6fc763f483ada6122adb9d3ee978613afad69c2f8e39aecd83b204326
+EBUILD lxqt-admin-0.8.0.ebuild 883 SHA256 62dda70d3f72124202a592f5fb0db1b382455a673d01519743fa931b92f6bf23 SHA512 94e55999a9bb897d2f60094c0418645e228fd010a216b5ceb64309f6de5c01943f6b59700710395571cf0f7fb6c561fc7928e6caea797557e366f590fdf7a107 WHIRLPOOL a9660cc2cd9648912b3e44e390734c84dc14cf1e3b500697cfca37f3beda78b846301841eea2b33afcee917e02593eac57afc2032ea02e29f7071026cfeedc74
+MISC ChangeLog 380 SHA256 78de054507916c2ec6b77da0bf022d2078faecd0ee518800b5158d070317ca8f SHA512 9186eb57481c9badf6ae7750bb03e5b8d0a8fdf83046f71adc316f4df7d31b52c0ccfcc93a4e8694a69398a95f8bfbdbd8827dbdc2b4fb0af1a6bdcd1605ad14 WHIRLPOOL 13a3d0196f4f76abab7ce1278ff69c3fb22038e7b7b1b0bee5fa666776ed52db463b85eecdc3baffc504660af563dfe3f3f6465f6105531e218d4ee865d99304
+MISC metadata.xml 263 SHA256 d23df106b61ed123144d9d24eea822badfbe6cb7d8d4ec61215af73b4c8f1fc6 SHA512 9f99b13f568e1cfda82dc35cd0b95fba565d5f18909db7b0d7dff75273cf4076a68288768ee5f65a70485833971fb3e511919a9e80d09e0d96f3a38744435d3a WHIRLPOOL 6bfa4c8737764e7450195f3ffd2e8fe8531ad44dfa02b0d7819678eeb7898280f07ed13ac87e0158abb6d9b804ee617b7683f73a4cd17db822419eba55fa62c6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCABmBQJU2gVGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOo5IP/1P2hoW0Q6/jRof2KzbSm1jE
+fOf1DaEnMAwXSnzJTBZw2FV2+R6LC27RYKAE5UuD8m/iGtIGjpNWW2Ijyd3r7ja9
+/RmU9LyXKSa8JX5Vbf7W+ONybT0n2wQmNCxLZ7UlQCR+dCZWPZMo4VzlpWjSzzqY
+0Q2ezpiFNFaOyFdygPIZ7wZQjpSYWPD3gIJrghaEaWUR51gutG9gpuTr8hKgcalr
+NulT9ab68Pn8WJWx5E4EOeqjxC9vQROmRuhZw/lCLZlYlnfxKSfJRCNtFtbzN5Ll
+AY9AcokUGeW8/H1WadlBILx7IsoCaWxosVxP2qVd+W81fgt1IhZZq3ZaS8V+zlqC
+TmEan4Dz+65lF5Vwq4cZjhp74fPzxeQJnPid1R9itGJbVU6Tu1vH2S2rP/zMRmlw
+J4wBPR+ajTxXy0x9k/08dg+bA6c72hNhkUIGyvLXvJrthHiOiomsO8TPts+G0RO2
+l+J2CsRZwaYoD4A0XvGx+Wf18NNp/46aGyi6AwdQwJV9aHfrM+5HT37CRK+hrbMz
+ajO/wCK/pnVYSGcVT2ymVebhyuxDV9KtUlqO4CFNb8S1mQv63piVQWV7tLrFRKbr
+Jy9d8ryrJOUIx/PD1Yhms6u45J3aK6p+arQcFmRoKVDG3W96KEhpr4tht973wMrK
+c72H8fxT0pArghru4JDn
+=HoMY
+-----END PGP SIGNATURE-----
diff --git a/app-admin/lxqt-admin/lxqt-admin-0.8.0.ebuild b/lxqt-base/lxqt-admin/lxqt-admin-0.8.0.ebuild
similarity index 79%
rename from app-admin/lxqt-admin/lxqt-admin-0.8.0.ebuild
rename to lxqt-base/lxqt-admin/lxqt-admin-0.8.0.ebuild
index 243ec1abff20..903e3e194bd4 100644
--- a/app-admin/lxqt-admin/lxqt-admin-0.8.0.ebuild
+++ b/lxqt-base/lxqt-admin/lxqt-admin-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/lxqt-admin/lxqt-admin-0.8.0.ebuild,v 1.2 2014/11/16 12:39:12 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxqt-base/lxqt-admin/lxqt-admin-0.8.0.ebuild,v 1.1 2015/02/10 13:18:56 yngwin Exp $
 
 EAPI=5
 inherit cmake-utils
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
 else
-	SRC_URI="http://lxqt.org/downloads/lxqt/${PV}/${P}.tar.xz"
+	SRC_URI="http://downloads.lxqt.org/lxqt/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/app-admin/lxqt-admin/metadata.xml b/lxqt-base/lxqt-admin/metadata.xml
similarity index 100%
rename from app-admin/lxqt-admin/metadata.xml
rename to lxqt-base/lxqt-admin/metadata.xml
diff --git a/lxqt-base/lxqt-meta/ChangeLog b/lxqt-base/lxqt-meta/ChangeLog
index c4bad8409b10..e13e64254239 100644
--- a/lxqt-base/lxqt-meta/ChangeLog
+++ b/lxqt-base/lxqt-meta/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for lxqt-base/lxqt-meta
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxqt-base/lxqt-meta/ChangeLog,v 1.6 2015/01/30 16:32:19 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxqt-base/lxqt-meta/ChangeLog,v 1.7 2015/02/10 13:27:58 yngwin Exp $
+
+  10 Feb 2015; Ben de Groot <yngwin@gentoo.org> lxqt-meta-0.7.0-r1.ebuild,
+  lxqt-meta-0.8.0.ebuild:
+  Update deps wrt category move
 
   30 Jan 2015; Michael Palimaka <kensington@gentoo.org>
   lxqt-meta-0.7.0-r1.ebuild, lxqt-meta-0.8.0.ebuild:
diff --git a/lxqt-base/lxqt-meta/Manifest b/lxqt-base/lxqt-meta/Manifest
index 078f3e11e222..28a75f9dade7 100644
--- a/lxqt-base/lxqt-meta/Manifest
+++ b/lxqt-base/lxqt-meta/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD lxqt-meta-0.7.0-r1.ebuild 1526 SHA256 89ad18b34eaf10e588fac8095d26248c57109063929777dafe0e04c709beee54 SHA512 c7ec42049ae3b875972f4b8c373bafcc32bd99d11ece837d409885737caaf76f7db85d86d56fb4ba58809fe9d73a05035b712f265be60a65d159b1ef9faf93c9 WHIRLPOOL ca08ddd5987a417f9f0e141d05c606f1694496ee958aa44f16f3ab96ac4fccc805d49b414524f00d31bc2023f1a374ad4aad4d9d47536f330b3bf922fdfe9a72
-EBUILD lxqt-meta-0.8.0.ebuild 1335 SHA256 5009d2331cb1496ea9f788ccbcddaa880798dd3cdda3d0fe6af51224307f5b8a SHA512 9d76f592484b09e3f05ad3ff4a7496170563a1773939bcb373efb18cc5ea728eb11abc38376b816865fa514a33ac1b06cbb7e0de048a0a207f3752a5b0ed5fde WHIRLPOOL a6a52ae67a38dc285e073d9f02ae43922b2993cc2ea6182ff00a4335919ae3bfdb6b20f597eea50d433f0f4b3b132af420e62352b994d2486fcb9f86bc4abc2e
-MISC ChangeLog 1274 SHA256 2f46e8f3ad5e710909d6850513038cb1e5e046d9e37c9db6cca5ded859d6a2af SHA512 565df51ee12c7d9bc960527c68f0a00fbac936541fb77ab6090c1e1473132e34fb656f305f6c1d6fcc328cb9ff0a62ea779e95d5d743acaa33b719accfaf3878 WHIRLPOOL ce26e40250d45774d2b418101008e2aa596cb797be10386efbdabf885fe8879dc2e48ee9bd247ab83541cac55fc7ba8eaff8569fc69a4ac8add20eb24a788066
+EBUILD lxqt-meta-0.7.0-r1.ebuild 1523 SHA256 2ca50b8679e3700d26a9b9a924f8837bf80f8d54a90032b19ee6bca8b44ee02a SHA512 48255c1ae0a02d8bf8c7c3d2589604c644707b4f073a20195fed4e13b1aab1333ae14e81e648d5cf06ef3b884865db234b913149aa112e0076f2306483c947d8 WHIRLPOOL b158a187c1f5369ce541725819dc703c68786373bddb96c91c86a564d4bb65be118198b084364bddf195c89718a335c5beec220af9527702d2ef3e94f578da9d
+EBUILD lxqt-meta-0.8.0.ebuild 1332 SHA256 e22b3c1d0959a179410aa04f32582da7bb5582a9810e37a4b3e2e82e695ce418 SHA512 d22462f4cc6e05233136653ba5af9ae672657d5e8d1f88fab47ae69edb386c82c39c215b6a2776f376f90f36c04718731d310f18a76c2b36f415c88cc0f40f2a WHIRLPOOL 184add1ca972ae1b8eeceade4a86130c46f35447b874b4ef2c1aed5421de2add0f62673c613aa2ae0e6e5c203f0308b360fdfba9b42032ad0713bc830a30ae56
+MISC ChangeLog 1404 SHA256 11e46099b89b4aafbc7374e82b2b3982a1b0adcccbfb8353372ddef6a0f9c5b9 SHA512 0a2384bed6d8ae0a05795b543ddd137bba522b71675242a7b8141a4ec4d22624e533e23dbeaef7ec2a46bfaf88a926c3a04f845d2e563cc218e4c6944a305549 WHIRLPOOL c9a90df5ea39021b9968ed2e7352a1006f95893f7455472cfb5d3af42a53a52054f0af0d2274f9237e4f8962acacc74d978876ec32ead55af474ccf460741084
 MISC metadata.xml 940 SHA256 0b1265d79a2d58970eb1cf5df11f11f895793b189a4c8150cbbd9acc65c4635d SHA512 d726497498f9bead2f310a33dbe87d98149eb4d44d4ebf6a3f5351040c7d58a5e746009bdcb54212ed1bc2109ca897363d365bf46516077e59e776785bf9e122 WHIRLPOOL 0d730da5b574f84445e616c0e4883bbcd4dd4d4a53bb35c7ac01efd9c08063dc972c5ef7c5e7aeabd7597adb688785130ea2180b2713744fda9acc09f98dd2d5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlTMWJUACgkQC77qH+pIQ6RmkAD+NRJCUUVdQH0BrCftu+sTFIsZ
-2RuO33Dy2kM43vEGUa0BAIka+Mz83RswSxa3vI0etHA08XpPlQEnt10lasMhYl5V
-=f2BP
+iQJ8BAEBCABmBQJU2gdgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOnX4QAKPrRmBYp4o+OLrLK+i80iKj
+JwdR7e7cvP7LH9lEluZSqUHm2FALR3VFnmTgWrFiKJ2ng8MxMuEORSChDY2PBNF2
+U1Vl3FyYx6PBxL4PQ7eSARrTfFhcF5NrVI5hyEygIS2Hr8wlWZLclCi7EzOnvNf7
+Ms0pxr96phJ34drOSxBK1NMx61Je2Vro0glX21fIZKFNVBod5B/tL474iorsntP1
+q/a8661HAN1B6ZXMjGoSyQc4PNBdk0QHK6gvd/+6WzxrpuipDYmk3PQmODqRgIUl
+B3QUgw950BiLTv+DcMJGHDFaIxeHXwFo1NPyqtya0Cne6mEQSHlflPEz0UAQm4Ct
+nBA/VjwsegrkrlKWJGVLxkenHomuGVoMpaoqdFkjIwEuUD1/WamAXmIwZFX68slK
+4qE3tv8qXg/sTC4cAE/G/ON8/OLkAS4dxIaaAQVlG1qA/mj1K8rRLkiIpIu6r7NZ
+OdSHl2cs6d/7le+gmPdserHcglMoCLyZ/Gcpq0y7jitlaqXA2SiOSZK7PJNEt0Bp
+SRbVuh+60Wg1AIZ2NPyExUnolSQoPIY0NDsbQhfrWqOGUtpo3tWglGkgCrxvVd2F
+svWx4DwEEdS/bcdCEy6I1FQz/a4V9vcBnTj34CNlif++gh/12e7qQQ2FGw3gXylr
+QJd1kFNuRuvBWfCGnQKd
+=e58g
 -----END PGP SIGNATURE-----
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-0.7.0-r1.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-0.7.0-r1.ebuild
index b9042b25356b..2889c06d24c6 100644
--- a/lxqt-base/lxqt-meta/lxqt-meta-0.7.0-r1.ebuild
+++ b/lxqt-base/lxqt-meta/lxqt-meta-0.7.0-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/lxqt-base/lxqt-meta/lxqt-meta-0.7.0-r1.ebuild,v 1.3 2015/01/30 16:32:19 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxqt-base/lxqt-meta/lxqt-meta-0.7.0-r1.ebuild,v 1.4 2015/02/10 13:27:58 yngwin Exp $
 
 EAPI=5
 
@@ -51,7 +51,7 @@ RDEPEND="
 	sddm? (
 		x11-misc/sddm )
 	ssh-askpass? (
-		~net-misc/lxqt-openssh-askpass-${PV} )
+		~lxqt-base/lxqt-openssh-askpass-${PV} )
 "
 
 pkg_postinst() {
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-0.8.0.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-0.8.0.ebuild
index 64832aa055ed..2d443279c48a 100644
--- a/lxqt-base/lxqt-meta/lxqt-meta-0.8.0.ebuild
+++ b/lxqt-base/lxqt-meta/lxqt-meta-0.8.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/lxqt-base/lxqt-meta/lxqt-meta-0.8.0.ebuild,v 1.2 2015/01/30 16:32:19 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxqt-base/lxqt-meta/lxqt-meta-0.8.0.ebuild,v 1.3 2015/02/10 13:27:58 yngwin Exp $
 
 EAPI=5
 
@@ -26,7 +26,7 @@ RDEPEND="
 	~lxqt-base/lxqt-session-${PV}
 	~x11-misc/pcmanfm-qt-${PV}
 	admin? (
-		~app-admin/lxqt-admin-${PV} )
+		~lxqt-base/lxqt-admin-${PV} )
 	icons? (
 		>=lxde-base/lxde-icon-theme-0.5 )
 	lightdm? (
@@ -45,5 +45,5 @@ RDEPEND="
 	sddm? (
 		>=x11-misc/sddm-0.10.0 )
 	ssh-askpass? (
-		~net-misc/lxqt-openssh-askpass-${PV} )
+		~lxqt-base/lxqt-openssh-askpass-${PV} )
 "
diff --git a/net-misc/lxqt-openssh-askpass/ChangeLog b/lxqt-base/lxqt-openssh-askpass/ChangeLog
similarity index 87%
rename from net-misc/lxqt-openssh-askpass/ChangeLog
rename to lxqt-base/lxqt-openssh-askpass/ChangeLog
index 890a882d9360..aeeaa5411e35 100644
--- a/net-misc/lxqt-openssh-askpass/ChangeLog
+++ b/lxqt-base/lxqt-openssh-askpass/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-misc/lxqt-openssh-askpass
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/lxqt-openssh-askpass/ChangeLog,v 1.4 2014/11/08 17:47:11 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxqt-base/lxqt-openssh-askpass/ChangeLog,v 1.1 2015/02/10 13:23:13 yngwin Exp $
 
 *lxqt-openssh-askpass-0.8.0 (08 Nov 2014)
 
diff --git a/lxqt-base/lxqt-openssh-askpass/Manifest b/lxqt-base/lxqt-openssh-askpass/Manifest
new file mode 100644
index 000000000000..b4513bf9e545
--- /dev/null
+++ b/lxqt-base/lxqt-openssh-askpass/Manifest
@@ -0,0 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST lxqt-openssh-askpass-0.7.0.tar.xz 14276 SHA256 764cac4eee716d19975f4f0f888a9341d74073519b19f331b7593362dbc878d5 SHA512 aff27c83f075427aa8fe8e5fa463a45eafc86da673f4feb618c3b101b37bbcc30224eb28146ca6652428a144b47f44ee62a37ca9c31fab5fcec81a8470d88e82 WHIRLPOOL ddf5459e364ff3ceff69bd44bcfac68da739dc977c3c2706a0c4fd22182d06009fd46ce62eba6c8e0b9bb268c43f3db7c84f0aa344350a399730c332b48aa04c
+DIST lxqt-openssh-askpass-0.8.0.tar.xz 14452 SHA256 be32a3d197aced5b4bb05231f281fb19312952ce22f973c2211633e0b2a03719 SHA512 c19c1c53d391915394143a81e655aedbc31087edf8580ec18276bfb65c5d1ac2bb9554b18fdf1838b8ea032f13a9efd4e8cae4677321653a67448eddf7330972 WHIRLPOOL 9ff59915eac4c0034f950932d9a01e8ef6202473f2e0c817c3739bb814eae61f469e6ba10f7cab73f263bddb017a8e82f9992746a6642d300ba7d58a1410d532
+EBUILD lxqt-openssh-askpass-0.7.0.ebuild 877 SHA256 1dafea3b2edf4b1cc6334e08fddceb1a5e4149c26fe02363525bda71468e2bfb SHA512 c5944e1c214c603b8ab8b62ecb548fdc1c9b12a537790d1025df61614d5bb49654626481f10fb612ab750186145458bef33d7337479e7fd8f354b04ba8726e83 WHIRLPOOL 94d525d95ffc3defa6419dfbf9027634861bf654679604dc7a42dfa34fb96fe343d2dac1a6f5202ffd7db65077252dc039be22609d4449f677893f68f50cf81e
+EBUILD lxqt-openssh-askpass-0.8.0.ebuild 1075 SHA256 9dad4f813ce620c44e2b000be788aba3c9ced47993d9543f563e571dc8d478df SHA512 fe9d057159d8e7e955e22e732224103929d8bcbd8b314376dbc6c95c9664c562ef28f2d11fc7a0b3fc1fce9823b327a2ce2175f22dafc6e6b2ce51eae60337cd WHIRLPOOL 29fed39675b14c8682b2ca48da5c6987cea23d0dd48da049cfad2ee017c172c049960344f5898c36141c698813007ea8333c71965ac6d2ca0386fca745f8988f
+MISC ChangeLog 926 SHA256 2fa0ddd7d6498a522bb7770e3008b408db800c0f7d0782ed45793811f72fca46 SHA512 d5c8f13191101a6aae75d4fcd6371d1dd0bbffb7f77554427fb4256ae51ede3fa720fd1d308e9f90fd38b0f4c5b8c37964f467622be9c11e1b1cc9afe0973f1d WHIRLPOOL 93cc54f872805b401fd5f77ef438e16763a26481bdeccbd8d6d98b6f6d07e5ba91cb9e1e2c1d99e1812b2f622423fde60e327956e8c6f9e9d822852d220f32e0
+MISC metadata.xml 263 SHA256 d23df106b61ed123144d9d24eea822badfbe6cb7d8d4ec61215af73b4c8f1fc6 SHA512 9f99b13f568e1cfda82dc35cd0b95fba565d5f18909db7b0d7dff75273cf4076a68288768ee5f65a70485833971fb3e511919a9e80d09e0d96f3a38744435d3a WHIRLPOOL 6bfa4c8737764e7450195f3ffd2e8fe8531ad44dfa02b0d7819678eeb7898280f07ed13ac87e0158abb6d9b804ee617b7683f73a4cd17db822419eba55fa62c6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCABmBQJU2gZDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOsjgP/1h+EK12ndNYqkChhAb+vPJA
+s6EBHsSZUqxyWyORXa07/FbGxIdKUbPEFOIdfQm5IUxfmPMmW49+ubRV9hpTLTZW
+KTAmzQ2iwmzAlosbcM/lzRJybojPVa8NhuYE5Dn2oVcc4ud2t44LMhQ2GAOjW1Il
+VyAz7/jMFPppbtFg+QELPOlyGALKLVkjG9tyBLnSoUSKjCBuP/fGXyjphaeDJbmC
+M9mo2PW4eQtajOYb+IzwBPeyChvJYFXqpvUybQ9n++Gv+9rtoB0f5WyOCEtt/xDA
+243s9tcbdSABoIil4OPlGFAvbforYJb2EYtmuprPocLl3+X8Rgop2hsFpAphsDBY
+zQI8bMG6GWHVeN8O5TedEk7lMkj3OLwSx79cOWvOcFksJaMpDn5gjosmGRgyIWUI
+n1rcrz05/p8Zg+cQ/hEM+veDBJhRxWsfRuvR+BFGYlaa8X6dteWnrCy+xDgZ0hjs
+eiSyv3Uvsc6J75NrAJ/dyBWx4MvydapvbSp7WhEjARVrgpdQAAiNtbsa2zd+BqjS
++l5itNhjNUWAxmSMZGHL9PN3fYoWcDWWTJn/pVNMlsmMJd0zf/kyFIy4K1lUScrW
+Hy6FICFO/CThSOiwn/O0tNKS6LoMKTXbjOrjTuhjKFsewJSptBdrI7WKnMwHWWJ2
+URJsVT2V8t8XJ35/NUfN
+=nQuD
+-----END PGP SIGNATURE-----
diff --git a/net-misc/lxqt-openssh-askpass/lxqt-openssh-askpass-0.7.0.ebuild b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.7.0.ebuild
similarity index 77%
rename from net-misc/lxqt-openssh-askpass/lxqt-openssh-askpass-0.7.0.ebuild
rename to lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.7.0.ebuild
index 4d347c6503fa..4f863d655481 100644
--- a/net-misc/lxqt-openssh-askpass/lxqt-openssh-askpass-0.7.0.ebuild
+++ b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/lxqt-openssh-askpass/lxqt-openssh-askpass-0.7.0.ebuild,v 1.5 2014/11/16 12:43:49 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.7.0.ebuild,v 1.1 2015/02/10 13:23:13 yngwin Exp $
 
 EAPI=5
 inherit cmake-utils
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
 else
-	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
+	SRC_URI="http://downloads.lxqt.org/lxqt/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
diff --git a/net-misc/lxqt-openssh-askpass/lxqt-openssh-askpass-0.8.0.ebuild b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.8.0.ebuild
similarity index 81%
rename from net-misc/lxqt-openssh-askpass/lxqt-openssh-askpass-0.8.0.ebuild
rename to lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.8.0.ebuild
index 6dbdc185174b..10a656e260b6 100644
--- a/net-misc/lxqt-openssh-askpass/lxqt-openssh-askpass-0.8.0.ebuild
+++ b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/lxqt-openssh-askpass/lxqt-openssh-askpass-0.8.0.ebuild,v 1.2 2014/11/16 12:43:49 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.8.0.ebuild,v 1.1 2015/02/10 13:23:13 yngwin Exp $
 
 EAPI=5
 inherit cmake-utils
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
 else
-	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
+	SRC_URI="http://downloads.lxqt.org/lxqt/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/net-misc/lxqt-openssh-askpass/metadata.xml b/lxqt-base/lxqt-openssh-askpass/metadata.xml
similarity index 100%
rename from net-misc/lxqt-openssh-askpass/metadata.xml
rename to lxqt-base/lxqt-openssh-askpass/metadata.xml
diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 1f540f17241e..4565aefed2ce 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.603 2015/02/10 09:47:52 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.604 2015/02/10 16:06:57 chithanh Exp $
+
+  10 Feb 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  mesa-10.4.4.ebuild:
+  Remove build fix again as it was already applied upstream, bug #539626.
 
   10 Feb 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   mesa-10.4.4.ebuild:
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index b77f2abf3d4b..4eb6b1dcebb1 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -38,31 +38,31 @@ EBUILD mesa-10.3.5.ebuild 14900 SHA256 8c2fa274efdf687ace1591a9f6feda155c845c022
 EBUILD mesa-10.3.7-r1.ebuild 14960 SHA256 1d33cd364e996865ad787a2f7f8958fe6b3ff42fe81e0b04401e1f4a35fd7fdf SHA512 99facb07e9ad51eb3cb0faceb767ca68240255181dc4c93d04ea3e98dbcdbe2472ed70c849eec5855d109be19cb43127fbb5396a026b1264ed1d60c0742e7dcb WHIRLPOOL dc5165416803a18256923ce3040eadaccbcec774e7248f29c4c2e09684bf5274c0737d64b694c12c367a1d1abb2956b6bf6242cd4fd4aeefa0b0cf05eaf8217a
 EBUILD mesa-10.3.7-r2.ebuild 13834 SHA256 f7a4c4072d6c1a3e943c7ad9807f4236917c4fc2cab00db941db5fe191890ada SHA512 95cacef6c9489539ae1f5d66e26bc28266aa9492048cf1fb83904b67d1b8b70432bc48cb617a43bd207f574b6ee6e661422b14dcdafa6cb9a6fb9f016f9747f3 WHIRLPOOL aaad9e947a7c86d6f0c43e9531a2bda8f102de08cccf49d6a6b03fedabc0f5ac5eba75dddf61f26dbc6bb865599e41d7b0bdc3042b99699b7f370a639e575371
 EBUILD mesa-10.4.3.ebuild 13807 SHA256 3e73db9e5af5c2fce6133705b447322dc6c3f3079ef6a5a03bbc35057a36f660 SHA512 d78b76e744c2e35e339f2f410c27f4a8a1e6c2c3dd475662f4d5ad097167520c9eef75dc840caa3e7516c59f89f3a20345724efde140c99311642db0b5adc41a WHIRLPOOL d5ba9c1cb22c471f58979425f674fa9bd504bd0b31dcb07543597e485db038111e7bc36041c7f7abba8246bcddee37ff6b9700c60d2efa567f6971ae4b054ebf
-EBUILD mesa-10.4.4.ebuild 13941 SHA256 85483960a0f7bf0b84671c12c21f13a92c20a724e25aa2f10ab28c5e61a7a22f SHA512 e5de1e136b0906fd4517f38d52c776c232dec7c2ad6d3085dbf3d3db0c33b900fd4e557598a8c1756c5ebc00bc0c7d80149c9c9b33cc5d839f8c7f0035549ccb WHIRLPOOL 51db310ccb7ae0287277261e14fccc226c0f8ca663692e6c3135d7284816bfc2700c970cf304546c2e4d8b72dfafe60a6f319d309ee8d886f1114cb31d812760
+EBUILD mesa-10.4.4.ebuild 13884 SHA256 67c46098fa23e1a2c44e70b490a3c621153ba6b604d0017db2266b9074c9e2c1 SHA512 8e0f2274b9c6f792523e61b2703c12d9e235f7d84ddd098ee7da43c1db757d097764c75eb4bf233cf12cd717ac57dc135cd9af3d05213b470b9d64e808b31209 WHIRLPOOL f1a5ca2593a3e0eadea88666df9c62ae198cfc81ecbf9b3545713dd83893f163252fb1847587ee24ac27f8933046a1a5839f74236ccc6302f9e7d3267d5d4661
 EBUILD mesa-7.10.3.ebuild 9833 SHA256 8d0fcf291314e22dfcc1e4a913320d67390920fae9dcbb1cc664989e8ae80fcd SHA512 71b145c6725f4ccf2ab7f99b45ec366c56fa9d3d0f602525cc95ad47f616563fbb6f8ff499408c6b0352b92b92413e130165fbddc64f4e09a3de3ce854533fc4 WHIRLPOOL 0084102900d7d9d4f2c206cb8f8c4087d0bfe974e60544b8afda1273a759d2a441ec8803f13fd0dc98a3bdef3cde69f11ef42128969e0fef4cc8c1257942765a
 EBUILD mesa-7.11.2.ebuild 9993 SHA256 7b53334b0ce4ccd58e0a6cf64c1211f985321f0a7bc345a3fc5340738798a4aa SHA512 5f6dd871a7ff804ffc6da7b3f8d936595dfa7b1e9d0fe6ce728c8ebf90c4ad8f38231d7a565fa3fce8eeb855ee1bd53abec1e71a6ff0c9c7b5e38c11511d1445 WHIRLPOOL d1fabc18aa97e308058ca2878bdf591c241047ef3b89e145936c859b3524e96cee6077a96d2622bc1ed4ed698c9d0bc2c3e2dacd5bd8b3794bad35f1df387133
 EBUILD mesa-8.0.4-r1.ebuild 10791 SHA256 99d033fcc41f3053bc46793022ba0f7a05b490ee813889022b202568937edff2 SHA512 b8f9b906827f3c66473feb90b3022c671b49783c411a23f61985e3361e9e8545397ba64b0e96cc0314d7f8a004aa31f7a23be57457908b9fb2774ad06e0ff1e3 WHIRLPOOL 12088fffae079e20c38881251f67948fec22d4dab2da46010d24f4b685fb14a783126bdcd1be977eb19a23e41225f897485d7e180a84a2b251b3882d0eb95a64
 EBUILD mesa-9.0.3.ebuild 11113 SHA256 ef9c8cab66b5d57787ed19ccef7e945589a652abdc9eda54cadb41f1e8ab7ebc SHA512 e5d4261beaa7f93c7382b2eab572bda5424b02c2eadcfea5e81ca8a0439fbc40f76a7c3887a57b73249e2c6a8599a42f3a536485ec7ec2ec6d06d4d3cae2901a WHIRLPOOL 91734df6565e97391d86ff5122e33820b82ae74ca8a7ff4c83b825a568ea87a79b1378d612b5f83a40abb5f98f4d71a84718e114a5c5a9bca5aaf9c426a7fdd8
 EBUILD mesa-9.1.6.ebuild 11043 SHA256 4e614a3bb2be81876d09618ed357ed36bde336b53e57794fa14c888990569b1d SHA512 d109bdc955ecc0e6357691c42be1bbde1cb3c2fb27b2a5b6c5013c5d54e587f5f9d486ed03dba1440346e4c4d3ed9366b7f5327754a497d4b2cc25e0b7660e6a WHIRLPOOL b421eb3bbd229a23ae3853745f17116ed77a5cfbdb0dd0b252a664a20de002655dfea626a42f10933eb14b9538f6562ce5b1deb74af3156b2df4510aeba41211
 EBUILD mesa-9.2.5-r1.ebuild 13934 SHA256 f23057faf60d26d7234eb79448efa568700418cbe27abf5dad12ae2e5b6df3fc SHA512 7bc40298c615f01aff79a5fa3f6a285f7e2359ea85c83be98f28cd587eea8026f7e9dbe37cc0176252a07606a682e1be59be91fe8e97c4872ca2bbeb8ef825c0 WHIRLPOOL 01b1f5938ced676b7b0ded85aa14d9ceeb844e3587c5ed527d67f1f40f3b47feaad49137209b21d9388d1209d407ff139d49c814bb5d2d8b41bcd1ab430a7a7d
-MISC ChangeLog 96892 SHA256 44449cf6d578494f6f747544ed3ea06f0db94722c5a2d76999fdea9fd43944b4 SHA512 dbda6f7d1f023d06a13d3985d33249b1f7d1adad74a772734dddd2cc92338d3067129fb711fecdbb9ab67cb661a994c3468e3bf0c84fa812facb63bde7f869ea WHIRLPOOL faa15f0329384ebf8dfd844cd28556712639e07415fa94080224e5c05bd40193d7d94d3b05ef1969dd288391d0e316e71dd06e8b36be22349048a4036e7732d0
+MISC ChangeLog 97058 SHA256 03502ba829279e1a072c5875b843bebcccde3926c92217e6eecce3bbc63b88cc SHA512 443be161a407af864bd8f713095af2bb18376ed960b4e1809857551e45ffef2458bcdba0615a81119d6ecf5e9e2d8f8dfde61b24afa193893fef93b8c21ad0f3 WHIRLPOOL 234352c42be2c11975af829c7f7db3bad5ba437fcdd2039d821ebcb5f7bc7ad855b0bdf477dd06af030cae41a07c9832a74f2e991a46daace79134d956cb8b85
 MISC metadata.xml 2404 SHA256 5f1078b6c20d702857df5c10bf06090287ea6778018c9a41a3e5c32609d320ae SHA512 2fb42a0145c765e26bae2b44c0e43641e7f6948a0b6e238827eb44e612521dfc5defaa2a0d5c9cd70f76512280fa9849ba71241f22b164be9858d7db0aff9007 WHIRLPOOL 4af80f8aada5bcbe5e7f0dbe94ec10b81c3b50a4cad87c932772f43bac76722c6d2d10dfd8e5323284b009369296372ef68028b64f3f8e7eb267c60479df6368
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU2dPaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJU2iyyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy
-MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYRPegP/jPApwsYbzFj3E2aFOXpvWVu
-o7ZgPW97BrbqCxn8P6FjxBoEZVfoGQXBFw8cZJJdsFrDXx1+D3IASksrAEB2ZUuf
-Oht9swNOZUUqjdPYz8RvDihOPezzbHRvVzW773Pqn3SjCPlcHv64EN4MvOh/vj0H
-SjGqT0K4yfTaZorcKMhEk2SVxinF69Lum5UOsM+K5uGhajenPOLPwsBK3Trr5Mpe
-vSxOOCAgzm1fRz1sabefvAg1z63YzHisldgbG1L+bOVoJwHxXQ5+4S70dVSMTejO
-+tKe7UCdZMYrMuP2Zq5Ry25c+fvwriCZVskHmTiwcfyDC2sVZYnY6G/Z44mkiEv1
-yD05WHt0/sYb0sGc3CfaDk4SYSbegcfEq+tDFOP07abuYnFo+yCJ88aglAVNzTvz
-8b7bTHsJRaKLoTXfPntT8LYa1Ng9mvjPP+5mXblGhU3GH5ZKwttSaG85kmnWLFfo
-Ysinm4myKbiaFAprDZDLkNtWKveTtK8bSjHDrqlIkLYafv8/Q9DZK+vjPuE/Lpeq
-hGtK7Qb5bGRjPswfONDPbMLKS93ULgXhh9PX7dbwW4Vb0WAGb1BUdG77ALo9ib6b
-4A9oS+ZBm9JJ9+sdU5iT8zh+sR7WCE7Hp1cjOjJhGqt7EEzYNyJLyvydZCN7Mntm
-AL2JcJwYVMBSutxUrAUY
-=PPEe
+MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYRR8kP/0osIDYXb7ddmiSs1CfXfGAs
+KjA4rr0k7jVXy+/KmeeDfLYls/AExefW/RmEyAVyGmBv+2lQ8WQIgl8kjTxbmbQy
+Z+LyybX9zbcMAiYkjF4q7nAKPYp88r5QeA+Oq50AAtdUeKiWsjQK0XgoXBLs+OYL
+pOeeEoWxvdR1fEAxJkkIcgiuhwW0SzU3DkQ/kbiR2a0bIUConKC1xJi6Pbkpv0pe
+Fdt/xaQJjxdH3Ud4oEHCMXmkJacxolnh00cr5Q3pAT2kYQBfh6rU0hAVmzyuu61M
+OxwPfgHqypOBhEjcfw2j/8Oll8ylkvUUtbWMCxpgJa5rmvga+jdD5k2hgFHBO54z
+KHJp865fy45JkJsCwZh/vqgXC0N9843G+xbb/0g5pJJG4H4TTXXFR48DG0vQW+Y8
+R74PM9/KE66rt2+kwcXYzwDuXVgGFYTha3ppAQRBYjYWgCs2CWCgejV3UKZuuhpa
+e5Ftea/YyshRxFL8HLAQOFrdKl2nXoW4xKnOFH/yboSRGO2e8AUEXQyE8mNmymEi
+uIdc+Vc2WlFm3gCbNBYdkqC4Dntvois18+UtW/LXIlR9RNvt16VXOQFilTATH8FA
+ZNloKrSBvV6A4RffnjQbOmW8kzdrkdevHx1Ee23YEP9xLIGg1OHg6/9gSNan3v/i
+bAB6NypTcNc24dtzq2ER
+=e8vB
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/mesa-10.4.4.ebuild b/media-libs/mesa/mesa-10.4.4.ebuild
index 52522777a21d..655ba81e169b 100644
--- a/media-libs/mesa/mesa-10.4.4.ebuild
+++ b/media-libs/mesa/mesa-10.4.4.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-libs/mesa/mesa-10.4.4.ebuild,v 1.2 2015/02/10 09:47:52 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.4.4.ebuild,v 1.3 2015/02/10 16:06:57 chithanh Exp $
 
 EAPI=5
 
@@ -214,8 +214,6 @@ src_prepare() {
 		epatch
 	fi
 
-	epatch "${FILESDIR}"/${PN}-10.3.7-dont-use-clrsb.patch
-
 	# fix for hardened pax_kernel, bug 240956
 	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
 
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 85fd751322f8..db3b70de96c9 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 10 Feb 2015 12:36:51 +0000
+Tue, 10 Feb 2015 17:06:51 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 85fd751322f8..d7e5533c1b3f 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 10 Feb 2015 12:36:51 +0000
+Tue, 10 Feb 2015 17:06:52 +0000
diff --git a/metadata/md5-cache/app-editors/bluefish-2.2.2 b/metadata/md5-cache/app-editors/bluefish-2.2.2
deleted file mode 100644
index 5d490d5e3db4..000000000000
--- a/metadata/md5-cache/app-editors/bluefish-2.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm setup
-DEPEND=x11-libs/gtk+:3 gnome-extra/gucharmap:2.90 sys-libs/zlib spell? ( app-text/enchant ) >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 virtual/pkgconfig x11-libs/pango nls? ( sys-devel/gettext dev-util/intltool ) python? ( =dev-lang/python-2* )
-DESCRIPTION=A GTK HTML editor for the experienced web designer or programmer
-EAPI=4
-HOMEPAGE=http://bluefish.openoffice.nl/
-IUSE=nls python spell
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:3 gnome-extra/gucharmap:2.90 sys-libs/zlib spell? ( app-text/enchant ) python? ( =dev-lang/python-2* )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.bennewitz.com/bluefish/stable/source/bluefish-2.2.2.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=28c8737e85f604fbc115e4133702ec27
diff --git a/metadata/md5-cache/app-editors/bluefish-2.2.3 b/metadata/md5-cache/app-editors/bluefish-2.2.3
deleted file mode 100644
index f20cba8e1c5c..000000000000
--- a/metadata/md5-cache/app-editors/bluefish-2.2.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm setup
-DEPEND=x11-libs/gtk+:3 gnome-extra/gucharmap:2.90 sys-libs/zlib spell? ( app-text/enchant ) >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 virtual/pkgconfig x11-libs/pango nls? ( sys-devel/gettext dev-util/intltool ) python? ( =dev-lang/python-2* )
-DESCRIPTION=A GTK HTML editor for the experienced web designer or programmer
-EAPI=4
-HOMEPAGE=http://bluefish.openoffice.nl/
-IUSE=nls python spell
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:3 gnome-extra/gucharmap:2.90 sys-libs/zlib spell? ( app-text/enchant ) python? ( =dev-lang/python-2* )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.bennewitz.com/bluefish/stable/source/bluefish-2.2.3.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=280750994ed3864a276f27605651bd93
diff --git a/metadata/md5-cache/app-editors/bluefish-2.2.3-r1 b/metadata/md5-cache/app-editors/bluefish-2.2.3-r1
deleted file mode 100644
index 14ff56552893..000000000000
--- a/metadata/md5-cache/app-editors/bluefish-2.2.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm setup
-DEPEND=x11-libs/gtk+:3 gnome-extra/gucharmap:2.90 sys-libs/zlib python? ( >=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(+)] ) spell? ( app-text/enchant ) >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 virtual/pkgconfig x11-libs/pango nls? ( sys-devel/gettext dev-util/intltool )
-DESCRIPTION=A GTK HTML editor for the experienced web designer or programmer
-EAPI=5
-HOMEPAGE=http://bluefish.openoffice.nl/
-IUSE=nls python spell python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:3 gnome-extra/gucharmap:2.90 sys-libs/zlib python? ( >=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(+)] ) spell? ( app-text/enchant )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.bennewitz.com/bluefish/stable/source/bluefish-2.2.3.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=35670f7180f6bf02169c94128554868e
diff --git a/metadata/md5-cache/app-text/paperwork-0.2 b/metadata/md5-cache/app-text/paperwork-0.2
index ca7ee4ce5d5d..0aa79676ee76 100644
--- a/metadata/md5-cache/app-text/paperwork-0.2
+++ b/metadata/md5-cache/app-text/paperwork-0.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=app-text/poppler[introspection] dev-python/joblib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycountry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyenchant[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyinsane-1.3.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyocr-0.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-levenshtein[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/whoosh[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/glade[introspection,python] sci-libs/scikits_learn[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scikits_image[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:3[introspection] 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(-)]
+DEPEND=app-text/poppler[introspection] dev-python/joblib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycountry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyenchant[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyinsane-1.3.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyocr-0.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-levenshtein[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/whoosh[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/glade[introspection,python] sci-libs/scikits_learn[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scikits_image[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:3[introspection] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=a personal document manager for scanned documents (and PDFs)
 EAPI=5
 HOMEPAGE=https://github.com/jflesch/paperwork
 IUSE=python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=app-text/poppler[introspection] dev-python/joblib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycountry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyenchant[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyinsane-1.3.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyocr-0.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-levenshtein[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/whoosh[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/glade[introspection,python] sci-libs/scikits_learn[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scikits_image[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:3[introspection] 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(-)]
+RDEPEND=app-text/poppler[introspection] dev-python/joblib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycountry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyenchant[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyinsane-1.3.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyocr-0.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-levenshtein[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/whoosh[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/glade[introspection,python] sci-libs/scikits_learn[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scikits_image[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:3[introspection] 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=https://github.com/jflesch/paperwork/archive/0.2.tar.gz -> paperwork-0.2.tar.gz
 _eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=ebaaf7c020ab6d16861dcf56a0e950c2
+_md5_=54c44bfb4db11b8098be6554d938259d
diff --git a/metadata/md5-cache/app-text/paperwork-0.2.1 b/metadata/md5-cache/app-text/paperwork-0.2.1
index 104890916e47..4162518684d6 100644
--- a/metadata/md5-cache/app-text/paperwork-0.2.1
+++ b/metadata/md5-cache/app-text/paperwork-0.2.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=app-text/poppler[introspection] dev-python/joblib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycountry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyenchant[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyinsane-1.3.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyocr-0.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-levenshtein[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/termcolor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/whoosh[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/glade[introspection,python] sci-libs/scikits_learn[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scikits_image[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:3[introspection] 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(-)]
+DEPEND=app-text/poppler[introspection] dev-python/joblib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycountry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyenchant[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyinsane-1.3.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyocr-0.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-levenshtein[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/termcolor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/whoosh[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/glade[introspection,python] sci-libs/scikits_learn[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scikits_image[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:3[introspection] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=a personal document manager for scanned documents (and PDFs)
 EAPI=5
 HOMEPAGE=https://github.com/jflesch/paperwork
 IUSE=python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=app-text/poppler[introspection] dev-python/joblib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycountry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyenchant[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyinsane-1.3.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyocr-0.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-levenshtein[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/termcolor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/whoosh[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/glade[introspection,python] sci-libs/scikits_learn[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scikits_image[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:3[introspection] 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(-)]
+RDEPEND=app-text/poppler[introspection] dev-python/joblib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycountry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyenchant[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyinsane-1.3.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyocr-0.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-levenshtein[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/termcolor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/whoosh[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/glade[introspection,python] sci-libs/scikits_learn[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scikits_image[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:3[introspection] 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=https://github.com/jflesch/paperwork/archive/0.2.1.tar.gz -> paperwork-0.2.1.tar.gz
 _eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=6cf8f32bd6ebc65f1265e9324803f779
+_md5_=28c270915282aff4fbf565b6e6686dfa
diff --git a/metadata/md5-cache/app-text/paperwork-0.2.2 b/metadata/md5-cache/app-text/paperwork-0.2.2
index b53ec126e3ee..800f0fe1bc82 100644
--- a/metadata/md5-cache/app-text/paperwork-0.2.2
+++ b/metadata/md5-cache/app-text/paperwork-0.2.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=app-text/poppler[introspection] dev-python/joblib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycountry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyenchant[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyinsane-1.3.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyocr-0.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-levenshtein[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/termcolor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/whoosh[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/glade[introspection,python] sci-libs/scikits_learn[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scikits_image[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:3[introspection] 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(-)]
+DEPEND=app-text/poppler[introspection] dev-python/joblib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycountry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyenchant[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyinsane-1.3.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyocr-0.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-levenshtein[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/termcolor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/whoosh[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/glade[introspection,python] sci-libs/scikits_learn[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scikits_image[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:3[introspection] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=a personal document manager for scanned documents (and PDFs)
 EAPI=5
 HOMEPAGE=https://github.com/jflesch/paperwork
 IUSE=python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=app-text/poppler[introspection] dev-python/joblib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycountry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyenchant[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyinsane-1.3.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyocr-0.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-levenshtein[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/termcolor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/whoosh[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/glade[introspection,python] sci-libs/scikits_learn[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scikits_image[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:3[introspection] 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(-)]
+RDEPEND=app-text/poppler[introspection] dev-python/joblib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycountry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyenchant[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyinsane-1.3.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyocr-0.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-levenshtein[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/termcolor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/whoosh[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/glade[introspection,python] sci-libs/scikits_learn[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scikits_image[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:3[introspection] 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=https://github.com/jflesch/paperwork/archive/0.2.2.tar.gz -> paperwork-0.2.2.tar.gz
 _eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=9a8ffa6f07778ad4f24468d7f609cccc
+_md5_=47bfecf89b0550d92e1d4f220f236418
diff --git a/metadata/md5-cache/dev-python/argcomplete-0.8.1 b/metadata/md5-cache/dev-python/argcomplete-0.8.1
index 7c9c65256980..c30f226ce7f7 100644
--- a/metadata/md5-cache/dev-python/argcomplete-0.8.1
+++ b/metadata/md5-cache/dev-python/argcomplete-0.8.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/a/argcomplete/argcomplete-0.8.1.tar.gz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=dc1adc4ad125c1792f48e8e72856f93f
+_md5_=9dad22adf3d4c4a83f89a775909342dd
diff --git a/metadata/md5-cache/dev-python/pyringe-1.0 b/metadata/md5-cache/dev-python/pyringe-1.0.2
similarity index 91%
rename from metadata/md5-cache/dev-python/pyringe-1.0
rename to metadata/md5-cache/dev-python/pyringe-1.0.2
index 1a69028f0fc5..df5c0a39c798 100644
--- a/metadata/md5-cache/dev-python/pyringe-1.0
+++ b/metadata/md5-cache/dev-python/pyringe-1.0.2
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 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=mirror://pypi/p/pyringe/pyringe-1.0.tar.gz
+SRC_URI=mirror://pypi/p/pyringe/pyringe-1.0.2.tar.gz
 _eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=1741c5763d1ca6469e90122c6e2eecba
+_md5_=fc3ff3ce958106289373ea8a9d003301
diff --git a/metadata/md5-cache/dev-python/pyroma-1.5 b/metadata/md5-cache/dev-python/pyroma-1.7
similarity index 95%
rename from metadata/md5-cache/dev-python/pyroma-1.5
rename to metadata/md5-cache/dev-python/pyroma-1.7
index 861ed743f015..1b608957e860 100644
--- a/metadata/md5-cache/dev-python/pyroma-1.5
+++ b/metadata/md5-cache/dev-python/pyroma-1.7
@@ -9,6 +9,6 @@ LICENSE=MIT
 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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
-SRC_URI=mirror://pypi/p/pyroma/pyroma-1.5.zip
+SRC_URI=mirror://pypi/p/pyroma/pyroma-1.7.zip
 _eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=d4637a8fcb0c482b11e62c701db42a4b
+_md5_=818b985044b7e47dc815082cbe7bdf7b
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-1.580.2 b/metadata/md5-cache/dev-util/jenkins-bin-1.580.3
similarity index 70%
rename from metadata/md5-cache/dev-util/jenkins-bin-1.580.2
rename to metadata/md5-cache/dev-util/jenkins-bin-1.580.3
index dd51fee280fb..fd741af4809d 100644
--- a/metadata/md5-cache/dev-util/jenkins-bin-1.580.2
+++ b/metadata/md5-cache/dev-util/jenkins-bin-1.580.3
@@ -8,6 +8,6 @@ LICENSE=MIT
 RDEPEND=media-fonts/dejavu !dev-util/jenkins-bin:0 virtual/jre
 RESTRICT=mirror
 SLOT=lts
-SRC_URI=http://mirrors.jenkins-ci.org/war-stable/1.580.2/jenkins.war -> jenkins-bin-1.580.2.war
+SRC_URI=http://mirrors.jenkins-ci.org/war-stable/1.580.3/jenkins.war -> jenkins-bin-1.580.3.war
 _eclasses_=user	f54e098dd38ba1c0847a13e685b87747
-_md5_=8484a6eab0d177cdf123a8f41759c0f2
+_md5_=2a9034616f0cdbcac49376643c330653
diff --git a/metadata/md5-cache/games-util/gamepick-0.35 b/metadata/md5-cache/games-util/gamepick-0.35
index 6f6c4137c639..c4f71d467279 100644
--- a/metadata/md5-cache/games-util/gamepick-0.35
+++ b/metadata/md5-cache/games-util/gamepick-0.35
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=x11-libs/gtk+:2 virtual/pkgconfig
 DESCRIPTION=Launch opengl games with custom graphic settings
-EAPI=2
+EAPI=5
 HOMEPAGE=http://www.rillion.net/gamepick/index.html
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/gtk+:2 games-misc/games-envd
 SLOT=0
 SRC_URI=http://www.rillion.net/gamepick/gamepick-0.35.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=f3e77990eeeb6858e239c34f60c9d6a1
+_md5_=e2225b960bae97f7703cede7b0abbc74
diff --git a/metadata/md5-cache/lxqt-base/libsysstat-0.3.0 b/metadata/md5-cache/lxqt-base/libsysstat-0.3.0
new file mode 100644
index 000000000000..3ee8ba17be3e
--- /dev/null
+++ b/metadata/md5-cache/lxqt-base/libsysstat-0.3.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/linguist-tools:5 dev-qt/qtcore:5 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=A Qt-based interface to system statistics
+EAPI=5
+HOMEPAGE=http://lxqt.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1+
+RDEPEND=dev-qt/linguist-tools:5 dev-qt/qtcore:5
+SLOT=0
+SRC_URI=http://downloads.lxqt.org/libsysstat/0.3.0/libsysstat-0.3.0.tar.xz
+_eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=d639a5dd18966c5eb42c7fed12e337f5
diff --git a/metadata/md5-cache/app-admin/lxqt-admin-0.8.0 b/metadata/md5-cache/lxqt-base/lxqt-admin-0.8.0
similarity index 89%
rename from metadata/md5-cache/app-admin/lxqt-admin-0.8.0
rename to metadata/md5-cache/lxqt-base/lxqt-admin-0.8.0
index aef7d6b830a7..77b875f3de7f 100644
--- a/metadata/md5-cache/app-admin/lxqt-admin-0.8.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-admin-0.8.0
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-libs/liboobs dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 ~lxqt-base/liblxqt-0.8.0 >=dev-libs/libqtxdg-1.0.0 x11-libs/libX11
 SLOT=0
-SRC_URI=http://lxqt.org/downloads/lxqt/0.8.0/lxqt-admin-0.8.0.tar.xz
+SRC_URI=http://downloads.lxqt.org/lxqt/0.8.0/lxqt-admin-0.8.0.tar.xz
 _eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=c8c0b9edb2889258850c954e86da7d8a
+_md5_=c73921547934f475a4cf7cb3e1a58755
diff --git a/metadata/md5-cache/lxqt-base/lxqt-meta-0.7.0-r1 b/metadata/md5-cache/lxqt-base/lxqt-meta-0.7.0-r1
index 8c508500d91b..1188ab4e77d9 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-meta-0.7.0-r1
+++ b/metadata/md5-cache/lxqt-base/lxqt-meta-0.7.0-r1
@@ -5,7 +5,7 @@ HOMEPAGE=http://lxqt.org/
 IUSE=+icons lightdm lximage -minimal +policykit powermanagement sddm ssh-askpass
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=metapackage
-RDEPEND=>=lxde-base/lxmenu-data-0.1.2 ~lxqt-base/lxqt-about-0.7.0 ~lxqt-base/lxqt-common-0.7.0 ~lxqt-base/lxqt-config-0.7.0 ~lxqt-base/lxqt-config-randr-0.7.0 ~lxqt-base/lxqt-notificationd-0.7.0 ~lxqt-base/lxqt-panel-0.7.0 ~lxqt-base/lxqt-qtplugin-0.7.0 ~lxqt-base/lxqt-runner-0.7.0 ~lxqt-base/lxqt-session-0.7.0 ~x11-misc/pcmanfm-qt-0.7.0 icons? ( >=lxde-base/lxde-icon-theme-0.5 ) lightdm? ( x11-misc/lightdm ) lximage? ( media-gfx/lximage-qt ) !minimal? ( x11-wm/openbox >=x11-misc/obconf-qt-0.1.0 ) policykit? ( ~lxqt-base/lxqt-policykit-0.7.0 || ( sys-auth/consolekit[policykit(-)] sys-apps/systemd[policykit(-)] ) ) powermanagement? ( ~lxqt-base/lxqt-powermanagement-0.7.0 ) sddm? ( x11-misc/sddm ) ssh-askpass? ( ~net-misc/lxqt-openssh-askpass-0.7.0 )
+RDEPEND=>=lxde-base/lxmenu-data-0.1.2 ~lxqt-base/lxqt-about-0.7.0 ~lxqt-base/lxqt-common-0.7.0 ~lxqt-base/lxqt-config-0.7.0 ~lxqt-base/lxqt-config-randr-0.7.0 ~lxqt-base/lxqt-notificationd-0.7.0 ~lxqt-base/lxqt-panel-0.7.0 ~lxqt-base/lxqt-qtplugin-0.7.0 ~lxqt-base/lxqt-runner-0.7.0 ~lxqt-base/lxqt-session-0.7.0 ~x11-misc/pcmanfm-qt-0.7.0 icons? ( >=lxde-base/lxde-icon-theme-0.5 ) lightdm? ( x11-misc/lightdm ) lximage? ( media-gfx/lximage-qt ) !minimal? ( x11-wm/openbox >=x11-misc/obconf-qt-0.1.0 ) policykit? ( ~lxqt-base/lxqt-policykit-0.7.0 || ( sys-auth/consolekit[policykit(-)] sys-apps/systemd[policykit(-)] ) ) powermanagement? ( ~lxqt-base/lxqt-powermanagement-0.7.0 ) sddm? ( x11-misc/sddm ) ssh-askpass? ( ~lxqt-base/lxqt-openssh-askpass-0.7.0 )
 SLOT=0
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=ff7442e13235e7b04143433ab54baf0f
+_md5_=249d57a7bd559f13d87ac6ea633c4daa
diff --git a/metadata/md5-cache/lxqt-base/lxqt-meta-0.8.0 b/metadata/md5-cache/lxqt-base/lxqt-meta-0.8.0
index 7c1a6f2e0bed..352c4884b9ae 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-meta-0.8.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-meta-0.8.0
@@ -5,6 +5,6 @@ HOMEPAGE=http://lxqt.org/
 IUSE=admin icons lightdm lximage -minimal +policykit powermanagement sddm ssh-askpass
 KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
-RDEPEND=>=lxde-base/lxmenu-data-0.1.2 ~lxqt-base/lxqt-about-0.8.0 ~lxqt-base/lxqt-common-0.8.0 ~lxqt-base/lxqt-config-0.8.0 ~lxqt-base/lxqt-notificationd-0.8.0 ~lxqt-base/lxqt-panel-0.8.0 ~lxqt-base/lxqt-qtplugin-0.8.0 ~lxqt-base/lxqt-runner-0.8.0 ~lxqt-base/lxqt-session-0.8.0 ~x11-misc/pcmanfm-qt-0.8.0 admin? ( ~app-admin/lxqt-admin-0.8.0 ) icons? ( >=lxde-base/lxde-icon-theme-0.5 ) lightdm? ( x11-misc/lightdm ) lximage? ( >=media-gfx/lximage-qt-0.3.0 ) !minimal? ( x11-wm/openbox >=x11-misc/obconf-qt-0.1.0_p20141029 ) policykit? ( ~lxqt-base/lxqt-policykit-0.8.0 || ( sys-auth/consolekit[policykit(-)] sys-apps/systemd[policykit(-)] ) ) powermanagement? ( ~lxqt-base/lxqt-powermanagement-0.8.0 ) sddm? ( >=x11-misc/sddm-0.10.0 ) ssh-askpass? ( ~net-misc/lxqt-openssh-askpass-0.8.0 )
+RDEPEND=>=lxde-base/lxmenu-data-0.1.2 ~lxqt-base/lxqt-about-0.8.0 ~lxqt-base/lxqt-common-0.8.0 ~lxqt-base/lxqt-config-0.8.0 ~lxqt-base/lxqt-notificationd-0.8.0 ~lxqt-base/lxqt-panel-0.8.0 ~lxqt-base/lxqt-qtplugin-0.8.0 ~lxqt-base/lxqt-runner-0.8.0 ~lxqt-base/lxqt-session-0.8.0 ~x11-misc/pcmanfm-qt-0.8.0 admin? ( ~lxqt-base/lxqt-admin-0.8.0 ) icons? ( >=lxde-base/lxde-icon-theme-0.5 ) lightdm? ( x11-misc/lightdm ) lximage? ( >=media-gfx/lximage-qt-0.3.0 ) !minimal? ( x11-wm/openbox >=x11-misc/obconf-qt-0.1.0_p20141029 ) policykit? ( ~lxqt-base/lxqt-policykit-0.8.0 || ( sys-auth/consolekit[policykit(-)] sys-apps/systemd[policykit(-)] ) ) powermanagement? ( ~lxqt-base/lxqt-powermanagement-0.8.0 ) sddm? ( >=x11-misc/sddm-0.10.0 ) ssh-askpass? ( ~lxqt-base/lxqt-openssh-askpass-0.8.0 )
 SLOT=0
-_md5_=58cfb0c043e83bc6f08cb5b28fa8c6e8
+_md5_=5972019879c344abffe0613d6a8ad256
diff --git a/metadata/md5-cache/net-misc/lxqt-openssh-askpass-0.7.0 b/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.7.0
similarity index 84%
rename from metadata/md5-cache/net-misc/lxqt-openssh-askpass-0.7.0
rename to metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.7.0
index 73b4e151cf48..96780638cecb 100644
--- a/metadata/md5-cache/net-misc/lxqt-openssh-askpass-0.7.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.7.0
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ~lxqt-base/liblxqt-0.7.0
 SLOT=0
-SRC_URI=http://lxqt.org/downloads/0.7.0/lxqt-openssh-askpass-0.7.0.tar.xz
+SRC_URI=http://downloads.lxqt.org/lxqt/0.7.0/lxqt-openssh-askpass-0.7.0.tar.xz
 _eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=5d47d15b173d2da37760c6fbdc66eff3
+_md5_=3a74ef52c4fb762624b8cc14268cca76
diff --git a/metadata/md5-cache/net-misc/lxqt-openssh-askpass-0.8.0 b/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.8.0
similarity index 88%
rename from metadata/md5-cache/net-misc/lxqt-openssh-askpass-0.8.0
rename to metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.8.0
index bb2de90121b5..0317e3bb7fd0 100644
--- a/metadata/md5-cache/net-misc/lxqt-openssh-askpass-0.8.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.8.0
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/linguist-tools:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 ~lxqt-base/liblxqt-0.8.0 >=dev-libs/libqtxdg-1.0.0 x11-libs/libX11
 SLOT=0
-SRC_URI=http://lxqt.org/downloads/0.8.0/lxqt-openssh-askpass-0.8.0.tar.xz
+SRC_URI=http://downloads.lxqt.org/lxqt/0.8.0/lxqt-openssh-askpass-0.8.0.tar.xz
 _eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=da5c29b51c08eed5280be7c5af226ea2
+_md5_=306175767afa86357f7805c9c193577c
diff --git a/metadata/md5-cache/media-libs/mesa-10.4.4 b/metadata/md5-cache/media-libs/mesa-10.4.4
index 5e272cf54975..3a790c0714ff 100644
--- a/metadata/md5-cache/media-libs/mesa-10.4.4
+++ b/metadata/md5-cache/media-libs/mesa-10.4.4
@@ -11,4 +11,4 @@ REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm vid
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/10.4.4/MesaLib-10.4.4.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=e534141543aa54109af475d3a158ceab
+_md5_=f7a7d199af9b82100833a6922c569f1f
diff --git a/metadata/md5-cache/net-wireless/bladerf-firmware-1.8.0 b/metadata/md5-cache/net-wireless/bladerf-firmware-1.8.0
new file mode 100644
index 000000000000..09044a304e51
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/bladerf-firmware-1.8.0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=bladeRF FX3 firmware images
+EAPI=5
+HOMEPAGE=http://nuand.com/fx3.php
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=http://nuand.com/fx3/bladeRF_fw_v1.8.0.img
+_md5_=42fa23c526b7bf8c6b7bebba48794388
diff --git a/metadata/md5-cache/net-wireless/bladerf-fpga-0.1.2 b/metadata/md5-cache/net-wireless/bladerf-fpga-0.1.2
new file mode 100644
index 000000000000..be73a2a23f15
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/bladerf-fpga-0.1.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=bladeRF FPGA bitstreams
+EAPI=5
+HOMEPAGE=http://nuand.com/fpga.php
+IUSE=+x40 +x115
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=x40? ( http://nuand.com/fpga/v0.1.2/hostedx40.rbf -> hostedx40-0.1.2.rbf ) x115? ( http://nuand.com/fpga/v0.1.2/hostedx115.rbf -> hostedx115-0.1.2.rbf )
+_md5_=ca53e07afaddcf5b0535b145860219e9
diff --git a/metadata/md5-cache/net-wireless/yatebts-4.0.0 b/metadata/md5-cache/net-wireless/yatebts-4.0.0
index 823f7b0627e8..d1c0859c0bac 100644
--- a/metadata/md5-cache/net-wireless/yatebts-4.0.0
+++ b/metadata/md5-cache/net-wireless/yatebts-4.0.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure prepare
-DEPEND=virtual/pkgconfig >=net-voip/yate-5.4.0[gsm] uhd? ( net-wireless/uhd ) virtual/libusb:1 !<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=virtual/pkgconfig >=net-voip/yate-5.4.0[gsm] bladerf? ( net-wireless/bladerf:= ) uhd? ( net-wireless/uhd ) virtual/libusb:1 !<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 Yate GSM base station
 EAPI=5
 HOMEPAGE=http://www.yatebts.com/
 IUSE=rad1 usrp1 uhd bladerf cpu_flags_x86_sse3 cpu_flags_x86_sse4_1
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=>=net-voip/yate-5.4.0[gsm] uhd? ( net-wireless/uhd ) virtual/libusb:1
+RDEPEND=>=net-voip/yate-5.4.0[gsm] bladerf? ( net-wireless/bladerf:= ) uhd? ( net-wireless/uhd ) virtual/libusb:1
 SLOT=0
 SRC_URI=http://yate.null.ro/tarballs/yatebts4/yate-bts-4.0.0-1.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=e0b1f646d86fa7283a490f1e81be3c00
+_md5_=d23266d88f1edee9df1a0c1554c1b7bd
diff --git a/metadata/md5-cache/net-wireless/yatebts-9999 b/metadata/md5-cache/net-wireless/yatebts-9999
index a8fa6a5a7e3f..3fc515534417 100644
--- a/metadata/md5-cache/net-wireless/yatebts-9999
+++ b/metadata/md5-cache/net-wireless/yatebts-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure preinst prepare unpack
-DEPEND=virtual/pkgconfig >=net-voip/yate-5.4.0[gsm] uhd? ( net-wireless/uhd ) virtual/libusb:1 !<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 || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DEPEND=virtual/pkgconfig >=net-voip/yate-5.4.0[gsm] bladerf? ( net-wireless/bladerf:= ) uhd? ( net-wireless/uhd ) virtual/libusb:1 !<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 || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=The Yate GSM base station
 EAPI=5
 HOMEPAGE=http://www.yatebts.com/
 IUSE=rad1 usrp1 uhd bladerf cpu_flags_x86_sse3 cpu_flags_x86_sse4_1
 LICENSE=GPL-2
-RDEPEND=>=net-voip/yate-5.4.0[gsm] uhd? ( net-wireless/uhd ) virtual/libusb:1
+RDEPEND=>=net-voip/yate-5.4.0[gsm] bladerf? ( net-wireless/bladerf:= ) uhd? ( net-wireless/uhd ) virtual/libusb:1
 SLOT=0
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=e053b1584f7c99a13066ea0a50bf7081
+_md5_=438b52936160b04bd14fe37213ee72d6
diff --git a/metadata/md5-cache/sys-apps/inxi-2.2.14 b/metadata/md5-cache/sys-apps/inxi-2.2.14
new file mode 100644
index 000000000000..345d762d1bae
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/inxi-2.2.14
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=A newer, better system information script for irc, administration, and system troubleshooters.
+EAPI=5
+HOMEPAGE=http://code.google.com/p/inxi/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-shells/bash-3.0 sys-apps/coreutils sys-apps/gawk sys-apps/grep sys-apps/pciutils sys-process/procps sys-apps/sed
+SLOT=0
+SRC_URI=https://inxi.googlecode.com/svn/tarballs/inxi_2.2.14.tar.gz -> inxi-2.2.14.tar.gz
+_md5_=1ffbadde4037540d26a0c69b35659375
diff --git a/metadata/md5-cache/www-client/opera-developer-28.0.1750.5 b/metadata/md5-cache/www-client/opera-developer-29.0.1770.1
similarity index 91%
rename from metadata/md5-cache/www-client/opera-developer-28.0.1750.5
rename to metadata/md5-cache/www-client/opera-developer-29.0.1770.1
index a62fa9a30715..393d127d1d21 100644
--- a/metadata/md5-cache/www-client/opera-developer-28.0.1750.5
+++ b/metadata/md5-cache/www-client/opera-developer-29.0.1770.1
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
 LICENSE=OPERA-2014
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
 SLOT=0
-SRC_URI=amd64? ( http://get.geo.opera.com/pub/opera-developer/28.0.1750.5/linux/opera-developer_28.0.1750.5_amd64.deb )
+SRC_URI=amd64? ( http://get.geo.opera.com/pub/opera-developer/29.0.1770.1/linux/opera-developer_29.0.1770.1_amd64.deb )
 _eclasses_=chromium	4a9f555199b35aa57f60b0e9b9627d2a	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=72b38695ecac87d2ceac2f723d866ef8
+_md5_=dd6fe0c29ae3c4a41fa645f04713351f
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.10.6-r3 b/metadata/md5-cache/x11-base/xorg-server-1.10.6-r3
deleted file mode 100644
index 3754f8602b6f..000000000000
--- a/metadata/md5-cache/x11-base/xorg-server-1.10.6-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-1.4 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-4.0.3 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) udev? ( >=virtual/udev-150 ) >=x11-apps/xinit-1.3 sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-4.1 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.11 >=x11-proto/inputproto-1.9.99.902 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.2.99.3 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.17 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.3 >=x11-libs/libdrm-2.4.20 ) !<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 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DESCRIPTION=X.Org X servers
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=dmx kdrive xnest xorg xvfb ipv6 minimal nptl tslib +udev static-libs doc
-KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
-LICENSE=MIT
-PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.10 )
-RDEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-1.4 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-4.0.3 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) udev? ( >=virtual/udev-150 ) >=x11-apps/xinit-1.3
-REQUIRED_USE=!minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
-SLOT=0/1.10.6
-SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.10.6.tar.bz2
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=c9ec488724d2b01a4fcd4cb55562531b
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.11.4-r3 b/metadata/md5-cache/x11-base/xorg-server-1.11.4-r3
deleted file mode 100644
index b118ede2106f..000000000000
--- a/metadata/md5-cache/x11-base/xorg-server-1.11.4-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver ) sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.14 >=x11-proto/inputproto-1.9.99.902 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.2.99.3 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.22 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.6 >=x11-libs/libdrm-2.4.20 ) !<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 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DESCRIPTION=X.Org X servers
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=dmx kdrive xnest xorg xvfb ipv6 minimal nptl selinux tslib +udev static-libs doc
-KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
-LICENSE=MIT
-PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.11 )
-RDEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver )
-REQUIRED_USE=!minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
-SLOT=0/1.11.4
-SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.11.4.tar.bz2
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=30e5b6c0bb9a8040dd46f6ebe0f9abc1
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.13.4-r1 b/metadata/md5-cache/x11-base/xorg-server-1.13.4-r1
deleted file mode 100644
index c9b86de5d8b3..000000000000
--- a/metadata/md5-cache/x11-base/xorg-server-1.13.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend test unpack
-DEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.20 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-8[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver ) sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.16 >=x11-proto/inputproto-2.1.99.3 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.4.0 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.2.0 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.22 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.8 ) !<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 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DESCRIPTION=X.Org X servers
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=dmx kdrive xnest xorg xvfb ipv6 minimal nptl selinux +suid tslib +udev static-libs doc
-KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.13 )
-RDEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.20 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-8[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver )
-REQUIRED_USE=!minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
-SLOT=0/1.13.4
-SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.13.4.tar.bz2
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=c12d58955c10d0f8ead877af6581c52e
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.14.5 b/metadata/md5-cache/x11-base/xorg-server-1.14.5
deleted file mode 100644
index 033d9ec6a6ae..000000000000
--- a/metadata/md5-cache/x11-base/xorg-server-1.14.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend test unpack
-DEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.20 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-8[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) >=x11-apps/xinit-1.3 sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.16 >=x11-proto/inputproto-2.2.99.1 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.4.0 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.2.0 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.22 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.8 ) !<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 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DESCRIPTION=X.Org X servers
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=dmx kdrive xnest xorg xvfb ipv6 minimal nptl selinux +suid tslib +udev static-libs doc
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.14 )
-RDEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.20 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-8[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver )
-REQUIRED_USE=!minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
-SLOT=0/1.14.5
-SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.14.5.tar.bz2
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=8fb5f512914d08b1632770a20cf8752e
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.14.7 b/metadata/md5-cache/x11-base/xorg-server-1.14.7
deleted file mode 100644
index 67a52d82d20a..000000000000
--- a/metadata/md5-cache/x11-base/xorg-server-1.14.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend test unpack
-DEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.20 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-8[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) >=x11-apps/xinit-1.3 sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.16 >=x11-proto/inputproto-2.2.99.1 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.4.0 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.2.0 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.22 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.8 ) !<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 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DESCRIPTION=X.Org X servers
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=dmx kdrive xnest xorg xvfb ipv6 minimal nptl selinux +suid tslib +udev static-libs doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.14 )
-RDEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.20 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-8[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver )
-REQUIRED_USE=!minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
-SLOT=0/1.14.7
-SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.14.7.tar.bz2
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=1e92e6c0d3de08d8cbdcea085247790a
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.9.5-r3 b/metadata/md5-cache/x11-base/xorg-server-1.9.5-r3
deleted file mode 100644
index 2ce2cc296271..000000000000
--- a/metadata/md5-cache/x11-base/xorg-server-1.9.5-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.15.20 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-1.4 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.5 >=x11-libs/libXfixes-4.0.3 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.3 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) udev? ( >=virtual/udev-150 ) sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-4.1 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.11 >=x11-proto/inputproto-1.9.99.902 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.2.99.3 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.0.99.3 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.17 dmx? ( >=x11-proto/dmxproto-2.2.99.1 ) doc? ( >=app-doc/doxygen-1.6.1 app-text/xmlto ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.3 >=x11-libs/libdrm-2.4.20 ) >=x11-apps/xinit-1.3 !<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 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org X servers
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=dmx kdrive xnest xorg xvfb doc ipv6 minimal nptl tslib +udev static-libs
-KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
-LICENSE=MIT
-PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.9 )
-RDEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.15.20 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-1.4 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.5 >=x11-libs/libXfixes-4.0.3 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.3 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) udev? ( >=virtual/udev-150 )
-SLOT=0/1.9.5
-SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.9.5.tar.bz2
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=591e5d0a65e9d1b659cf35a28e5b2c94
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.9.0 b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.9.0
new file mode 100644
index 000000000000..96783e9e0043
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.9.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-libs/glib-2.18:2 dev-qt/linguist-tools:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=lxde-base/menu-cache-0.4.1 >=x11-libs/libfm-1.2.0 x11-libs/libxcb:= >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Fast lightweight tabbed filemanager (Qt port)
+EAPI=5
+HOMEPAGE=http://pcmanfm.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.18:2 dev-qt/linguist-tools:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=lxde-base/menu-cache-0.4.1 >=x11-libs/libfm-1.2.0 x11-libs/libxcb:= x11-misc/xdg-utils virtual/eject virtual/freedesktop-icon-theme
+SLOT=0
+SRC_URI=http://downloads.lxqt.org/lxqt/0.9.0/pcmanfm-qt-0.9.0.tar.xz
+_eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=2e05cc0aba9374a9b27f8ead341b991b
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-app-2.3 b/metadata/md5-cache/x11-misc/xscreensaver-app-2.3
deleted file mode 100644
index 65e65d18b860..000000000000
--- a/metadata/md5-cache/x11-misc/xscreensaver-app-2.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libdockapp
-DESCRIPTION=XScreenSaver dockapp for the Window Maker window manager
-HOMEPAGE=http://xscreensaverapp.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=x11-misc/xscreensaver
-SLOT=0
-SRC_URI=http://www.asleep.net/download/XScreenSaver.App-2.3.tar.gz
-_md5_=6b4cda7befcaa3bc79b334aeb5a8b04e
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index d4b415c488a1..3effeb17fef9 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 10 Feb 2015 12:36:54 +0000
+Tue, 10 Feb 2015 17:06:55 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 057230c3fdea..82ec25a65319 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Feb 10 12:36:51 UTC 2015
+Tue Feb 10 17:06:51 UTC 2015
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index d6122b2bff08..96040598ac49 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -2442,7 +2442,7 @@
 1408110131 ./media-libs/coin/coin-3.1.0.ebuild
 1408110131 ./media-libs/coin/coin-3.1.3-r2.ebuild
 1408110131 ./media-libs/coin/coin-3.1.3-r1.ebuild
-1502101301 ./media-libs/mesa/mesa-10.4.4.ebuild
+1502101931 ./media-libs/mesa/mesa-10.4.4.ebuild
 1502082307 ./media-libs/mesa/mesa-10.3.7-r1.ebuild
 1407261331 ./media-libs/mesa/mesa-7.11.2.ebuild
 1412082150 ./media-libs/mesa/mesa-10.3.5.ebuild
@@ -3252,8 +3252,6 @@
 1501271722 ./net-misc/sipsak/sipsak-0.9.6_p1-r1.ebuild
 1010281359 ./net-misc/dcetest/dcetest-2.0.ebuild
 0909232347 ./net-misc/vconfig/vconfig-1.9.ebuild
-1411161601 ./net-misc/lxqt-openssh-askpass/lxqt-openssh-askpass-0.7.0.ebuild
-1411161601 ./net-misc/lxqt-openssh-askpass/lxqt-openssh-askpass-0.8.0.ebuild
 1401081035 ./net-misc/mdidentd/mdidentd-1.04c.ebuild
 1101182310 ./net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild
 1407181824 ./net-misc/apt-cacher-ng/apt-cacher-ng-0.7.27.ebuild
@@ -7104,7 +7102,6 @@
 0911070037 ./app-admin/eselect-mpost/eselect-mpost-0.2.ebuild
 1205131601 ./app-admin/cronolog/cronolog-1.6.2-r4.ebuild
 0910120320 ./app-admin/cronolog/cronolog-1.6.2-r3.ebuild
-1411161601 ./app-admin/lxqt-admin/lxqt-admin-0.8.0.ebuild
 1501050623 ./app-admin/webmin/webmin-1.730.ebuild
 1401181331 ./app-admin/superadduser/superadduser-1.0.9.ebuild
 1404230131 ./app-admin/eselect-lua/eselect-lua-1.ebuild
@@ -8619,8 +8616,8 @@
 1404050049 ./www-client/jumanji/jumanji-0.0.0_p20130103-r1.ebuild
 1306221620 ./www-client/jumanji/jumanji-0.0.0_p20111209.ebuild
 1404050049 ./www-client/jumanji/jumanji-9999.ebuild
-1501291259 ./www-client/opera-developer/opera-developer-28.0.1750.5.ebuild
 1502022231 ./www-client/opera-developer/opera-developer-28.0.1750.11.ebuild
+1502101933 ./www-client/opera-developer/opera-developer-29.0.1770.1.ebuild
 1410181801 ./www-client/seamonkey-bin/seamonkey-bin-2.30-r1.ebuild
 1412102301 ./www-client/seamonkey-bin/seamonkey-bin-2.31.ebuild
 1502061828 ./www-client/google-chrome/google-chrome-40.0.2214.111_p1.ebuild
@@ -13629,7 +13626,7 @@
 1404010131 ./dev-python/ipaddr/ipaddr-2.1.10-r1.ebuild
 1502011701 ./dev-python/ipaddr/ipaddr-2.1.11.ebuild
 1202231231 ./dev-python/pyclimate/pyclimate-1.2.2-r1.ebuild
-1411281431 ./dev-python/pyroma/pyroma-1.5.ebuild
+1502101653 ./dev-python/pyroma/pyroma-1.7.ebuild
 1409192001 ./dev-python/python-evdev/python-evdev-0.4.3.ebuild
 1411281431 ./dev-python/python-evdev/python-evdev-0.4.5.ebuild
 1206151901 ./dev-python/urlgrabber/urlgrabber-3.9.1-r1.ebuild
@@ -14752,7 +14749,7 @@
 1408110131 ./dev-python/pygments/pygments-1.6.ebuild
 1501051231 ./dev-python/pygments/pygments-2.0.1.ebuild
 1408190919 ./dev-python/envoy/envoy-0.0.3.ebuild
-1412011652 ./dev-python/argcomplete/argcomplete-0.8.1.ebuild
+1502101601 ./dev-python/argcomplete/argcomplete-0.8.1.ebuild
 1410040856 ./dev-python/argcomplete/argcomplete-0.6.5-r1.ebuild
 1410040901 ./dev-python/argcomplete/argcomplete-0.6.5.ebuild
 1412090955 ./dev-python/wsgiintercept/wsgiintercept-0.9.0.ebuild
@@ -14834,7 +14831,7 @@
 1412070943 ./dev-python/billiard/billiard-3.3.0.19.ebuild
 1405021101 ./dev-python/billiard/billiard-3.3.0.17.ebuild
 1412281331 ./dev-python/billiard/billiard-3.3.0.18.ebuild
-1404162030 ./dev-python/pyringe/pyringe-1.0.ebuild
+1502101702 ./dev-python/pyringe/pyringe-1.0.2.ebuild
 1408110131 ./dev-python/cheetah-docs/cheetah-docs-0.9.16_alpha1.ebuild
 1412301057 ./dev-python/functest/functest-0.8.8-r1.ebuild
 1411281331 ./dev-python/django-extensions/django-extensions-1.4.0.ebuild
@@ -16343,8 +16340,8 @@
 1306261559 ./net-wireless/rfkill/rfkill-0.5.ebuild
 1408022301 ./net-wireless/wavemon/wavemon-0.7.6.ebuild
 1403061112 ./net-wireless/wavemon/wavemon-0.7.5.ebuild
-1501290231 ./net-wireless/yatebts/yatebts-4.0.0.ebuild
-1501290231 ./net-wireless/yatebts/yatebts-9999.ebuild
+1502101931 ./net-wireless/yatebts/yatebts-4.0.0.ebuild
+1502101931 ./net-wireless/yatebts/yatebts-9999.ebuild
 1412112101 ./net-wireless/bluedevil/bluedevil-2.0.ebuild
 1412122001 ./net-wireless/bluedevil/bluedevil-2.0_rc1.ebuild
 1412230022 ./net-wireless/bluedevil/bluedevil-2.1.ebuild
@@ -16429,6 +16426,7 @@
 1411172201 ./net-wireless/dump1090/dump1090-9999.ebuild
 1411172134 ./net-wireless/dump1090/dump1090-0.0_p20140919.ebuild
 1411032251 ./net-wireless/bladerf-fpga/bladerf-fpga-0.1.1-r1.ebuild
+1502101859 ./net-wireless/bladerf-fpga/bladerf-fpga-0.1.2.ebuild
 1407250745 ./net-wireless/bladerf-fpga/bladerf-fpga-0.0.6.ebuild
 1310131842 ./net-wireless/iw/iw-3.11.ebuild
 1402040919 ./net-wireless/iw/iw-3.14.ebuild
@@ -16460,6 +16458,7 @@
 1412232131 ./net-wireless/rtl-sdr/rtl-sdr-0.5.3.ebuild
 1306290213 ./net-wireless/rtl-sdr/rtl-sdr-0.5.0.ebuild
 1211290123 ./net-wireless/rfswitch/rfswitch-1.3.ebuild
+1502102001 ./net-wireless/bladerf-firmware/bladerf-firmware-1.8.0.ebuild
 1407250801 ./net-wireless/bladerf-firmware/bladerf-firmware-1.7.1.ebuild
 1203301254 ./net-wireless/cpyrit-opencl/cpyrit-opencl-0.4.0.ebuild
 1404290521 ./net-wireless/osmocom-bb/osmocom-bb-9999.ebuild
@@ -17448,17 +17447,11 @@
 1105270139 ./x11-base/nouveau-drm/nouveau-drm-20110526.ebuild
 1009171739 ./x11-base/nouveau-drm/nouveau-drm-20100811.ebuild
 1111011829 ./x11-base/nouveau-drm/nouveau-drm-20111101.ebuild
-1310221136 ./x11-base/xorg-server/xorg-server-1.9.5-r3.ebuild
 1501251431 ./x11-base/xorg-server/xorg-server-1.15.2-r1.ebuild
-1310221136 ./x11-base/xorg-server/xorg-server-1.10.6-r3.ebuild
 1501251431 ./x11-base/xorg-server/xorg-server-1.12.4-r3.ebuild
-1411021401 ./x11-base/xorg-server/xorg-server-1.14.7.ebuild
-1407261401 ./x11-base/xorg-server/xorg-server-1.11.4-r3.ebuild
 1501081855 ./x11-base/xorg-server/xorg-server-1.16.3.ebuild
 1502090631 ./x11-base/xorg-server/xorg-server-1.17.0.ebuild
 1501081855 ./x11-base/xorg-server/xorg-server-1.16.3-r1.ebuild
-1411021401 ./x11-base/xorg-server/xorg-server-1.14.5.ebuild
-1407261401 ./x11-base/xorg-server/xorg-server-1.13.4-r1.ebuild
 1210070046 ./x11-base/xorg-drivers/xorg-drivers-1.10.ebuild
 1210070046 ./x11-base/xorg-drivers/xorg-drivers-1.9.ebuild
 1406081315 ./x11-base/xorg-drivers/xorg-drivers-1.15.ebuild
@@ -20958,7 +20951,7 @@
 1401261601 ./dev-util/kdevelop-php/kdevelop-php-1.5.2.ebuild
 1501210703 ./dev-util/jenkins-bin/jenkins-bin-1.597.ebuild
 1501270526 ./dev-util/jenkins-bin/jenkins-bin-1.598.ebuild
-1412181936 ./dev-util/jenkins-bin/jenkins-bin-1.580.2.ebuild
+1502101840 ./dev-util/jenkins-bin/jenkins-bin-1.580.3.ebuild
 1409101601 ./dev-util/valgrind/valgrind-3.9.0.ebuild
 1306190056 ./dev-util/valgrind/valgrind-3.8.1-r1.ebuild
 1305261631 ./dev-util/valgrind/valgrind-3.8.1.ebuild
@@ -21534,9 +21527,9 @@
 1410230711 ./app-text/ansifilter/ansifilter-1.11.ebuild
 1410080527 ./app-text/ansifilter/ansifilter-1.10.ebuild
 1103060352 ./app-text/pyrpub/pyrpub-2.1.1.ebuild
-1501201913 ./app-text/paperwork/paperwork-0.2.2.ebuild
-1501061526 ./app-text/paperwork/paperwork-0.2.1.ebuild
-1409301545 ./app-text/paperwork/paperwork-0.2.ebuild
+1502102001 ./app-text/paperwork/paperwork-0.2.2.ebuild
+1502102001 ./app-text/paperwork/paperwork-0.2.1.ebuild
+1502102001 ./app-text/paperwork/paperwork-0.2.ebuild
 1203061831 ./app-text/crm114/crm114-20100106.ebuild
 1408061131 ./app-text/expander/expander-2.0.5-r1.ebuild
 1001021356 ./app-text/clara/clara-20031214.ebuild
@@ -29663,7 +29656,6 @@
 1303101614 ./app-emulation/vmware-tools/vmware-tools-9.2.3.1031769.ebuild
 1210241501 ./app-emulation/dlx/dlx-1.0.0-r1.ebuild
 0504241511 ./app-emulation/dlx/dlx-1.0.0.ebuild
-1408110031 ./x11-misc/xscreensaver-app/xscreensaver-app-2.3.ebuild
 1502101331 ./x11-misc/xscreensaver-app/xscreensaver-app-2.3-r2.ebuild
 1404261230 ./x11-misc/menulibre/menulibre-13.01.4.ebuild
 1404261230 ./x11-misc/menulibre/menulibre-13.01.4-r1.ebuild
@@ -30043,6 +30035,7 @@
 1407241804 ./x11-misc/xmobar/xmobar-0.21.ebuild
 1407150136 ./x11-misc/xmobar/xmobar-0.20.1-r1.ebuild
 1410251656 ./x11-misc/xmobar/xmobar-0.22.1.ebuild
+1502101840 ./x11-misc/pcmanfm-qt/pcmanfm-qt-0.9.0.ebuild
 1411082051 ./x11-misc/pcmanfm-qt/pcmanfm-qt-0.8.0.ebuild
 1405291149 ./x11-misc/pcmanfm-qt/pcmanfm-qt-0.7.0.ebuild
 1308141635 ./x11-misc/sux/sux-1.0-r4.ebuild
@@ -31561,6 +31554,7 @@
 1411100459 ./sys-apps/pcsc-lite/pcsc-lite-1.8.13.ebuild
 1412062001 ./sys-apps/pcsc-lite/pcsc-lite-1.8.12-r1.ebuild
 1411021301 ./sys-apps/pcsc-lite/pcsc-lite-1.8.8-r1.ebuild
+1502101945 ./sys-apps/inxi/inxi-2.2.14.ebuild
 1401182327 ./sys-apps/texinfo/texinfo-5.2.ebuild
 1401182327 ./sys-apps/texinfo/texinfo-5.1.ebuild
 1401182327 ./sys-apps/texinfo/texinfo-4.13-r2.ebuild
@@ -32642,7 +32636,7 @@
 1411282301 ./games-util/qjoypad/qjoypad-4.1.0.ebuild
 1501282049 ./games-util/antimicro/antimicro-2.10.1.ebuild
 1405272211 ./games-util/antimicro/antimicro-2.3.3.ebuild
-1205030801 ./games-util/gamepick/gamepick-0.35.ebuild
+1502101901 ./games-util/gamepick/gamepick-0.35.ebuild
 1205030801 ./games-util/xqf/xqf-1.0.5.ebuild
 1412140310 ./games-util/wit/wit-2.30a.ebuild
 1404162131 ./games-util/datutil/datutil-2.46.ebuild
@@ -35512,9 +35506,6 @@
 1210071654 ./app-editors/yudit/yudit-2.9.2.ebuild
 1403200831 ./app-editors/dhex/dhex-0.68.ebuild
 1502101331 ./app-editors/bluefish/bluefish-2.2.6.ebuild
-1408102201 ./app-editors/bluefish/bluefish-2.2.2.ebuild
-1408102201 ./app-editors/bluefish/bluefish-2.2.3.ebuild
-1412270135 ./app-editors/bluefish/bluefish-2.2.3-r1.ebuild
 1407171101 ./app-editors/ng/ng-1.5_beta1-r1.ebuild
 1006282204 ./app-editors/ng/ng-1.5_beta1.ebuild
 1303011201 ./app-editors/elvis/elvis-2.2.0-r4.ebuild
@@ -36654,6 +36645,7 @@
 1501302001 ./lxqt-base/lxqt-panel/lxqt-panel-0.7.0-r1.ebuild
 1501302001 ./lxqt-base/lxqt-config-randr/lxqt-config-randr-0.7.0.ebuild
 1501302001 ./lxqt-base/libsysstat/libsysstat-0.1.0.ebuild
+1502101754 ./lxqt-base/libsysstat/libsysstat-0.3.0.ebuild
 1501302001 ./lxqt-base/libsysstat/libsysstat-0.2.0.ebuild
 1501302001 ./lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.7.0.ebuild
 1501302001 ./lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.8.0.ebuild
@@ -36663,10 +36655,13 @@
 1501302001 ./lxqt-base/lxqt-notificationd/lxqt-notificationd-0.7.0.ebuild
 1501302001 ./lxqt-base/lxqt-session/lxqt-session-0.8.0.ebuild
 1501302001 ./lxqt-base/lxqt-session/lxqt-session-0.7.0-r1.ebuild
+1502101618 ./lxqt-base/lxqt-admin/lxqt-admin-0.8.0.ebuild
 1501302001 ./lxqt-base/lxqt-about/lxqt-about-0.8.0.ebuild
 1501302001 ./lxqt-base/lxqt-about/lxqt-about-0.7.0.ebuild
-1501302001 ./lxqt-base/lxqt-meta/lxqt-meta-0.7.0-r1.ebuild
-1501302001 ./lxqt-base/lxqt-meta/lxqt-meta-0.8.0.ebuild
+1502101623 ./lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.7.0.ebuild
+1502101623 ./lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.8.0.ebuild
+1502101631 ./lxqt-base/lxqt-meta/lxqt-meta-0.7.0-r1.ebuild
+1502101631 ./lxqt-base/lxqt-meta/lxqt-meta-0.8.0.ebuild
 1501302001 ./lxqt-base/liblxqt-mount/liblxqt-mount-0.8.0.ebuild
 1501302001 ./lxqt-base/liblxqt-mount/liblxqt-mount-0.7.0.ebuild
 1501302001 ./lxqt-base/lxqt-runner/lxqt-runner-0.7.0-r1.ebuild
@@ -38968,7 +38963,7 @@
 1411010854 metadata/md5-cache/media-libs/lv2core-4.0
 1501150220 metadata/md5-cache/media-libs/ctl-1.4.1
 1501150220 metadata/md5-cache/media-libs/libogg-1.3.2
-1502101306 metadata/md5-cache/media-libs/mesa-10.4.4
+1502101936 metadata/md5-cache/media-libs/mesa-10.4.4
 1501150220 metadata/md5-cache/media-libs/libaacplus-2.0.2-r2
 1411111437 metadata/md5-cache/media-libs/adplug-2.2.1
 1501150220 metadata/md5-cache/media-libs/libdvdread-5.0.0-r2
@@ -39506,7 +39501,6 @@
 1501150223 metadata/md5-cache/net-misc/mediatomb-0.12.1-r7
 1501232136 metadata/md5-cache/net-misc/netifrc-0.3.1
 1501150222 metadata/md5-cache/net-misc/apt-cacher-ng-0.8.0-r1
-1501150223 metadata/md5-cache/net-misc/lxqt-openssh-askpass-0.7.0
 1502022036 metadata/md5-cache/net-misc/i2pd-0.5.0
 1411010857 metadata/md5-cache/net-misc/htpdate-1.0.4
 1501150223 metadata/md5-cache/net-misc/guacamole-server-0.9.0
@@ -39532,7 +39526,6 @@
 1502101336 metadata/md5-cache/net-misc/dibbler-1.0.0
 1411201907 metadata/md5-cache/net-misc/pssh-2.3.1
 1501150223 metadata/md5-cache/net-misc/vmpsd-1.4
-1501150223 metadata/md5-cache/net-misc/lxqt-openssh-askpass-0.8.0
 1501150222 metadata/md5-cache/net-misc/dhcpcd-6.6.6
 1501150223 metadata/md5-cache/net-misc/httptunnel-3.3-r2
 1501291307 metadata/md5-cache/net-misc/gwget-1.0.4
@@ -43514,7 +43507,6 @@
 1307281136 metadata/md5-cache/app-admin/eselect-php-0.6.2
 1501150206 metadata/md5-cache/app-admin/bastille-3.0.9
 1404071836 metadata/md5-cache/app-admin/python-updater-0.13
-1501150206 metadata/md5-cache/app-admin/lxqt-admin-0.8.0
 1501261306 metadata/md5-cache/app-admin/procinfo-ng-2.0.304-r1
 1501150206 metadata/md5-cache/app-admin/monit-5.11-r1
 1502090036 metadata/md5-cache/app-admin/apache-tools-2.2.29
@@ -45234,7 +45226,6 @@
 1501150227 metadata/md5-cache/www-client/dwb-2014.03.07
 1411010903 metadata/md5-cache/www-client/luakit-2012.09.13_p1-r1
 1502091406 metadata/md5-cache/www-client/chromium-41.0.2272.12-r1
-1501291336 metadata/md5-cache/www-client/opera-developer-28.0.1750.5
 1501150227 metadata/md5-cache/www-client/w3m-0.5.3-r4
 1502091406 metadata/md5-cache/www-client/chromium-41.0.2272.16
 1501150227 metadata/md5-cache/www-client/netrik-1.16.1-r1
@@ -45281,6 +45272,7 @@
 1501291307 metadata/md5-cache/www-client/epiphany-3.14.2
 1501150227 metadata/md5-cache/www-client/httrack-3.45.4
 1501150227 metadata/md5-cache/www-client/jd-2.6.5_p100425
+1502102006 metadata/md5-cache/www-client/opera-developer-29.0.1770.1
 1502041836 metadata/md5-cache/www-client/vivaldi-1.0.83.38_p1-r1
 1501150227 metadata/md5-cache/www-client/qupzilla-1.8.5
 1501150227 metadata/md5-cache/www-client/firefox-24.3.0
@@ -50885,6 +50877,7 @@
 1501310608 metadata/md5-cache/dev-python/sphinxtogithub-1.0.0
 1501310608 metadata/md5-cache/dev-python/twisted-runner-14.0.0
 1501310606 metadata/md5-cache/dev-python/blockcanvas-4.0.3-r1
+1502101736 metadata/md5-cache/dev-python/pyringe-1.0.2
 1501310607 metadata/md5-cache/dev-python/mysql-connector-python-2.0.2
 1501310606 metadata/md5-cache/dev-python/django-ldapdb-0.1.0_p20130921
 1501310607 metadata/md5-cache/dev-python/encore-0.3
@@ -51015,6 +51008,7 @@
 1501310607 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
+1502101706 metadata/md5-cache/dev-python/pyroma-1.7
 1501310606 metadata/md5-cache/dev-python/cython-0.19.1-r1
 1501310607 metadata/md5-cache/dev-python/peewee-2.4.5
 1501310607 metadata/md5-cache/dev-python/pygene-0.2.1-r1
@@ -51679,7 +51673,6 @@
 1501310607 metadata/md5-cache/dev-python/oslo-serialization-1.0.0
 1501310607 metadata/md5-cache/dev-python/pylast-0.5.11-r1
 1501310606 metadata/md5-cache/dev-python/argcomplete-0.6.5
-1501310607 metadata/md5-cache/dev-python/pyroma-1.5
 1501310607 metadata/md5-cache/dev-python/python-poppler-qt4-0.18.1
 1501310607 metadata/md5-cache/dev-python/patsy-0.3.0
 1502101336 metadata/md5-cache/dev-python/py2play-0.1.10-r1
@@ -51954,7 +51947,6 @@
 1501310607 metadata/md5-cache/dev-python/lz4-0.6.1
 1501310607 metadata/md5-cache/dev-python/envisage-4.3.0-r1
 1501310608 metadata/md5-cache/dev-python/sqlalchemy-0.8.4
-1501310607 metadata/md5-cache/dev-python/pyringe-1.0
 1411201907 metadata/md5-cache/dev-python/pygtkhelpers-0.4.3
 1501310607 metadata/md5-cache/dev-python/kid-0.9.6-r1
 1501310607 metadata/md5-cache/dev-python/pytest-timeout-0.4
@@ -52526,7 +52518,7 @@
 1501310607 metadata/md5-cache/dev-python/python-debian-0.1.21_p2
 1501310607 metadata/md5-cache/dev-python/pyvorbis-1.4-r4
 1501150213 metadata/md5-cache/dev-python/PyQt4-4.11.3
-1501310606 metadata/md5-cache/dev-python/argcomplete-0.8.1
+1502101606 metadata/md5-cache/dev-python/argcomplete-0.8.1
 1501310606 metadata/md5-cache/dev-python/autopep8-0.9.5
 1501310607 metadata/md5-cache/dev-python/feedgenerator-1.6
 1501310607 metadata/md5-cache/dev-python/python-distutils-extra-2.33-r1
@@ -53007,6 +52999,7 @@
 1502041306 metadata/md5-cache/net-wireless/lorcon-9999
 1211091748 metadata/md5-cache/net-wireless/orinoco-fwutils-0.1
 1502041306 metadata/md5-cache/net-wireless/blueman-9999
+1502101906 metadata/md5-cache/net-wireless/bladerf-fpga-0.1.2
 1501150223 metadata/md5-cache/net-wireless/gr-iqbal-0.36.0
 1411010858 metadata/md5-cache/net-wireless/iw-3.10
 1501150223 metadata/md5-cache/net-wireless/wpa_supplicant-2.0-r2
@@ -53053,6 +53046,7 @@
 1405302106 metadata/md5-cache/net-wireless/wireless-regdb-20140529
 1411010858 metadata/md5-cache/net-wireless/iw-3.13
 1501150223 metadata/md5-cache/net-wireless/reaver-1.4-r3
+1502102006 metadata/md5-cache/net-wireless/bladerf-firmware-1.8.0
 1501150223 metadata/md5-cache/net-wireless/iw-3.10-r1
 1501150223 metadata/md5-cache/net-wireless/irda-utils-0.9.18-r3
 1501150223 metadata/md5-cache/net-wireless/blueman-1.23-r2
@@ -53096,14 +53090,14 @@
 1411010858 metadata/md5-cache/net-wireless/spectools-2011.08.1_p20140618
 1501150223 metadata/md5-cache/net-wireless/gobi_loader-0.7-r2
 1501150223 metadata/md5-cache/net-wireless/gnuradio-3.7.5.2
-1501290236 metadata/md5-cache/net-wireless/yatebts-4.0.0
+1502101936 metadata/md5-cache/net-wireless/yatebts-4.0.0
 1501150223 metadata/md5-cache/net-wireless/bluedevil-2.0_rc1
 1501310608 metadata/md5-cache/net-wireless/lorcon-0.0_p20130212-r1
 1501310608 metadata/md5-cache/net-wireless/aircrack-ng-9999
 1501150223 metadata/md5-cache/net-wireless/hackrf-tools-9999
 1501150223 metadata/md5-cache/net-wireless/madwifi-ng-0.9.4.4165.20110816
 1501150223 metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.30-r2
-1501290236 metadata/md5-cache/net-wireless/yatebts-9999
+1502101936 metadata/md5-cache/net-wireless/yatebts-9999
 1501150223 metadata/md5-cache/net-wireless/cpyrit-cuda-0.4.0
 1501150223 metadata/md5-cache/net-wireless/adm8211-20060111
 1402130006 metadata/md5-cache/net-wireless/wireless-regdb-20131127-r1
@@ -54112,31 +54106,25 @@
 1211091752 metadata/md5-cache/x11-base/xorg-drivers-1.11
 1406081336 metadata/md5-cache/x11-base/xorg-drivers-1.15
 1501150227 metadata/md5-cache/x11-base/nouveau-drm-20110526
-1501150227 metadata/md5-cache/x11-base/xorg-server-1.14.7
 1501150227 metadata/md5-cache/x11-base/xorg-server-1.16.3-r1
 1211091752 metadata/md5-cache/x11-base/xorg-drivers-1.9
 1211091752 metadata/md5-cache/x11-base/xorg-drivers-1.10
-1501150227 metadata/md5-cache/x11-base/xorg-server-1.10.6-r3
 1501251436 metadata/md5-cache/x11-base/xorg-server-1.12.4-r3
 1502042106 metadata/md5-cache/x11-base/xorg-drivers-1.16
 1501150227 metadata/md5-cache/x11-base/nouveau-drm-20120605
 1501150227 metadata/md5-cache/x11-base/nouveau-drm-20101107
-1501150227 metadata/md5-cache/x11-base/xorg-server-1.14.5
 1501150227 metadata/md5-cache/x11-base/nouveau-drm-20100811
 1501150227 metadata/md5-cache/x11-base/nouveau-drm-20120322
 1502090636 metadata/md5-cache/x11-base/xorg-server-1.17.0
-1501150227 metadata/md5-cache/x11-base/xorg-server-1.11.4-r3
 1501150227 metadata/md5-cache/x11-base/nouveau-drm-20120728
 1501150227 metadata/md5-cache/x11-base/nouveau-drm-20110602
 1302271036 metadata/md5-cache/x11-base/xorg-drivers-1.13
 1501150227 metadata/md5-cache/x11-base/xorg-server-1.16.3
 1502082106 metadata/md5-cache/x11-base/xorg-drivers-1.17
-1501150227 metadata/md5-cache/x11-base/xorg-server-1.9.5-r3
 1501150227 metadata/md5-cache/x11-base/xorg-x11-7.4-r2
 1310080936 metadata/md5-cache/x11-base/xorg-drivers-1.14
 1501150227 metadata/md5-cache/x11-base/nouveau-drm-20110820
 1501150227 metadata/md5-cache/x11-base/nouveau-drm-20111101
-1501150227 metadata/md5-cache/x11-base/xorg-server-1.13.4-r1
 1501150227 metadata/md5-cache/x11-base/nouveau-drm-20100520
 1501150227 metadata/md5-cache/x11-base/nouveau-drm-20121015
 1501251436 metadata/md5-cache/x11-base/xorg-server-1.15.2-r1
@@ -57433,6 +57421,7 @@
 1211091741 metadata/md5-cache/dev-util/aap-1.091
 1501150217 metadata/md5-cache/dev-util/kdevelop-php-1.6.0
 1306021636 metadata/md5-cache/dev-util/kup-0.3.2
+1502101906 metadata/md5-cache/dev-util/jenkins-bin-1.580.3
 1501150217 metadata/md5-cache/dev-util/include-what-you-use-3.3-r1
 1501150216 metadata/md5-cache/dev-util/buildbot-0.8.7_p1-r1
 1501150217 metadata/md5-cache/dev-util/gtk-doc-am-1.21
@@ -57637,7 +57626,6 @@
 1501150217 metadata/md5-cache/dev-util/itstool-1.2.0-r1
 1211091741 metadata/md5-cache/dev-util/shtool-2.0.4
 1411201907 metadata/md5-cache/dev-util/molecule-core-1.0.2
-1412182007 metadata/md5-cache/dev-util/jenkins-bin-1.580.2
 1501150217 metadata/md5-cache/dev-util/kdevelop-python-1.6.0
 1502041306 metadata/md5-cache/dev-util/uncrustify-9999
 1501150217 metadata/md5-cache/dev-util/lttng-tools-2.5.2
@@ -58277,14 +58265,14 @@
 1501150208 metadata/md5-cache/app-text/pandoc-1.12
 1501150208 metadata/md5-cache/app-text/calibre-1.2
 1501150208 metadata/md5-cache/app-text/sloccount-2.26-r1
-1501310606 metadata/md5-cache/app-text/paperwork-0.2.1
+1502102006 metadata/md5-cache/app-text/paperwork-0.2.1
 1501261336 metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.78.0-r1
 1309281406 metadata/md5-cache/app-text/xmlformat-1.04
 1501150208 metadata/md5-cache/app-text/unrtf-0.21.8
 1501150208 metadata/md5-cache/app-text/highlight-3.17
 1308062236 metadata/md5-cache/app-text/gocr-0.50
 1501190236 metadata/md5-cache/app-text/wiki2beamer-0.9.5-r1
-1501310606 metadata/md5-cache/app-text/paperwork-0.2
+1502102006 metadata/md5-cache/app-text/paperwork-0.2
 1501150208 metadata/md5-cache/app-text/poppler-0.28.1
 1501150208 metadata/md5-cache/app-text/dvipdfm-0.13.2d-r2
 1501150208 metadata/md5-cache/app-text/zathura-cb-0.1.2
@@ -58384,7 +58372,7 @@
 1501150208 metadata/md5-cache/app-text/llpp-18
 1501150208 metadata/md5-cache/app-text/a2ps-4.14-r2
 1501150208 metadata/md5-cache/app-text/docbook-xml-dtd-4.3-r1
-1501310606 metadata/md5-cache/app-text/paperwork-0.2.2
+1502102006 metadata/md5-cache/app-text/paperwork-0.2.2
 1501150208 metadata/md5-cache/app-text/bibletime-2.9.1
 1411010839 metadata/md5-cache/app-text/wscr-1.2-r1
 1501150208 metadata/md5-cache/app-text/iso-codes-3.51
@@ -66621,7 +66609,6 @@
 1501150228 metadata/md5-cache/x11-misc/notification-daemon-0.7.6
 1501310609 metadata/md5-cache/x11-misc/winswitch-0.12.18-r1
 1501150228 metadata/md5-cache/x11-misc/imake-1.0.7
-1408110037 metadata/md5-cache/x11-misc/xscreensaver-app-2.3
 1501150228 metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10
 1501150228 metadata/md5-cache/x11-misc/compton-0.1_beta1
 1410101806 metadata/md5-cache/x11-misc/xautomation-1.09
@@ -66817,6 +66804,7 @@
 1501150228 metadata/md5-cache/x11-misc/xrmap-2.33
 1501150228 metadata/md5-cache/x11-misc/skippy-0.5.0
 1501150228 metadata/md5-cache/x11-misc/qterm-0.5.12
+1502101906 metadata/md5-cache/x11-misc/pcmanfm-qt-0.9.0
 1501150228 metadata/md5-cache/x11-misc/xfe-1.34
 1411010904 metadata/md5-cache/x11-misc/trayer-srg-1.1.5
 1501150228 metadata/md5-cache/x11-misc/wmctrl-1.07-r1
@@ -68548,6 +68536,7 @@
 1501150225 metadata/md5-cache/sys-apps/ipmiutil-2.9.3
 1501150225 metadata/md5-cache/sys-apps/fakeroot-1.19
 1501150225 metadata/md5-cache/sys-apps/sg3_utils-1.39
+1502102006 metadata/md5-cache/sys-apps/inxi-2.2.14
 1411240109 metadata/md5-cache/sys-apps/gsmartcontrol-0.8.7
 1501150225 metadata/md5-cache/sys-apps/pcsc-slb-rf72-drv-1.1.0-r2
 1302170306 metadata/md5-cache/sys-apps/apply-default-acl-0.0.4
@@ -69333,7 +69322,7 @@
 1501282106 metadata/md5-cache/games-util/antimicro-2.10.1
 1411010850 metadata/md5-cache/games-util/grfcodec-6.0.4
 1501150218 metadata/md5-cache/games-util/hearse-1.5
-1501150218 metadata/md5-cache/games-util/gamepick-0.35
+1502101906 metadata/md5-cache/games-util/gamepick-0.35
 1501150218 metadata/md5-cache/games-util/joystick-1.4.7
 1411010850 metadata/md5-cache/games-util/wiiload-0.5
 1501150218 metadata/md5-cache/games-util/linux-wbfs-manager-9999
@@ -72033,7 +72022,6 @@
 1501150207 metadata/md5-cache/app-editors/nano-2.3.2
 1501150207 metadata/md5-cache/app-editors/mp-5.2.2
 1501291306 metadata/md5-cache/app-editors/gedit-plugins-3.12.1
-1501150206 metadata/md5-cache/app-editors/bluefish-2.2.2
 1501150207 metadata/md5-cache/app-editors/qwriter-0.1.9
 1501291306 metadata/md5-cache/app-editors/gedit-plugins-3.12.1-r1
 1501150207 metadata/md5-cache/app-editors/scite-3.5.2
@@ -72091,7 +72079,6 @@
 1501150207 metadata/md5-cache/app-editors/gobby-0.4.8
 1502041306 metadata/md5-cache/app-editors/emacs-vcs-25.0.9999-r1
 1501150207 metadata/md5-cache/app-editors/gobby-0.4.94
-1501150206 metadata/md5-cache/app-editors/bluefish-2.2.3
 1501150207 metadata/md5-cache/app-editors/emacs-24.3-r6
 1501150207 metadata/md5-cache/app-editors/elvis-2.2.0-r3
 1301041936 metadata/md5-cache/app-editors/jupp-3.1_p23
@@ -72143,7 +72130,6 @@
 1501150207 metadata/md5-cache/app-editors/lpe-1.2.6.13
 1501150207 metadata/md5-cache/app-editors/nano-2.0.9
 1501150207 metadata/md5-cache/app-editors/zoinks-0.4.1
-1501150206 metadata/md5-cache/app-editors/bluefish-2.2.3-r1
 1211091734 metadata/md5-cache/app-editors/yudit-2.9.2
 1501150207 metadata/md5-cache/app-editors/vim-7.4.560
 1501150206 metadata/md5-cache/app-editors/diakonos-0.9.4
@@ -73315,12 +73301,16 @@
 1501302006 metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.7.0
 1501302006 metadata/md5-cache/lxqt-base/lxqt-config-0.7.0-r1
 1501302006 metadata/md5-cache/lxqt-base/liblxqt-0.8.0
+1502101806 metadata/md5-cache/lxqt-base/libsysstat-0.3.0
+1502101636 metadata/md5-cache/lxqt-base/lxqt-admin-0.8.0
 1501302006 metadata/md5-cache/lxqt-base/lxqt-config-randr-0.7.0
 1501302006 metadata/md5-cache/lxqt-base/lxqt-panel-0.7.0-r1
 1501302006 metadata/md5-cache/lxqt-base/libsysstat-0.2.0
 1501302006 metadata/md5-cache/lxqt-base/liblxqt-mount-0.7.0
 1501302006 metadata/md5-cache/lxqt-base/lxqt-policykit-0.7.0-r1
 1501302006 metadata/md5-cache/lxqt-base/lxqt-common-0.8.0
+1502101636 metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.7.0
+1502101636 metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.8.0
 1501302006 metadata/md5-cache/lxqt-base/lxqt-session-0.8.0
 1501302006 metadata/md5-cache/lxqt-base/lxqt-notificationd-0.7.0
 1501302006 metadata/md5-cache/lxqt-base/libsysstat-0.1.0
@@ -73333,11 +73323,11 @@
 1501302006 metadata/md5-cache/lxqt-base/liblxqt-mount-0.8.0
 1501302006 metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.7.0
 1501302006 metadata/md5-cache/lxqt-base/lxqt-panel-0.8.0
-1501310736 metadata/md5-cache/lxqt-base/lxqt-meta-0.8.0
+1502101636 metadata/md5-cache/lxqt-base/lxqt-meta-0.8.0
 1501302006 metadata/md5-cache/lxqt-base/lxqt-common-0.7.0
 1501302006 metadata/md5-cache/lxqt-base/lxqt-notificationd-0.8.0
 1501302006 metadata/md5-cache/lxqt-base/lxqt-session-0.7.0-r1
-1501310736 metadata/md5-cache/lxqt-base/lxqt-meta-0.7.0-r1
+1502101636 metadata/md5-cache/lxqt-base/lxqt-meta-0.7.0-r1
 1501302006 metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.7.0
 1501302006 metadata/md5-cache/lxqt-base/lxqt-runner-0.8.0
 1501302006 metadata/md5-cache/lxqt-base/lxqt-config-0.8.0
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 09e802d08fbd..a8efe09bd0aa 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 10 Feb 2015 13:00:01 +0000
+Tue, 10 Feb 2015 17:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 9b9efaed3f2e..042dc4774463 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1423571701 Tue 10 Feb 2015 12:35:01 PM UTC UTC
+1423587901 Tue 10 Feb 2015 05:05:01 PM UTC UTC
diff --git a/net-im/turses/ChangeLog b/net-im/turses/ChangeLog
index b431ba915ad7..1010663e50b1 100644
--- a/net-im/turses/ChangeLog
+++ b/net-im/turses/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/turses
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/turses/ChangeLog,v 1.9 2014/10/14 01:54:06 idella4 Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/turses/ChangeLog,v 1.10 2015/02/10 12:33:33 dastergon Exp $
+
+  10 Feb 2015; Pavlos Ratis <dastergon@gentoo.org> metadata.xml:
+  Drop myself from metadata
 
   14 Oct 2014; Ian Delaney <idella4@gentoo.org> -turses-0.2.13.ebuild:
   remove old
diff --git a/net-im/turses/Manifest b/net-im/turses/Manifest
index c4c9022bd54b..7ac3c78b2953 100644
--- a/net-im/turses/Manifest
+++ b/net-im/turses/Manifest
@@ -4,12 +4,22 @@ Hash: SHA256
 AUX turses-0.2.11-tests.patch 844 SHA256 6b5f5b71c04363f4113762badcb8da3627df1532e5561a72d397cfc50402d0cc SHA512 196063b5f9bd05933f47dfc04cec873d0fa536967ee424f8590db4f869ca6c1abf0566b50c9bd64b84293aeb7b71bcc550763e3b32dd8b7a8028299a4fd9cbf5 WHIRLPOOL e6966ca8d21514cbdd74cfebd4a37c9858ffa62b235bb8c35f18b5daf46b4a666dc92f990c698b6b9b1eab2ea67112830a9406b686ab7ea40b33958655e9110e
 DIST turses-0.2.13-r1.tar.gz 2239614 SHA256 76db7c296049c85054e4fb0e3ed86c4ea34aa0724eedd59f8ee55e0d483e0307 SHA512 ce7e2042b6a3c7fb998bb7f5523f7718f60d773d3b89d9175a462bf6f24f458f09aae8a78d481f6de69d6bc5af55dacc57c6976bcd2df2186200b0ee60627aa8 WHIRLPOOL 1920478d4d9d863149e59514700509aea432f1cf06985be635db8651900b7d1cab1f54cd5a7fc6f45df06b353e3ba12e6ab6bb65fdedb3c81645efc070eee539
 EBUILD turses-0.2.13-r1.ebuild 968 SHA256 dcd291cd7f6b1d8d70d0e49926a2dc0c9cfa587595520806e830069e025c3adb SHA512 7f233f9fcecac823f6d8c536526bd109fa738e6421bdabdd8eec302be6d454178855ec6e1cb46eb4d71fda009839b4b909f4af8d3cb13c0c84558010eed6b12f WHIRLPOOL 1654704c5b05c96144b49530d9980142bba2da09ecb85a150113dcc486e491b53204ce281499c7a4dad43a04e9a6cca75432263557dc5dd217f953ce094530a2
-MISC ChangeLog 1495 SHA256 91a38428c0d68e25bf71bd13516b02afe689aec75da8613dd54defbf60c6eb20 SHA512 23b8a1f27f8f5ae1872fde873153b418ed0ddfb8d8db971a2aba6d846f45a37f335e0a5732281f9356d74688beb82502409859355fdbcff0f5d602d7c87d3dc9 WHIRLPOOL 19d9b92a74ef66a033e991d0c8467169fd7dcfeffa5fb968caf2df6630649b4d8395ca7e84a24b7734e9d22232c199ea919bacb4131a0f513def552416c7e316
-MISC metadata.xml 305 SHA256 cde86562030dbe85e7e0bd36ba17696eea47196b894d4ae4e1606e064a28c5c8 SHA512 1189a9d6baf59c4a16bc8dbcede722ce4290b0c45bbe4a43f423174101f9cbd2e0d41e2ea952b14cf86d92572c8a4c20ab71fd77f9be59e755ceddfe1ec7a58f WHIRLPOOL 54a7fd2039b5ca4900dfdb7555f99cf5c4c3bde658d69b5b38cdbd66f70619f1f73d5bffc94c40728293e2f6004f1899e4d898554e2e75b8732155040a162d3e
+MISC ChangeLog 1592 SHA256 d08d9bf1d24bcbe186902daad57829aa6b1b9d15174342e3177c304ee32a1b9d SHA512 01351dc3c80f2dfabca74c54bb2a3d6f60562327f81a5891acba8eeb8f4714d3fd416b240277993839942017aa1c8d47a244d7c9a76b7264b90493aec8aef70a WHIRLPOOL 807cc0ce451ac7507c3d636385945d3d5ca5e6c89296c1adb5868cd5826abd8806a6561d03c6ef156bd1cc914a8ab44f1fedf6b332357c5659eb5f15fff9aa02
+MISC metadata.xml 210 SHA256 bfc187ce01bae1b5717bff2847fc503b065f40e8009c022a33afec9bfd520b8f SHA512 92f0d17f2e7beb5aae7ff36e7cea668dd423c7c0a65a77f5aa5128c6a24721f3552b763750738e07068d3c2c57558239cda49bdf1afb8a8204874896b09061a6 WHIRLPOOL 39804da0b5a5112e2385210a1577ed0d2965c5e358a77df7ebfaba535779da2aeb019c98a74e609028201da5db785569e34cf6eb4d55716777e9fa60e6a06ad5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlQ8gk8ACgkQso7CE7gHKw2fMwCgzZjwAGLh/on5fQaMJpDkiYER
-A7QAn2frXaO/xdmWTsTilTwIWOrzYHVm
-=eVjO
+iQIcBAEBCAAGBQJU2fotAAoJEKMbvrI6BRdGzA4P/1v1Ab4rkSd0jRg3lD6FzQHL
+FTN2UhRRa3tKc38WJrP3WQmtY5AwnJlW0hD0TnA8lFeIXukRdfV5id4AI1oCSndn
+BBekSd1lRdaQZxV+bQt7ti9nuHT110olSqZVoIQSt11VaGVPYEf6FWH4PUsrjRGg
+JKYzQnFSQQow5kNyd/9TbeqBECm2q4jIIiMFGSOrCSoZKOxkbPqb4E81kCn187IQ
+0PnhSasrhON7McAMRgSFkKsi6pupDp+dcxUorB6vL1DAkTvgA+FunyyykOm6G6bG
+AArHZv+ntmmWrsLRL7rXtGdjyFlCykPzxWdiwo6XH+y0JCgL88PeiyI5q5JsTmlt
+fr1A6br9XDf4OjHlPfxAHw5LPlgoHcV7KT5qYvSUzZr0v2q3BVVK6YdCRPlbbiiN
+Bc8/NAbjcDntO1SyBqoaJniVrSx5q//7ZIj9YHNL2ww992/a+d3TSnxuS8YkZruu
+xTVhhTfSfvN08Ehc+jt0rsMLbKcBvQCc2OEflDkXUYzlYCb2rXQT8A/Cn7u3D/D1
+noKT/8kjldV9OY6MW2cXXhKa99RUj2DpePHxYmimr2JBjVGU4BeKwY61gQHv9dnv
+UW3ezLi5wp7J583NUe10EwNb7Bpp9qmEyTjENco8NJX8/DTgAL3Cc4HHvh+nMjNY
+W9OeBTHKPY+7WOUjPAUT
+=Ysec
 -----END PGP SIGNATURE-----
diff --git a/net-im/turses/metadata.xml b/net-im/turses/metadata.xml
index c788cd25f1c0..c3ed92bae9de 100644
--- a/net-im/turses/metadata.xml
+++ b/net-im/turses/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
-	<maintainer>
-		<email>dastergon@gentoo.org</email>
-		<name>Pavlos Ratis</name>
-	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 </pkgmetadata>
diff --git a/net-misc/lxqt-openssh-askpass/Manifest b/net-misc/lxqt-openssh-askpass/Manifest
deleted file mode 100644
index 1d4b2bda9a6f..000000000000
--- a/net-misc/lxqt-openssh-askpass/Manifest
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST lxqt-openssh-askpass-0.7.0.tar.xz 14276 SHA256 764cac4eee716d19975f4f0f888a9341d74073519b19f331b7593362dbc878d5 SHA512 aff27c83f075427aa8fe8e5fa463a45eafc86da673f4feb618c3b101b37bbcc30224eb28146ca6652428a144b47f44ee62a37ca9c31fab5fcec81a8470d88e82 WHIRLPOOL ddf5459e364ff3ceff69bd44bcfac68da739dc977c3c2706a0c4fd22182d06009fd46ce62eba6c8e0b9bb268c43f3db7c84f0aa344350a399730c332b48aa04c
-DIST lxqt-openssh-askpass-0.8.0.tar.xz 14452 SHA256 be32a3d197aced5b4bb05231f281fb19312952ce22f973c2211633e0b2a03719 SHA512 c19c1c53d391915394143a81e655aedbc31087edf8580ec18276bfb65c5d1ac2bb9554b18fdf1838b8ea032f13a9efd4e8cae4677321653a67448eddf7330972 WHIRLPOOL 9ff59915eac4c0034f950932d9a01e8ef6202473f2e0c817c3739bb814eae61f469e6ba10f7cab73f263bddb017a8e82f9992746a6642d300ba7d58a1410d532
-EBUILD lxqt-openssh-askpass-0.7.0.ebuild 872 SHA256 6deb318a56e3777819086029753a57a4b811d40ee3f4f51598392662df857242 SHA512 3aad39749bcae2bdd3986d9f64ebf1496e565ee53e2df8ab455a3ff181cff92a4fe3513d7033b09f4578b2bf80cfc17a28781faa156de24af3c1c48454209677 WHIRLPOOL b89ba7d24c596d95dd377286a42e8f6aadd694fa38eb88563f16df103536a6302dd3285ed106a5f0ca381c3c58ba340c728ccbe7953d136a66986d5664591f9c
-EBUILD lxqt-openssh-askpass-0.8.0.ebuild 1070 SHA256 02f46887cc536f692fdf4a177bff23c5991b887ca54b76a19d47949b66556d8e SHA512 643950e845fba6af6ddab31b2efa557aec216c7af16b62b4d41caaebbdc44167ad94730cdb7f9f9a8c25f0c085198e3c474bd995caf1d004c58182302f73525e WHIRLPOOL 781ae3ec197a7e84fa4876e3cfe0e1f2ea9aa9f220bf1452b61dfe40691ccf53f88e42de564e6fb097e483c5b090e152de0d548fa0d2b04ca6a34641a2115240
-MISC ChangeLog 926 SHA256 1af2efd19413521122146f42cce2b677f29902104541559f83fb58d5783b545e SHA512 6ae6a70f456f3cad7869665a02d6a95f6b61f0ee8edca9aa8f6a79647755478095950df7642113da772ed1a990c023e0a17df9ad5a2b18e1fe977ce4cf203401 WHIRLPOOL 837d06054e6533d189bd7aa78cfdd928c9e040a56bbf1a86b1e0c056ae47c384368d2345a6eeb7c74c9e2fdc58817272607e4b7bc5eb4c235e170dbcc277561e
-MISC metadata.xml 263 SHA256 d23df106b61ed123144d9d24eea822badfbe6cb7d8d4ec61215af73b4c8f1fc6 SHA512 9f99b13f568e1cfda82dc35cd0b95fba565d5f18909db7b0d7dff75273cf4076a68288768ee5f65a70485833971fb3e511919a9e80d09e0d96f3a38744435d3a WHIRLPOOL 6bfa4c8737764e7450195f3ffd2e8fe8531ad44dfa02b0d7819678eeb7898280f07ed13ac87e0158abb6d9b804ee617b7683f73a4cd17db822419eba55fa62c6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJUaJwGAAoJELvuk32y76HUoyEP/1+sZAWg0jx1bmo5IvtSWsw/
-1d+feJcMoz//h2PqVuijLEgzNmDkjK6CS27BmfcxvPil84zPQmbIUJTCR3ZucC3A
-r5IYGvDv2jrsWWDTB5PKl0K1D/QQ/TGdIbaVmza755jQi9TSDxVbOtGJTxJIPPxV
-vvylzGjAYcvhTMb6Vb2WCELK3HIN4rQV/SJ4eUqEvHqAA5KTAR+dydoFoRVhbKcO
-ZYKsEJ5heOaceDNvfSxqk8Nj0wYrfxm3JMP4WLea/RcVZRQROdw6CG3lUbYfUoKb
-xKfWVPJDL09kgP/uIUkB0YGO/7m2V1zkj7zoOF1k6T4iQ3m6S4ejr8/z+OiVnvTo
-Vj3WU2sXjy3sNRDVCq6w8XATO9rCQqsZlH0joCDUvUrut26CBl1etI3seEb96cuK
-LNsC8nKsMpy3G/eKFDwOUp5Y2fFa3FzOCZTJMaejbeRrFhrAqk/g+4vQS/wpGu3G
-wQZUobTy/E+WxZHhriDsOqVXz6mLQmK9r9hLPn35RnEhWTYujXPrY35tp/A8w93w
-0YvdNta0FYuziLm7ujuFhyBLba0L/cakZZdcTb4u3cLr8va+w0WC688GTkB43O65
-y7iTYrULEunAPu3xYif5WCGvWZdpR8c8naNy9Na0rxBG4ayea9UQc8vA+Yd/9hOs
-SQX5mNJzhk0Jf1dY1RDP
-=Ok/A
------END PGP SIGNATURE-----
diff --git a/net-wireless/bladerf-firmware/ChangeLog b/net-wireless/bladerf-firmware/ChangeLog
index 5c7aa32e23db..8961105479e8 100644
--- a/net-wireless/bladerf-firmware/ChangeLog
+++ b/net-wireless/bladerf-firmware/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-wireless/bladerf-firmware
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bladerf-firmware/ChangeLog,v 1.2 2014/07/25 03:44:57 zerochaos Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bladerf-firmware/ChangeLog,v 1.4 2015/02/10 16:37:45 zerochaos Exp $
+
+  10 Feb 2015; Rick Farina <zerochaos@gentoo.org> bladerf-firmware-1.8.0.ebuild:
+  add warning message to remind people to flash update the firmware
+
+*bladerf-firmware-1.8.0 (10 Feb 2015)
+
+  10 Feb 2015; Rick Farina <zerochaos@gentoo.org>
+  +bladerf-firmware-1.8.0.ebuild:
+  version bump
 
   25 Jul 2014; Rick Farina <zerochaos@gentoo.org> bladerf-firmware-1.7.1.ebuild:
   make bumping easier
diff --git a/net-wireless/bladerf-firmware/Manifest b/net-wireless/bladerf-firmware/Manifest
index c777ebecd358..59746c0c65c6 100644
--- a/net-wireless/bladerf-firmware/Manifest
+++ b/net-wireless/bladerf-firmware/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST bladeRF_fw_v1.7.1.img 122408 SHA256 9af2faa3b648e59f07b2c19d1e9ea2b91b47abd2b44c55e10bd2daed52943464 SHA512 9dc1f461bc48a7eb32957fef4818a2e3b50b13da0924385404abb972d653243c0de5717044bcac6eb44dac637ae429311e776a4f5aaa235a80193eb3ec7a0e7e WHIRLPOOL b15e158068bad1840c230f2fb9efbc5f8eef70cae4ac6ed69042293dcc7ecdcd830f1f445a452b0ee6f0ae40f425a9fd015fb311c11788b242067cf52b98bed7
+DIST bladeRF_fw_v1.8.0.img 122576 SHA256 3d8bb1bb2511d5d9b264b51c16cff7648c08fcaa7e7350127e6e82d80a695d02 SHA512 5cc8e69e550e60af0c9fbead9655c6af19a29afa18c352b0d010727e28b7c8fa015c6294054d19a65caa4a8ed2fb5096fa90f460561e4a7abaabb2b0bb15e366 WHIRLPOOL b71b3aec706e7fd6a92c913d1646fb31576dd97a6ad2c3a36965567d17e98e5035203d200e6d5b3da38ded00104a044027fb3bc63cdca760ccafa0112649b676
 EBUILD bladerf-firmware-1.7.1.ebuild 742 SHA256 0377ba80dc1195dcfa6c9127c8e223d00e1f91b4bdf60eddd9ff848b39a727cc SHA512 688193339916562b05f2bf404d7b58bb45e971036b901075733a25abd0f4157b2d7849088d1f0dc98a5b4b63799adf78044f31e7b1bf9b4f88cafc2832ac7fea WHIRLPOOL 4f01c30a559e57e586f38364ab24c284748af57ef2e9122ae46b8fcbcf775595a00b07f660f114cb0a2a70f3edcb8010517c95903adc4b64c5cb2bf0e438b55c
-MISC ChangeLog 499 SHA256 fac160e9b60b89b29f73465d420d9ec98923b2b2ba7adf54d286d4060c87d0ca SHA512 96e108cd2f442c7f2bccd6d66d7f565fbb03c28e25161a436647d512e23fc7af242c22c5d1ccb0bf18441e6869ab336a3c60a7d987247a51be75774034fd9dd9 WHIRLPOOL ac10bb0f684ce8020f21856a8c245130765c1478b12b91dec6d59bfb8c436e0ea834715105f0d2c0238ad8f7441b85f09dab22036dc59e99dc597d6ffd97a16b
+EBUILD bladerf-firmware-1.8.0.ebuild 942 SHA256 7c4474030b3a87ff8424da5a4c57bebef75bbf06b203d68e695c26b90862a086 SHA512 7af03a34bea1220c067356464659f92c5a1f8956b0480c1c94edbb4b713f2a592e2fa0c285e23b3dbeec86c3346eecf624cc64b6a6f0fff18e4238967338bc95 WHIRLPOOL d7a25d2c18dfc571cf5f63a50c0a1f19a8df09607b1eeb93a5fa8b2582f1329f692af19da2aff594d60be42e5388cd35dd85b8edffb45aa2c83c894fa9bb6d8f
+MISC ChangeLog 788 SHA256 9abdca398b3d50b2e95a4c284e4b1709d76a561aac7adbe405b50897f22faa48 SHA512 4509dc97083c6b543658faec34cc42e4edc35610b0ef098044829cdd378bd16620f81dcf63be33661090d54f3b8cd5620bb54904864feaac2ce57c12373cf9b2 WHIRLPOOL 0ee6e10c3cd48de3aee94dbc2bed5ce473f42c81f1f4a6ca54cb03d27c0156e9507aad3800b0386d9cb59d9a30bd9a65a731d1cb8be97261c3b704d797249935
 MISC metadata.xml 293 SHA256 300e69f50a4a860ff411bc9a1bfc3cf7d7f2fa482dbf497ba146340d03fff1ab SHA512 24e417f158ed14c02c9aa943d1e0c10812b99bbfbd9685b3d09c63b296f84b2820c2885a03a0d82605d8542c88e59887d4f1abe859711414aa56fbdf843d9867 WHIRLPOOL 9c364f1bf6fe6bb8dac6a9d10c444ed4622b8523dde64f74d06ee96943d543df995b3d9b38b0fcf04b443ff90892af9495a83faa77b5704741c9388802fefe2f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCgAGBQJT0dOfAAoJEKXdFCfdEflK1G4P/0cBhMtioYKkt8qg82OxAnHM
-zqEdv1w2SqxQ/Oi7hZg1YOVNXtvEgkZKzx2dErVrtV0IFPR7yrEOL98TwbgEDVPo
-Hurwjj3g+ju1qnk2IofQLRK41jHmg0mrM3b6s3ECCvAS386U6jtHM1cn/aSbBpLi
-SfdfNhmYoyQ1g+Djpf9vwkgDVc+s9tL0OC1lzZZby/hHC5IK+eCNxDN4xoPrhli7
-mG3dVp3b29EGOqR1isTIu9Lifxan8zCNYSqnAyNS/W3kQqgzUQfoG0M2b73gqD+h
-tFgBq147XYxQ2ZC7d0lzhB4bRvYMioNIaCZYaZ6dcDQwoScT6VzelSeFbRz6iREC
-JDHuoAOuO/8wOY3AhDuBRF6bVkSlJp8SN9CxSHfBkIMOv02YLpQo3u1bNNgBSkHN
-q+oX7drCuH4l3se+gRuIabE4+byKgo8D9EqxJqIZZaICMpZks2iHIqNG8efYqrXW
-evP13Slg5wP75+pf+RjuGbDyRcd6O4hid2RlExpKy+eilP+0abE+KUAm3aTUCp7N
-lCqq6rqIfXpWcS+4OOEiYuVp53GPk1p6Qo5HzPG92Pmqe3uPDL3hvJiqrkb8LR/q
-OOP7Iu2YaORMUcMCyUguqzSiTN4x4ThCSYVi4uDEIyrXbbMu4JVfXlA1JzmEWaNh
-SAetRFVWaJRLPEMaPKoJ
-=jqMz
+iQIcBAEBCAAGBQJU2jPoAAoJEKXdFCfdEflK6rgP/jS8cEaHtW5OxFtCYkMH5Mst
+p6W/tXKRtZU3qfgUIVemcugBoC8Oa8hxdrJY6Qnbe39zPSdAJKqS4YAIXGbHwNsR
+NkJT926ND2pAHGqEgrTwBbDd7ZdR1YLmGDvVnW6T1cqzwk9siZleypmBjDnqo2nl
+4CJpQB9DjkFANUhr0KahycMCR/t+yOrpdW+s7nHC0LHOEGjhwHhuO71magEb1T9p
+0tF/wRghHpvTk6TCVmfQBCbGBbeoNdU+I2hyAUIDH1EMm3W2m2rluvBl09xjdJ3Y
+9c2RBQkTv7iseBrmOlISWwIAeMSLuaFXOWKHDwji/tsq8237iuNFZShlfq/ARzLk
+hVOl/xynF5WephVu+AFx2PMjO/V+7brHMG4sYr+S30NBxApwbeNmmjbTLK6wcvnu
+MxNrgInprnO3Cc6B/cO/4Sx7Wlah9V0roOlk7q4GdAUzBq3B73ct3qpF2ng/2482
+JwVbvBKr/T896wIDTunRWkKu5jqiWvH4lOXoos9l5GkGlDTeNZguDAz2oua6sWlF
+jjZA5tXz+K5FYpo8COaX4JRqSkSFpbNBIRgOSQeFkmiVs9jqnQ0+PEIWt3x/ClQs
+eLEGCPhViAP8GMnCKnh/7ZgE7/ZMfkJx3ig5AIWthU6vJ7GI3l/9zyEjQmeTt7ja
+A/Lbd76IooE50JNA9pGn
+=ujjm
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/bladerf-firmware/bladerf-firmware-1.8.0.ebuild b/net-wireless/bladerf-firmware/bladerf-firmware-1.8.0.ebuild
new file mode 100644
index 000000000000..f34c539719f2
--- /dev/null
+++ b/net-wireless/bladerf-firmware/bladerf-firmware-1.8.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bladerf-firmware/bladerf-firmware-1.8.0.ebuild,v 1.2 2015/02/10 16:37:45 zerochaos Exp $
+
+EAPI=5
+
+DESCRIPTION="bladeRF FX3 firmware images"
+HOMEPAGE="http://nuand.com/fx3.php"
+
+#firmware is open source, but uses a proprietary toolchain to build
+#automated builds from git are available, but likely unneeded
+#http://hoopycat.com/bladerf_builds/
+SRC_URI="http://nuand.com/fx3/bladeRF_fw_v${PV}.img"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${DISTDIR}"
+
+src_install() {
+	insinto /usr/share/Nuand/bladeRF/
+	doins bladeRF_fw_v${PV}.img
+}
+
+pkg_postinst() {
+	elog "Please remember you have to actually flash this onto"
+	elog "your bladerf with the following command:"
+	elog "bladeRF-cli -f /usr/share/Nuand/bladeRF/bladeRF_fw_v${PV}.img"
+}
diff --git a/net-wireless/bladerf-fpga/ChangeLog b/net-wireless/bladerf-fpga/ChangeLog
index 58763e1d908f..b765d68187f9 100644
--- a/net-wireless/bladerf-fpga/ChangeLog
+++ b/net-wireless/bladerf-fpga/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/bladerf-fpga
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bladerf-fpga/ChangeLog,v 1.4 2014/11/03 19:51:15 zerochaos Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bladerf-fpga/ChangeLog,v 1.5 2015/02/10 15:59:28 zerochaos Exp $
+
+*bladerf-fpga-0.1.2 (10 Feb 2015)
+
+  10 Feb 2015; Rick Farina <zerochaos@gentoo.org> +bladerf-fpga-0.1.2.ebuild:
+  version bump
 
 *bladerf-fpga-0.1.1-r1 (03 Nov 2014)
 
diff --git a/net-wireless/bladerf-fpga/Manifest b/net-wireless/bladerf-fpga/Manifest
index b4ba913bc1c5..f7c016af7971 100644
--- a/net-wireless/bladerf-fpga/Manifest
+++ b/net-wireless/bladerf-fpga/Manifest
@@ -1,28 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST hostedx115-0.1.1.rbf 3571462 SHA256 112b315efaa4aef4bdb15285fb637ff1c93aa24cc3aa98d86ebb4e02d2352aa6 SHA512 14a74942963d0a47b6c3a46540fb8fbedf0204d9e056e5ad8c87b3988441ab0e4d1f875196a6c2e7c8e462b5e091a18e7cbe5a7e5c3d3773952e43d7a4165e99 WHIRLPOOL 76b7e6157fe889abc6dec9d1e81656ff60b0de9d3a7c1405f2fc25166ef3ee963e4f37f93e9f52d881cb6b899ca33be90ff1920179b44bc12a7f7bd70963cda8
+DIST hostedx115-0.1.2.rbf 3571462 SHA256 3dea872433a4dc3410c3aa667dc18caa8c2fda0a616d325f95d6f2ef02221f90 SHA512 0c90a2e5add5443df549b2428e6ea2c043171b4c18bbbf953eb1c96ad3a2bb53f655212353eac6df1e7758366fd4ea5dabc355f85db3abdecdb16b4b2b85fd4d WHIRLPOOL 5065e033c6882c92e117444480b969e9f17ee99c794fbf16edccaa9396d1d1c804969463cbcf90a4c86abebee4a78349a3a8ebe40388a38a7e517bdd317de431
 DIST hostedx115.rbf 3571462 SHA256 1c145aee9555a84ecc065fe50e15b56835be2c3691ae747cb74e0c24a8fd1e4b SHA512 4df268602e662cd54a6da2b94d52cc355afdda8578c8342ea1be6a168ff874c095f92230f3cdfe5aada3d1c3237d8572e427c377c57f4a6d555f0ca49f85d6e4 WHIRLPOOL ea66c0779023eb6ef5b15bd4c34dc108cc1c624cbf2265adc5f2e0a64f70b1ac1011cce943bacbe8be09580fe0551493bf29ae130bdcb0e1e3baf09260c435ce
 DIST hostedx40-0.1.1.rbf 1191788 SHA256 48852d9d0a64f03331e0c3c1adf6dd56ee8ef77bf6ae93401bf845a1117714a8 SHA512 426aa48c588e02fe3a13c7310ab7f2a78f0c5aaba1925164c78f484cf99cfcfba103b8a738329a198c3b905fd23cb48fbe29fa4e08ded6d2fe5d70f90b850af1 WHIRLPOOL e39e3494e9e39798b3af00b145bf05c9544b995abf549a49f1f82af313efcdbc4bcfa923c6b6e6e7903c45331b94ab7d3a5bdfe73879d9986cd9da8318ab0b09
+DIST hostedx40-0.1.2.rbf 1191788 SHA256 85f2e237829476f6f15851a25ce96084dfc695820c37cd6751efee4c4806999a SHA512 9f06b5560d91ed65df14e48c729da04ae4c8720aae863d215f24db7efc4a353751840605aeb6b2ae9e4a71ffb9820d7f310bdca6dddad27768514e2edd7fc933 WHIRLPOOL 077c947b7f9558ab45193170374b6472187f1c26b874029a7eecc9823392ffbdcdab5d7f6461a5a391719311ff7e8aec3e4fd517a2c1aecdbc68357ca9776879
 DIST hostedx40.rbf 1191788 SHA256 206c7629d3191d4bb29e2826730c89a160cc565a7e54a7c2b2c2db05549e72cb SHA512 e56686a8dd4372cf11d3f373ef4262c3897f9adbd8952d82b3d737d38e77d8ddde9c427ddb6ba20364ff3748d57f29974044bd32c0f4177690ff37a600b210e9 WHIRLPOOL 0aeddf6169db1b05e8d722a1f1d5056621890a96301055e27d06c3fb928a11884ad89310c27c4c1cadde9be65c9a7c063416f2da0dd94ea28e535bd561e54a7a
 EBUILD bladerf-fpga-0.0.6.ebuild 844 SHA256 125c5a8cc5f463ecd8b82b5b5557f55f044b44d03f6cd552a6c39994bc8144c1 SHA512 2d3fe6ee17a3ea58720cdb77878729c7af9948897898b717b650e101633eec6d8152093bdc6bcd452455f0869c4a4424822cafe180b06c3e66409d7221888fb5 WHIRLPOOL ad178db7ad02eb42f6aa6aa1f92c5335836255829b4df2800bb45290d7bb0e2e319c6db4f145d7bf09d9b8c9064b4462bfd4febefb52014d19eb29a3e7dbc107
 EBUILD bladerf-fpga-0.1.1-r1.ebuild 937 SHA256 bccc4a302d94e837c311debc8bbe82f7f36f306c9ac8fb70feadd531c075495e SHA512 fd8b05beba10a784c01d8cca96d87f91e19d850516a4940a47725e5ed2465a7acae4ddfb74a446fdab3e7dbafac2f7ded4db87dbe1985d695bed45be44940930 WHIRLPOOL 85a35b34b9770a5f3cd2882ecc97e61d043df78e0571accc209c6c04296fcc300d555dafc4064c5e89f8b157786a78b57fe38ad0a64af3deaa818f9d85f829f7
-MISC ChangeLog 816 SHA256 c3455aa15547fb6938fa2e9b809ee50de913866a46f0c5ccb6303345e7bf4c03 SHA512 fb2f3fbcfa36e21dc355dfa9a4343a3fbbb429288c795e7553c63e97284dc22af207acc421b17fef3de28eaf11a2d33510a2b7bd3a9488fa58e977c4ec5734eb WHIRLPOOL 76974a15e7381f87cb6619832a2532672e504ef79c0cd54b3eb33cd33ef6f0604e5970f1d0cf194a384634523513623b4d54d6c3ef4072e83953b5473df4a24f
+EBUILD bladerf-fpga-0.1.2.ebuild 934 SHA256 81259872605a12deb06a4fe9f10b4d70a4489cc0de5384b75c30e32538b89082 SHA512 48b06c5fcdc2fe65d8b4709cfc81418ac77ebdde84c73e80ec778f84a1503fdb414486da499e25929ebfa28dcaffa071539790f4eb0938d952433db87b0653e8 WHIRLPOOL 7f94f957062122b376fd3651a842231e9f80df75f20b0df32954aa9a436b51a32b2f6b4229c87869dfbb39bb14e7f275614aa7b807a929233da5c218b88a1bbe
+MISC ChangeLog 945 SHA256 609ceff1b40546fd5acf6b71e535e1f1e5e201352824e53d15cf9c315db8d0ec SHA512 6fb6ff469ca94129d7a3d837b7cc7da01b1e6c3bc1735c596a0bd586588c16b4104f7ee32a5290b1f66bd5211582f71db6eaade1842148b11058140f89b7f8e6 WHIRLPOOL d34a7a5b2f120a96ee468c903edd7f4a4ef44285dc57d9b70dbc57790fff0f4623a780ec990292b07ed58a886d18e4c50bba317b7dfb318ecdfab7b9dcadc3d2
 MISC metadata.xml 468 SHA256 3684e7477b6260841f83b7d5a79f5e136f2c14ef6b1817f0dd82668d243b4cf3 SHA512 105c39b1afa001c7ad6d77f23cd12476c7eb99aad336a0810d7ad24134b1e8b28a2eef85d7cfd17f6ef83ac2edad5878f9aa8a9e315ab496a8f2fbef11aa5924 WHIRLPOOL d28a59ff71fd861390286ab0c5f358e3099a0fab66403130deda85be021d5c987f3f3bca6f77cfca11a6e6e6f257cd563aad6a2a3d525ab9eb10043b84801e69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCgAGBQJUV91cAAoJEKXdFCfdEflKSSoP/3JZDxOEjvT5yJbbyzhyWfpT
-IDDtJexstY0YLo1MqzHnGO/ezTg4dIHy/MThXGwdUt3ehvJzJMHYx6LbewufQ4cI
-sirtZ6/XHy8KmsYnGzHaIbHbrYoDFqXrfy+fYgaGHVZ7/Qw2vuCRumaQKWp1DRrx
-xPJWaTwXMNQ8461T8uu7qS03moUIt0Rccm6enYO6vWlCk2XsxtPAjIm0+rcPg0ge
-tNuSZ4zTnxxHGXzOUziVE3JgblNy/260jfdeRPnOeoboPU5eH3Ar0ryBUA2qcsde
-5Yjv/2T3t5dVlBk0jUT8P1azJKTHqRQa3+jEx/iB92mtNSrAYmYdf+BAPV1qzwJD
-Y+szqZ/ouG49udGDBNoRGIpD9lmVybBJadPjjvg3QCCM/BYErhkAiHKg9AhA6X+c
-zOyyAFg+fsoa9tjqLP599IrmJxVuU5PKCbohYhEmhTGfFMP5JJfVpOL1SzZ6ZHef
-a7kVOGlsOZDjLTsO9ze0Azrb3olVjI8kFFdL3S7lTKfnUsL8UtktkK3p68fyMlsn
-nWHNT+/JhIJsrekJItgcE4xQJFfs/t6fqLAzXc5YGoY6jKvGgHAyQvpEh9dpQ4I+
-b2+4bNkHp4f+S0iwPVGivGLaXzfXMKxGIJjuzPtgKZp/zUYMxdrRi4zHyDvTDVNM
-uT2G2l9PqwqUCH1mwf13
-=1oEv
+iQIcBAEBCAAGBQJU2irsAAoJEKXdFCfdEflKzVQQAKlonqCUckHlVw1pUzPdfn9A
+YyMKqijye/EzgRIw9CPkgNIkPIHpcZBWovU5+ZYwW0HvD5TCeuZ+9hlzCwChGlhi
+17DLhaiHipkB2I4LHdeIySHabrmnb4BCWXc+9D5mSyDb3nAZdBG4/te26Gpir+pW
+oo1z16mvlaU0Ux4v0LiuCl42geYEK4Yy+nYjIibXGK30R7hAE2gc08SK1FMRTueP
+07P6UXQCZKWzQRkFbIo82vP9TE98zuPbDg/2wCBN4s6NXy6yA98h+a66yYabhtGF
+wkHznmWrWxYtRG0/KI+siA+qX/3Jt1UJSauxGR9bXm2vsvKPlvtxAfngcQUKe3CT
+dwIoKJ6ISLEuEcLUX3htCJNx6cahGSnuBWx4eqdECJLr1e7TpnSzupk1UTrQ8GWn
+U8jPNYgcH+3RhkSqmqljXP/4GQYunHlZOiU1jcAlhHXQGIIGIyG00O9V75x7Hf8s
+rTI7G0BOuVf4kJ3uNH71jO74+vnSVFjIpk+OfEU+b1pRwLs51grrJ8nrTz/4oUQ6
+AjlQs+I8zj2T90zVgMLHsbB3pYXwyBLrPZDq7gXbfnOH2939zSysJH/NSH8fG+Lg
+gKHxAAoQ0naTll79pQ1f4YR7KqOpBiYSCZoNKWf0ik1wjU8X8h4E1G6AUifzHpTg
+xucs9hH7s506xuNv0Nd6
+=8Vdg
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/bladerf-fpga/bladerf-fpga-0.1.2.ebuild b/net-wireless/bladerf-fpga/bladerf-fpga-0.1.2.ebuild
new file mode 100644
index 000000000000..2b2d59faf1e0
--- /dev/null
+++ b/net-wireless/bladerf-fpga/bladerf-fpga-0.1.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bladerf-fpga/bladerf-fpga-0.1.2.ebuild,v 1.1 2015/02/10 15:59:28 zerochaos Exp $
+
+EAPI=5
+
+DESCRIPTION="bladeRF FPGA bitstreams"
+HOMEPAGE="http://nuand.com/fpga.php"
+
+#fpga code is open source, but uses a proprietary toolchain to build
+#automated builds from git are available, but likely unneeded
+#http://hoopycat.com/bladerf_builds/
+SRC_URI="x40? ( http://nuand.com/fpga/v${PV}/hostedx40.rbf -> hostedx40-${PV}.rbf )
+		x115? ( http://nuand.com/fpga/v${PV}/hostedx115.rbf -> hostedx115-${PV}.rbf )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+x40 +x115"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${DISTDIR}"
+
+src_install() {
+	insinto /usr/share/Nuand/bladeRF/
+	use x40 && newins hostedx40-${PV}.rbf hostedx40.rbf
+	use x115 && newins hostedx115-${PV}.rbf hostedx115.rbf
+}
diff --git a/net-wireless/yatebts/ChangeLog b/net-wireless/yatebts/ChangeLog
index 19153c5896d0..66c725c014ed 100644
--- a/net-wireless/yatebts/ChangeLog
+++ b/net-wireless/yatebts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/yatebts
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/yatebts/ChangeLog,v 1.4 2015/01/28 23:02:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/yatebts/ChangeLog,v 1.5 2015/02/10 16:20:12 zerochaos Exp $
+
+  10 Feb 2015; Rick Farina <zerochaos@gentoo.org> yatebts-4.0.0.ebuild,
+  yatebts-9999.ebuild:
+  add missing dep on bladerf per depcheck
 
   28 Jan 2015; Michał Górny <mgorny@gentoo.org> yatebts-4.0.0.ebuild,
   yatebts-9999.ebuild:
diff --git a/net-wireless/yatebts/Manifest b/net-wireless/yatebts/Manifest
index e1148755c0c3..5509389c2c85 100644
--- a/net-wireless/yatebts/Manifest
+++ b/net-wireless/yatebts/Manifest
@@ -3,26 +3,24 @@ Hash: SHA256
 
 AUX yatebts-4.0.0-dont-mess-with-cflags.patch 434 SHA256 7acf78c645b5c797dce66d51d017aa6c26e228343651f998a0f3bd52a4fe6718 SHA512 9a8ce2aaaa3e5183a4d77b4ece5f53d71b2c1c59856d1f3054a8a552a547624585674f8d67cc068eb6546279a87a14e8471d99ca79fc7025c989e94aa03a3d25 WHIRLPOOL 9496ca5c1cf6090302f30ee25f1523295dc6be3cbe1664902f3e9eb50d7ba5ed8b8ecebf13f625a371d166cf1adf3ba0b5783742f018682029997f703ca89ee5
 DIST yate-bts-4.0.0-1.tar.gz 3311644 SHA256 0cf40839e81e1600b3bd7a184404249cca387d9a7413dda1db02f92d3b501c31 SHA512 802e765fb5dd1702b71c6e7a68f671dcfb82431d7c6defc4fea1494558b8824c0a4b61dc9b7b787bc8badf09752b12efb531d7435d6d32db60edd96fe32f850d WHIRLPOOL 67b983de759b0cf87ded1673c2fe41fef6f10ccb0848a5816cb37c9f20c48c6e11667f4098469d8b381a5e9a50d00c623d494d623227f879e0bf32e11bd447d3
-EBUILD yatebts-4.0.0.ebuild 1104 SHA256 8f5de382a90a2396cc0c3b68a2c357679e1823ec498baae8237b46ced607d959 SHA512 a2cc5d7ffdd9a84145a33cffa91e7da301e062a886e63fa05e22b6441be14c00b255d4a78ef0c430ad69d824451650962c9dfbd38c4f9c5838b3a8410cfcbe06 WHIRLPOOL d4242a291994fddbfe182d89e02600f6d9276213a34cee02e2c982f823bbbe45bb5be43ef5b957b81211a6c9ad425876320d8fe642b099b9352656caa93c4dfc
-EBUILD yatebts-9999.ebuild 1275 SHA256 00fedae7c868c22ce0acc13136ec85ff4e5dbdd67a9f908dedc4cd115cef54a2 SHA512 94abba31c43438578f190831868f4bdaa3784c0e36014b69f817f8d22ef4355ebfa3b7f515b9d39a972b2cf43b44bdd22d4336e94bde5278e69c10a141f30019 WHIRLPOOL 6d7d90c765594fb409b6807a96493dea16111fdd93276b979e48239308fbe0da91ffb665d0dd6e8a9280f8769c3c9c8a01c566b8d4be7224b7009d70f4e92774
-MISC ChangeLog 831 SHA256 dd5d457ed3ab209f88a6422ae709b33d7f48f876be5fde09361cf274688ef4a7 SHA512 31422e93d49236c7671a224b8a50582302a89047ec51bd97f0c4bb7cc069d1eb4974df1abae7f1da64544fe5a190cb7c7c80e7e1731a953aad4b6f65f1aaf9dd WHIRLPOOL 6feec2a3c313858491a252d9876be8db22a35417837f05466f5623324ddc3250a93df2c3fc71fc642b7dad148a6263a9410b7c83af672a7ac6ca7428641231d7
+EBUILD yatebts-4.0.0.ebuild 1144 SHA256 7413124d731ca96726601bb88fddfa21bb026508ae979aaa37ee7bf111d6fa28 SHA512 1c1089c99f186764143b06026d45b9bc3d0eb83c5bddc2161e2df7722173a285ff2bcd3b971ff7e301a424e9a59feed64146301a04d28ffb653cc2ae27b9ed79 WHIRLPOOL 2179a309a71981091c86f5b0f57133020fd5ea02d82ba8da2c600cdedb270e5ba03d26380336de5c9f22c7746715cc3a290248e08daa4b9acb9d3346b0c18024
+EBUILD yatebts-9999.ebuild 1315 SHA256 1279642c919d0a8feb58d2e0e2e87ac1973962ffd7929fdd311f61375df9b8fe SHA512 614e13418e01e64e8f13b6ce07db60fe49fa73e5785abdc6c1cbc23599aadc3c81f39deeab636576c3958884fe74aa62e36475962b304494c57223ac7af5c965 WHIRLPOOL 684917c7adfce117d18a6b8c856e295f765ba9bae51f36c7eb1ce8276a7498d894b2478b0f94828e0f551e73b15004fcf48e81bc58e19a962f5bc3bba671d193
+MISC ChangeLog 972 SHA256 94f7cb52453b105388718344adce42d27d3fefa99e7c7456bc8f81fd26b6a049 SHA512 5f9ad76c9edab634722d9055d5b4122962e8832e2064565c4904f23394bbf3e8763ef6bca6e91a3adedf296d2d79903a7a8e4207f53def16c2ee73b48e097b94 WHIRLPOOL a66786a89eb30f6dfc6bd8e3508da14ad9803858fdfbeaf38cb4950e3f60d04403eb382d63e2500570dc75ece2f8e63f5e917058c1ec559b0ac18da8ff1a16ec
 MISC metadata.xml 381 SHA256 5e809688499f49fb8cdc1658684acb9f1c2703ea5df1e611c1f56e49f30ccdf9 SHA512 779dfbfaf7e54881abd7d07e1201b0fd17bae74850f4ecb0a2eb8fac50e10e6a969e659a0da239f8348f04351a107135b559acf662578bb5b1f74e388051a985 WHIRLPOOL f89db54229479c3b55f75a5b42b203d071bb7fb62c705349dfd581bafd22e9a611fd5551d7f2201c89dadd1a7d4f30930e3ab7d8a0d4e88adeb2c0068963b2da
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUyWp+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOUIMQAMkMowQ9lBVyVrlDIlzn/m8p
-GEDQs0+C9oxSh8766ibJKZyAJ+pjGN+ysn4aGK+VL5c1uuUFH1OVXaLCP7KEWLrR
-x538Qh6GZmU+tvsx+z51GoiX9Vsd91di2o0GKbQMN2PiTZymLHm6I/JRAB5n55gi
-mGv4NEQH7AM1esENvP9ckovxdplsHM25tyfLa9L7K6A+njVFgZYaDIjbBH+Ixwnn
-dR33H53/7PG+w912tUOBeKkBglfwGzmceebOjuC3lQHEZXM3UwJXcHmG7BkCSIe8
-84jssHUEb6o95vgoJqOFFeyK/p301eUGz1kiwFoG+Yjd58dHfGsdbrh+/43Mdbth
-ap7z0ArrqDqx5EfX1M/Fp6fMA24vakCpz6eynOwmEQYxsmEH1OpzdTvUVs2W1+lW
-RkTkZ5MKFprhEW6vMlLUJ/ylakYZ/3nZBQC1liVwzpj+X6/XV667Heitu7mJ9zAc
-mIiTNjhdjfg2+bwiheBbYHPtLLFD07Two/gNknoAGPC0A0jMSXe92UzVFLBfbhir
-7d3RGtrgwzFTFRTuYXgx6ZiKzzXIo/wEsSpdXmty64Zgpd1A3SH/JT65NCfNwakt
-hSBdoHxeKse9kNUe5OQV/mAYbsG4xipkq+AvfgBzbXEoN2bJrdFZzCtIejbNQwEu
-lUShoO8/h5s7/GaFfLli
-=bCJj
+iQIcBAEBCAAGBQJU2i/QAAoJEKXdFCfdEflKazgP/0uvMDy9C8WlFXnytL4+N0+f
+ZWFAJ0iVg1Y/IQx1LZJ64zY3IqWGTQa3hRHixIa3s2XiSaJfHGjJP4XMcJ5+bOLj
+R1ucDXoY4f2bh61VZELOM1sSXvvkU7i8TBwIlNO2tJyFmRfN+6sibC7T0gsll7xN
+sVATn+iqkEKAGPkSzyO0ax5XipT30bh08V6Vmy7Oqafbbb+CrZtXoJAmrGS/ah1x
+S4QLhzUKyNnyJVzaNm4SY+ZmSR25QUgEtwl9P+5AhuHn1im/yVtsVXiEMA+jfhUA
+xAZgMRxF1NjWHJsvxoBvrIE0lY/tpTrQ5cd+KhwDsh8x60Zb6GC5QTLSgizgvja/
+7S9R0/c1Iw68DfnuPw4qaD4V0auE4bNvrsbONwyKlkJ0Y2sdbrecs7iTSr5sush7
+C+u489Rgi6lhml707JUnq4yRz2bNp8vBu+oOosgDrlquiL8VjRILKl5Qm9Vmf2uC
+tbK2/MoWHYHd1pAkiCedmhzc+0lJFjGhKcAkCYByLMcqephkwYqV6Q9xQjNdCYYU
+wpJuTFIsPc7/fSXQY49h+jyqGKi0H7K376Z/Am0IBGblCJzqxjbYADGK8qsOs/xQ
+dKvPFLS1y2QjQ6N9pKYSSIh+b1RV9G7hp9zJrmA6AeIkUsqznKqYLsx8GMpt/N2s
+u3avB9/Wt1k7HkTO7ClJ
+=P9ae
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/yatebts/yatebts-4.0.0.ebuild b/net-wireless/yatebts/yatebts-4.0.0.ebuild
index 9bb9aff9ab7a..cade2346b46f 100644
--- a/net-wireless/yatebts/yatebts-4.0.0.ebuild
+++ b/net-wireless/yatebts/yatebts-4.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/net-wireless/yatebts/yatebts-4.0.0.ebuild,v 1.3 2015/01/28 23:02:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/yatebts/yatebts-4.0.0.ebuild,v 1.4 2015/02/10 16:20:12 zerochaos Exp $
 
 EAPI=5
 
@@ -16,6 +16,7 @@ IUSE="rad1 usrp1 uhd bladerf cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
 
 RDEPEND="
 	>=net-voip/yate-5.4.0[gsm]
+	bladerf? ( net-wireless/bladerf:= )
 	uhd? ( net-wireless/uhd )
 	virtual/libusb:1"
 DEPEND="virtual/pkgconfig
diff --git a/net-wireless/yatebts/yatebts-9999.ebuild b/net-wireless/yatebts/yatebts-9999.ebuild
index 44475701e560..c623fe61d1dd 100644
--- a/net-wireless/yatebts/yatebts-9999.ebuild
+++ b/net-wireless/yatebts/yatebts-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/net-wireless/yatebts/yatebts-9999.ebuild,v 1.4 2015/01/28 23:02:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/yatebts/yatebts-9999.ebuild,v 1.5 2015/02/10 16:20:12 zerochaos Exp $
 
 EAPI=5
 
@@ -16,6 +16,7 @@ IUSE="rad1 usrp1 uhd bladerf cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
 
 RDEPEND="
 	>=net-voip/yate-5.4.0[gsm]
+	bladerf? ( net-wireless/bladerf:= )
 	uhd? ( net-wireless/uhd )
 	virtual/libusb:1"
 DEPEND="virtual/pkgconfig
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 09018d53cb04..d7a20c7f2c50 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,22 @@
 # ChangeLog for profile directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9771 2015/02/10 05:59:41 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9774 2015/02/10 15:52:31 yngwin Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  10 Feb 2015; Ben de Groot <yngwin@gentoo.org> base/package.use.mask:
+  Remove outdated mpv libav and lxqt-meta sddm use masks
+
+  10 Feb 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  package.mask:
+  Remove mask after cleanup for bug #532086.
+
+  10 Feb 2015; Ben de Groot <yngwin@gentoo.org> updates/1Q-2015:
+  Move app-admin/lxqt-admin and net-misc/lxqt-openssh-askpass to lxqt-base
+  category.
+
   10 Feb 2015; Patrick Lauer <patrick@gentoo.org> base/package.use.mask,
   package.mask:
   Re-mask media-video/handbrake-0.10.0-r1 until ffmpeg catches up
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 0b2654b9a14e..b25a32208102 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -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/profiles/base/package.use.mask,v 1.644 2015/02/10 11:33:36 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.645 2015/02/10 15:52:31 yngwin Exp $
 
 # This file requires >=portage-2.1.1
 # New entries go on top.
@@ -13,12 +13,6 @@ dev-lang/rust system-llvm
 # Mask for all arches, can be unmasked on arm once keyworded there
 games-board/stockfish armv7
 
-# Ben de Groot <yngwin@gentoo.org> (04 Feb 2015)
-# Requires hard-masked version of libav.
-# Besides, upstream recommends using ffmpeg. See
-# https://github.com/mpv-player/mpv/wiki/FFmpeg-versus-Libav
->=media-video/mpv-0.6.0 libav
-
 # Michael Palimaka <kensington@gentoo.org> (03 Feb 2015)
 # Requires unreleased version of dev-libs/soprano
 app-office/akonadi-server qt5
@@ -69,12 +63,6 @@ dev-libs/DirectFB swfdec
 # Masked since skype isn't stable
 net-im/bitlbee skype
 
-# Jauhien Piatlicki <jauhien@gentoo.org> (5 Oct 2014)
-# Masked because of bug 524390: privilege escalation
-# until upstream fixes this security issue.
-# Use at your own risk
-lxqt-base/lxqt-meta sddm
-
 # Sergey Popov <pinkbyte@gentoo.org> (01 Oct 2014)
 # Mask multislot USE flag for packages, where it breaks
 # metadata cache consistency.
diff --git a/profiles/package.mask b/profiles/package.mask
index 9dae8edad80b..1fdc831bfaec 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16342 2015/02/10 05:59:41 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16343 2015/02/10 13:47:56 chithanh Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -181,28 +181,6 @@ games-action/cylindrix
 # Removal in 30 days
 net-dialup/gtk-imonc
 
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (10 Jan 2015)
-# obsolete and vulnerable, bug #532086
-# removal in 30 days
-=x11-base/xorg-server-1.9*
-=x11-base/xorg-server-1.10*
-=x11-base/xorg-server-1.11*
-=x11-base/xorg-server-1.13*
-=x11-base/xorg-server-1.14*
-
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (10 Jan 2015)
-# requires obsolete and vulnerable xorg-server, bug #532086
-# removal in 30 days
-<=net-misc/tigervnc-1.3.1
-x11-drivers/psb-firmware
-x11-drivers/xf86-input-citron
-x11-drivers/xf86-video-cyrix
-x11-drivers/xf86-video-impact
-x11-drivers/xf86-video-nsc
-x11-drivers/xf86-video-sunbw2
-x11-libs/libdrm-poulsbo
-x11-libs/xpsb-glx
-
 # Tim Harder <radhermit@gentoo.org> (10 Jan 2015)
 # Masked until protobuf-2.6.0 is unmasked
 >=dev-libs/protobuf-c-1.1.0
diff --git a/profiles/updates/1Q-2015 b/profiles/updates/1Q-2015
index 8229ce367992..1a7780018cb0 100644
--- a/profiles/updates/1Q-2015
+++ b/profiles/updates/1Q-2015
@@ -10,3 +10,5 @@ slotmove sys-firmware/iwl7260-ucode 2 9
 slotmove sys-firmware/iwl7260-ucode 3 10
 slotmove dev-ruby/tilt 2.0.1 2
 move app-vim/zencoding-vim app-vim/emmet
+move app-admin/lxqt-admin lxqt-base/lxqt-admin
+move net-misc/lxqt-openssh-askpass lxqt-base/lxqt-openssh-askpass
diff --git a/sys-apps/inxi/ChangeLog b/sys-apps/inxi/ChangeLog
new file mode 100644
index 000000000000..4caaed7cb0dc
--- /dev/null
+++ b/sys-apps/inxi/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for sys-apps/inxi
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/inxi/ChangeLog,v 1.1 2015/02/10 16:45:30 dastergon Exp $
+
+*inxi-2.2.14 (10 Feb 2015)
+
+  10 Feb 2015; Pavlos Ratis <dastergon@gentoo.org> +inxi-2.2.14.ebuild,
+  +metadata.xml:
+  initial ebuild
diff --git a/sys-apps/inxi/Manifest b/sys-apps/inxi/Manifest
new file mode 100644
index 000000000000..3b5cb391a4ec
--- /dev/null
+++ b/sys-apps/inxi/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST inxi-2.2.14.tar.gz 179900 SHA256 c7acc482e860864d69365c2548b2efcfd334432dc053568a4dce37d6699146e5 SHA512 0cc5c1a6d6e3611e3203ca9747477316b6171a8926c33ce4b6f2531fa9c644fa4a7de654e78958efb770fdd0fd1c7ec734bc32e98d9651e3154ab5a2aee58f2d WHIRLPOOL f74ac82c213bc5949da2602d5a38abd061889877ceb6f0e3a2e4988b205d1179e1eac8a42a2402e064773b8ca124cba544e9e37fbb1d1d16b2c4d83e58ce0728
+EBUILD inxi-2.2.14.ebuild 977 SHA256 cd66103d5783bd1146d47cc34005ffc19e1abbcfd037a470c22330711cffd719 SHA512 d7bd15cd7b55d8b19c21da538bf6b547e56d259d91cbd5c826e60a170ece63c6473c9df3e372e0ca336109695c06decdbc3fd95fcd01099484fa38786995c9ac WHIRLPOOL 2b286f86354510a85b3556641fabf2e2bc4c01dcea89fa6b6e7f0470d6f65872ea2a16f9396912833b258dfdf00d457b43d5bd3b1c27a3a13be8fc683069f395
+MISC ChangeLog 336 SHA256 9a548a1c85373bc1b7be9bcc29754f6b1d7c13d0377127df81e34cb6fcdc1073 SHA512 3c5936a7c896d2e4a10169418337e0f2c472de98f6c70c915bf4e1fed92cbd6d3547704d5af2d24e3f67a1351fcc2ba0eceec8406b9acc53dea543741ee1d971 WHIRLPOOL d76877cb4a1c37269969bd22884a54f4ae1d2f410381b9038b7c67ebdda329f91e2c848168c7a80b95777ab67a0fb50e5f891538a0eb779c4e95ef1e42137a5e
+MISC metadata.xml 234 SHA256 6b97ebbf95666ad2ed800b3ef162e50cf9067467be2e8551a789e931d714b681 SHA512 899792ecc76e722ac6c1fa278ee94a2ece1261398d31f4e6099332a5b8164d54c124cd9556f47304428b35135f89fa6f65ef089b8b37f440cbe858b4ad92d2f0 WHIRLPOOL 6448a5dc2b2112c34d095bf2f45f73360b55b57f4a9ebdd2bd8289cdb468ea086cdf425c63cb278d38d65db35ac541042526d11aebd124970db3b1869b4b68ac
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJU2jU9AAoJEKMbvrI6BRdGIpIP/1E8fmR1UkLEnyGL4nPBpz5r
+M1hICkquDnd5jQYRA2HdBu4Q2UqqTICPYk4VF+6c1c55nn0IZQiz0buetPXW+7Xe
+FmMqquab4rVboJ5Hj7oXyDiK4OJ/5vjOjBlpvyAmE3F88nM2iom39PrQcqukd77r
+qouEpgzR3x5tJRz2uvmxwGiy0QyAHs0DJirAmQX6qZ+ELxTjcxEPPL4WD2num7NP
+zH0O+sKbYcD2y8yV0LrhuUlSGTnxblHZUL/UVkEIeyU67TyUu8c1u18LWjeQriN7
+XmudxGgTl0UKQaA0OA7nuH3MGHZYK5vbYLw4Ry+AAI/Ph1uMyVkWcIy+3u9gdkTp
+t0ou8HA3ooWWB2FuOpBOxIx5lhSwfndJnQkb1KhYWpAu93cMK1oP77qIknfActvJ
+Bf9dIQdzMl26nW3mAaVW9XbPKJKufTUOe/sSGtAJvp5M5ftnGcFfoQQbXCtLknuK
+ykGvFWCgcL3q5PwHyynitz7s5bzHpptQ9izvdeAy3v3L2NiVcSVX5VqChVBnadkU
+4/W0vLhBR+G1Cy1IO2Nyf6ucBhcdF1lUn5Qj+CFgIAiBuqF2SC9pTbMQoTI7G/Lc
+EthsTjfbW5kDnkh77k6n9kUqbfJoVu7gjBIGBm7BJ8SOPNCP0cf+C9gLJZsTct74
+xaugnvjyRX2F/LhY4ZER
+=iiLp
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/inxi/inxi-2.2.14.ebuild b/sys-apps/inxi/inxi-2.2.14.ebuild
new file mode 100644
index 000000000000..82ffaafd8233
--- /dev/null
+++ b/sys-apps/inxi/inxi-2.2.14.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/sys-apps/inxi/inxi-2.2.14.ebuild,v 1.1 2015/02/10 16:45:30 dastergon Exp $
+
+EAPI=5
+
+DESCRIPTION="A newer, better system information script for irc, administration, and system troubleshooters."
+HOMEPAGE="http://code.google.com/p/inxi/"
+SRC_URI="https://inxi.googlecode.com/svn/tarballs/${PN}_${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	>=app-shells/bash-3.0
+	sys-apps/coreutils
+	sys-apps/gawk
+	sys-apps/grep
+	sys-apps/pciutils
+	sys-process/procps
+	sys-apps/sed
+	"
+
+S=${WORKDIR}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1.gz
+}
+
+pkg_postinst() {
+	einfo "To view a short or full system information."
+	einfo "inxi -b for short information."
+	einfo "inxi -F for full information."
+	einfo "inxi also provides verbose levels '-v1 to -v7'."
+	einfo "inxi -h for help."
+}
diff --git a/sys-apps/inxi/metadata.xml b/sys-apps/inxi/metadata.xml
new file mode 100644
index 000000000000..61c052a97a13
--- /dev/null
+++ b/sys-apps/inxi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>dastergon@gentoo.org</email>
+		<name>Pavlos Ratis</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/www-client/opera-developer/ChangeLog b/www-client/opera-developer/ChangeLog
index 3d593554ba0d..052ddc933771 100644
--- a/www-client/opera-developer/ChangeLog
+++ b/www-client/opera-developer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/opera-developer
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera-developer/ChangeLog,v 1.30 2015/02/02 19:31:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-developer/ChangeLog,v 1.31 2015/02/10 16:33:34 jer Exp $
+
+*opera-developer-29.0.1770.1 (10 Feb 2015)
+
+  10 Feb 2015; Jeroen Roovers <jer@gentoo.org>
+  -opera-developer-28.0.1750.5.ebuild, +opera-developer-29.0.1770.1.ebuild:
+  Version bump.
 
 *opera-developer-28.0.1750.11 (02 Feb 2015)
 
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 12842bdeb9d5..ff5cbf512230 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -2,15 +2,15 @@
 Hash: SHA256
 
 DIST opera-developer_28.0.1750.11_amd64.deb 42298676 SHA256 f84eba6ea3181a85bec7e66dcf814d52973814fcc915f390bd9ddc1145da7243 SHA512 49b0bcfd1980cb30d8223d2e59c5f9e5a1fab2be2a5bbe0b4ac2403cf325af243e319481a97a742052d54a0255c1d748923fdcf08e2afff04ab0812c65955cc4 WHIRLPOOL 0ef9ef39edac92255965be405690571fe0794652fbde3514d3bf4ae9fb249e521a5e2be1916d1f479c07e20ae42efabdf634bd24bce51214c2d09ad8ebba0d24
-DIST opera-developer_28.0.1750.5_amd64.deb 42480330 SHA256 82c17b5f92092c3d4f65ea1971e22838c77600e5476a683466fad24d0ce08187 SHA512 2850ed205f3538b7fe703661cb4849a0b121627f395449b4c0d772d579a73b9885a5e98f4dd40dcc03853c17c2daf29992b9369f5c237e4e39f9d63574b81975 WHIRLPOOL cf204a1c2a46884f69d2d12e28ae3d1a27af3815f44e789bd3a81e69aaaeb927bada1207769cedff12cdc41c510d7b5da8a7ae7548f9ee149f8ad444edd0ef5c
+DIST opera-developer_29.0.1770.1_amd64.deb 42992000 SHA256 4f7230e506c8c951ef6f0b574df4e865ecceb1eba7cea44a05a1f1f71de13423 SHA512 b98c062e8c871617c7750239707d317f3260bffafab18c7efab9e9f2b0cea7936a56ad0c2f3d1363000d48b2d474679dfac21a00899cce5058c623ee2421f4dd WHIRLPOOL 97ada40790c3fe83d0c8100757eb4853f441b505a4e8b28e0d7429646976e96a04c4e8a202004390b9f18f0f37b62f2d73707fe5382bffdeaf35de211b226733
 EBUILD opera-developer-28.0.1750.11.ebuild 1914 SHA256 106a0596dcef4879cfa1b6d557b2f03e7af196e443d0c430524f0f910973d25f SHA512 4ff6da82b756173f84c84809ba2832fe1faf4c3394d95ba29927637893973247670ae9fbeaaa5b3ba259abcdee628b8dee1a39df8c3d52d437966c8fdc04b10b WHIRLPOOL e356a4a7eda081f916677a4ede55fa74f5c34e07c2cc8ffa51f5290113944f72cd382d3b203564537f0bab056141e2055961ccbb99326b6998a38248643bafa9
-EBUILD opera-developer-28.0.1750.5.ebuild 1913 SHA256 6f0ef65c373930036073aa8e3a687b5166acb5a173ecf2ff5c179b54f7c0c39b SHA512 2ca3c684e1a0b11bf1875971ac7b622d8017e79581fc74cef57bd4966c6df44eee8bb865d95bb3605a1320a58531ee8cd461f5d671cf244d0288a6bc151e1f4a WHIRLPOOL 0e7cf4af1fc8607e7f4e57bf50992b87037a3fc0651fa85074d1dc0184d84c7b2281f05956a761e6a1568eb85691bef66995d988eb4425fa30467b9223bb659d
-MISC ChangeLog 5079 SHA256 2b80be9ac715e9232519cbbaade5e2a84d5ac07aca109bf504fb0ea8ecc3d455 SHA512 7f48e9c49992746a2cfdfc7df66ebd6fce9ac0229e47c77de4d4939574426444b4f8cf20d5eb17dc8fb82dbc9584b23d1e8e0ef6c9bea0ecb8e8a935f40b9ff4 WHIRLPOOL e2da8770f56c9887bd301764c2a581303a817e914b5b74969b0451fd6f488af8bceb5fb48cede81e537ffd8cfb45bf510880ee0ad5a20e374be6d0c34f5f601b
+EBUILD opera-developer-29.0.1770.1.ebuild 1913 SHA256 7f986f0000452c50fe5e0ac8f41737ee2e35d5340a1b88b9a19b457d2c8f416c SHA512 9e2c03ba31c8591ea85165f48bcacc4412d5db762035e87bd626f3983dc1b99bcacac7ffbb8002364ba4882ecc906e6d3778a28101a52a4a5e7fb3680bafcf8f WHIRLPOOL a00622e7d5afa8e4e197a044241b433e1cd9f0a79cc8434c025606436b683bf70b1696aca055fbf7b09f798ae6d2fd5c00cf95c5fa1b065bbafc4c31ccf5506d
+MISC ChangeLog 5263 SHA256 3b8c443fe9581172211b1a8cabcf544dcb2f04a4ba2643a047f786c83219ddcb SHA512 18c1bd4130a113a481d5b98f7b6f78d885240f09dc3a2f2aa1a7b281f84f4df55973cfbae5bc97dfbe1b41b32c70295344ec288fb9f1644a268ae20a4eae57ba WHIRLPOOL 269acb8667bbc0932902617689ea01a4c133582b138367765e4b3404900ccc2692a585406ee5471736d8232489530f567d3da6f214bda65a6eb380b989a1ff79
 MISC metadata.xml 224 SHA256 d7ffc52704d4bc0180f6f1c448ea4bdd0e3ff3a562384dc944af4a00debc9620 SHA512 6487ad35c6f3d2e4876714919e7bb01fd65f57e7753cbfc318130727dded4fcf8632a06ab9b7a3016fc1ab127434d1d20de2dd0ef2cc63ad162023f2dbf64b1e WHIRLPOOL 879ad2c41f2e1297b677803b2b0478ed2affc91059b198524795e1a128cf8ab6b9fbe78b53bdd3421041f27b419bce387a267e389111125cd55b05e260abc998
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTP0JgACgkQVWmRsqeSphP/CgCfdacV7Jy18VQYlmY8Nj29t4nD
-C8oAnjl+RimNl5nBR+GHlKZr/IZyi4+u
-=Gjg4
+iEYEAREIAAYFAlTaMt8ACgkQVWmRsqeSphM5gACff1iigeVn6AUhtTyHIqc1hy7i
+xVwAn2UT8Hz6Bgal9xYixpM/MIyNdtQ9
+=dM2V
 -----END PGP SIGNATURE-----
diff --git a/www-client/opera-developer/opera-developer-28.0.1750.5.ebuild b/www-client/opera-developer/opera-developer-29.0.1770.1.ebuild
similarity index 96%
rename from www-client/opera-developer/opera-developer-28.0.1750.5.ebuild
rename to www-client/opera-developer/opera-developer-29.0.1770.1.ebuild
index ba264bf05788..4808ff26be80 100644
--- a/www-client/opera-developer/opera-developer-28.0.1750.5.ebuild
+++ b/www-client/opera-developer/opera-developer-29.0.1770.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/www-client/opera-developer/opera-developer-28.0.1750.5.ebuild,v 1.1 2015/01/29 09:59:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-developer/opera-developer-29.0.1770.1.ebuild,v 1.1 2015/02/10 16:33:34 jer Exp $
 
 EAPI=5
 CHROMIUM_LANGS="
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 29f5345e3e12..4249ea94312b 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.820 2015/02/09 03:08:51 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.821 2015/02/10 13:43:53 chithanh Exp $
+
+  10 Feb 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -files/xdm.initd-10, -files/xorg-cve-2011-4028+4029.patch,
+  -files/xorg-server-1.11-disable-tests-without-ddx.patch,
+  -files/xorg-server-1.11-dix-pointerrootwin-send-focusin.patch,
+  -files/xorg-server-1.11-dix-send-focus-events.patch,
+  -files/xorg-server-1.11-log-format-fix.patch,
+  -files/xorg-server-1.13-ia64-asm.patch,
+  -files/xorg-server-1.9-cve-2013-1940.patch,
+  -files/xorg-server-1.9-cve-2013-4396.patch,
+  -files/xorg-server-1.9-nouveau-default.patch,
+  -files/xorg-server-glapi_c.patch, -xorg-server-1.10.6-r3.ebuild,
+  -xorg-server-1.11.4-r3.ebuild, -xorg-server-1.13.4-r1.ebuild,
+  -xorg-server-1.14.5.ebuild, -xorg-server-1.14.7.ebuild,
+  -xorg-server-1.9.5-r3.ebuild:
+  Drop obsolete and vulnerable versions, bug #532086.
 
   09 Feb 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   xorg-server-1.17.0.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index d8a6cd26f868..eb93c379d0ee 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -3,69 +3,46 @@ Hash: SHA256
 
 AUX xdm-setup.initd-1 346 SHA256 942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406 SHA512 b12ef1a757213c2df2d4fb50691695fdaf00ee9edb7d4ec551980c48b6eb05598d3eda0db543719a11a82b019939fb4af82a19813d238a725dcc0d818379103e WHIRLPOOL 28a033355ec3871eba2dfdf45969e9ac354d8ae542dcb1449901af856b9c26314318f6a91cec81f2548caaede19d88e14eac2de0fd7dab8957a7358e94a594b2
 AUX xdm.confd-4 562 SHA256 9d26b72bb28611a60a6b9f942b8d8cfe47b59f926be89af9709b5912668344d8 SHA512 facfb91c0b4e0b1cae86b707d263523215633720e1e8f4595639411f936907b321643e8a06111dd3f7b74fa601476e4b0d09768edfdec762c73fa07cb227588b WHIRLPOOL d701fb5f40ecde2b2f2bb56970576c8abde1499916168fee4a6d27afbc1c0493eb17ddd1a8ee70bfbc77d553a47e219e538febada4946d19cccbdabc90f40e6f
-AUX xdm.initd-10 6032 SHA256 85e5778e23748c6a6285fdadaeb18e6c04b3fdf98d2a81f0ab9d854dbac8076c SHA512 60656a77800a773f5e05e4725e62c2a666a4635192f0fa4f51dd27b31e743dac6ed3b2eeef4de271df3a0863b1e1c59d99755987a88c8bdb9542911266dd3bc7 WHIRLPOOL 8d2b389b74e45963fcfb98faefe1297d1f8ba2b7d03f243cc9555635073c599c4367e2d54a0081dcfc24964d3045f539f0c88ad22b6f76a517ef326e24957a71
 AUX xdm.initd-11 6136 SHA256 86a17c9ba172481318d5fd51c3aadfdcad9e5d52ed7478379723ce1784061930 SHA512 6ebd1d4aa538c4de0591348e2befe0d03da2014863208ce52dbe9966e069908adcd5efd5b8ed01cfa3bd3c84121e91494e6d82e1cf96acac2ab0b03a2961dfae WHIRLPOOL 16c6f69008c28f3fc2b84e7257e75df578308ed4a4a537600c43d7a6d372c64a3d8f9e8f1a59c2d8106e1bee9a87694d06f3d1f777d132a19544b747e745473d
 AUX xdm.initd-9 5700 SHA256 96b1fe826db2b46b08e055d57bffd9405616b7980d9e40e95f19e52bc49eef3f SHA512 a4f652aff6a03d902da7ce1c706396911e853e78031d3246b764cb67930f20935d5aa912834add9f839742e824c380d2793b6b62592a10ad1bde646623b419d3 WHIRLPOOL ebddb96a2552a76f1d2f13b25dd773c822e8a0a5135f950163426477c689d0c35a74946a3323103d604783244e3a2f0bee5f5009b50828c90227370b13c433a9
-AUX xorg-cve-2011-4028+4029.patch 671 SHA256 76b9bb4a928fa7179eb52ab3b2bd2ef6d7db83e0543ba80de37cdab05efa601c SHA512 1474c1045de134ec3224bd77d71ab00b57fcd0983eb2f45719ba3916f93020526ae0b4b62578ac8803556ad129d086f814acc957910df4d343d935c7556702ef WHIRLPOOL 183b05d47989b4c4991b37c9007d5b376ff44b627652c92da52eb93c61e452a7214467ad0366fcb2aebed8b65e4a473faa6cc52eb57d54c22a89c5616a602748
-AUX xorg-server-1.11-disable-tests-without-ddx.patch 2184 SHA256 e3b92e31843ff5046a96d3c4eb6ce67ab00e6422ffe92e7e7d13424b67dc844e SHA512 d6abd8d50f341ff1d7971c45ab44b50b7ca27cfe84418047f2d0ca722d22f0c5da54753bd80d7e172b3fc54b7aee79b526af5c9444f3c711e3dc6d596cbfcbbf WHIRLPOOL ba2239350399bfddf70968e8126f773fe3b64943f7b87691587a48fb0aa7553338315825c1d619dbebbee04b9fd1ed8326bd432969148ed012abd2e790c7d795
-AUX xorg-server-1.11-dix-pointerrootwin-send-focusin.patch 970 SHA256 c65e3499f6f2974d00bfcec6f6c6826982e87327b61d9621dce6c2bf26949a7d SHA512 6bae6d30aed0389f0f858b3d3cddd03bad15ec8c21bbf741c30b6163b69066a8dec311a48b82fe44aeab13d4258eac82e9ebb53c84150f60846e3a7f7c266163 WHIRLPOOL 1e3bdd0c95b136410c63dfa380c1b696bec6570aef110c4e526503e54c081e86ddb3e02a49c76ecf52433efa58a1a74bbd00255ac24d5f6db6980f4a674ee839
-AUX xorg-server-1.11-dix-send-focus-events.patch 2345 SHA256 77e1ce80ebf57718b5aa7cfdb1add109c62c8b8728899405c212239b2576d110 SHA512 382d64834fa4e10756efc731954a5e3dc1c00148cecf7ff8506995e5b2258cb8344c679435049ffaa89d847c98a9fa7855849c23de40dc168b806bf1c01eaec9 WHIRLPOOL 0be9ae4e435e2f0dbb794ef2fb30aff6538c3e484267ed0ecc05515b2ee63613be26beed2c4d6c036e2cde3629d7159e96a6e75bbc9cbea059e63a33af6e777f
-AUX xorg-server-1.11-log-format-fix.patch 13585 SHA256 2a70be6fa9d77c5dbc831cc1891eb7426005a22fc3e03707810a2e07eebd58c0 SHA512 d6c560aa7c7ae0aa0e893e81feaf45850c7b43764b725258db8fb71e3cb85b0ec5bfedb05385582adb2456a7a2cd745f14ef0476fb7139527c6b9c8890e9ab14 WHIRLPOOL 1bc8f276072e613d9c1788bb2df5d5a8e5e1374c71e134854ec8b2154e85321d89dbd5c7b7fe1a533658bc5f020ac3ccc07ccdc78b56029c5d8f0777e1096304
 AUX xorg-server-1.12-cve-2013-1940.patch 1191 SHA256 cd2c72854f04bf8140e8c5beee51f7575eac63857b01353daec63d8d473d75c5 SHA512 cd38bf7fed8bde0b69c55c05b6e275843eb78178669cbbbcf313edbfcd02a91c4f297898f0220faa1e3592bec8e24e5b9a708499f6e63c2e8c15655de3f7149b WHIRLPOOL 3522bd9735e83f6ee6d9c1efc5bdfa41684dae9b9e49f92005ac7c54f1b9f7c23904042cb9714d97c73832272d6b92b5eaed16982392b0707f3ee82ca893de02
 AUX xorg-server-1.12-cve-2013-4396.patch 2807 SHA256 11707d59d550a9f0b04f0ca3dba1668c7f848a4e8a4cea7a6ae01c665bd11fe9 SHA512 9c8fea712e7ad727390052fd6a717c00e6d16eecaee23153b21870b82772a67c841d9ae48573cf4f8adfc101c948ed25e454ce420226ca991a3c671ecdefa209 WHIRLPOOL 932cba6b4641156de7a56fa977fd39dcf171015e21d196de588694e31cb0fa1d9928b17a3ac81568581c6f722be252ca09125eb08a9f088d5550e205dd09cb42
 AUX xorg-server-1.12-disable-acpi.patch 275 SHA256 1d3878d44e2b8690bb7d1595960d06acee7f86a6a4724236a09a74900404e953 SHA512 ca52ce0931819acf46a066116b8485c3a398a56d79826a5cdb2b3b8c7809e5163e17a5954de370805dc51a3be3c75a0333d5c17c30bf99139105d705de2fff95 WHIRLPOOL 048be09bad947a5ef02d5935534c47d08439f0ceccddcdb017908bf73aa0484a69b0e42e8e6630393323305b31a8008ef8a0f4655556082245bc5fcde254aa5b
 AUX xorg-server-1.12-ia64-fix_inx_outx.patch 1737 SHA256 bf996a01faf3d1e6f00f12b17373a2530e7e433d3e6c4cac8935ebddc91cd089 SHA512 18bf9bbb973ae4e3f95ffafca8f82845f0c318c3b2dbf0cf9089a2614215ecf000b9037bfed7d80d9367be01247bf316ba2f6e16aa04fe79c54d81441c962bcd WHIRLPOOL cd133d58fc74de9d49773fe2a570d023cea38d09d7550fb9097a8c83a8393e8fc829ffaac566eee732475410e5d8063d0f99d437a68a67e8d3f65d012522240e
 AUX xorg-server-1.12-unloadsubmodule.patch 1373 SHA256 c68c4c0749b9229c3ca11c72b5ca98b58c7dbaf5c7311ce45890204bdc637c3c SHA512 a6a8ebbb1005f2ea9cfdfc928209a23fe213caab31a889c3290f14bcae0a9afd40176330e2e56cb5ff986d522505e7fb98fa0c71187f403e2afd33c9c919780e WHIRLPOOL 7e9dce7dc4e064567e68697a2966f87cef756670db7e49da50c8d9a5379d7930c3f9642913b8482b8c7597067ef9098e1989284986b5ec605aca6a536329c05c
-AUX xorg-server-1.13-ia64-asm.patch 1166 SHA256 525fc255734f062758877ad45a29862dfeb1fb8e7b3a476d9410a6f0d73420a2 SHA512 51b8695af30988f99a480d2ecadc6dbe7cb46d4d9461fa006d9001200dfc1bed7390025fd1ebbadc936aee90444bb5cfd892d41c5260d5c33347ee2bdc88e78e WHIRLPOOL 46d8b55b67c82118e2a36a01c739217c6e6dd02228b0a0e730b44372b77b476f4a76fcfa8a584550cdfc87db22c26839890b7719318678aaedba7db761a39c6c
 AUX xorg-server-1.17-ia64-fix_inx_outx.patch 1539 SHA256 4c844b2d41b6412304b8a918e3cd93d8f2ab8dad8e6a22310cd87d1f3d8f5e95 SHA512 1db65132bb04eff380d38ccc8441f9f9e5286d7a47956495c0a7de7978107d15e5638d05df0aabbcd11687dd03189a7ac50fca51d755d082869aed71e66dbda1 WHIRLPOOL 8f7f3d107e2f8ce5e07d5dac9bf68b7547425943c3e6b6db92eab8bebc0194da53384c953f5e823a5284025e1bbcf18000b497d31de7c5d46e43f9cc02999915
-AUX xorg-server-1.9-cve-2013-1940.patch 1159 SHA256 2ddde47a5b80b28d5240e51a33862722787d37cf7621aa919d2966b7bdaa7f7c SHA512 744abfda3defd3746783e2e71501c769ee7a09160efbed8fa37d3dc02eea89151de36ff7ad47f8a5cb5c56fa960cf7ea68a09a2ef45e0d0bfb49e9296a9571da WHIRLPOOL c446c7e4a2aad2ee1960d1fab142d1df84fca4822e1bec37e1851576be6fa85522eea64977565303e144d8bd55df866f6a38991575878034f762f883b4706f01
-AUX xorg-server-1.9-cve-2013-4396.patch 915 SHA256 a1686c0bd07337991eba7edf769790be30b33d1295a22a847fd139f4573379cb SHA512 e8a4fb8c4097662d0e4188fec3d6ab827addd7edb0122ddb94f66795ebc8e0ef18bba899da8fd76e918556a625ffa0c0d19c650182683ff6216faa7655aa8d11 WHIRLPOOL 98b4999c932669047094f6063b007d673957547180507dfe714943d21eda5f2371d97424efb97be6b9039aeba8d2b9282efc6023ae3edbfa9d5c8fc63fac848f
-AUX xorg-server-1.9-nouveau-default.patch 916 SHA256 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea SHA512 fe91ff469c2569aaf6e2ceb0decf44c46ec4be4314dcb94c42b107adf2aaa8592c84b78b1621856acfd51e604e012c35c0609a3651930999829c7040d4b46ed3 WHIRLPOOL 18ced96c233b537634ee32a5aad186764d8796c5cadc398e9406457c8ace02c6608dc7378ca37fd09ecb178c5564c16f602d46772472166ca3fcb56ac9a04e52
 AUX xorg-server-disable-acpi.patch 663 SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200 SHA512 0f741e3dac610ba75c3f22cb9412d93e6d8422216100bce886be5f8d6dc49a94e0dab525039247d7af668f162b02fdab302aeb55b02a949ebf56c1f455fa68cf WHIRLPOOL 69e7425e3fbb1154b64568261ab17dc513d561a0d92558fad4e1281869b43132892f14eb89443dc11003cc62bacb4a80f86f592d9dc4bdd873f29fd970c25558
-AUX xorg-server-glapi_c.patch 2215 SHA256 5f59b883d49f53d2f6f71cbbf5e4ef74bdf545238afd61fa3011e0eb311cfb3b SHA512 77ccf8cf5732930affd41c3631a945e768becf504e507c1140d2d4d55f0fb49fb787fd9ace14463c22173c95c3187c985712cba79b53c3f1472be08ea46401d4 WHIRLPOOL f284f2fb5b04d6ae3a0cb781a7e78ba8763d3fe75efb738a0643783d77685bc1606b8fc940e66c89c1ee41a5f2ffdba1698b8d11b0c59550f4f40dab4716a219
 AUX xorg-sets.conf 199 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 WHIRLPOOL 4acac88e1688ea71df59a86a8a188b5369ad05f61e1369cd620eecd754511578e961a537ff6d0b22156f671d3485289cbc941dfe83bea24a27329b7bebb46c7d
-DIST xorg-server-1.10.6.tar.bz2 5406712 SHA256 c4da5a97b6986688efe74bc9bff6a38795977019ac032dd6d787abad32c50682 SHA512 91913cba2549c73f8ea3c23bbc48eaf2d4e392403b73da0f51fd4ed94a135081003c0600df653aaa3e420b30c57da58f3b25d7b8424898870c89a5b419c457f1 WHIRLPOOL 45b26330d2bc1d6bdc1e9ef66226a7e26127ed2b0ef9eb16efdc852174d789a43ea576c8f9df9685900180c8b08a55a244ee61a3d610732ad468064f576f617b
-DIST xorg-server-1.11.4.tar.bz2 4900810 SHA256 3e2935bc400612df58d5b5e6840829e2c63af02c2e7d2893092500358a4366fc SHA512 29013ffd51ff1b6a2b5679580c490d68dc5feaebdc9201a2812a410761200f5468de76c8791ab089950504be649e61f2cccb705587fde66eef1bcd3461f537ed WHIRLPOOL f1a5db2396cf1b490542c65177e047b37b636706b2d7e2bc15ef1ba527d2c7afd58669b99b83e7c2d2b7c1994f8603ebfe63419d2d924a75f4032afbe6806f26
 DIST xorg-server-1.12-cve-2014-8091..8103.patches.tar.xz 14832 SHA256 a98fd1589ef92d6f8a633326d387f2f203df72452788a6aaa2bcd4242700fe7f SHA512 2ac18d36cd8b6d9fcaf98a32e3e6b9107e420476e066a4ac9581f12e9afb7e397614761373a20d96c8fa840886b81ee0ec5cfc812e16876b4922bf6c5fe3f736 WHIRLPOOL 5c3ddd654fdecf3285d865b4b864bcaa3de87cd6005f8d500da4250b5b659db69e103743109ec3c72cb79abf24910b6de4ac05c0a7b7bcb2656d5a95c9703d38
 DIST xorg-server-1.12.4.tar.bz2 5444761 SHA256 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7 SHA512 70997e8ba4f948829c158e52924753c5691a783dd14e5a86fdce4fc601638dd4e0b281590876b0315a303bf8d5195bdf43ede7113d1d569415a41ab03d938d85 WHIRLPOOL bfee61329ca85ecedb991ca933de6e3a1e94e34a04d9a723a0e9c90a36e067824701c38e8a0034498ed28dfca82eb653d1e1ab5c0223020f5da69cbbf80bbf98
-DIST xorg-server-1.13.4.tar.bz2 5506293 SHA256 a2c969887f3c7b0f3f7d31e2ee8e91fa73ce81ba3c16d82da9150ffa302c98cf SHA512 600fe0fc77a9d6c242ec264f74624cddf5e3dd0e2eacaa65d475be638e2b4d9497bc555d753b43b24845bd6f446a811e387446f94fa98d3e75f664063a7a3d3d WHIRLPOOL 68ca7d6f121496d3a371fb4242c4e9c8fa77eae5c79a13dfec2cdbfd8f0ed82b9a97aa607923674f2e17f3380ec9a8c82d3aab9b2d8b829457a29b8330970f54
-DIST xorg-server-1.14.5.tar.bz2 5503638 SHA256 8d0f06bf1416487a5170318477088826a8d737d4a201e996b2dc1ecff47461d1 SHA512 7b737631fb9a7a6e305c2281b854cde0e1cc62ba546adf008582e2e8a54089df519ad4b79705d0f08f40255e4c607b726299ee4e50e2281efaa871c071e7771b WHIRLPOOL ea6e7368a1a99477a2e57f378f07ca0f1ded826fccd90e810c3b0fa3c71aa8cd7c0285ead23431397ae91e4245da45efa66648c1e77612556d1244f367e72257
-DIST xorg-server-1.14.7.tar.bz2 5520884 SHA256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f SHA512 89424c51f752cbbf6a531363f8c119d2f66c361bc67722290ebc561ee4da56dd3aa18ceaf3dafd4bb3cec97915f73353a5167e00362bf04bdb94ace1e5de7750 WHIRLPOOL 6bc5b27b0898dab3aa464d8f42e7fe7cd4ad15108e366c72fc567d25eec2e1d01b60345db02a8edf5a7f9798c72495976c85f3bb45d0a42b5b63f94dd208bf0c
 DIST xorg-server-1.15.2.tar.bz2 5551426 SHA256 3c0585607c654ded836da43a45a75492fc13454ff4149704fb08dac39f051163 SHA512 5fcbf0012af309f80e1db206e05d7861796146d765cd17f3963fde6da7f43f0e57d63dbbdbf2c554612a557aa4dee623ef62f7ca7d007834aafd7a46ca7bb1d6 WHIRLPOOL 22cdbad68462f9bac32b13be958df496411ca72fe47435ec7e3ebb470b121ba4b4a0e023913f31a92113c5a56bc4be660dfec5086bc1fb72a617d2cdeaa8adf1
 DIST xorg-server-1.16-cve-2014-8091..8103.patches.tar.xz 27892 SHA256 47d8c9bb79c829389e7599aef1110d43afbc5bf744dbcf73d8f3cf01796d287a SHA512 f8b55c009166883b3e6ec2c8c7a2ff4ed61df6970afcc4f0efb9efa36741af194456a368d4b1c7ba9345ef973fb139a48eb50cb5a7ebc144b43749b9ffdb1f7b WHIRLPOOL 2f8b26c018f4ad4cf780ed7dcb0b844de64e7a612adc30c622d1956dfcee710086ffcc837ff0a64cdcc14d47720d82d8797374488bf0b52d77ca63adf6806885
 DIST xorg-server-1.16.3.tar.bz2 5806406 SHA256 5e0f443238af1078b48f6eea98a382861b59187da221c2cf714d31c1d560b0fb SHA512 c0459ed95a6682b2094340b6b8fc7b59fcda5227ee2f13e87f68eb5c29b91cd3f05c5fc2126e33d6303beb3ad04d19466951ef4eb53f2e9918684cdaf3692c5a WHIRLPOOL 960ecad4cbee0514c2c2b5856d35e51b37942795092e743346d2182b887db53e9fb96c8437f2e9b608d9412941c8ea5c3f3d287a18acc8de1e428e9ee0bf3d72
 DIST xorg-server-1.17.0.tar.bz2 5852312 SHA256 4e8548bae163129d2fc8f8e1f3b6071fe9d62821e3d5617507ccd2f589526166 SHA512 95e8fec64a05d56f12c29843d0d7b659e37bb5b8afa86bb8ca27bb94c88a41bff0177d1debc44189788269911eecd688393c13fad700b6fd1c8f40fcae22a2b7 WHIRLPOOL 36f7fed319e70f2a978f5b382d39677b7cc91aaf8aa80a1a657dc912a875289afeaec9e21a1702450a51fc114ca63265085435f1c9513a9b35cc90ad666f4bc8
-DIST xorg-server-1.9.5.tar.bz2 5172054 SHA256 3fc775097c4f0e8f731447d0183ee709ae37c44c0c286ba00a4b028274e029dc SHA512 f17baa6e871c7df4dc61330e32e235906d9e4c842a70226b0833d2b64ab62811131b960eb942f4dc9359ea828676ce60afd82802aa7cffc711d27c4946c32345 WHIRLPOOL a8ede9d5e4ae80713e2b363042a80fe7ac9a03f8623dbf058b241a4237edd2397b437dda5ea56076ec1da71b946dc5b936adfd4afd436893b5c8350996ba169e
-EBUILD xorg-server-1.10.6-r3.ebuild 7244 SHA256 0ecb1d013df6b783d07e1b98a3b63279303a09adc77c894ce3707d1324cdde97 SHA512 7e360a813c87d33bc1e3e13f9634ace0bec8349835aea1c1a24d4c7a26ebb4dd9359cdd597ff920c62fe32cf4af13f95414f71e9b3034a224dd4dc645cd974d9 WHIRLPOOL d0c1a7e8c63254d9f3c4475a0a2fad7c12a9fb2d7a9bb3341c85b0b9d743cf306d4547897d88577af3d03f436de3dfcb9a7a75e763251d3d7f34e956b9c9af05
-EBUILD xorg-server-1.11.4-r3.ebuild 7256 SHA256 864ef1891d91d492725bd34c7494810df85cca470dd045d9cc0255bd5f80b43f SHA512 6f7a6eed11e8fc2be8de1a1318afdd4d48b82a1084ea6e9f00bb85ba463287fba53c4350deaf5ef58f15d66666a6357955ae79bdceb834863f19976ab0e2970e WHIRLPOOL 67dfa1d6e552eb9d4c6d850a82686185b9a43a116e739a118a17251d1e972a0ce22a6bece879f4aae7cf75ced0c43f53bdf0b4d8567c08525fee9fd7467e54fd
 EBUILD xorg-server-1.12.4-r3.ebuild 7095 SHA256 2da75901c7fee7946e4f4938d631a9828be186b5d9ede672c215061911aac2cd SHA512 74b76ae684ba70434204dc3916a5d54879f56ec750be37b99f9615b66edac42688084ab944e99abda8730ed6dcfbd94ff2c80b7317a1f34b94a8cebb8d8e3fa4 WHIRLPOOL 8b6ab1a9363861bf0d1afce66db68f4ec5ed30560c4388bf3d4dece6ac3835e8cf37b3595323e6c040e91565961552f5691972c3e5f3018952ed376c828aed7e
-EBUILD xorg-server-1.13.4-r1.ebuild 6867 SHA256 dd1fd3668fa0dde0aea23af81b5e5e21160ecb5c49d01b1e798231b99d932009 SHA512 868cf38391e0a2631e9f870162e35410f15da9a0f00854ad81027d407e9655e4ae8ab03daad8ddc6c3876b4269b6f4b033ea15891018b6c18b222a2465f87819 WHIRLPOOL d54235391e9d291580a564abba15160f6c8bb8138d8bee4443684ac7daa64fa1619dfa354cb09722dc5761c8b8c98993854a82c91beccc24a7a929afc8a5295a
-EBUILD xorg-server-1.14.5.ebuild 6982 SHA256 1feb2b09207af6f99664b816e5a6162c3d93271b66d9c97043662bcaddf68dee SHA512 9ceb51f43e85a560f2bb688952a255ed0528f77df4705946533fba16b3a752e348f0c324aba45b1cd2f73a2c98a07a7ea8bdad5a73c8575f56f3ddaf54155d91 WHIRLPOOL d2ef44457092590be0b340f4ada364cc0277693ae9e3c02f7efe1015c06bcd1ccafb00c7ff9e5f46806efb7ec6ebc7a4b5653b1a721a5e2e83ccfbafb4076f6a
-EBUILD xorg-server-1.14.7.ebuild 6990 SHA256 fb8095e48e36082fea4a0d49fb4d0c66cb79b47f4d06188391e752f58149065a SHA512 a3ef2659a70f9a10f85921765c059e2ff125db59acda51aeb1acb93976a4c3c8a5f940c38d7eab1fb44ac2f35e9830fd9fc84cf9148cf15c03c32316a8edca92 WHIRLPOOL 7700ca083678f604297203988788439d7b02682198129fc9c79b0005105bfe30df3e1e4c57a79164e914b8305399b4cb3c5b2a1f38e9cac6a9fd36735158880b
 EBUILD xorg-server-1.15.2-r1.ebuild 7223 SHA256 a5f4065ca7d9a0ddd26202cbf933bf7a0e3d42812f18f6d113e0f730d39e505d SHA512 9c7568589838955f8b3fecded46ea7149bc62a6f6c35c56ddf4c31c5dbae190315bfe155406f25786d81627bbf4666fb3f74fe1e036041701f8fd65e5199202e WHIRLPOOL af0b64311352dff7eac33b2bd5948b540d9be0e112fcc1abb948d1cf5d6e4fdc3cfb7a00be051d10ab1f0c631311987aeefa887af13ba18208eea6d432cd2b88
 EBUILD xorg-server-1.16.3-r1.ebuild 6761 SHA256 285ba4a6c9c8e40b1261fae8f606c350dfa03df96fb233f0de237a981bfb8b4c SHA512 457d08a77be36547c4f1802cf0e965449e713e7f930754a10b32d996bfec23fbe69f2e96870d88798d5fc468229552d25a09f18b17c1b591b788552b3e202f66 WHIRLPOOL 1039b0eee178cf6b0f862ee2b26579658e9dbe32ee9c9f278b7c9938f228384dee2aa42ead4375492f6cab191cd322fcd12e59b67cddbc26fb9d0ed341268565
 EBUILD xorg-server-1.16.3.ebuild 7662 SHA256 ed4a52760a60b2baf5162235a5ce6d3c6c0aa87c91f4d05de3c209fbe1f41a61 SHA512 6687e90d925bcd1af3d2e21c2dc8abaec9866ab4952f04d0c2edefa54e00cf246b299ab73c4f5fd7fbf9af3802e4be892ee6e5c8135a7eddb2c1fb3fdad7d1f7 WHIRLPOOL 950ea824fbd63110f11d99d1387031c85c3ecaea7f231e18ac609153cf2f5e981ed284ebcf78b8a36b276447e5f86bd6318c2a168207497bf83048e86e01ef02
 EBUILD xorg-server-1.17.0.ebuild 6152 SHA256 07bc61384c6bd41a0df7a353dbc3f4ee449250a71e26d804113cda367d1ecfad SHA512 c2999e551d08c9315c6581fff18220a4c6c846cce527ee7c11e491f7d3bc2610c931ced09894749052614fae3b162b00961f472a70198dd4113af6087b127ff8 WHIRLPOOL dceb49434de366df2f2ac00642d649517ab7ddee4ac0ac6a16b1bcc552a6be3b8e0a14bec84728842aed1f62eba397aa2a347fb012b1740477dbf9ede5945bd1
-EBUILD xorg-server-1.9.5-r3.ebuild 7967 SHA256 74e6a536de6c99f4c3081ca6f4b65c653e6b54d72ba17963b2186be0b031a3a6 SHA512 bb5b4f17f6fbd07cc1501019464b7b944599256e5ca0021d5481e6c194fd19fdb0e5029351b999b1efa621c61c1c7256970d431f99b3c31a659859649a09a63d WHIRLPOOL 4ff73d879f6a8c3c69d2f8f7414eb08d873187e3cbd6b4f1453d53398a3b13a93da4e3847a62c87e6b26f30fffb2fb7153b2e3da3a8bd0eaffc4eeb870701cb8
-MISC ChangeLog 61218 SHA256 db19799f0c4ea2cb89e9a3c1c370830526f8ac9ddad2acd51b7c3337c1c9bf30 SHA512 f2311d184f94efeb89a48d7c27657ef1a438b0b7cff2c2e970c2f9893a10b875adf899b41a6f38f3415d11f12db2c7ba2b40d22e3d18de52298aa3db5cc9667b WHIRLPOOL 4d4eeba27adfb99418bb994d9e1356da609c7e2698202ea6df6f90ed02fa6ba85e3d75648f7f0b9226e9fd6e6ddb4eb3b4068dabbbea5fcd293ee9273e285213
+MISC ChangeLog 62033 SHA256 4766364d88efd966955758d007fd42bdd69a1a0fe8fad7920dd471b6be22ae0e SHA512 9d38c5f2f12154b35fb4fc134efbeb340af7f1e5bb7398c5fcc2e1990cbe7550ba4dbe98467bca04cf2dd373c8b101ea16409102306ed3d4999e58fad1c6e45d WHIRLPOOL 5c1d738a54d900e0b1b2418bcfedc7c0d6ca4a3d21992d034c17523ac32fd10efa67535cad93be127ce37de11209ac39f2f246a74e787115b1ac508e19d80359
 MISC ChangeLog-2009 109242 SHA256 76119bd85f64b74b4f8129911eef944e8f1baa3ae38bbfb65bcd6197a6f58c88 SHA512 200b2a1f8d66bc4461de84a5b675ae9bdc1fd38ffea339cdc69afdb613d7a6d6ffe29175fba62b10c4f9d95e050035933f59e21172bf9c545d7a70137c8d04f4 WHIRLPOOL 1c084a461e803c1a6627986cb2444cd7a23743f409df5bb1ca5f55d1e7c3106670cfc2cd4f875a479e0c75513b7937ee35b591b4016b715f7fa45209e098cece
 MISC metadata.xml 803 SHA256 11ce7d6b3d1a4b32ac268d791e3e9fc1a47e579fb0587f87caf4c064c1abc355 SHA512 73fee10d52b8012ee64bdb789d0ecc0368c418822ec823ad22c1eac3c7c4af37c561a58599db68a6638059624e6f37e7d3cb5f3fd363255a372a9614c1deaf75 WHIRLPOOL f26245d7f8c9bf8c653730e1e832781289e06e43dc6cbc1efc422b6e8e3f7342e5a94f8cb731b4c2193c40af6087048da0ca384e4f13e697f86098296936e2e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU2CTSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJU2gspXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy
-MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYRBAoQAJEwaT2Jqd2643CpcbkiABsH
-MrSWdDkQDDMLTo2bMLB/zKMoWI/p+4YbJqfXLhR39QyTtkt/T1JNcaem9MdxoMUZ
-An1ic8x2YQkOfPycEyKsyJfj2KCx/rdUYkmXOle45uFcf73PzFKdZtxEqQksBV1f
-M4yme2mw3B79pwaSqIJLDcdOxOWx4OKgNZPkThQYsN2g/Tlg77Z8FhpTiNjDVSo5
-M83kW0qdNlt/ezObctoWSkC7Gqfxjwx2HpvX5c7UyuGRQNoD2MxuMPQEDqBDlF8o
-pNULDH4+iKfdA2n+23s3QYv0h3JCrLsIk7cZ9GJOhos8HN+5ift/TAgb2GMxdwI5
-bi49tnzn5TJr1Hg9cDgvkDeWw7NZDvhGtSnWgEAJ18LhMBRAlbc7xc5po8iDiaZg
-UwZVxUnUITX727ecOzwXOu0L6UA+PBMNwYK9GBqI9E6/ww8BMkcBCdUcJc0fuM/Y
-4ybmwfxteHKjLujdREwCL/dCxg+AROY6GtWNylZnzy9EAXDpKDc/nr4305rOZFe9
-1MhJrHqJYs6jLToJOc6HFRhA14EiV0pQHsCPRpWDprtgXMMtKkZ63aIlDGKuYzKX
-P7hHAaMcVEf8KOtSRVB8LCixl3Hj4l6ZryYWsUGizW+Z/xmq14rPmCSHmcFfaFi4
-v0GJaijRkZQSJ0vI8xao
-=LwmF
+MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYRz8sP/2FWSLZ5bDbj2yugnbXijpiR
+G/TKTKTCOqwlnEe/DgW5eHz9ZyPzG0XWaWhb9VkJr5XifSA96T6T78fQqREvmOUN
+LagkyFQA+KsBE4KHA0PEh0pJA73Q2vaYJZE8PlErgClFcCYNMhhpcpr112TLA1wn
+fujcUQB5B4az15dTrITs+MgjeOkgTslxqVB1wvxsd4yH61Y3iiZYAI7jvpdzz+Wo
+EsUAim1eINpknvepJabGUrL7E6hictu7P9O9R4Ev5qUuZMSjrcjhjjoSHVuwrq4k
+ooV/b7MvNBFCw6YlN4ZJfW4sJic7vkQCkJ3z0vGO9bOdvKClacEpTydblxss9t+/
+tPFJo/RkFkvLu9sLpEQeAcCd0c7ICiazXNbPMZiHLraNWcLvWP4CakoVySr1oCgS
+ogk4nOsbO1DAO0Fs/ZXdjInKemt56F4YRGkhUdjKpde+Zi2tmjjCGms5o2wChk18
+yrjKAM/uSPVTcpPan4yOf64gfrIqPhxFGc8LhxZpgfJ4vSxlKGeDbl22XcLVw74C
+hXCcrXwtU2nD3sM2zcjgLvSegOG533fkBxFdmRzg4QNzbCDGboziqNGUIUk7pH5U
+K5c3Q12Pwraoxc/8PBWEwLu6MPrrfx4W/UDaZpsLVmbWQd/t6kyYH1utzeYyrU27
+JLLUR6hm2F2bJuGYOuaC
+=LLkP
 -----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/files/xdm.initd-10 b/x11-base/xorg-server/files/xdm.initd-10
deleted file mode 100644
index 9826e6bb149e..000000000000
--- a/x11-base/xorg-server/files/xdm.initd-10
+++ /dev/null
@@ -1,226 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-10,v 1.1 2013/09/26 15:23:33 axs Exp $
-
-# This is here to serve as a note to myself, and future developers.
-#
-# Any Display manager (gdm,kdm,xdm) has the following problem:  if
-# it is started before any getty, and no vt is specified, it will
-# usually run on vt2.  When the getty on vt2 then starts, and the
-# DM is already started, the getty will take control of the keyboard,
-# leaving us with a "dead" keyboard.
-#
-# Resolution: add the following line to /etc/inittab
-#
-#  x:a:once:/etc/X11/startDM.sh
-#
-# and have /etc/X11/startDM.sh start the DM in daemon mode if
-# a lock is present (with the info of what DM should be started),
-# else just fall through.
-#
-# How this basically works, is the "a" runlevel is a additional
-# runlevel that you can use to fork processes with init, but the
-# runlevel never gets changed to this runlevel.  Along with the "a"
-# runlevel, the "once" key word means that startDM.sh will only be
-# run when we specify it to run, thus eliminating respawning
-# startDM.sh when "xdm" is not added to the default runlevel, as was
-# done previously.
-#
-# This script then just calls "telinit a", and init will run
-# /etc/X11/startDM.sh after the current runlevel completes (this
-# script should only be added to the actual runlevel the user is
-# using).
-#
-# Martin Schlemmer
-# aka Azarah
-# 04 March 2002
-
-depend() {
-	need localmount xdm-setup
-
-	# this should start as early as possible
-	# we can't do 'before *' as that breaks it
-	# (#139824) Start after ypbind and autofs for network authentication
-	# (#145219 #180163) Could use lirc mouse as input device
-	# (#70689 comment #92) Start after consolefont to avoid display corruption
-	# (#291269) Start after quota, since some dm need readable home
-	# (#390609) gdm-3 will fail when dbus is not running
-	# (#366753) starting keymaps after X causes problems
-	after bootmisc consolefont modules netmount
-	after readahead-list ypbind autofs openvpn gpm lircmd
-	after quota keymaps
-	before alsasound
-
-	# Start before X
-	use consolekit dbus xfs
-}
-
-setup_dm() {
-	local MY_XDM
-	
-	MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]')
-
-	# Load our root path from profile.env
-	# Needed for kdm
-	PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}")
-
-	NAME=
-	case "${MY_XDM}" in
-		kdm|kde)
-			EXE=/usr/bin/kdm
-			PIDFILE=/run/kdm.pid
-			;;
-		entrance*)
-			EXE=/usr/sbin/entrance
-			PIDFILE=/run/entrance.pid
-			;;
-		gdm|gnome)
-			# gdm-3 and above has different paths
-			if [ -f /usr/sbin/gdm ]; then
-				EXE=/usr/sbin/gdm
-				PIDFILE=/run/gdm/gdm.pid
-				START_STOP_ARGS="--background"
-				AUTOCLEAN_CGROUP="yes"
-			else
-				EXE=/usr/bin/gdm
-				PIDFILE=/run/gdm.pid
-			fi
-			[ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary
-			;;
-		wdm)
-			EXE=/usr/bin/wdm
-			PIDFILE=
-			;;
-		gpe)
-			EXE=/usr/bin/gpe-dm
-			PIDFILE=/run/gpe-dm.pid
-			;;
-		lxdm)
-			EXE=/usr/sbin/lxdm-binary
-			PIDFILE=/run/lxdm.pid
-			START_STOP_ARGS="--background"
-			;;
-		lightdm)
-			EXE=/usr/sbin/lightdm
-			PIDFILE=/run/lightdm.pid
-			START_STOP_ARGS="--background"
-			;;
-		*)
-			# first find out if there is such executable
-			EXE="$(command -v ${MY_XDM} 2>/dev/null)"
-			PIDFILE="/run/${MY_XDM}.pid"
-
-			# warn user that he is doing sick things if the exe was not found
-			if [ -z "${EXE}" ]; then
-				echo "ERROR: Your XDM value is invalid."
-				echo "  No ${MY_XDM} executable could be found on your system."
-			fi
-			;;
-	esac
-
-	if ! [ -x "${EXE}" ]; then
-		EXE=/usr/bin/xdm
-		PIDFILE=/run/xdm.pid
-		if ! [ -x "/usr/bin/xdm" ]; then
-			echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm,"
-			echo "	or install x11-apps/xdm package"
-			eend 255
-		fi
-	fi
-}
-
-# Check to see if something is defined on our VT
-vtstatic() {
-	if [ -e /etc/inittab ] ; then
-		grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab
-	elif [ -e /etc/ttys ] ; then
-		grep -q "^ttyv$(($1 - 1))" /etc/ttys
-	else
-		return 1
-	fi
-}
-
-start() {
-	local EXE NAME PIDFILE AUTOCLEAN_CGROUP
-	setup_dm
-
-	if [ -f /etc/.noxdm ]; then
-		einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\" bootparam passed."
-		rm /etc/.noxdm
-		return 0
-	fi
-
-	ebegin "Setting up ${EXE##*/}"
-
-	# save the prefered DM
-	save_options "service" "${EXE}"
-	save_options "name"    "${NAME}"
-	save_options "pidfile" "${PIDFILE}"
-	save_options "start_stop_args" "${START_STOP_ARGS}"
-	save_options "autoclean_cgroup" "${AUTOCLEAN_CGROUP:-no}"
-
-	if [ -n "${CHECKVT-y}" ] ; then
-		if vtstatic "${CHECKVT:-7}" ; then
-			if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ]; then
-				ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later"
-				telinit a >/dev/null 2>&1
-				return 0
-			else
-				eerror "Something is already defined on VT ${CHECKVT:-7}, not starting"
-				return 1
-			fi
-		fi
-	fi
-
-	/etc/X11/startDM.sh
-	eend 0
-}
-
-stop() {
-	local curvt retval
-
-	retval=0
-	if [ -t 0 ]; then
-		if type fgconsole >/dev/null 2>&1; then
-			curvt=$(fgconsole 2>/dev/null)
-		else
-			curvt=$(tty)
-			case "${curvt}" in
-				/dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;;
-				*) curvt= ;;
-			esac
-		fi
-	fi
-	local myexe myname mypidfile myservice
-	myexe=$(get_options "service")
-	myname=$(get_options "name")
-	mypidfile=$(get_options "pidfile")
-	myservice=${myexe##*/}
-	yesno "${rc_cgroup_cleanup:-no}" || rc_cgroup_cleanup=$(get_options "autoclean_cgroup")
-
-	[ -z "${myexe}" ] && return 0
-
-	ebegin "Stopping ${myservice}"
-
-	if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then
-		start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \
-			${mypidfile:+--pidfile} ${mypidfile} \
-			${myname:+--name} ${myname}
-		retval=${?}
-	fi
-
-	# switch back to original vt
-	if [ -n "${curvt}" ]; then
-		if type chvt >/dev/null 2>&1; then
-			chvt "${curvt}"
-		else
-			vidcontrol -s "$((curvt + 1))"
-		fi
-	fi
-
-	eend ${retval} "Error stopping ${myservice}"
-	return ${retval}
-}
-
-# vim: set ts=4 :
diff --git a/x11-base/xorg-server/files/xorg-cve-2011-4028+4029.patch b/x11-base/xorg-server/files/xorg-cve-2011-4028+4029.patch
deleted file mode 100644
index 66e77f66e002..000000000000
--- a/x11-base/xorg-server/files/xorg-cve-2011-4028+4029.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/os/utils.c b/os/utils.c
-index e8ecb71..18ff1ca 100644
---- a/os/utils.c
-+++ b/os/utils.c
-@@ -297,7 +297,7 @@ LockServer(void)
-     FatalError("Could not create lock file in %s\n", tmp);
-   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
-   (void) write(lfd, pid_str, 11);
--  (void) chmod(tmp, 0444);
-+  (void) fchmod(lfd, 0444);
-   (void) close(lfd);
-
-   /*
-@@ -318,7 +318,7 @@ LockServer(void)
-       /*
-        * Read the pid from the existing file
-        */
--      lfd = open(LockFile, O_RDONLY);
-+      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
-       if (lfd < 0) {
-         unlink(tmp);
-         FatalError("Can't read lock file %s\n", LockFile);
diff --git a/x11-base/xorg-server/files/xorg-server-1.11-disable-tests-without-ddx.patch b/x11-base/xorg-server/files/xorg-server-1.11-disable-tests-without-ddx.patch
deleted file mode 100644
index facb9727a7d2..000000000000
--- a/x11-base/xorg-server/files/xorg-server-1.11-disable-tests-without-ddx.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -ur a/test/Makefile.am b/test/Makefile.am
---- a/test/Makefile.am	2011-07-15 15:26:40.000000000 +0200
-+++ b/test/Makefile.am	2012-01-02 01:03:15.232740535 +0100
-@@ -1,21 +1,32 @@
- if ENABLE_UNIT_TESTS
- if HAVE_LD_WRAP
--SUBDIRS= . xi2
--noinst_PROGRAMS = xkb input xtest list misc fixes
-+SUBDIRS= .
-+noinst_PROGRAMS = list
-+if XORG
-+# Tests that require at least some DDX functions in order to fully link
-+# For now, requires xf86 ddx, could be adjusted to use another
-+SUBDIRS += xi2
-+noinst_PROGRAMS += xkb input xtest misc fixes
-+endif
- check_LTLIBRARIES = libxservertest.la
- 
- TESTS=$(noinst_PROGRAMS)
- 
- AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
--INCLUDES = $(XORG_INCS) -I$(top_srcdir)/hw/xfree86/parser \
--	-I$(top_srcdir)/miext/cw -I$(top_srcdir)/hw/xfree86/ddc \
-+INCLUDES = $(XORG_INCS) -I$(top_srcdir)/miext/cw
-+if XORG
-+INCLUDES += -I$(top_srcdir)/hw/xfree86/parser \
-+	-I$(top_srcdir)/hw/xfree86/ddc \
- 	-I$(top_srcdir)/hw/xfree86/i2c -I$(top_srcdir)/hw/xfree86/modes \
- 	-I$(top_srcdir)/hw/xfree86/ramdac
-+endif
- TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS)
- 
-+if XORG
- if SPECIAL_DTRACE_OBJECTS
- TEST_LDADD += $(OS_LIB) $(DIX_LIB)
- endif
-+endif
- 
- xkb_LDADD=$(TEST_LDADD)
- input_LDADD=$(TEST_LDADD)
-@@ -24,9 +35,10 @@
- misc_LDADD=$(TEST_LDADD)
- fixes_LDADD=$(TEST_LDADD)
- 
-+libxservertest_la_LIBADD = $(XSERVER_LIBS)
-+if XORG
- nodist_libxservertest_la_SOURCES = $(top_builddir)/hw/xfree86/sdksyms.c
--libxservertest_la_LIBADD = \
--            $(XSERVER_LIBS) \
-+libxservertest_la_LIBADD += \
-             $(top_builddir)/hw/xfree86/loader/libloader.la \
-             $(top_builddir)/hw/xfree86/os-support/libxorgos.la \
-             $(top_builddir)/hw/xfree86/common/libcommon.la \
-@@ -36,7 +48,9 @@
-             $(top_builddir)/hw/xfree86/ramdac/libramdac.la \
-             $(top_builddir)/hw/xfree86/ddc/libddc.la \
-             $(top_builddir)/hw/xfree86/i2c/libi2c.la \
--            $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \
-+            $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la
-+endif
-+libxservertest_la_LIBADD += \
-             $(top_builddir)/mi/libmi.la \
-             $(top_builddir)/os/libos.la \
-             @XORG_LIBS@
diff --git a/x11-base/xorg-server/files/xorg-server-1.11-dix-pointerrootwin-send-focusin.patch b/x11-base/xorg-server/files/xorg-server-1.11-dix-pointerrootwin-send-focusin.patch
deleted file mode 100644
index d548c898d03a..000000000000
--- a/x11-base/xorg-server/files/xorg-server-1.11-dix-pointerrootwin-send-focusin.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3ce102c362cadcd7087bdcf48440d9498eaf77d0 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 05 Jan 2012 12:08:01 +0000
-Subject: dix: on PointerRootWin send a FocusIn to the sprite window too
-
-XTS XSetDeviceFocus-7
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
----
-diff --git a/dix/enterleave.c b/dix/enterleave.c
-index 2b8c7c5..89a82ab 100644
---- a/dix/enterleave.c
-+++ b/dix/enterleave.c
-@@ -1299,7 +1299,10 @@ DeviceFocusEvents(DeviceIntPtr dev,
-         for (i = 0; i < nscreens; i++)
-             DeviceFocusEvent(dev, XI_FocusIn, mode, in, screenInfo.screens[i]->root);
-         if (to == PointerRootWin)
-+        {
-             DeviceFocusInEvents(dev, GetCurrentRootWindow(dev), sprite->win, mode, NotifyPointer);
-+            DeviceFocusEvent(dev, XI_FocusIn, mode, NotifyPointer, sprite->win);
-+        }
-     }
-     else
-     {
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-base/xorg-server/files/xorg-server-1.11-dix-send-focus-events.patch b/x11-base/xorg-server/files/xorg-server-1.11-dix-send-focus-events.patch
deleted file mode 100644
index e9ba0a7c717a..000000000000
--- a/x11-base/xorg-server/files/xorg-server-1.11-dix-send-focus-events.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From a125aabda3a5cf27aa98cb61f16e49280b66f451 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 05 Jan 2012 12:02:51 +0000
-Subject: dix: send focus events to the immediate parent (#44079)
-
-For a transition from windows A to B, A->parent did not receive an event.
-DeviceFocusOutEvents sends to windows ]from, to[, so start with the actual
-window, not it's parent.
-
-X.Org Bug 44079 <http://bugs.freedesktop.org/show_bug.cgi?id=44079>
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
-Reviewed-by: Keith Packard <keithp@keithp.com>
----
-diff --git a/dix/enterleave.c b/dix/enterleave.c
-index a39e640..2b8c7c5 100644
---- a/dix/enterleave.c
-+++ b/dix/enterleave.c
-@@ -1292,7 +1292,7 @@ DeviceFocusEvents(DeviceIntPtr dev,
-                         NotifyPointer);
-             DeviceFocusEvent(dev, XI_FocusOut, mode, NotifyNonlinear, from);
-             /* next call catches the root too, if the screen changed */
--            DeviceFocusOutEvents(dev, from->parent, NullWindow, mode,
-+            DeviceFocusOutEvents(dev, from, NullWindow, mode,
-                     NotifyNonlinearVirtual);
-         }
-         /* Notify all the roots */
-@@ -1321,7 +1321,7 @@ DeviceFocusEvents(DeviceIntPtr dev,
-             if (IsParent(to, from))
-             {
-                 DeviceFocusEvent(dev, XI_FocusOut, mode, NotifyAncestor, from);
--                DeviceFocusOutEvents(dev, from->parent, to, mode,
-+                DeviceFocusOutEvents(dev, from, to, mode,
-                         NotifyVirtual);
-                 DeviceFocusEvent(dev, XI_FocusIn, mode, NotifyInferior, to);
-                 if ((IsParent(to, sprite->win)) &&
-@@ -1353,7 +1353,7 @@ DeviceFocusEvents(DeviceIntPtr dev,
-                                 NotifyPointer);
-                     DeviceFocusEvent(dev, XI_FocusOut, mode, NotifyNonlinear, from);
-                     if (from->parent != NullWindow)
--                        DeviceFocusOutEvents(dev, from->parent, common, mode,
-+                        DeviceFocusOutEvents(dev, from, common, mode,
-                                 NotifyNonlinearVirtual);
-                     if (to->parent != NullWindow)
-                         DeviceFocusInEvents(dev, common, to, mode, NotifyNonlinearVirtual);
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-base/xorg-server/files/xorg-server-1.11-log-format-fix.patch b/x11-base/xorg-server/files/xorg-server-1.11-log-format-fix.patch
deleted file mode 100644
index 61e7eae69016..000000000000
--- a/x11-base/xorg-server/files/xorg-server-1.11-log-format-fix.patch
+++ /dev/null
@@ -1,441 +0,0 @@
-Description: extreme backport of upstream log format fixes (CVE-2012-2118).
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xorg-server/+bug/996250
-Origin: http://patchwork.freedesktop.org/patch/10001/
-
-Index: xorg-server-1.11.4/os/log.c
-===================================================================
---- xorg-server-1.11.4.orig/os/log.c	2012-05-06 11:03:17.621808123 -0700
-+++ xorg-server-1.11.4/os/log.c	2012-05-06 11:03:18.057814189 -0700
-@@ -167,6 +167,12 @@
- #ifndef X_NOT_IMPLEMENTED_STRING
- #define X_NOT_IMPLEMENTED_STRING	"(NI)"
- #endif
-+#ifndef X_DEBUG_STRING
-+#define X_DEBUG_STRING          "(DB)"
-+#endif
-+#ifndef X_NONE_STRING
-+#define X_NONE_STRING           ""
-+#endif
- 
- /*
-  * LogInit is called to start logging to a file.  It is also called (with
-@@ -223,7 +229,7 @@
-      * needed.
-      */
-     if (saveBuffer && bufferSize > 0) {
--	free(saveBuffer);	/* Must be free(), not free() */
-+	free(saveBuffer);
- 	saveBuffer = NULL;
- 	bufferSize = 0;
-     }
-@@ -265,36 +271,19 @@
- }
- 
- /* This function does the actual log message writes. */
--
--void
--LogVWrite(int verb, const char *f, va_list args)
-+static void
-+LogSWrite(int verb, const char *buf, size_t len, Bool end_line)
- {
--    static char tmpBuffer[1024];
--    int len = 0;
-     static Bool newline = TRUE;
- 
--    if (newline) {
--	sprintf(tmpBuffer, "[%10.3f] ", GetTimeInMillis() / 1000.0);
--	len = strlen(tmpBuffer);
--	if (logFile)
--	    fwrite(tmpBuffer, len, 1, logFile);
--    }
--
--    /*
--     * Since a va_list can only be processed once, write the string to a
--     * buffer, and then write the buffer out to the appropriate output
--     * stream(s).
--     */
--    if (verb < 0 || logFileVerbosity >= verb || logVerbosity >= verb) {
--	vsnprintf(tmpBuffer, sizeof(tmpBuffer), f, args);
--	len = strlen(tmpBuffer);
--    }
--    newline = (tmpBuffer[len-1] == '\n');
--    if ((verb < 0 || logVerbosity >= verb) && len > 0)
--	fwrite(tmpBuffer, len, 1, stderr);
--    if ((verb < 0 || logFileVerbosity >= verb) && len > 0) {
-+    if (verb < 0 || logVerbosity >= verb)
-+        fwrite(buf, len, 1, stderr);
-+    if (verb < 0 || logFileVerbosity >= verb) {
- 	if (logFile) {
--	    fwrite(tmpBuffer, len, 1, logFile);
-+            if (newline)
-+                fprintf(logFile, "[%10.3f] ", GetTimeInMillis() / 1000.0);
-+            newline = end_line;
-+            fwrite(buf, len, 1, logFile);
- 	    if (logFlush) {
- 		fflush(logFile);
- #ifndef WIN32
-@@ -311,13 +300,19 @@
- 		    FatalError("realloc() failed while saving log messages\n");
- 	    }
- 	    bufferUnused -= len;
--	    memcpy(saveBuffer + bufferPos, tmpBuffer, len);
-+            memcpy(saveBuffer + bufferPos, buf, len);
- 	    bufferPos += len;
- 	}
-     }
- }
- 
- void
-+LogVWrite(int verb, const char *f, va_list args)
-+{
-+    return LogVMessageVerb(X_NONE, verb, f, args);
-+}
-+
-+void
- LogWrite(int verb, const char *f, ...)
- {
-     va_list args;
-@@ -327,60 +322,75 @@
-     va_end(args);
- }
- 
--void
--LogVMessageVerb(MessageType type, int verb, const char *format, va_list args)
-+/* Returns the Message Type string to prepend to a logging message, or NULL
-+ * if the message will be dropped due to insufficient verbosity. */
-+static const char *
-+LogMessageTypeVerbString(MessageType type, int verb)
- {
--    const char *s  = X_UNKNOWN_STRING;
--    char tmpBuf[1024];
-+    if (type == X_ERROR)
-+        verb = 0;
- 
--    /* Ignore verbosity for X_ERROR */
--    if (logVerbosity >= verb || logFileVerbosity >= verb || type == X_ERROR) {
--	switch (type) {
--	case X_PROBED:
--	    s = X_PROBE_STRING;
--	    break;
--	case X_CONFIG:
--	    s = X_CONFIG_STRING;
--	    break;
--	case X_DEFAULT:
--	    s = X_DEFAULT_STRING;
--	    break;
--	case X_CMDLINE:
--	    s = X_CMDLINE_STRING;
--	    break;
--	case X_NOTICE:
--	    s = X_NOTICE_STRING;
--	    break;
--	case X_ERROR:
--	    s = X_ERROR_STRING;
--	    if (verb > 0)
--		verb = 0;
--	    break;
--	case X_WARNING:
--	    s = X_WARNING_STRING;
--	    break;
--	case X_INFO:
--	    s = X_INFO_STRING;
--	    break;
--	case X_NOT_IMPLEMENTED:
--	    s = X_NOT_IMPLEMENTED_STRING;
--	    break;
--	case X_UNKNOWN:
--	    s = X_UNKNOWN_STRING;
--	    break;
--	case X_NONE:
--	    s = NULL;
--	    break;
--	}
-+    if (logVerbosity < verb && logFileVerbosity < verb)
-+        return NULL;
- 
--        /* if s is not NULL we need a space before format */
--        snprintf(tmpBuf, sizeof(tmpBuf), "%s%s%s", s ? s : "",
--                                                   s ? " " : "",
--                                                   format);
--        LogVWrite(verb, tmpBuf, args);
-+    switch (type) {
-+    case X_PROBED:
-+        return X_PROBE_STRING;
-+    case X_CONFIG:
-+        return X_CONFIG_STRING;
-+    case X_DEFAULT:
-+        return X_DEFAULT_STRING;
-+    case X_CMDLINE:
-+        return X_CMDLINE_STRING;
-+    case X_NOTICE:
-+        return X_NOTICE_STRING;
-+    case X_ERROR:
-+        return X_ERROR_STRING;
-+    case X_WARNING:
-+        return X_WARNING_STRING;
-+    case X_INFO:
-+        return X_INFO_STRING;
-+    case X_NOT_IMPLEMENTED:
-+        return X_NOT_IMPLEMENTED_STRING;
-+    case X_UNKNOWN:
-+        return X_UNKNOWN_STRING;
-+    case X_NONE:
-+        return X_NONE_STRING;
-+    case X_DEBUG:
-+        return X_DEBUG_STRING;
-+    default:
-+        return X_UNKNOWN_STRING;
-     }
- }
- 
-+void
-+LogVMessageVerb(MessageType type, int verb, const char *format, va_list args)
-+{
-+    const char *type_str;
-+    char buf[1024];
-+    const size_t size = sizeof(buf);
-+    Bool newline;
-+    size_t len = 0;
-+
-+    type_str = LogMessageTypeVerbString(type, verb);
-+    if (!type_str)
-+        return;
-+
-+    /* if type_str is not "", prepend it and ' ', to message */
-+    if (type_str[0] != '\0')
-+        len += Xscnprintf(&buf[len], size - len, "%s ", type_str);
-+
-+    if (size - len > 1)
-+        len += Xvscnprintf(&buf[len], size - len, format, args);
-+
-+    /* Force '\n' at end of truncated line */
-+    if (size - len == 1)
-+        buf[len - 1] = '\n';
-+
-+    newline = (buf[len - 1] == '\n');
-+    LogSWrite(verb, buf, len, newline);
-+}
-+
- /* Log message with verbosity level specified. */
- void
- LogMessageVerb(MessageType type, int verb, const char *format, ...)
-@@ -404,6 +414,49 @@
- }
- 
- void
-+LogVHdrMessageVerb(MessageType type, int verb, const char *msg_format,
-+                   va_list msg_args, const char *hdr_format, va_list hdr_args)
-+{
-+    const char *type_str;
-+    char buf[1024];
-+    const size_t size = sizeof(buf);
-+    Bool newline;
-+    size_t len = 0;
-+
-+    type_str = LogMessageTypeVerbString(type, verb);
-+    if (!type_str)
-+        return;
-+
-+    /* if type_str is not "", prepend it and ' ', to message */
-+    if (type_str[0] != '\0')
-+        len += Xscnprintf(&buf[len], size - len, "%s ", type_str);
-+
-+    if (hdr_format && size - len > 1)
-+        len += Xvscnprintf(&buf[len], size - len, hdr_format, hdr_args);
-+
-+    if (msg_format && size - len > 1)
-+        len += Xvscnprintf(&buf[len], size - len, msg_format, msg_args);
-+
-+    /* Force '\n' at end of truncated line */
-+    if (size - len == 1)
-+        buf[len - 1] = '\n';
-+
-+    newline = (buf[len - 1] == '\n');
-+    LogSWrite(verb, buf, len, newline);
-+}
-+
-+void
-+LogHdrMessageVerb(MessageType type, int verb, const char *msg_format,
-+                  va_list msg_args, const char *hdr_format, ...)
-+{
-+    va_list hdr_args;
-+
-+    va_start(hdr_args, hdr_format);
-+    LogVHdrMessageVerb(type, verb, msg_format, msg_args, hdr_format, hdr_args);
-+    va_end(hdr_args);
-+}
-+
-+void
- AbortServer(void) _X_NORETURN;
- void
- SigAbortServer(int signo) _X_NORETURN;
-Index: xorg-server-1.11.4/include/Xprintf.h
-===================================================================
---- xorg-server-1.11.4.orig/include/Xprintf.h	2012-05-06 10:32:42.436348011 -0700
-+++ xorg-server-1.11.4/include/Xprintf.h	2012-05-06 11:03:18.057814189 -0700
-@@ -66,4 +66,16 @@
- # define vasprintf Xvasprintf
- #endif
- 
-+/*
-+ * These functions provide a portable implementation of the linux kernel
-+ * scnprintf & vscnprintf routines that return the number of bytes actually
-+ * copied during a snprintf, (excluding the final '\0').
-+ */
-+extern _X_EXPORT int
-+Xscnprintf(char *s, int n, const char * _X_RESTRICT_KYWD fmt, ...)
-+_X_ATTRIBUTE_PRINTF(3,4);
-+extern _X_EXPORT int
-+Xvscnprintf(char *s, int n, const char * _X_RESTRICT_KYWD fmt, va_list va)
-+_X_ATTRIBUTE_PRINTF(3,0);
-+
- #endif /* XPRINTF_H */
-Index: xorg-server-1.11.4/os/xprintf.c
-===================================================================
---- xorg-server-1.11.4.orig/os/xprintf.c	2012-05-06 10:32:42.472348510 -0700
-+++ xorg-server-1.11.4/os/xprintf.c	2012-05-06 11:03:18.057814189 -0700
-@@ -182,6 +182,50 @@
-     return size;
- }
- 
-+/**
-+ * Varargs snprintf that returns the actual number of bytes (excluding final
-+ * '\0') that were copied into the buffer.
-+ * This is opposed to the normal sprintf() usually returns the number of bytes
-+ * that would have been written.
-+ *
-+ * @param s       buffer to copy into
-+ * @param n       size of buffer s
-+ * @param format  printf style format string
-+ * @param va      variable argument list
-+ * @return        number of bytes actually copied, excluding final '\0'
-+ */
-+int
-+Xvscnprintf(char *s, int n, const char *format, va_list args)
-+{
-+    int x;
-+    if (n == 0)
-+        return 0;
-+    x = vsnprintf(s, n , format, args);
-+    return (x >= n) ? (n - 1) : x;
-+}
-+
-+/**
-+ * snprintf that returns the actual number of bytes (excluding final '\0') that
-+ * were copied into the buffer.
-+ * This is opposed to the normal sprintf() usually returns the number of bytes
-+ * that would have been written.
-+ *
-+ * @param s       buffer to copy into
-+ * @param n       size of buffer s
-+ * @param format  printf style format string
-+ * @param ...     arguments for specified format
-+ * @return        number of bytes actually copied, excluding final '\0'
-+ */
-+int Xscnprintf(char *s, int n, const char *format, ...)
-+{
-+    int x;
-+    va_list ap;
-+    va_start(ap, format);
-+    x = Xvscnprintf(s, n, format, ap);
-+    va_end(ap);
-+    return x;
-+}
-+
- /* Old api, now deprecated, may be removed in the future */
- char *
- Xvprintf(const char *format, va_list va)
-Index: xorg-server-1.11.4/hw/xfree86/common/xf86Helper.c
-===================================================================
---- xorg-server-1.11.4.orig/hw/xfree86/common/xf86Helper.c	2012-05-06 10:32:42.488348731 -0700
-+++ xorg-server-1.11.4/hw/xfree86/common/xf86Helper.c	2012-05-06 11:03:18.057814189 -0700
-@@ -1036,25 +1036,13 @@
- xf86VDrvMsgVerb(int scrnIndex, MessageType type, int verb, const char *format,
- 		va_list args)
- {
--    char *tmpFormat;
--
-     /* Prefix the scrnIndex name to the format string. */
-     if (scrnIndex >= 0 && scrnIndex < xf86NumScreens &&
--	xf86Screens[scrnIndex]->name) {
--	tmpFormat = malloc(strlen(format) +
--			   strlen(xf86Screens[scrnIndex]->name) +
--			   PREFIX_SIZE + 1);
--	if (!tmpFormat)
--	    return;
--
--	snprintf(tmpFormat, PREFIX_SIZE + 1, "%s(%d): ",
--		 xf86Screens[scrnIndex]->name, scrnIndex);
--
--	strcat(tmpFormat, format);
--	LogVMessageVerb(type, verb, tmpFormat, args);
--	free(tmpFormat);
--    } else
--	LogVMessageVerb(type, verb, format, args);
-+        xf86Screens[scrnIndex]->name)
-+        LogHdrMessageVerb(type, verb, format, args, "%s(%d): ",
-+                          xf86Screens[scrnIndex]->name, scrnIndex);
-+    else
-+        LogVMessageVerb(type, verb, format, args);
- }
- #undef PREFIX_SIZE
- 
-@@ -1087,15 +1075,18 @@
- xf86VIDrvMsgVerb(InputInfoPtr dev, MessageType type, int verb, const char *format,
- 		 va_list args)
- {
--    char *msg;
-+    const char *driverName = NULL;
-+    const char *deviceName = NULL;
- 
--    if (asprintf(&msg, "%s: %s: %s", dev->drv->driverName, dev->name, format)
--	== -1) {
--	LogVMessageVerb(type, verb, "%s", args);
--    } else {
--	LogVMessageVerb(type, verb, msg, args);
--	free(msg);
-+    /* Prefix driver and device names to formatted message. */
-+    if (dev) {
-+        deviceName = dev->name;
-+        if (dev->drv)
-+            driverName = dev->drv->driverName;
-     }
-+
-+    LogHdrMessageVerb(type, verb, format, args, "%s: %s: ", driverName,
-+                      deviceName);
- }
- 
- /* Print input driver message, with verbose level specified directly */
-Index: xorg-server-1.11.4/include/os.h
-===================================================================
---- xorg-server-1.11.4.orig/include/os.h	2012-05-06 11:03:17.621808123 -0700
-+++ xorg-server-1.11.4/include/os.h	2012-05-06 11:03:29.353971366 -0700
-@@ -514,6 +514,7 @@
-     X_INFO,			/* Informational message */
-     X_NONE,			/* No prefix */
-     X_NOT_IMPLEMENTED,		/* Not implemented */
-+    X_DEBUG,            /* Debug message */
-     X_UNKNOWN = -1		/* unknown -- this must always be last */
- } MessageType;
- 
-@@ -528,6 +529,20 @@
- 			   ...) _X_ATTRIBUTE_PRINTF(3,4);
- extern _X_EXPORT void LogMessage(MessageType type, const char *format, ...)
- 			_X_ATTRIBUTE_PRINTF(2,3);
-+
-+extern _X_EXPORT void
-+LogVHdrMessageVerb(MessageType type, int verb,
-+                   const char *msg_format, va_list msg_args,
-+                   const char *hdr_format, va_list hdr_args)
-+_X_ATTRIBUTE_PRINTF(3, 0)
-+_X_ATTRIBUTE_PRINTF(5, 0);
-+extern _X_EXPORT void
-+LogHdrMessageVerb(MessageType type, int verb,
-+                  const char *msg_format, va_list msg_args,
-+                  const char *hdr_format, ...)
-+_X_ATTRIBUTE_PRINTF(3, 0)
-+_X_ATTRIBUTE_PRINTF(5, 6);
-+
- extern _X_EXPORT void FreeAuditTimer(void);
- extern _X_EXPORT void AuditF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);
- extern _X_EXPORT void VAuditF(const char *f, va_list args) _X_ATTRIBUTE_PRINTF(1,0);
diff --git a/x11-base/xorg-server/files/xorg-server-1.13-ia64-asm.patch b/x11-base/xorg-server/files/xorg-server-1.13-ia64-asm.patch
deleted file mode 100644
index 024370494977..000000000000
--- a/x11-base/xorg-server/files/xorg-server-1.13-ia64-asm.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
---- a/hw/xfree86/common/compiler.h	2012-10-14 01:38:50.000000000 +0200
-+++ b/hw/xfree86/common/compiler.h	2012-12-25 14:59:05.637854813 +0100
-@@ -1351,7 +1351,7 @@
- #else                           /* ix86 */
- 
- #if !defined(__SUNPRO_C)
--#if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
-+#if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__) && !defined(__ia64__)
- #ifdef GCCUSESGAS
- 
- /*
-@@ -1453,7 +1453,7 @@
- 
- #endif                          /* GCCUSESGAS */
- 
--#else                           /* !defined(FAKEIT) && !defined(__mc68000__)  && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__m32r__) */
-+#else                           /* !defined(FAKEIT) && !defined(__mc68000__)  && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__m32r__) && !defined(__ia64__) */
- 
- static __inline__ void
- outb(unsigned short port, unsigned char val)
diff --git a/x11-base/xorg-server/files/xorg-server-1.9-cve-2013-1940.patch b/x11-base/xorg-server/files/xorg-server-1.9-cve-2013-1940.patch
deleted file mode 100644
index f06b923f3d92..000000000000
--- a/x11-base/xorg-server/files/xorg-server-1.9-cve-2013-1940.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 6ca03b9161d33b1d2b55a3a1a913cf88deb2343f Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@gmail.com>
-Date: Wed, 10 Apr 2013 06:09:01 +0000
-Subject: xf86: fix flush input to work with Linux evdev devices.
-
-So when we VT switch back and attempt to flush the input devices,
-we don't succeed because evdev won't return part of an event,
-since we were only asking for 4 bytes, we'd only get -EINVAL back.
-
-This could later cause events to be flushed that we shouldn't have
-gotten.
-
-This is a fix for CVE-2013-1940.
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
-Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-
-diff -ur a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c
---- a/hw/xfree86/os-support/shared/posix_tty.c	2010-06-11 08:10:22.000000000 +0200
-+++ b/hw/xfree86/os-support/shared/posix_tty.c	2013-04-17 22:49:20.389795964 +0200
-@@ -460,7 +460,8 @@
- {
- 	fd_set fds;
- 	struct timeval timeout;
--	char c[4];
-+	/* this needs to be big enough to flush an evdev event. */
-+	char c[256];
- 
- 	DebugF("FlushingSerial\n");
- 	if (tcflush(fd, TCIFLUSH) == 0)
diff --git a/x11-base/xorg-server/files/xorg-server-1.9-cve-2013-4396.patch b/x11-base/xorg-server/files/xorg-server-1.9-cve-2013-4396.patch
deleted file mode 100644
index fa8b4825f7e4..000000000000
--- a/x11-base/xorg-server/files/xorg-server-1.9-cve-2013-4396.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -ur a/dix/dixfonts.c b/dix/dixfonts.c
---- a/dix/dixfonts.c	2011-12-18 05:44:54.000000000 +0100
-+++ b/dix/dixfonts.c	2013-10-10 12:06:44.579225694 +0200
-@@ -1479,6 +1479,7 @@
- 	    GC *pGC;
- 	    unsigned char *data;
- 	    ITclosurePtr new_closure;
-+	    ITclosurePtr old_closure;
- 
- 	    /* We're putting the client to sleep.  We need to
- 	       save some state.  Similar problem to that handled
-@@ -1491,6 +1492,7 @@
- 		err = BadAlloc;
- 		goto bail;
- 	    }
-+	    old_closure = c;
- 	    *new_closure = *c;
- 	    c = new_closure;
- 
-@@ -1498,6 +1500,7 @@
- 	    if (!data)
- 	    {
- 		free(c);
-+		c = old_closure;
- 		err = BadAlloc;
- 		goto bail;
- 	    }
-@@ -1509,6 +1512,7 @@
- 	    {
- 		free(c->data);
- 		free(c);
-+		c = old_closure;
- 		err = BadAlloc;
- 		goto bail;
- 	    }
-@@ -1522,6 +1526,7 @@
- 		FreeScratchGC(pGC);
- 		free(c->data);
- 		free(c);
-+		c = old_closure;
- 		err = BadAlloc;
- 		goto bail;
- 	    }
diff --git a/x11-base/xorg-server/files/xorg-server-1.9-nouveau-default.patch b/x11-base/xorg-server/files/xorg-server-1.9-nouveau-default.patch
deleted file mode 100644
index 2b05967a9434..000000000000
--- a/x11-base/xorg-server/files/xorg-server-1.9-nouveau-default.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
-index 74016af..9c296f5 100644
---- a/hw/xfree86/common/xf86pciBus.c
-+++ b/hw/xfree86/common/xf86pciBus.c
-@@ -1118,7 +1118,23 @@ videoPtrToDriverList(struct pci_device *dev,
- 	    break;
- 	case 0x102b:		    driverList[0] = "mga";	break;
- 	case 0x10c8:		    driverList[0] = "neomagic"; break;
--	case 0x10de: case 0x12d2:   driverList[0] = "nv";	break;
-+	case 0x10de: case 0x12d2:
-+	    switch (dev->device_id) {
-+	    /* NV1 */
-+	    case 0x0008:
-+	    case 0x0009:
-+		driverList[0] = "vesa";
-+		break;
-+	    /* NV3 */
-+	    case 0x0018:
-+	    case 0x0019:
-+		driverList[0] = "nv";
-+		break;
-+	    default:
-+		driverList[0] = "nouveau";
-+		break;
-+	    }
-+	    break;
- 	case 0x1106:		    driverList[0] = "openchrome"; break;
-         case 0x1b36:		    driverList[0] = "qxl"; break;
- 	case 0x1163:		    driverList[0] = "rendition"; break;
--- 
diff --git a/x11-base/xorg-server/files/xorg-server-glapi_c.patch b/x11-base/xorg-server/files/xorg-server-glapi_c.patch
deleted file mode 100644
index e65a969af176..000000000000
--- a/x11-base/xorg-server/files/xorg-server-glapi_c.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 17d9e374721d6c8ee3f7f9cdc882f80127bdb57f Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 02 Mar 2011 18:21:39 +0000
-Subject: glx: Lobotomize _glapi_get_proc_address
-
-This isn't a meaningful thing in the indirect glx loader, so just warn
-if it ever happens and move on.
-
-But also, mark it PUBLIC, so if the driver does ever call it we merely
-warn instead of aborting because ld.so can't find the symbol.
-
-Reviewed-by: Dave Airlie <airlied@redhat.com>
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/glx/glapi.c b/glx/glapi.c
-index 1814493..79ff6b1 100644
---- a/glx/glapi.c
-+++ b/glx/glapi.c
-@@ -54,6 +54,7 @@
- 
- #include <dix-config.h>
- #include <X11/Xfuncproto.h>
-+#include <os.h>
- #define PUBLIC _X_EXPORT
- 
- #else
-@@ -713,43 +714,15 @@ _glapi_add_dispatch( const char * const * function_names,
-    return offset;
- }
- 
--/**
-- * Return pointer to the named function.  If the function name isn't found
-- * in the name of static functions, try generating a new API entrypoint on
-- * the fly with assembly language.
-+/*
-+ * glXGetProcAddress doesn't exist in the protocol, the drivers never call
-+ * this themselves, and neither does the server.  warn if it happens though.
-  */
--_glapi_proc
-+PUBLIC _glapi_proc
- _glapi_get_proc_address(const char *funcName)
- {
--   struct _glapi_function * entry;
--   GLuint i;
--
--#ifdef MANGLE
--   if (funcName[0] != 'm' || funcName[1] != 'g' || funcName[2] != 'l')
--      return NULL;
--#else
--   if (funcName[0] != 'g' || funcName[1] != 'l')
--      return NULL;
--#endif
--
--   /* search extension functions first */
--   for (i = 0; i < NumExtEntryPoints; i++) {
--      if (strcmp(ExtEntryTable[i].name, funcName) == 0) {
--         return ExtEntryTable[i].dispatch_stub;
--      }
--   }
--
--#if !defined( XFree86Server ) && !defined( XGLServer )
--   /* search static functions */
--   {
--      const _glapi_proc func = get_static_proc_address(funcName);
--      if (func)
--         return func;
--   }
--#endif /* !defined( XFree86Server ) */
--
--   entry = add_function_name(funcName);
--   return (entry == NULL) ? NULL : entry->dispatch_stub;
-+    ErrorF("_glapi_get_proc_address called!\n");
-+    return NULL;
- }
- 
- /**
---
-cgit v0.8.3-6-g21f6
diff --git a/x11-base/xorg-server/xorg-server-1.10.6-r3.ebuild b/x11-base/xorg-server/xorg-server-1.10.6-r3.ebuild
deleted file mode 100644
index 7b5930feec27..000000000000
--- a/x11-base/xorg-server/xorg-server-1.10.6-r3.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.6-r3.ebuild,v 1.10 2013/10/22 07:36:05 ago Exp $
-
-EAPI=5
-
-XORG_DOC=doc
-inherit flag-o-matic xorg-2 multilib versionator
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-
-IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} ipv6 minimal nptl tslib +udev"
-
-RDEPEND=">=app-admin/eselect-opengl-1.0.8
-	dev-libs/openssl
-	media-libs/freetype
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	x11-apps/xkbcomp
-	>=x11-libs/libpciaccess-0.10.3
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont-1.4.2
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/pixman-0.21.8
-	>=x11-libs/xtrans-1.2.2
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-1.4
-	dmx? (
-		x11-libs/libXt
-		>=x11-libs/libdmx-1.0.99.1
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXaw-1.0.4
-		>=x11-libs/libXext-1.0.99.4
-		>=x11-libs/libXfixes-4.0.3
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXmu-1.0.3
-		>=x11-libs/libXres-1.0.3
-		>=x11-libs/libXtst-1.0.99.2
-	)
-	kdrive? (
-		>=x11-libs/libXext-1.0.5
-		x11-libs/libXv
-	)
-	!minimal? (
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-7.8_rc[nptl=]
-	)
-	tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
-	udev? ( >=virtual/udev-150 )
-	>=x11-apps/xinit-1.3"
-
-# dmx+doc DEPEND is a hack, a proper solution needs to be implemented in the
-# xorg-2.eclass for next release
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	>=x11-proto/bigreqsproto-1.1.0
-	>=x11-proto/compositeproto-0.4
-	>=x11-proto/damageproto-1.1
-	>=x11-proto/fixesproto-4.1
-	>=x11-proto/fontsproto-2.0.2
-	>=x11-proto/glproto-1.4.11
-	>=x11-proto/inputproto-1.9.99.902
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/randrproto-1.2.99.3
-	>=x11-proto/recordproto-1.13.99.1
-	>=x11-proto/renderproto-0.11
-	>=x11-proto/resourceproto-1.0.2
-	>=x11-proto/scrnsaverproto-1.1
-	>=x11-proto/trapproto-3.4.3
-	>=x11-proto/videoproto-2.2.2
-	>=x11-proto/xcmiscproto-1.2.0
-	>=x11-proto/xextproto-7.1.99
-	>=x11-proto/xf86dgaproto-2.0.99.1
-	>=x11-proto/xf86rushproto-1.1.2
-	>=x11-proto/xf86vidmodeproto-2.2.99.1
-	>=x11-proto/xineramaproto-1.1.3
-	>=x11-proto/xproto-7.0.17
-	dmx? (
-		>=x11-proto/dmxproto-2.2.99.1
-		doc? (
-			|| (
-				www-client/links
-				www-client/lynx
-				www-client/w3m
-			)
-		)
-	)
-	!minimal? (
-		>=x11-proto/xf86driproto-2.1.0
-		>=x11-proto/dri2proto-2.3
-		>=x11-libs/libdrm-2.4.20
-	)"
-
-PDEPEND="
-	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-REQUIRED_USE="!minimal? (
-		|| ( ${IUSE_SERVERS} )
-	)"
-
-#UPSTREAMED_PATCHES=(
-#	"${WORKDIR}/patches/"
-#)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-disable-acpi.patch
-	"${FILESDIR}"/${PN}-1.9-nouveau-default.patch
-	"${FILESDIR}"/${PN}-1.11-log-format-fix.patch
-	"${FILESDIR}"/${PN}-1.9-cve-2013-1940.patch
-	"${FILESDIR}"/${PN}-1.9-cve-2013-4396.patch
-)
-
-pkg_pretend() {
-	# older gcc is not supported
-	[[ $(gcc-major-version) -lt 4 ]] && \
-		die "Sorry, but gcc earlier than 4.0 wont work for xorg-server."
-}
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	# localstatedir is used for the log location; we need to override the default
-	#	from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	#	--enable-install-setuid needed because sparcs default off
-	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
-	#	package it somewhere
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable kdrive)
-		$(use_enable kdrive kdrive-kbd)
-		$(use_enable kdrive kdrive-mouse)
-		$(use_enable kdrive kdrive-evdev)
-		$(use_enable tslib)
-		$(use_enable tslib xcalibrate)
-		$(use_enable !minimal record)
-		$(use_enable !minimal xfree86-utils)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable !minimal dri)
-		$(use_enable !minimal dri2)
-		$(use_enable !minimal glx)
-		$(use_enable xnest)
-		$(use_enable xorg)
-		$(use_enable xvfb)
-		$(use_enable nptl glx-tls)
-		$(use_enable udev config-udev)
-		$(use_with doc doxygen)
-		$(use_with doc xmlto)
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--enable-install-setuid
-		--with-fontrootdir=/usr/share/fonts
-		--with-xkb-output=/var/lib/xkb
-		--disable-config-hal
-		--without-dtrace
-		--without-fop
-		--with-os-vendor=Gentoo
-	)
-
-	# Xorg-server requires includes from OS mesa which are not visible for
-	# users of binary drivers.
-	mkdir -p "${T}/mesa-symlinks/GL"
-	for i in gl glx glxmd glxproto glxtokens; do
-		ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
-	done
-	for i in glext glxext; do
-		ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
-	done
-	append-cppflags "-I${T}/mesa-symlinks"
-}
-
-src_install() {
-	xorg-2_src_install
-
-	dynamic_libgl_install
-
-	server_based_install
-
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
-	fi
-
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
-	newinitd "${FILESDIR}"/xdm.initd-9 xdm
-	newconfd "${FILESDIR}"/xdm.confd-4 xdm
-
-	# install the @x11-module-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postinst() {
-	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-	eselect opengl set xorg-x11 --use-old
-
-	if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
-		elog "You should consider reading upgrade guide for this release:"
-		elog "	http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml"
-		echo
-		ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
-		ewarn "because the ABI changed. If you cannot start X because"
-		ewarn "of module version mismatch errors, this is your problem."
-
-		echo
-		ewarn "You can generate a list of all installed packages in the x11-drivers"
-		ewarn "category using this command:"
-		ewarn "	emerge portage-utils; qlist -I -C x11-drivers/"
-		ewarn "or using sets from portage-2.2:"
-		ewarn "	emerge @x11-module-rebuild"
-	fi
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-		rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
-	fi
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
-		local x=""
-		for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
-			fi
-		done
-	eend 0
-}
-
-server_based_install() {
-	if ! use xorg; then
-		rm "${D}"/usr/share/man/man1/Xserver.1x \
-			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${D}"/usr/share/man/man1/Xserver.1x
-	fi
-}
diff --git a/x11-base/xorg-server/xorg-server-1.11.4-r3.ebuild b/x11-base/xorg-server/xorg-server-1.11.4-r3.ebuild
deleted file mode 100644
index 3d0f29fe1fd2..000000000000
--- a/x11-base/xorg-server/xorg-server-1.11.4-r3.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.11.4-r3.ebuild,v 1.11 2014/07/26 09:31:38 ssuominen Exp $
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_EAUTORECONF=yes
-inherit flag-o-matic xorg-2 multilib versionator
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-
-IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev"
-
-RDEPEND=">=app-admin/eselect-opengl-1.0.8
-	dev-libs/openssl
-	media-libs/freetype
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	x11-apps/xkbcomp
-	>=x11-libs/libpciaccess-0.10.3
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont-1.4.2
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/pixman-0.21.8
-	>=x11-libs/xtrans-1.2.2
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-	dmx? (
-		x11-libs/libXt
-		>=x11-libs/libdmx-1.0.99.1
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXaw-1.0.4
-		>=x11-libs/libXext-1.0.99.4
-		>=x11-libs/libXfixes-5.0
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXmu-1.0.3
-		x11-libs/libXrender
-		>=x11-libs/libXres-1.0.3
-		>=x11-libs/libXtst-1.0.99.2
-	)
-	kdrive? (
-		>=x11-libs/libXext-1.0.5
-		x11-libs/libXv
-	)
-	!minimal? (
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-7.8_rc[nptl=]
-	)
-	tslib? ( >=x11-libs/tslib-1.0 )
-	udev? ( >=virtual/udev-150 )
-	>=x11-apps/xinit-1.3
-	selinux? ( sec-policy/selinux-xserver )"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	>=x11-proto/bigreqsproto-1.1.0
-	>=x11-proto/compositeproto-0.4
-	>=x11-proto/damageproto-1.1
-	>=x11-proto/fixesproto-5.0
-	>=x11-proto/fontsproto-2.0.2
-	>=x11-proto/glproto-1.4.14
-	>=x11-proto/inputproto-1.9.99.902
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/randrproto-1.2.99.3
-	>=x11-proto/recordproto-1.13.99.1
-	>=x11-proto/renderproto-0.11
-	>=x11-proto/resourceproto-1.0.2
-	>=x11-proto/scrnsaverproto-1.1
-	>=x11-proto/trapproto-3.4.3
-	>=x11-proto/videoproto-2.2.2
-	>=x11-proto/xcmiscproto-1.2.0
-	>=x11-proto/xextproto-7.1.99
-	>=x11-proto/xf86dgaproto-2.0.99.1
-	>=x11-proto/xf86rushproto-1.1.2
-	>=x11-proto/xf86vidmodeproto-2.2.99.1
-	>=x11-proto/xineramaproto-1.1.3
-	>=x11-proto/xproto-7.0.22
-	dmx? (
-		>=x11-proto/dmxproto-2.2.99.1
-		doc? (
-			|| (
-				www-client/links
-				www-client/lynx
-				www-client/w3m
-			)
-		)
-	)
-	!minimal? (
-		>=x11-proto/xf86driproto-2.1.0
-		>=x11-proto/dri2proto-2.6
-		>=x11-libs/libdrm-2.4.20
-	)"
-
-PDEPEND="
-	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-REQUIRED_USE="!minimal? (
-		|| ( ${IUSE_SERVERS} )
-	)"
-
-#UPSTREAMED_PATCHES=(
-#	"${WORKDIR}/patches/"
-#)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-disable-acpi.patch
-	"${FILESDIR}"/${PN}-1.9-nouveau-default.patch
-	"${FILESDIR}"/${PN}-1.11-disable-tests-without-ddx.patch
-	"${FILESDIR}"/${PN}-1.11-dix-pointerrootwin-send-focusin.patch
-	"${FILESDIR}"/${PN}-1.11-dix-send-focus-events.patch
-	"${FILESDIR}"/${PN}-1.11-log-format-fix.patch
-	"${FILESDIR}"/${PN}-1.9-cve-2013-1940.patch
-	"${FILESDIR}"/${PN}-1.9-cve-2013-4396.patch
-)
-
-pkg_pretend() {
-	# older gcc is not supported
-	[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
-		die "Sorry, but gcc earlier than 4.0 wont work for xorg-server."
-}
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	# localstatedir is used for the log location; we need to override the default
-	#	from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	#	--enable-install-setuid needed because sparcs default off
-	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
-	#	package it somewhere
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable kdrive)
-		$(use_enable kdrive kdrive-kbd)
-		$(use_enable kdrive kdrive-mouse)
-		$(use_enable kdrive kdrive-evdev)
-		$(use_enable tslib)
-		$(use_enable !minimal record)
-		$(use_enable !minimal xfree86-utils)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable !minimal dri)
-		$(use_enable !minimal dri2)
-		$(use_enable !minimal glx)
-		$(use_enable xnest)
-		$(use_enable xorg)
-		$(use_enable xvfb)
-		$(use_enable nptl glx-tls)
-		$(use_enable udev config-udev)
-		$(use_with doc doxygen)
-		$(use_with doc xmlto)
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--enable-install-setuid
-		--with-fontrootdir=/usr/share/fonts
-		--with-xkb-output=/var/lib/xkb
-		--disable-config-hal
-		--without-dtrace
-		--without-fop
-		--with-os-vendor=Gentoo
-	)
-
-	# Xorg-server requires includes from OS mesa which are not visible for
-	# users of binary drivers.
-	mkdir -p "${T}/mesa-symlinks/GL"
-	for i in gl glx glxmd glxproto glxtokens; do
-		ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
-	done
-	for i in glext glxext; do
-		ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
-	done
-	append-cppflags "-I${T}/mesa-symlinks"
-
-	# Make breakage less obvious, bug #402285.
-	replace-flags -O3 -O2
-}
-
-src_install() {
-	xorg-2_src_install
-
-	dynamic_libgl_install
-
-	server_based_install
-
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
-	fi
-
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
-	newinitd "${FILESDIR}"/xdm.initd-9 xdm
-	newconfd "${FILESDIR}"/xdm.confd-4 xdm
-
-	# install the @x11-module-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postinst() {
-	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-	eselect opengl set xorg-x11 --use-old
-
-	if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
-		ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
-		ewarn "because the ABI changed. If you cannot start X because"
-		ewarn "of module version mismatch errors, this is your problem."
-
-		echo
-		ewarn "You can generate a list of all installed packages in the x11-drivers"
-		ewarn "category using this command:"
-		ewarn "	emerge portage-utils; qlist -I -C x11-drivers/"
-		ewarn "or using sets from portage-2.2:"
-		ewarn "	emerge @x11-module-rebuild"
-	fi
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-		rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
-	fi
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
-		local x=""
-		for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
-			fi
-		done
-	eend 0
-}
-
-server_based_install() {
-	if ! use xorg; then
-		rm "${D}"/usr/share/man/man1/Xserver.1x \
-			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${D}"/usr/share/man/man1/Xserver.1x
-	fi
-}
diff --git a/x11-base/xorg-server/xorg-server-1.13.4-r1.ebuild b/x11-base/xorg-server/xorg-server-1.13.4-r1.ebuild
deleted file mode 100644
index d3979f740058..000000000000
--- a/x11-base/xorg-server/xorg-server-1.13.4-r1.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.13.4-r1.ebuild,v 1.11 2014/07/26 09:31:38 ssuominen Exp $
-
-EAPI=5
-
-XORG_DOC=doc
-inherit xorg-2 multilib versionator flag-o-matic
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev"
-
-RDEPEND=">=app-admin/eselect-opengl-1.0.8
-	dev-libs/openssl
-	media-libs/freetype
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	x11-apps/xkbcomp
-	>=x11-libs/libdrm-2.4.20
-	>=x11-libs/libpciaccess-0.12.901
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont-1.4.2
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/pixman-0.21.8
-	>=x11-libs/xtrans-1.2.2
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-	dmx? (
-		x11-libs/libXt
-		>=x11-libs/libdmx-1.0.99.1
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXaw-1.0.4
-		>=x11-libs/libXext-1.0.99.4
-		>=x11-libs/libXfixes-5.0
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXmu-1.0.3
-		x11-libs/libXrender
-		>=x11-libs/libXres-1.0.3
-		>=x11-libs/libXtst-1.0.99.2
-	)
-	kdrive? (
-		>=x11-libs/libXext-1.0.5
-		x11-libs/libXv
-	)
-	!minimal? (
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-8[nptl=]
-	)
-	tslib? ( >=x11-libs/tslib-1.0 )
-	udev? ( >=virtual/udev-150 )
-	>=x11-apps/xinit-1.3
-	selinux? ( sec-policy/selinux-xserver )"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	>=x11-proto/bigreqsproto-1.1.0
-	>=x11-proto/compositeproto-0.4
-	>=x11-proto/damageproto-1.1
-	>=x11-proto/fixesproto-5.0
-	>=x11-proto/fontsproto-2.0.2
-	>=x11-proto/glproto-1.4.16
-	>=x11-proto/inputproto-2.1.99.3
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/randrproto-1.4.0
-	>=x11-proto/recordproto-1.13.99.1
-	>=x11-proto/renderproto-0.11
-	>=x11-proto/resourceproto-1.2.0
-	>=x11-proto/scrnsaverproto-1.1
-	>=x11-proto/trapproto-3.4.3
-	>=x11-proto/videoproto-2.2.2
-	>=x11-proto/xcmiscproto-1.2.0
-	>=x11-proto/xextproto-7.1.99
-	>=x11-proto/xf86dgaproto-2.0.99.1
-	>=x11-proto/xf86rushproto-1.1.2
-	>=x11-proto/xf86vidmodeproto-2.2.99.1
-	>=x11-proto/xineramaproto-1.1.3
-	>=x11-proto/xproto-7.0.22
-	dmx? (
-		>=x11-proto/dmxproto-2.2.99.1
-		doc? (
-			|| (
-				www-client/links
-				www-client/lynx
-				www-client/w3m
-			)
-		)
-	)
-	!minimal? (
-		>=x11-proto/xf86driproto-2.1.0
-		>=x11-proto/dri2proto-2.8
-	)"
-
-PDEPEND="
-	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-REQUIRED_USE="!minimal? (
-		|| ( ${IUSE_SERVERS} )
-	)"
-
-#UPSTREAMED_PATCHES=(
-#	"${WORKDIR}/patches/"
-#)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-1.12-disable-acpi.patch
-	"${FILESDIR}"/${PN}-1.13-ia64-asm.patch
-	"${FILESDIR}"/${PN}-1.12-cve-2013-4396.patch
-)
-
-pkg_pretend() {
-	# older gcc is not supported
-	[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
-		die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
-}
-
-src_configure() {
-	# localstatedir is used for the log location; we need to override the default
-	#	from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
-	#	package it somewhere
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable kdrive)
-		$(use_enable kdrive kdrive-kbd)
-		$(use_enable kdrive kdrive-mouse)
-		$(use_enable kdrive kdrive-evdev)
-		$(use_enable suid install-setuid)
-		$(use_enable tslib)
-		$(use_enable !minimal record)
-		$(use_enable !minimal xfree86-utils)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable !minimal dri)
-		$(use_enable !minimal dri2)
-		$(use_enable !minimal glx)
-		$(use_enable xnest)
-		$(use_enable xorg)
-		$(use_enable xvfb)
-		$(use_enable nptl glx-tls)
-		$(use_enable udev config-udev)
-		$(use_with doc doxygen)
-		$(use_with doc xmlto)
-		--enable-libdrm
-		--sysconfdir="${EPREFIX}"/etc/X11
-		--localstatedir="${EPREFIX}"/var
-		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
-		--with-xkb-output="${EPREFIX}"/var/lib/xkb
-		--disable-config-hal
-		--without-dtrace
-		--without-fop
-		--with-os-vendor=Gentoo
-	)
-
-	# Xorg-server requires includes from OS mesa which are not visible for
-	# users of binary drivers.
-	mkdir -p "${T}/mesa-symlinks/GL"
-	for i in gl glx glxmd glxproto glxtokens; do
-		ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
-	done
-	for i in glext glxext; do
-		ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
-	done
-	append-cppflags "-I${T}/mesa-symlinks"
-
-	xorg-2_src_configure
-}
-
-src_install() {
-	xorg-2_src_install
-
-	dynamic_libgl_install
-
-	server_based_install
-
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
-	fi
-
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
-	newinitd "${FILESDIR}"/xdm.initd-9 xdm
-	newconfd "${FILESDIR}"/xdm.confd-4 xdm
-
-	# install the @x11-module-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postinst() {
-	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-	eselect opengl set xorg-x11 --use-old
-
-	if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
-		ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
-		ewarn "because the ABI changed. If you cannot start X because"
-		ewarn "of module version mismatch errors, this is your problem."
-
-		echo
-		ewarn "You can rebuild all installed packages in the x11-drivers"
-		ewarn "category using this command:"
-		ewarn "	emerge @x11-module-rebuild"
-	fi
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
-	fi
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
-		local x=""
-		for x in "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} "${ED}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
-			fi
-		done
-	eend 0
-}
-
-server_based_install() {
-	if ! use xorg; then
-		rm "${ED}"/usr/share/man/man1/Xserver.1x \
-			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${ED}"/usr/share/man/man1/Xserver.1x
-	fi
-}
diff --git a/x11-base/xorg-server/xorg-server-1.14.5.ebuild b/x11-base/xorg-server/xorg-server-1.14.5.ebuild
deleted file mode 100644
index a385b78062d2..000000000000
--- a/x11-base/xorg-server/xorg-server-1.14.5.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.14.5.ebuild,v 1.13 2014/11/02 10:35:21 swift Exp $
-
-EAPI=5
-
-XORG_DOC=doc
-# avoid maintainer mode, bug #484634
-XORG_EAUTORECONF=yes
-inherit xorg-2 multilib versionator flag-o-matic
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev"
-
-CDEPEND=">=app-admin/eselect-opengl-1.0.8
-	dev-libs/openssl
-	media-libs/freetype
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	x11-apps/xkbcomp
-	>=x11-libs/libdrm-2.4.20
-	>=x11-libs/libpciaccess-0.12.901
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont-1.4.2
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/pixman-0.27.2
-	>=x11-libs/xtrans-1.2.2
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-	dmx? (
-		x11-libs/libXt
-		>=x11-libs/libdmx-1.0.99.1
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXaw-1.0.4
-		>=x11-libs/libXext-1.0.99.4
-		>=x11-libs/libXfixes-5.0
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXmu-1.0.3
-		x11-libs/libXrender
-		>=x11-libs/libXres-1.0.3
-		>=x11-libs/libXtst-1.0.99.2
-	)
-	kdrive? (
-		>=x11-libs/libXext-1.0.5
-		x11-libs/libXv
-	)
-	!minimal? (
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-8[nptl=]
-	)
-	tslib? ( >=x11-libs/tslib-1.0 )
-	udev? ( >=virtual/udev-150 )
-	>=x11-apps/xinit-1.3"
-
-DEPEND="${CDEPEND}
-	sys-devel/flex
-	>=x11-proto/bigreqsproto-1.1.0
-	>=x11-proto/compositeproto-0.4
-	>=x11-proto/damageproto-1.1
-	>=x11-proto/fixesproto-5.0
-	>=x11-proto/fontsproto-2.0.2
-	>=x11-proto/glproto-1.4.16
-	>=x11-proto/inputproto-2.2.99.1
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/randrproto-1.4.0
-	>=x11-proto/recordproto-1.13.99.1
-	>=x11-proto/renderproto-0.11
-	>=x11-proto/resourceproto-1.2.0
-	>=x11-proto/scrnsaverproto-1.1
-	>=x11-proto/trapproto-3.4.3
-	>=x11-proto/videoproto-2.2.2
-	>=x11-proto/xcmiscproto-1.2.0
-	>=x11-proto/xextproto-7.1.99
-	>=x11-proto/xf86dgaproto-2.0.99.1
-	>=x11-proto/xf86rushproto-1.1.2
-	>=x11-proto/xf86vidmodeproto-2.2.99.1
-	>=x11-proto/xineramaproto-1.1.3
-	>=x11-proto/xproto-7.0.22
-	dmx? (
-		>=x11-proto/dmxproto-2.2.99.1
-		doc? (
-			|| (
-				www-client/links
-				www-client/lynx
-				www-client/w3m
-			)
-		)
-	)
-	!minimal? (
-		>=x11-proto/xf86driproto-2.1.0
-		>=x11-proto/dri2proto-2.8
-	)"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-xserver )
-"
-
-PDEPEND="
-	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-REQUIRED_USE="!minimal? (
-		|| ( ${IUSE_SERVERS} )
-	)"
-
-#UPSTREAMED_PATCHES=(
-#	"${WORKDIR}/patches/"
-#)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-1.12-disable-acpi.patch
-	"${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch
-	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
-)
-
-pkg_pretend() {
-	# older gcc is not supported
-	[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
-		die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
-}
-
-src_configure() {
-	# localstatedir is used for the log location; we need to override the default
-	#	from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
-	#	package it somewhere
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable kdrive)
-		$(use_enable kdrive kdrive-kbd)
-		$(use_enable kdrive kdrive-mouse)
-		$(use_enable kdrive kdrive-evdev)
-		$(use_enable suid install-setuid)
-		$(use_enable tslib)
-		$(use_enable !minimal record)
-		$(use_enable !minimal xfree86-utils)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable !minimal dri)
-		$(use_enable !minimal dri2)
-		$(use_enable !minimal glx)
-		$(use_enable xnest)
-		$(use_enable xorg)
-		$(use_enable xvfb)
-		$(use_enable nptl glx-tls)
-		$(use_enable udev config-udev)
-		$(use_with doc doxygen)
-		$(use_with doc xmlto)
-		--enable-libdrm
-		--sysconfdir="${EPREFIX}"/etc/X11
-		--localstatedir="${EPREFIX}"/var
-		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
-		--with-xkb-output="${EPREFIX}"/var/lib/xkb
-		--disable-config-hal
-		--without-dtrace
-		--without-fop
-		--with-os-vendor=Gentoo
-		--with-sha1=libcrypto
-	)
-
-	# Xorg-server requires includes from OS mesa which are not visible for
-	# users of binary drivers.
-	mkdir -p "${T}/mesa-symlinks/GL"
-	for i in gl glx glxmd glxproto glxtokens; do
-		ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
-	done
-	for i in glext glxext; do
-		ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
-	done
-	append-cppflags "-I${T}/mesa-symlinks"
-
-	xorg-2_src_configure
-}
-
-src_install() {
-	xorg-2_src_install
-
-	dynamic_libgl_install
-
-	server_based_install
-
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
-	fi
-
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
-	newinitd "${FILESDIR}"/xdm.initd-10 xdm
-	newconfd "${FILESDIR}"/xdm.confd-4 xdm
-
-	# install the @x11-module-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postinst() {
-	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-	eselect opengl set xorg-x11 --use-old
-
-	if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
-		ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
-		ewarn "because the ABI changed. If you cannot start X because"
-		ewarn "of module version mismatch errors, this is your problem."
-
-		echo
-		ewarn "You can rebuild all installed packages in the x11-drivers"
-		ewarn "category using this command:"
-		ewarn "	emerge @x11-module-rebuild"
-	fi
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
-	fi
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
-		local x=""
-		for x in "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} "${ED}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
-			fi
-		done
-	eend 0
-}
-
-server_based_install() {
-	if ! use xorg; then
-		rm "${ED}"/usr/share/man/man1/Xserver.1x \
-			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${ED}"/usr/share/man/man1/Xserver.1x
-	fi
-}
diff --git a/x11-base/xorg-server/xorg-server-1.14.7.ebuild b/x11-base/xorg-server/xorg-server-1.14.7.ebuild
deleted file mode 100644
index 6e1114a012f8..000000000000
--- a/x11-base/xorg-server/xorg-server-1.14.7.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.14.7.ebuild,v 1.3 2014/11/02 10:35:21 swift Exp $
-
-EAPI=5
-
-XORG_DOC=doc
-# avoid maintainer mode, bug #484634
-XORG_EAUTORECONF=yes
-inherit xorg-2 multilib versionator flag-o-matic
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev"
-
-CDEPEND=">=app-admin/eselect-opengl-1.0.8
-	dev-libs/openssl
-	media-libs/freetype
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	x11-apps/xkbcomp
-	>=x11-libs/libdrm-2.4.20
-	>=x11-libs/libpciaccess-0.12.901
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont-1.4.2
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/pixman-0.27.2
-	>=x11-libs/xtrans-1.2.2
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-	dmx? (
-		x11-libs/libXt
-		>=x11-libs/libdmx-1.0.99.1
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXaw-1.0.4
-		>=x11-libs/libXext-1.0.99.4
-		>=x11-libs/libXfixes-5.0
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXmu-1.0.3
-		x11-libs/libXrender
-		>=x11-libs/libXres-1.0.3
-		>=x11-libs/libXtst-1.0.99.2
-	)
-	kdrive? (
-		>=x11-libs/libXext-1.0.5
-		x11-libs/libXv
-	)
-	!minimal? (
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-8[nptl=]
-	)
-	tslib? ( >=x11-libs/tslib-1.0 )
-	udev? ( >=virtual/udev-150 )
-	>=x11-apps/xinit-1.3"
-
-DEPEND="${CDEPEND}
-	sys-devel/flex
-	>=x11-proto/bigreqsproto-1.1.0
-	>=x11-proto/compositeproto-0.4
-	>=x11-proto/damageproto-1.1
-	>=x11-proto/fixesproto-5.0
-	>=x11-proto/fontsproto-2.0.2
-	>=x11-proto/glproto-1.4.16
-	>=x11-proto/inputproto-2.2.99.1
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/randrproto-1.4.0
-	>=x11-proto/recordproto-1.13.99.1
-	>=x11-proto/renderproto-0.11
-	>=x11-proto/resourceproto-1.2.0
-	>=x11-proto/scrnsaverproto-1.1
-	>=x11-proto/trapproto-3.4.3
-	>=x11-proto/videoproto-2.2.2
-	>=x11-proto/xcmiscproto-1.2.0
-	>=x11-proto/xextproto-7.1.99
-	>=x11-proto/xf86dgaproto-2.0.99.1
-	>=x11-proto/xf86rushproto-1.1.2
-	>=x11-proto/xf86vidmodeproto-2.2.99.1
-	>=x11-proto/xineramaproto-1.1.3
-	>=x11-proto/xproto-7.0.22
-	dmx? (
-		>=x11-proto/dmxproto-2.2.99.1
-		doc? (
-			|| (
-				www-client/links
-				www-client/lynx
-				www-client/w3m
-			)
-		)
-	)
-	!minimal? (
-		>=x11-proto/xf86driproto-2.1.0
-		>=x11-proto/dri2proto-2.8
-	)"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-xserver )
-"
-
-PDEPEND="
-	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-REQUIRED_USE="!minimal? (
-		|| ( ${IUSE_SERVERS} )
-	)"
-
-#UPSTREAMED_PATCHES=(
-#	"${WORKDIR}/patches/"
-#)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-1.12-disable-acpi.patch
-	"${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch
-	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
-)
-
-pkg_pretend() {
-	# older gcc is not supported
-	[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
-		die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
-}
-
-src_configure() {
-	# localstatedir is used for the log location; we need to override the default
-	#	from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
-	#	package it somewhere
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable kdrive)
-		$(use_enable kdrive kdrive-kbd)
-		$(use_enable kdrive kdrive-mouse)
-		$(use_enable kdrive kdrive-evdev)
-		$(use_enable suid install-setuid)
-		$(use_enable tslib)
-		$(use_enable !minimal record)
-		$(use_enable !minimal xfree86-utils)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable !minimal dri)
-		$(use_enable !minimal dri2)
-		$(use_enable !minimal glx)
-		$(use_enable xnest)
-		$(use_enable xorg)
-		$(use_enable xvfb)
-		$(use_enable nptl glx-tls)
-		$(use_enable udev config-udev)
-		$(use_with doc doxygen)
-		$(use_with doc xmlto)
-		--enable-libdrm
-		--sysconfdir="${EPREFIX}"/etc/X11
-		--localstatedir="${EPREFIX}"/var
-		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
-		--with-xkb-output="${EPREFIX}"/var/lib/xkb
-		--disable-config-hal
-		--without-dtrace
-		--without-fop
-		--with-os-vendor=Gentoo
-		--with-sha1=libcrypto
-	)
-
-	# Xorg-server requires includes from OS mesa which are not visible for
-	# users of binary drivers.
-	mkdir -p "${T}/mesa-symlinks/GL"
-	for i in gl glx glxmd glxproto glxtokens; do
-		ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
-	done
-	for i in glext glxext; do
-		ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
-	done
-	append-cppflags "-I${T}/mesa-symlinks"
-
-	xorg-2_src_configure
-}
-
-src_install() {
-	xorg-2_src_install
-
-	dynamic_libgl_install
-
-	server_based_install
-
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
-	fi
-
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
-	newinitd "${FILESDIR}"/xdm.initd-11 xdm
-	newconfd "${FILESDIR}"/xdm.confd-4 xdm
-
-	# install the @x11-module-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postinst() {
-	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-	eselect opengl set xorg-x11 --use-old
-
-	if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
-		ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
-		ewarn "because the ABI changed. If you cannot start X because"
-		ewarn "of module version mismatch errors, this is your problem."
-
-		echo
-		ewarn "You can rebuild all installed packages in the x11-drivers"
-		ewarn "category using this command:"
-		ewarn "	emerge @x11-module-rebuild"
-	fi
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
-	fi
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
-		local x=""
-		for x in "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} "${ED}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
-			fi
-		done
-	eend 0
-}
-
-server_based_install() {
-	if ! use xorg; then
-		rm "${ED}"/usr/share/man/man1/Xserver.1x \
-			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${ED}"/usr/share/man/man1/Xserver.1x
-	fi
-}
diff --git a/x11-base/xorg-server/xorg-server-1.9.5-r3.ebuild b/x11-base/xorg-server/xorg-server-1.9.5-r3.ebuild
deleted file mode 100644
index 22554607065e..000000000000
--- a/x11-base/xorg-server/xorg-server-1.9.5-r3.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.5-r3.ebuild,v 1.10 2013/10/22 07:36:05 ago Exp $
-
-EAPI=5
-inherit flag-o-matic xorg-2 multilib versionator
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-OPENGL_DIR="xorg-x11"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-
-IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} doc ipv6 minimal nptl tslib +udev"
-RDEPEND=">=app-admin/eselect-opengl-1.0.8
-	dev-libs/openssl
-	media-libs/freetype
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	x11-apps/xkbcomp
-	>=x11-libs/libpciaccess-0.10.3
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont-1.4.2
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/pixman-0.15.20
-	>=x11-libs/xtrans-1.2.2
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-1.4
-	dmx? (
-		x11-libs/libXt
-		>=x11-libs/libdmx-1.0.99.1
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXaw-1.0.4
-		>=x11-libs/libXext-1.0.5
-		>=x11-libs/libXfixes-4.0.3
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXmu-1.0.3
-		>=x11-libs/libXres-1.0.3
-		>=x11-libs/libXtst-1.0.3
-	)
-	kdrive? (
-		>=x11-libs/libXext-1.0.5
-		x11-libs/libXv
-	)
-	!minimal? (
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-7.8_rc[nptl=]
-	)
-	tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
-	udev? ( >=virtual/udev-150 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	>=x11-proto/bigreqsproto-1.1.0
-	>=x11-proto/compositeproto-0.4
-	>=x11-proto/damageproto-1.1
-	>=x11-proto/fixesproto-4.1
-	>=x11-proto/fontsproto-2.0.2
-	>=x11-proto/glproto-1.4.11
-	>=x11-proto/inputproto-1.9.99.902
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/randrproto-1.2.99.3
-	>=x11-proto/recordproto-1.13.99.1
-	>=x11-proto/renderproto-0.11
-	>=x11-proto/resourceproto-1.0.2
-	>=x11-proto/scrnsaverproto-1.1
-	>=x11-proto/trapproto-3.4.3
-	>=x11-proto/videoproto-2.2.2
-	>=x11-proto/xcmiscproto-1.2.0
-	>=x11-proto/xextproto-7.0.99.3
-	>=x11-proto/xf86dgaproto-2.0.99.1
-	>=x11-proto/xf86rushproto-1.1.2
-	>=x11-proto/xf86vidmodeproto-2.2.99.1
-	>=x11-proto/xineramaproto-1.1.3
-	>=x11-proto/xproto-7.0.17
-	dmx? ( >=x11-proto/dmxproto-2.2.99.1 )
-	doc? (
-		>=app-doc/doxygen-1.6.1
-		app-text/xmlto
-	)
-	!minimal? (
-		>=x11-proto/xf86driproto-2.1.0
-		>=x11-proto/dri2proto-2.3
-		>=x11-libs/libdrm-2.4.20
-	)
-	>=x11-apps/xinit-1.3"
-
-PDEPEND="
-	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-EPATCH_FORCE="yes"
-EPATCH_SUFFIX="patch"
-
-# These have been sent upstream
-UPSTREAMED_PATCHES=(
-#	"${WORKDIR}/patches/"
-	)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-disable-acpi.patch
-	"${FILESDIR}"/${PN}-1.9-nouveau-default.patch
-	"${FILESDIR}"/xorg-cve-2011-4028+4029.patch
-	"${FILESDIR}"/${PN}-1.9-cve-2013-1940.patch
-	"${FILESDIR}"/${PN}-1.9-cve-2013-4396.patch
-	)
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	use minimal || ensure_a_server_is_building
-
-	# localstatedir is used for the log location; we need to override the default
-	#	from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	#	--enable-install-setuid needed because sparcs default off
-	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
-	#	package it somewhere
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable kdrive)
-		$(use_enable kdrive kdrive-kbd)
-		$(use_enable kdrive kdrive-mouse)
-		$(use_enable kdrive kdrive-evdev)
-		$(use_enable tslib)
-		$(use_enable tslib xcalibrate)
-		$(use_enable !minimal record)
-		$(use_enable !minimal xfree86-utils)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable !minimal dri)
-		$(use_enable !minimal dri2)
-		$(use_enable !minimal glx)
-		$(use_enable xnest)
-		$(use_enable xorg)
-		$(use_enable xvfb)
-		$(use_enable nptl glx-tls)
-		$(use_enable udev config-udev)
-		$(use_with doc doxygen)
-		$(use_with doc xmlto)
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--enable-install-setuid
-		--with-fontrootdir=/usr/share/fonts
-		--with-xkb-output=/var/lib/xkb
-		--disable-config-hal
-		--without-dtrace
-		--without-fop
-		--with-os-vendor=Gentoo
-		${conf_opts}
-	)
-
-	# Xorg-server requires includes from OS mesa which are not visible for
-	# users of binary drivers.
-	# Due to the limitations of CONFIGURE_OPTIONS, we have to export this
-	mkdir -p "${T}/mesa-symlinks/GL"
-	for i in gl glx glxmd glxproto glxtokens; do
-		ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
-	done
-	for i in glext glxext; do
-		ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
-	done
-	append-cppflags "-I${T}/mesa-symlinks"
-
-	# (#121394) Causes window corruption
-	filter-flags -fweb
-
-	# Incompatible with GCC 3.x SSP on x86, bug #244352
-	if use x86 ; then
-		if [[ $(gcc-major-version) -lt 4 ]]; then
-			filter-flags -fstack-protector
-		fi
-	fi
-
-	# Incompatible with GCC 3.x CPP, bug #314615
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		ewarn "GCC 3.x C preprocessor may cause build failures. Use GCC 4.x"
-		ewarn "or set CPP=cpp-4.3.4 (replace with the actual installed version)"
-	fi
-
-	# detect if we should inform user about ebuild breakage
-	if ! has_version "x11-base/xorg-server" ||
-			has_version "<x11-base/xorg-server-$(get_version_component_range 1-2)"; then
-		INFO="yes"
-	fi
-}
-
-src_install() {
-	xorg-2_src_install
-
-	dynamic_libgl_install
-
-	server_based_install
-
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example into docs
-		dodoc "${WORKDIR}"/${P}_build/hw/xfree86/xorg.conf.example \
-			|| die "couldn't install xorg.conf.example"
-	fi
-
-	newinitd "${FILESDIR}"/xdm.initd-9 xdm || die "initd file install failed"
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup || die
-	newconfd "${FILESDIR}"/xdm.confd-4 xdm || die
-
-	# install the @x11-module-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf || die
-}
-
-pkg_postinst() {
-	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-	eselect opengl set --use-old xorg-x11
-
-	if [[ ${INFO} = yes ]]; then
-		elog "You should consider reading upgrade guide for this release:"
-		elog "	http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml"
-		echo
-		ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
-		ewarn "because the ABI changed. If you cannot start X because"
-		ewarn "of module version mismatch errors, this is your problem."
-
-		echo
-		ewarn "You can generate a list of all installed packages in the x11-drivers"
-		ewarn "category using this command:"
-		ewarn "	emerge portage-utils; qlist -I -C x11-drivers/"
-	fi
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if ! has_version x11-base/xorg-server; then
-		if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-			rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
-		fi
-	fi
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-		local x=""
-		for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-			fi
-		done
-	eend 0
-}
-
-server_based_install() {
-	if ! use xorg; then
-		rm "${D}"/usr/share/man/man1/Xserver.1x \
-			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${D}"/usr/share/man/man1/Xserver.1x
-	fi
-}
-
-ensure_a_server_is_building() {
-	for server in ${IUSE_SERVERS}; do
-		use ${server} && return;
-	done
-	eerror "You need to specify at least one server to build."
-	eerror "Valid servers are: ${IUSE_SERVERS}."
-	die "No servers were specified to build."
-}
diff --git a/x11-misc/pcmanfm-qt/ChangeLog b/x11-misc/pcmanfm-qt/ChangeLog
index 60753162b522..091526880317 100644
--- a/x11-misc/pcmanfm-qt/ChangeLog
+++ b/x11-misc/pcmanfm-qt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/pcmanfm-qt
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm-qt/ChangeLog,v 1.6 2014/11/08 17:51:43 jauhien Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm-qt/ChangeLog,v 1.7 2015/02/10 15:40:32 yngwin Exp $
+
+*pcmanfm-qt-0.9.0 (10 Feb 2015)
+
+  10 Feb 2015; Ben de Groot <yngwin@gentoo.org> +pcmanfm-qt-0.9.0.ebuild:
+  version bump
 
 *pcmanfm-qt-0.8.0 (08 Nov 2014)
 
diff --git a/x11-misc/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest
index e58020e16ca8..a150ddd74554 100644
--- a/x11-misc/pcmanfm-qt/Manifest
+++ b/x11-misc/pcmanfm-qt/Manifest
@@ -1,26 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST pcmanfm-qt-0.7.0.tar.xz 125308 SHA256 7ed3b2dec812294f770bdc39725eb94c8ea722420065d040ed4edf4d8455ec31 SHA512 1ddfb8139c805cb1df1cc028a82dadaee8f7cdd918ef108b3d4bad81a737b7cab517dd19803537264f5abab3e1942591da859cc431ad16916c756b402b269178 WHIRLPOOL 33046e270cbca03ac93348686a496d0a1ae210c13e28119307bd67e0ff2a1b3c89899e2c39884d4fa7924af23361b7e3e015981e7ae6ed53b1734f0882ab7aa8
 DIST pcmanfm-qt-0.8.0.tar.xz 164284 SHA256 63672fdf819d8a2c60b3ab21841a830702624d33565352af2850ef7cba9b5f16 SHA512 6135546b34703605de9ca51e4b28758cfda662aa10ce67eedadacfd6a56af65e1fa2229c7973e33d77e0f3877eca03581a930c0fc217904d62567f76cc273802 WHIRLPOOL f49bf98a56411b1c8e589104ace3dd0361baa6cac424e16d874d88e14361cf4055698b69c125892bea0bef688676080edc1685f5e21f3dd7c892437f2d50c3ba
+DIST pcmanfm-qt-0.9.0.tar.xz 189184 SHA256 2df0f0a0c092f9ee6e7311255ab2aed66c8ea897b3399affb96732c46421e2df SHA512 cbd2f508ad26f5f0b0ea55ad210fadea773fc1a9f7851cb7e40459b6c0fcab0a65cafa51b8de881b6e197594dd2aa862d815241fb2818ac4ee3c03274051e0e0 WHIRLPOOL e5ff20b344d3ff307df7030b2fd76cffad354f578999252a3d76fc80601a6a7ddbce208b906fb6e04e0161d5cc73caa9d64892a27b28872bf8be73e42cc7b925
 EBUILD pcmanfm-qt-0.7.0.ebuild 1221 SHA256 960342c5a31446d05165b27abe1ac699c92fcbf85b6b73299484a65fdd1fbadb SHA512 84bdc4c14113f91860b699dd2ffc5c54f8634d115c443835a599b302ec73b8712c3d34d0838f989de0061bfded265c4f290edd777a4a18a1c1fca93a5d3ac01b WHIRLPOOL 1b4e645ed67e7f225acfd3152ea81909ff9ca4717a8c589354662b435dece32b6a44b49318485d21db4424f12e92891c0ae6d70c1b7c51500c1cd9af55e01901
 EBUILD pcmanfm-qt-0.8.0.ebuild 1396 SHA256 2554ec2f18fd5501857265a8a0d41c8e25ab3af3c0a88b410a009cbb890d448c SHA512 9ace30fef0a6bc7fa6de130cffd97f1a086167aaa3c0684fb2a308946b2e7af15eac990921c8d40846944fa7ad8654c817d4abd6f4ba66b6c96284cf045edfa2 WHIRLPOOL b4e606c3ac2c6103df66038de35488b1488b8d67dd0fab68a2b4bb41023d9df81cc615f609915f971fd94ebd12cb4afb47cf34e5008532c472440a986f5b4999
-MISC ChangeLog 1199 SHA256 288edef2f40ec6410658dc75419e0716c71cf95e015b94299be7923f4cdc4266 SHA512 0eb70b4145186787ed7cdb75c6a1db3b21a4b5e6423d530e9f18807e4ef0d8a3996b7c06548717e42d1a3a6eedf4ff4bb726712aec779d4a5bd4cad53f6d40ae WHIRLPOOL 74958f20676b4c1b17e2300dd98f8f95ca272a8388bf3f1bc0e4411479e686c8525f1116dbc64b31a842dec91cde822834f736712050a9252e5aa8b7d18dcffd
+EBUILD pcmanfm-qt-0.9.0.ebuild 1313 SHA256 1f8118506f012aaa174f1b26bb271e2a05838f1dcc6b62cba3ce7a983aa8c6ce SHA512 6a2972ca09d798f2d03c2f9f0fb142235fe2ff6fbacad703709828ae6aadd49ea95625f86cfff111b66c1fdbb6aab014296c275ecaf17ea0a458cf846f23e44b WHIRLPOOL 5cd3a82e3aef4dc301b95dbe738963b473d0fcc5be62be84127ce541ba40626b0e6080ff875891b5551024c2a66f26bf97fad1876bdb0dc3a2ed56e1b96742fb
+MISC ChangeLog 1321 SHA256 055d163323dae427fc421624cb3e77fe31bf8e238e0e929ac98ed0c9c2cd92d7 SHA512 97859a8b8cb02b8bd474022c869bc75e26e00b266481e658637a7214cc8c8c9fede6ac1da5aafce45de7d803d2463bf43a5147cec1c58ebad7e9bb70a7502f06 WHIRLPOOL fc620a7bff4edc489c021ba24bf56add2fb22babb9b07c18f29ad97c8ee38ecd7c668021ff3f7b243bca0494599f31f4a0ed16a50d54c45d615d32ba7d0d0287
 MISC metadata.xml 314 SHA256 23a6adcfa039549019eecbce7664e8a9ffda0a968305cde4d3f6823193de06e3 SHA512 e41169f7aa25fdaf86b206ca3428a0c9a97198dc75cea488c217db755dc2195dc8e5819027d2b07d4e0dd4476b40cf81b2b0b7c6f82252806faa7bfe08b6e0ce WHIRLPOOL 471f1f9a98a97e2c5071ee3ec53e886dd3307faae02e0e0928f7385c3f98f262fcb8d228e42610288ff2173bb71d5e5f68e05a90b741e32269f38dd297b492fc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJUXlgwAAoJELvuk32y76HUo74P/2g+njcgWeCS65mtNK8Uq6OE
-BREH6/yTtgbZXnMjxYjvHL2Ce8kT/di9/CUUsQNhd8DUqABittMPkoyTj+IqAddM
-3oFMwF2QIY3zYRnLjEj0jeRUmO9wQ/Z53pFPNdCAc/uPb91ZNobYyFJPMjLadrN0
-I07I4Bk7cnc7xtPXOC1oqxHSVRaWMBjtWnUu7MWvv6JyA+lZagy6gLy7vjCKVELQ
-8u6cdgTan9v/8yERVOFNdlUvBxeLtKux+77fqrPg7gGnCRQavgQ0GER0FRuVIxA8
-r5D/GKr2H2nVYO1p0JhpgJEp/rz7ojSiDLq/1OKumNXpsn0Wg1kuagBNIDizOtAb
-SelpYmXSdTlQO8TfhRMAU9zP1cUOLlZHm1BzOvdnunrhwjGoeOCaJHXJnGnaXM3h
-+vXeBSLv9DtKjsMy7k96APMWo3eXEjKt/NG/kHenG6sjPQN5a4+2IfcwZQ16hmy0
-fMpN+y3G7tqDIuAWpCg4+5+W7L6xKVbKkjWDm0MA/2GT39yAm+6yh+GpPKGGC0mg
-Hz8g1OHgNcvrnJlkQpWOPRZ1LfrOtNft3jQJunlabiNHg/k/lI9vrM4DOjNuMAUG
-ltSnzgFl3ortWN0NfvTAqDZ/yhD/CIzptjrteUJV6mwoE3IwVb1HS21vOe4QZQpx
-vd1BuUtBkHBd1fR0wxBt
-=uWTy
------END PGP SIGNATURE-----
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.9.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.9.0.ebuild
new file mode 100644
index 000000000000..e56943001031
--- /dev/null
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.9.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm-qt/pcmanfm-qt-0.9.0.ebuild,v 1.1 2015/02/10 15:40:32 yngwin Exp $
+
+EAPI=5
+
+inherit cmake-utils multilib readme.gentoo
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}"
+else
+	SRC_URI="http://downloads.lxqt.org/lxqt/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Fast lightweight tabbed filemanager (Qt port)"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="0"
+
+CDEPEND=">=dev-libs/glib-2.18:2
+	dev-qt/linguist-tools:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	>=lxde-base/menu-cache-0.4.1
+	>=x11-libs/libfm-1.2.0
+	x11-libs/libxcb:=
+"
+RDEPEND="${CDEPEND}
+	x11-misc/xdg-utils
+	virtual/eject
+	virtual/freedesktop-icon-theme"
+DEPEND="${CDEPEND}
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	# fix multilib
+	sed -i -e "/LIBRARY\ DESTINATION/s:lib:$(get_libdir):" \
+		libfm-qt/CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_install() {
+	cmake-utils_src_install
+	DOC_CONTENTS="Be sure to set an icon theme in Edit > Preferences > User Interface"
+	readme.gentoo_src_install
+}
diff --git a/x11-misc/xscreensaver-app/ChangeLog b/x11-misc/xscreensaver-app/ChangeLog
index b38ec91634de..42acce40881b 100644
--- a/x11-misc/xscreensaver-app/ChangeLog
+++ b/x11-misc/xscreensaver-app/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/xscreensaver-app
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver-app/ChangeLog,v 1.15 2015/02/10 10:04:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver-app/ChangeLog,v 1.16 2015/02/10 16:20:36 jer Exp $
+
+  10 Feb 2015; Jeroen Roovers <jer@gentoo.org> -xscreensaver-app-2.3.ebuild:
+  Old.
 
   10 Feb 2015; Agostino Sarubbo <ago@gentoo.org> xscreensaver-app-2.3-r2.ebuild:
   Stable for x86, wrt bug #538954
diff --git a/x11-misc/xscreensaver-app/Manifest b/x11-misc/xscreensaver-app/Manifest
index 852e2d0d319b..33deb7353dc7 100644
--- a/x11-misc/xscreensaver-app/Manifest
+++ b/x11-misc/xscreensaver-app/Manifest
@@ -4,23 +4,12 @@ Hash: SHA256
 AUX xscreensaver-app-2.3-underlinking.patch 253 SHA256 3f95bb06bcddd6210fe1a073247a87f1b409e32c8f68617231ea949f92daa200 SHA512 02b73e67150661971105d062871b1d2f832c6c422689d5a1a53f68c6f77014aa19497d85aaf86d1c017a8302e36d567e73b0bd3f351133b6240c786c0ee6de97 WHIRLPOOL daf5e39dd221aa86c606a2b965ef80790bebe8110d6dd696cdc7785916f92693ebb60fb3ed10b3ff7e207a3bb90b708a9499a27f8e427d8e5e77d70380552cd1
 DIST XScreenSaver.App-2.3.tar.gz 47566 SHA256 f5ee06a00f57153f1f8e3dac480a6eb3ab93e74406c23ff6bf1dbc67d39138e1 SHA512 eb65cd14f70e6f152fced9f073dbc7737c855f27787472d0e7e9c4caaaf59026c0977c0f27ebd55b13391ab29491f4a96878236b78716b1f15dd9b772091f290 WHIRLPOOL 0dfdee9bcb57ec2deecd8889b1e74c88d95be1aa791fe16398b716b59fefde8f6ab0e6a2a5a4f3518d5881fda9c1ba153086c27dc26b2c5d8e24f1957c9c3fcb
 EBUILD xscreensaver-app-2.3-r2.ebuild 955 SHA256 379a5dbb4c76dca4344bc384e4ae8e0b0012f92625398017d2d30c6a95574bc8 SHA512 f1cc998b66e9508dbe8f0e5c7faf0e175f1f1032f8dfce8a25fa36be7f644c0ffd4ae9ba57be58e07c5ab326615c81ca9ab263762a19e79b4968cd7cb64dc909 WHIRLPOOL b4dcc35f683d4eb87d8d75cd115bb9b0b2a07a9dcecbb0db70e728c3b0ab0f0c227b08e77e92d50e13684a871cd7feb2ae4f5e28bbade755b73a00c32010e01f
-EBUILD xscreensaver-app-2.3.ebuild 809 SHA256 b5a315e4f5f81cfa6170292ce81d12de7ad3d1ce166cde0d034f0ea269d814c7 SHA512 416ab4b1b65abdf1aa1cb1ab4d960ddeed87e757daa32ba5a3797bbc4d0224b9c95548c9df1353cf20379d1e5a12d339e10db1573b23013ba3290b796f9ed333 WHIRLPOOL eb16b31c00f1e80a4339edfdefe8a5a8fcd9f1fcfb678f5a981d5d16f8f3a5d07eb57871d6f10b91640471f5325a22cff094df9fd871f546d24869fa5d37fe3f
-MISC ChangeLog 2186 SHA256 90239f5b683a46c8aed14b4371a3205af8981e64f810a1a526bbb07e85e2401f SHA512 6ecf7834329c647d3a9ce51ae9706f4bfbc5d93bb3ab06e5cd0f768bfa445a041cf8e5cb96ae5f9ba202dae04bf1557ee52fc3d5ac00fdfee96e15fef10f80cf WHIRLPOOL cd3e8f57ca29b87982ee8bd786492b7528d7837dfa345a0f0deb3fe894e921b4dcae4c425155230f39cbc16f44b3fdd2795a1c796225cd74b2cc97ded4bcec5c
+MISC ChangeLog 2271 SHA256 e8120dfd30239cd36555a6a9eae69acebb7a0da0e2710e51d786be0e321a6005 SHA512 9cddc73c91cc22be7af5d3ddc969b6f747febf556590257b35a2c110341b84bcc7ebb7663170709e863b97b850907cbfc133fc94c225065f23bd454edb01a3a2 WHIRLPOOL b3222033a0e19fa16faf2a85b2d05c6f52ee9f7d6d113e409df19c6729360ee2186b52cf2198fd161a9ec810ad96c1a14a4f6796bc5fb537081d10995fad2b64
 MISC metadata.xml 173 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f SHA512 0f9f902a37286192de62589f1aace6bec3cfe2a8511ac95e98b55324a9da1a5e79b8f14316e1be0b818e90c0be0cec5fe16f75d9055301a774b241e1486f62c2 WHIRLPOOL 0d0c57c7890f2cdb7210d2d1d61d03d412478747414999bc7919d70b8243ddc66d7903df50158671e8cc454913b4d859f752bbe3709404aa15608e1f1234d717
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU2dfIAAoJELp701BxlEWf0XEP/0aiEZKDoV3BOCwboHdLZvpF
-Q5JXo3o6ymliCFmcLFqeoOCv1FkMNkiW2vA5ohwRNuvV7J9lDNoF8rpw5pVUMX90
-DyWWzvurdPw8/dZZRy7zl5aAHwBrmmVRgFMPt5u9DB0AFdbWU2feAclpU3fT45j5
-2RNnqLjCXVW/R9Bfx6c8LcBDwnokQKP2k/e5TzOmyB3PGP3coxQFZOdwkY6EXpuY
-5AE2qwzoedYYxTJyhDqvfHPI+oEwW0qXnmfXL4dy83vPLIrzkqWYStkqzMrlYaU1
-GQpdzZdsgb+S5S5hPaBtX05P4KnGojGfpZWZtIqUCFKvHDkBelxQODFjsFCfDw6K
-3rblP3UMJOBIlhr3neVlSWp5cvqCAYOcbQsle2W2OT8Zq/1HOep09/ZjBg8aYHcf
-9+A1c9Z/DJdADx2ptuDAUZZJ4QuP7NsXcNslVPcjZxianmViADIByyMF+DTTP5L4
-Ncm8NE8PfC7xnfjeJ5zMpPsIuDZgNxzWC3DouM3oMjrmy2f2FTX2UGZ64xgXFkLr
-hGsHhRGQJhznm7z7t6ON91h2C2myme+XqhDeFIU6l5I8De2EPH3+vlE8+nUSGkPr
-iL1XluB7UZOx/yOIR6me0PxcbrI5QheWNNFcpBS4rS/4mQukc6gmOb9A91rtN4Ef
-0ao8PSUTaR6EQPe3Z/h1
-=ibwF
+iEYEAREIAAYFAlTaL9UACgkQVWmRsqeSphPyCwCeKtUv8bbTbMjoSS+CHx1zonw7
+UakAn0AT+L9dh317hFqaAArtc9AsCK43
+=eSwc
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xscreensaver-app/xscreensaver-app-2.3.ebuild b/x11-misc/xscreensaver-app/xscreensaver-app-2.3.ebuild
deleted file mode 100644
index 4305b63e6875..000000000000
--- a/x11-misc/xscreensaver-app/xscreensaver-app-2.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver-app/xscreensaver-app-2.3.ebuild,v 1.9 2014/08/10 20:05:12 slyfox Exp $
-
-IUSE=""
-
-MY_PN=${PN/-a/.A}
-MY_PN=${MY_PN/xs/XS}
-MY_PN=${MY_PN/s/S}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-DESCRIPTION="XScreenSaver dockapp for the Window Maker window manager"
-SRC_URI=" http://www.asleep.net/download/${MY_PN}-${PV}.tar.gz"
-HOMEPAGE="http://xscreensaverapp.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-RDEPEND="x11-misc/xscreensaver"
-DEPEND="x11-libs/libdockapp"
-
-src_compile() {
-	econf || die "Configuration failed"
-	emake || die "Make Failed"
-}
-
-src_install () {
-	einstall || die "Install failed"
-	dodoc README NEWS ChangeLog TODO AUTHORS
-}