Sync with portage [Mon Mar 23 09:19:11 MSK 2015].

2015-03-23 09:19:11 +03:00 · 2015-03-23 09:19:11 +03:00 · e269ac1c15
commit e269ac1c15
parent 1a0af72363
9140 changed files with 51498 additions and 43504 deletions
--- a/app-admin/ec2-ami-tools/ChangeLog
+++ b/app-admin/ec2-ami-tools/ChangeLog
@ -1,6 +1,13 @@
 # ChangeLog for app-admin/ec2-ami-tools
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ec2-ami-tools/ChangeLog,v 1.18 2014/11/14 00:49:32 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ec2-ami-tools/ChangeLog,v 1.19 2015/03/22 21:01:29 blueness Exp $
+
+*ec2-ami-tools-1.5.6 (22 Mar 2015)
+
+  22 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
+  +ec2-ami-tools-1.5.6.ebuild:
+  Version bump.  Switch to ruby 2.0. See:
+  https://aws.amazon.com/developertools/368

  14 Nov 2014; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
  Maintainer needed.
--- a/app-admin/ec2-ami-tools/Manifest
+++ b/app-admin/ec2-ami-tools/Manifest
@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST ec2-ami-tools-1.4.0.5.zip 139373 SHA256 e5a8f49826c85c9df2421e36d618fb9bc1951bb0eeb45680c4379a0362c50d6e SHA512 e9754b26b61e168760002ac3c15d83c8d9f702e478c2295df42ae9e08e7d1788c73b60f7292867d8df553225a82e70ac335419dbcc226e3f0e251f1950a66621 WHIRLPOOL c71b102824595ceeeee693ad5cfca5dd7120510b2f4165fd7010f9cf9de3d4bcb5242166ee58b8295f4ff7f2a1dccaa834bb277ccf325928ede9307bd18da980
+DIST ec2-ami-tools-1.5.6.zip 156541 SHA256 7aa6f2e581d52febf8850b3657a2f01c2f0180d91d33bdb1c246d485c1194708 SHA512 77ce82acbccf32bb1b900ef0b8c7440d4fc05e9b883081432935c6fef94b1f27191a0147e73c9eec680eca94c62075ab81bb8b0c33bec56bb2b861876de0129d WHIRLPOOL 1c7d20edde821e307eb8190413658e48d49a9c17d73b6c67a93b89f6b22512b1149c524d0a8111c5e6d36ca26465ae4a7f44cf4adf523318692dbef9213ce1ac
 EBUILD ec2-ami-tools-1.4.0.5-r3.ebuild 1502 SHA256 684cb10bb3d6e7644812d7d2594362d59e066ef327504ac1a9acfaff83b5f1da SHA512 e49481794c4022d574ba81bf54111dbef2e45aebc26b312c0a919e70e2e20b7e6653e4c479ce376f42183a46938b9fbb39fa5218321943a3f51c139e930df5b7 WHIRLPOOL 1f0f6617e21914b6d4ec7e79c87371e1c9d2488175fe0442058915acf34705ca86700848056aacb4ce2ccb4426f59c47f15bf68a3daec9f0dc17e19568d2a6f0
-MISC ChangeLog 3961 SHA256 570271216b1bfda2999176cd2b5d83fa82d000a76de3d8ed1885265c3a66b0af SHA512 54b33d453e2040e0951a247fc0483e6f8054acd8b050557bc092ac81e6c8d7cb43404d3a8e9fa2b2c66aa4faf00a86871d648bbc36483c315dabf64b314348b6 WHIRLPOOL 9467f02e672e2bde97d866f070d84db47fa1f98c62d8c921e18827c1bb54ef7e30844f69b1d18a91322272b027d5f0f6876f87d18b4a39078e7bbdb1c4289b16
+EBUILD ec2-ami-tools-1.5.6.ebuild 1498 SHA256 02222e30656dc4f32e81c319adfc23dd95cf56abd4d44b9ec096ab980ea1798d SHA512 0421f4b270cc56e398bd07341cc1ba853c9ac19d2479aa21014f60525b8a31c9d954dccfe9a54638d59fbf11c54e6c61963149bc0712be763021b4b6e5387aed WHIRLPOOL 59949c7496b24a38b3a3b68338831580b9858adbacbc03a493dcee520c16705605eaf8d9f021227fed3c36383ae73de50b8578682b55f0d50175e0d17333b2f3
+MISC ChangeLog 4172 SHA256 02b3de152cfd1e791de422abc914ee66e366ad1f8f488b5dbb7ff70119cafae8 SHA512 c8aa37175b6b910dd65d114103041ec907be6742c111af812efed4550ea119c4ffc0d2382e5dc74e6a836570eda8c85b8153c803da338aa66ea5bb0581ba0a39 WHIRLPOOL e1534feef8de431bfac294cd44cceadf04b7508c6d0aa1e087f77537d34a7780360d22f9311d7de169a8c084c7edffdef7a9a1f3606ed3037b980887cfe90a64
 MISC metadata.xml 349 SHA256 f94624e0a3380efe18d74c69d54f76054e1e54b911052cd9012849cfe17340fe SHA512 c2dced90461ef57100d2b0c057207457ca76291d2c0cd091b9167c0b050e123179f42335eedb013b37b95ae6f23c931c5bf2cc6895cd70252dac9e4d5947d056 WHIRLPOOL 50a39dc046923e6ce9ac7da7936b9aeab414b7b8d0835d0a230b15e841a4ac3e937162cf04813ae640170112ae4a8961aaf840baeda77f1f224b481f7a96f21b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVDy37AAoJEJOE+m71LUu6nD8P/3jQ/w+HOxh2Ul+aetIPfuBI
+pYqU3G3xF8p8gJyRGt6CZcbPPOD/rq6/m66Hq+7wtTeZKlOD2SSr8EDGqKzKvzeY
+pkBctaJu00P2tJt5TO4vEPrWmq0djhBazQvs/HK0F3psRaixzXsC2UxIuiQQWFPx
+tMew1Nw6nyBtT3qjnrpYAM6zwrYLRbcLWQ3j7OF7+mUy6MZrQ+4foBjUhQHWn4o/
+wK1noo2XSBa+wviW9u2GytSWEjQN6KQ/bGkKF7PgbAZlWYMB8Pohzifoob+k4A1C
+wlxx4GDZPjfAuRp1Go9GhApotydzSp1h9Qs3IED157qUprj/dnPI9gzeVugW9slH
+9oXQxTLV9n7j6GL+FSOFDoU2mLgFBkMdqx0Twa/9pFrh4SciW/DMbNH5dK7UygSi
+lQ8RrtgtAYoMlqH3SWuIpRbp7jeaYPBKtAron7zHRoCb7eywWeqXAsbFYUg4BgdS
+VLHNIpIVfsP/8eOVd7Gaon/LzdjFzLfSFaUER10wOMw0SCMC3R1xMfwcgEeo1GDk
+a6A/kFLoJi+nxYOOmD3VKRSrZHSPT4fJRjDuQQ6uOdDQGetvUUyXTtrP33J0hiaZ
+8Kx01eb3qjoEUEN4QToGmDpXGN8JjxLdKec6SXC0vpzvWhULcDBnoQRkVMDzgM7g
+Oe9XYPdwvHGr4dpd/srp
+=yI1r
+-----END PGP SIGNATURE-----
--- a/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.6.ebuild
+++ b/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.6.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.6.ebuild,v 1.1 2015/03/22 21:01:29 blueness Exp $
+
+EAPI="5"
+
+inherit versionator
+
+DESCRIPTION="These command-line tools serve as the client interface to the Amazon EC2 web service"
+HOMEPAGE="http://developer.amazonwebservices.com/connect/entry.jspa?externalID=368&categoryID=88"
+SRC_URI="http://s3.amazonaws.com/ec2-downloads/${P}.zip"
+
+LICENSE="Amazon
+	|| ( Ruby GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+ruby_slot="2.0"
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-lang/ruby:${ruby_slot}[ssl]
+	net-misc/rsync
+	net-misc/curl"
+
+src_prepare() {
+	# Simplify the scripts to always run Ruby 20, since Gentoo supports
+	# alternative implementations as well it is not guaranteed that ruby is ruby19.
+	sed -i -e "\$s:^ruby:exec ruby${ruby_slot/./}:" bin/* || die 'Sed failed.'
+
+	# Remove a left behind license file.
+	rm lib/ec2/oem/LICENSE.txt || die 'Removal of LICENSE failed.'
+}
+
+src_install() {
+	dobin bin/*
+
+	insinto /usr
+	doins -r lib
+
+	insinto /etc/ec2/amitools
+	doins etc/ec2/amitools/*
+
+	dodir /etc/env.d
+	echo "EC2_AMITOOL_HOME=/usr" >> "${T}"/99${PN} || die "Can't write environment variable."
+	doenvd "${T}"/99${PN}
+}
+
+pkg_postinst() {
+	ewarn "Remember to run \`env-update && source /etc/profile\` if you plan"
+	ewarn "to use these tools in a shell before logging out (or restarting"
+	ewarn "your login manager)."
+}
--- a/app-admin/logstash-forwarder/ChangeLog
+++ b/app-admin/logstash-forwarder/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for app-admin/logstash-forwarder
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logstash-forwarder/ChangeLog,v 1.2 2015/03/20 19:43:25 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logstash-forwarder/ChangeLog,v 1.3 2015/03/21 15:14:40 aidecoe Exp $
+
+  21 Mar 2015; Amadeusz Żołnowski <aidecoe@gentoo.org>
+  files/logstash-forwarder.initd:
+  Make variables names consistent.

  20 Mar 2015; Amadeusz Żołnowski <aidecoe@gentoo.org>
  files/logstash-forwarder.initd:
--- a/app-admin/logstash-forwarder/Manifest
+++ b/app-admin/logstash-forwarder/Manifest
@ -2,19 +2,19 @@
 Hash: SHA256

 AUX logstash-forwarder.confd 46 SHA256 9facaebb72117a4ac2e24dbc8699c46cde41f579e58ad4da449745502f44a65f SHA512 fc74aa79b03eef36640324477d56988d5e180c865beda1b0b09c4e72f8dfc3fe9f8b0339713680108ff7b34cc666d309506ea5b1b43ffd13dbfcc0ed742fc769 WHIRLPOOL f3ed7420fc5849338a8273907cb3c0c9dba3029b2c2a0b3012f88b3f839aea7849384164866c4953c995e7bdbb1b05dc3f4923556da92f4c77f2f05090ae8f18
-AUX logstash-forwarder.initd 1591 SHA256 e851a728b8cb489d0a84c85e6e3b5df0f7b37229245e8796c6b7f1889bde3029 SHA512 3c67b8d0f5c245bd1aeb861939e79c1bd105d2db2a73a7e69e413a5cd68b4c4d70a60771bcbabb01ef6bbc26df1856b20aca5331f870981007498c72a795af2b WHIRLPOOL b72920d568ded63d0305b9eab7aca1c3a16793276bacf5182128975862f1c927410b5e17e5d8565fef537034fd58f3a21b8303efc675dcb419bc38bf27b6fcee
+AUX logstash-forwarder.initd 1613 SHA256 7368caa9aea003b0348fcee5ae210a23f18f77602694fa4e464f52e306dfb615 SHA512 0ad39e4555113e15f5b77f12d50724c196efeb2fbb2f3208c49f51260de8c50f5626bc2718106f281cc439306e1c1f2fb178820f665c2f88076dc4382b1f11ce WHIRLPOOL 05c405e573508e340a12919b3d45fed41411f8c7bd6f6e7b9813653f9c8774b12db49fa636c954e67415d1225e3120ce25e9c001e8a5f8beea3ae62d22878c1a
 DIST logstash-forwarder-0.4.0.tar.gz 35189 SHA256 d930cd33747b2826c7358238a25e690324751d1b098e7c00de1357944766b3c3 SHA512 1f89b065d1b26a6f5b18da6215bdaed5a312af12fa721835f5e1a77248dd67f398f5af08b5d93c0c4c5ef9623eb1ddb58449b52039c0db0241d5ca61872102ef WHIRLPOOL 7715c723f8b8712b5cccc1e678017b2d733f243ea936d312ab31938fba73934a66d552656516bc72b65a3541945401f99463d8346fdf6a00372e9b3a0ed67655
 EBUILD logstash-forwarder-0.4.0.ebuild 1243 SHA256 ef0611685f557a42d66a3f00042111c16bc09d009db5f8b3889db772e2877c96 SHA512 36b10a7e987a068aa3af3aabdf8d40b426f6814660cb9fe791568a0605d212e1489542b70465406148f651b601e5e0b4393c8210724a6f136bfd2f8532af921d WHIRLPOOL c1d0aac1b3a70de3ff5ac9abbc6ae3b62673808979e9905b75b62cefffb873d6ff4eb40a753667fefe6cd9ed39e6380acaca4c6b0a312a1a170b27dfdb45fa0c
-MISC ChangeLog 645 SHA256 52a2938382b5c0fcfa1492074496b1db27bd5de480299488256811e0f529bc7d SHA512 e024ff70529ad0bf29fd8fd7ab3a55e1b224b590d140de5f0783f925cd66a81e8b81d2a785fdcec0a1798d3e6d0ebe6b2ae2bb76c2b725ef43a2eb7cfbba27a4 WHIRLPOOL 3f03324672c6f7731b6fd4df4204ff5ba9b710268df41651d7ff63781f73414765de0c1359f15a31b38cee27f104935cf0343e3139c5c5da8721c1a42f00d2b3
+MISC ChangeLog 772 SHA256 10c9a5025126f6154d42f6730bf68de8edcfefab98ff3a5de5b2367afa34d23f SHA512 ef56b5f8b8d4e85ae8d5aec9027b42729e512f043694d2cdbc9935f04551b58d3d5c9167bb525e4f0742c7a4ddb0c5560372926490c1805535f554207134029c WHIRLPOOL 0446d96e6c45c0d6cd7b5d7f75487a1b96b3de38b1253d716960e3c145be661a70caea7941d4ca44dafcc45fe46d39fb01ec84db5e8382e3c3d23f3fea28357a
 MISC metadata.xml 603 SHA256 afa09b7a5d2ccf7611d9bd5ee329ba209bd0f821ad64f8a68fa9d2e32a4e3fd6 SHA512 430670391f408196e00a8315a174476d3751363d4626dd1288f01b47bfb2483a3afbe90036dff082714fd03654dea69a49b9110d333b937c37b697aaffa703b3 WHIRLPOOL 27e1449eb094410b5733351ce21d56c31f5a7251fe2aa8623bf217532e8b35bb764af82a062110a401b64854a534b0ee25c2795571a7c81294a7dd932841f1e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2

-iQEcBAEBCAAGBQJVDHhfAAoJEPATRTHh2/q1kEUH/j92eN33EN/iz8X/CBNfuMw+
-j5qDN9yWeBM209eHHYw4nqSoz1zYVryHVMNHqVw6XKNgXTJLiMsTYExt0+67VuyS
-gzZ1q+Q/8MVKnWcU5uIlBcdJibApvL9T3Li/L73vJ3mwuhDDAfaNYnI1NwX71z7/
-dnd7YTHAtMB0m/9XNWyGMELWw9VAcde87cn4ztaqvSHfoc2vDmsidcginjs7+421
-sjQfcCSmc37jxG8au3Vycvlo1HFzgNfiaP7lJMKFZLb2hwx6Vas88GfSf1gmUKuz
-iwMCT24MgHS+uYoD2VwlheETuHzzRdM82NYiGqNyJuPPn/NYUyo529ReKVHTL2c=
-=+US/
+iQEcBAEBCAAGBQJVDYriAAoJEPATRTHh2/q1c1oIAIKdAqcdsSDzAzt7oLDJSpiF
+O7MFtLI6HzMwvzmq46u9HNfB14+s/r9GuLl8Ao/51s0V4Xm1EGChTfDKz4dZciVB
+jNxDHjS6b9KOlWLGX/rTVtKFdIcJ4yTqS578XSVdaUVLls4YDSVpVLoMVrkOV9W
+7lkYWzMRy15qn5KPfEKBAcdoPgJHRKEKLOEmR37lOtmfDUHKttFITPdrXlaM1B3q
+exNyETco/fAs58g88hVqH/xikgNEGye5kVtreKzLHg+rZ1Wp0y4i5cXYMWjsL1SY
+DVQPoi1aZ6aVs7yrGNX3Ci9D1rs6Dq91AFsl9m/VSUN2zSapEcOOSiLkvS2rfLQ=
+=lsAt
 -----END PGP SIGNATURE-----
--- a/app-admin/logstash-forwarder/files/logstash-forwarder.initd
+++ b/app-admin/logstash-forwarder/files/logstash-forwarder.initd
@ -1,15 +1,15 @@
 #!/sbin/runscript
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logstash-forwarder/files/logstash-forwarder.initd,v 1.2 2015/03/20 19:43:26 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logstash-forwarder/files/logstash-forwarder.initd,v 1.3 2015/03/21 15:14:41 aidecoe Exp $

 create_tmpdir() {
 	local tmpdir="$(mktemp -d -p /tmp logstash-forwarder.XXXXXXXXXX)"

-	chown logstash:logstash "$tmpdir" || return 1
-	chmod 0750 "$tmpdir" || return 1
+	chown logstash:logstash "${tmpdir}" || return 1
+	chmod 0750 "${tmpdir}" || return 1

-	echo "$tmpdir"
+	echo "${tmpdir}"
 }

 remove_tmpdir() {
@ -17,25 +17,25 @@ remove_tmpdir() {
 	local tmpdir=''

 	for d in /tmp/logstash-forwarder.??????????; do
-		[[ -e $d ]] || return 0
-		[[ -d $d ]] || continue
+		[[ -e ${d} ]] || return 0
+		[[ -d ${d} ]] || continue

-		if ! [[ $tmpdir ]]; then
-			tmpdir="$d"
+		if ! [[ ${tmpdir} ]]; then
+			tmpdir="${d}"
 		else
 			# There are more directories like that, so better keep them all.
 			return 1
 		fi
 	done

-	rm -r "$tmpdir"
+	rm -r "${tmpdir}"
 }

 start() {
 	local config_file=/etc/logstash-forwarder/logstash-forwarder.conf
 	local tmpdir="$(create_tmpdir)"

-	if ! [[ -d $tmpdir ]]; then
+	if ! [[ -d ${tmpdir} ]]; then
 		eend 1 "Failed to create tmp directory for logstash-forwarder"
 		return 1
 	fi
@ -43,7 +43,7 @@ start() {
 	ebegin "Starting logstash-forwarder"
 	start-stop-daemon --start --exec /usr/bin/logstash-forwarder \
 		--make-pidfile --pidfile /run/logstash-forwarder.pid \
-		--background --wait 100 --chdir "$tmpdir" \
+		--background --wait 100 --chdir "${tmpdir}" \
 		--user logstash --group logstash \
 		-- -config="${config_file}" ${LOGSTASH_FORWARDER_ARGS}
 	eend $?
@ -59,5 +59,5 @@ stop() {
 		ewarn "Failed to remove logstash-forwarder tmp directory"
 	fi

-	eend $rc
+	eend ${rc}
 }
--- a/app-admin/restart_services/ChangeLog
+++ b/app-admin/restart_services/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for app-admin/restart_services
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/restart_services/ChangeLog,v 1.4 2015/03/12 00:24:54 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/restart_services/ChangeLog,v 1.5 2015/03/21 21:06:13 jlec Exp $
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> restart_services-0.10.0.ebuild:
+  use dosbin instead of exeinto /usr/sbin/ && doexe

 *restart_services-0.10.0 (12 Mar 2015)

--- a/app-admin/restart_services/Manifest
+++ b/app-admin/restart_services/Manifest
@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512

 DIST restart_services-0.10.0.tgz 19786 SHA256 207a0861084b0e18dd1098f46b2fa502d2fc6cd08048cf6e490d8b62efadfcbc SHA512 dcd171bc584998b36316229e426f142a9cd93c42310e8d58e0b1d3561b2b09ce817b22703dd8aba3f8dcea7ebf1a469c26a80582fc7579d73eff0c5e5104fb34 WHIRLPOOL 24b1c036f55b6bd1807a135f21dce1cdb8b4a2189913f00b060b05dc3ef57051d333a1b51274f3b7f0fc19e0871b0f900354aa385d3e79b099b243f98951dd61
-EBUILD restart_services-0.10.0.ebuild 711 SHA256 12c174cb80a56b3c7e0b36d25001d72b92ad43a389beed6ebd78ac32f4732a16 SHA512 fe094076fe7cdfac31ec7e6aa4e611e9dd88b409a7064a1635fe2644fd32d5ab84f3a2d561a37a72ed6ce231c235b467723af62d4829bca9ebe469c90229a36d WHIRLPOOL ef2446f43f2d3bfd37d3a47b529285d56771053d35eac7e9b171991852ef641208d43e117e792a061217432825169efa105976b3927620a61ab4194e79bc1198
-MISC ChangeLog 931 SHA256 906ad971efbf42f61a8f87589e7c5bd18101d3b9715cd41665b2fc1d71eb447b SHA512 0a627cefb64ab1511cb41e7b63609ba603b7c8490127fca496cf03b7aa21af246108d4eb674ff0cc8a53753ddb6b8307b2fab257fafd33c95b3e9f6cbda98b51 WHIRLPOOL 3f7028519a476f8d96996a4231be0b5213f6eb15f3fadf31dc71259adc0b65d4d0e72c981410d65bd7815571097646c42479e12f137e963fdad02d380a7b6dc3
+EBUILD restart_services-0.10.0.ebuild 690 SHA256 bf9df462384ad9eeb03c097d772bee808dce88445fd376bb560ce1c8afcf2269 SHA512 082c0e3e380dfd384133c563194b6bc39f880275eb50707924387e4ba1f194eb5a5033ecd9fce1dfed52d2dc1fe53325f9a09d7036e1e991b285863eaa2b4dfb WHIRLPOOL addf2cfe8f8d3dc14bd25bb772c0ca84cd713dc4de14612fe73e483010a8fa907453d663d8d3f14d5ebda2319db7f2286d452ea959131d8dde43325fa1716d4e
+MISC ChangeLog 1060 SHA256 a5dd133314347b2089312adc8b986233c37c7f174c4a58fe5ed8bf53b270b0c0 SHA512 12d61752e903b64b4cd100fce3a6d2899bbac12fbb1932729d27d98ec3979dd4ead32d15a8d9b25eda0f77297a6d4e24cee683f000f6b7f5038b3d6aa1a74c47 WHIRLPOOL 9778188b50faada8d6375dbd695112b7e2a16d996102cc30f1271354c42fd85a257638f3a4ba414617e99dd353fb85d9eb9e89302498a7e8d96867c6633c4d70
 MISC metadata.xml 236 SHA256 f55443c9b3d97fcc9437b9aeba1b3beae39e38599620bd520d0693bb8948b531 SHA512 842ec0962624e280c2c3909e6da541cdaf35532f0f00d76cc9ca0e03dfb8c3dc83a426ae370bc37d73d0c4b1fdd4983171a0586220546b967afe3a3f5dd78ce4 WHIRLPOOL 8ee0a6397a1bae24973eba9b31e1ac64bac9726ca45e5f2127a3ffc991627479030060c605c7cf0957891c184f5e5d01fb2387f94c3a68693c988e4a180c7260
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0

-iD8DBQFVANzcKWxsyjWmQTQRCPumAJ0ToG9A5DyFkAo0nFL3H4UCdHF/8QCfaWMs
-W3IJXC4DOwQtxQ+/qQICUkg=
-=OFcj
+iQJ8BAEBCgBmBQJVDd1GXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirXXcQAJToe6Nt7jnHjherkjgNroBO
+5mvLGwYXBfY6wkV1XalLq11BzbDoNIRnOewEaduDE0CxkTsftlSybF6d/I2lIru7
+V4Vjw1it6YS0+FZckfBvWz0dO/OP0LpAsspuXX42VdlJMMHpwzQvxmqAXesCo1aj
+NMpTs2DVEx5AVcpl++QAm7aFI+3ja66nMvtkMgB7mOcci8gTGg8bgtHnmHT9uWrD
+eYBDiRozSyxP6wLA69ynay9wb6wCe5zzo82HHKOjmg6M87G5cjfHsSTUgPFP3e+S
+CVVVGOUjNeycDOAJnZjNLENJbzGZLiXHAky6WWsL7P7eTwMqklMsGlZQl8yNC4oi
+eYOmz8L+0YNjgBmM1oWGukss/gT7H/528I+BxYiHkejNGfOyYz7aMOflXu/TqnDm
+LLadtK4tUEkVsGhfktddEdFPfZvuKf/oEl/UPJkOe6sN0jdjdD2WtLYAWeoJO1PF
+AcYV7Q3K3/zPP/s2rWsIlrvCSctaMUTfIZ6E0YTGprUrVNYduSnOAvAJwvhe5tL5
+4/BaL/fVDrdeT7LJxhxlTqKCN3viEcR/tSdm/84hkZByq6XYqR7K7fhAg8PjBCym
+9zIUiyulXxhCYDznHyqRo9Mcw0Fw5rLgECiT567DmM89+Qwx/FDt1RHJxP6aSskr
+W5c4MHxlLaRi76OkwfJZ
+=XHx6
 -----END PGP SIGNATURE-----
--- a/app-admin/restart_services/restart_services-0.10.0.ebuild
+++ b/app-admin/restart_services/restart_services-0.10.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/app-admin/restart_services/restart_services-0.10.0.ebuild,v 1.1 2015/03/12 00:24:54 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/restart_services/restart_services-0.10.0.ebuild,v 1.2 2015/03/21 21:06:13 jlec Exp $

 EAPI=5

@ -20,8 +20,7 @@ RDEPEND="
 "

 src_install() {
-	exeinto /usr/sbin
-	doexe restart_services
+	dosbin restart_services
 	doman restart_services.1
 	insinto /etc
 	doins restart_services.conf
--- a/app-backup/obnam/ChangeLog
+++ b/app-backup/obnam/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for app-backup/obnam
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/ChangeLog,v 1.24 2014/12/28 18:21:45 floppym Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/ChangeLog,v 1.25 2015/03/22 23:57:28 mschiff Exp $
+
+*obnam-1.9 (22 Mar 2015)
+
+  22 Mar 2015; Marc Schiffbauer <mschiff@gentoo.org>
+  +files/obnam-1.9-setup-man.diff, +obnam-1.9.ebuild:
+  Bump version

  28 Dec 2014; Mike Gilbert <floppym@gentoo.org> obnam-1.7.4.ebuild,
  obnam-1.8-r1.ebuild:
--- a/app-backup/obnam/Manifest
+++ b/app-backup/obnam/Manifest
@ -1,17 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256

+AUX obnam-1.9-setup-man.diff 414 SHA256 71c1f842d2f90c309ea924a49ba3c173340693bfad7717241f9d99bdc7f3a6f3 SHA512 4cd7eda9d34a81d7344fa90d967b7f8914a53ddd682e9b49fe262693a2e2fae11846c3bcc1495b4d3fecf991f7385f00f295383726c49712ad78397e7c533b2d WHIRLPOOL f7ab9203f3c2e0f6f23c3462104d32dd70ed1a5d3992b939f44813f71ae1f0c10ef9fc474cd0651868729403e57299f06c630e1317c2d8e55b3ee819f01c6be5
 AUX obnam.conf 2366 SHA256 2a609d1243d5ea3e063a413e78421ede02eda5cbbfd984c211f78ff0239cb5bb SHA512 7fdeb7c51e3ee80c60cf857117ad9571f38a4657fb8e3f95767e6fa0d0eae9b31cd54d5e2e8aa93e1e5255bd2c116c462594b5cd01f0efc0059d2d9ee07efc1c WHIRLPOOL 9766794181bed1e6aef1b15b5be69412dada2d075292c177a4edfa550d29612b8291e2f1b6170ee1d61c735d217ef8d94d3a2fb5b78271f1212e186af1b622de
+DIST obnam-1.9.tar.gz 340103 SHA256 7e0182efb16597d63916d052ac36546e7c597ee75ba40ae23b2dc9afbb959f82 SHA512 f170a4223b84d2b26617c412524e9ec6efcf3b7bb7bb1a4bfc7333c138e9b9066658c54da9aa8c41b4ea3c3335da3bcd1c26b911b2cce7eb98eabf52d72af67f WHIRLPOOL 73b72c8fe7bbf2958714ef05dba518839471aea91aa02d60f8015481c30440de985f2db0a610bcf08d29eaa86e074cf7b39e975c3847cb1e78c0adf27d793b31
 DIST obnam_1.7.4.orig.tar.gz 264769 SHA256 9c3ca22f08a3639ec2d5a2cd6291c4c6ac6ec31cdb63c9bd22b379c3cf0af4d4 SHA512 b08bc5256dc5d2fe61920db1dc210e78a46c4baa0ac0ccb3931a15118f147820ed782607af790c7053dcc6a5cbe6f8338b952ee41fe6382fe6429bfe22963717 WHIRLPOOL 65d0f9e539ad208b68e155cd552b4ba8a1f89bd06c10c1fd32caf896082cc0ab781d4200308afd55c38d88dbf45325ec1a710ab07fb7de01e0295d9886fc2d46
 DIST obnam_1.8.orig.tar.gz 287488 SHA256 f70469c29e3d16c7080dffb433c8027ea5f2fb8f0112cd7b32b83958ccf72005 SHA512 02752227eda5d73e5ad292ea2347e5c7cf1a86b7a6c08cc9f3471a3d50f2c2b181fdb326aa0bf55d920a6c5a653aa9e4a7601b895774de33dd950dec767ee9fb WHIRLPOOL aabf7e5f9eeb9467e4daecf2d7ea81abd1bf35cfd38b195f600d93da3dcd0a72c3efff48108b512b0867a21725db153752627029a9c7eb7041882408ebc8c9d8
 EBUILD obnam-1.7.4.ebuild 1292 SHA256 8ad0915fb4b00479d85927cc42d6290a3b1a82b35233e694a3f2b2858ab6c408 SHA512 02573b53cd73a0a569b8ba3040a9b884b67fb514bcec269bcbceeb64e6f30f95fca56b10b1e9dbea06546318c05e2adb6e7cfa49591327f00c7866e35044f3f1 WHIRLPOOL 0ca0a3ba46d3ebd2db129a7be57a36872959d081c84389afc44990281e2b043f5c414c0289bff137351152442427fd6391a6bb75679637f447c78fa5c23bcc10
 EBUILD obnam-1.8-r1.ebuild 1357 SHA256 83ed2d8b6e745c7d6386ce6e21a3bbc5fd67e7fc8dc8770e42ff9a48bf83a62f SHA512 c8630cd1833dda6e29a16eda19d8dc0e099349dc6d3abca2f5b3c20db812339ec03e20784f94de6e81e42b94f5790e7cea4db53e3edc6f137736e04883f9ba8f WHIRLPOOL 6b26ccaa38672712b92f2b62340ecb692c97fa52d99029c1bdaccfd92417aa9e251e5b1b186ccad4b775cceeed978e53ae874478b56b327426a5648b264b83de
-MISC ChangeLog 4223 SHA256 13d8111b2b5f455a17ac0f73a37e689d3ef9d43207a4635b01d0cd97dfcae0f2 SHA512 9f9ac1e52f94a80558db077dcae902d2f3577449cf3266f68d09458e6669c2f8c168f4ddacf510c9d3a2bde34250d9d0bfae58b0d622f40d5a7b54fca6d8fe21 WHIRLPOOL 1efff95dd95405a3491d8f8113832d73ded2af79a85e37d982c39a401008fa91d3eb74c692c15ec3039076d40d32b750af7ef3f538e0f1f2fe5f8dff37eadf96
+EBUILD obnam-1.9.ebuild 1370 SHA256 b7dd5efd272947616d49fd8ced03d8407e4cebc6f180a2746698e1b95f7bf378 SHA512 3f092edfa73089a8e298b632e815cbf56bed68f4bc71e5b9d64aaf7cb9d715fa338b09cdebb9d22e2a0d63ea564e89a3238b723f46a093da46e99ac869f17361 WHIRLPOOL dad107c313e69163f82d9d1ad83b0a570ee02e91c88f3e760002f4cdd07715445408e8c4ef4044208842f3d9f14de761e65f74d807cc9a740e313c9a8b41f1be
+MISC ChangeLog 4372 SHA256 2df483f9e638a69720c064b311c2900ff55c43eec95d1ccaee5d3bdb248e0294 SHA512 842617084cc6fd168896c33ecfaa646c567d9374d3e2df497d27f3140f52d928b8709192d13be08f170667646ff5799e0095dbd3cfb42659cbaac51a17f682e9 WHIRLPOOL e9537afea1bb2086b4a64c293442bd094469554de4fd9e636c6e5f58a508b1b68933d52b0ffaf1fe771d2e741308ab79aa7e8dcff0055f61b3a29d240a7bcd7f
 MISC metadata.xml 236 SHA256 f55443c9b3d97fcc9437b9aeba1b3beae39e38599620bd520d0693bb8948b531 SHA512 842ec0962624e280c2c3909e6da541cdaf35532f0f00d76cc9ca0e03dfb8c3dc83a426ae370bc37d73d0c4b1fdd4983171a0586220546b967afe3a3f5dd78ce4 WHIRLPOOL 8ee0a6397a1bae24973eba9b31e1ac64bac9726ca45e5f2127a3ffc991627479030060c605c7cf0957891c184f5e5d01fb2387f94c3a68693c988e4a180c7260
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2

-iF4EAREIAAYFAlSgSjsACgkQC77qH+pIQ6SwrQD/VJF04wW3k6IqLuHxs3Cw1siF
-RVVRhL40xMm1wHp7mMQA+wTxZcKCd8VJ/A4oBEA9qzt7/pEKWsUWnrwjjJ6vdWUg
-=K07Y
+iD8DBQFVD1buKWxsyjWmQTQRCHznAJ0b4Ka9/WhCqIOey2jQ3pb13U75qQCfeWXr
+fP+mnDdS+Bt5M9hiSxgsrrI=
+=g+9O
 -----END PGP SIGNATURE-----
--- a/app-backup/obnam/files/obnam-1.9-setup-man.diff
+++ b/app-backup/obnam/files/obnam-1.9-setup-man.diff
@ -0,0 +1,11 @@
+--- setup.py.orig	2015-03-23 00:11:50.833110091 +0100
+++ setup.py	2015-03-23 00:12:19.892915511 +0100
+@@ -78,7 +78,7 @@
+         env['MANWIDTH'] = '80'
+         with open('%s.1.txt' % program, 'w') as f:
+             cliapp.runcmd(
+-                ['man', '-l', '%s.1' % program],
+                ['man', './%s.1' % program],
+                 ['col', '-b'],
+                 stdout=f,
+                 env=env)
--- a/app-backup/obnam/obnam-1.9.ebuild
+++ b/app-backup/obnam/obnam-1.9.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/obnam-1.9.ebuild,v 1.1 2015/03/22 23:57:28 mschiff Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="threads"
+
+inherit eutils distutils-r1
+
+DESCRIPTION="A backup program that supports encryption and deduplication"
+HOMEPAGE="http://obnam.org/"
+SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/obnam/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}
+	dev-python/cliapp
+	dev-python/fuse-python
+	dev-python/larch
+	!=dev-python/paramiko-1.13.0
+	|| ( <dev-python/paramiko-1.13.0 >dev-python/paramiko-1.13.0 )
+	dev-python/tracing
+	dev-python/ttystatus
+	"
+RDEPEND="${DEPEND}"
+
+PATCHES=( ${FILESDIR}/${P}-setup-man.diff )
+
+src_compile() {
+	addwrite /proc/self/comm
+	distutils-r1_src_compile
+}
+
+src_install() {
+	distutils-r1_src_install
+	find "${D}" -name "obnam-viewprof*" -delete
+	insinto /etc
+	doins "${FILESDIR}"/obnam.conf
+	keepdir /var/log/obnam
+}
+
+pkg_postinst() {
+	if [[ $REPLACING_VERSIONS < "1.2" ]]; then
+		elog "You will need to setup a config file before running obnam for the first time."
+		elog "For details, please see the obnam(1) manual page."
+		elog "An example file has been installed as /etc/obnam.conf for your convenience."
+	fi
+}
--- a/app-backup/spideroak-bin/ChangeLog
+++ b/app-backup/spideroak-bin/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for app-backup/spideroak-bin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/ChangeLog,v 1.51 2015/03/21 08:09:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/ChangeLog,v 1.52 2015/03/22 01:55:45 blueness Exp $
+
+*spideroak-bin-5.1.10 (22 Mar 2015)
+
+  22 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
+  +spideroak-bin-5.1.10.ebuild:
+  Version bump.

  21 Mar 2015; Justin Lecher <jlec@gentoo.org> spideroak-bin-5.0.3.ebuild,
  spideroak-bin-5.1.8-r2.ebuild:
--- a/app-backup/spideroak-bin/Manifest
+++ b/app-backup/spideroak-bin/Manifest
@ -1,31 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256

 AUX spideroak-bin-5.0.1-headless.patch 462 SHA256 c7f8ef0ff49cdc3381c72f23da9e64c4982c3b30db2bdf9d676531738979f28c SHA512 0bc91900322fb11864a233a601a8e513f41edc570c86b5cdc3a278f543ea823b789a7db115a968e63d99c4f7e6f4b795d107c1c076663a34648af75bc2fd0879 WHIRLPOOL afad68a97589d1195febc4aac6a105e7eaf432fab64b057c3689be0456d8dcd8634f2967f476608aeac131e5b30c54b058ae16b3d3cc29f5ae85c4c08abbde8e
 DIST spideroak-bin-5.0.3_amd64.deb 25230410 SHA256 c83cafcb4d65192d30b8bb99ba1bc53a359a869bcf7bf93cf9edabe806b12947 SHA512 f2a5a943ff2221bafd14d3696302890dbbea2da97fb704e44a94e7ec77b9e0958bf604416e5036e2605b8957353a070e0a317e03ab6ac6220f911e9057026321 WHIRLPOOL 1a5eb5c911eb0c2ecdf051d49f7dfab8e1cbb3f8cce8eaa68cf3306f1d6608137d3c3f27f123101daf5544645a7adfa29f36c8986e820582a296b09e8ca388b0
 DIST spideroak-bin-5.0.3_x86.deb 24913558 SHA256 6a09cc9b448b8fe808ac0ed0007849c56933ddf91a8d6183348d9204d40db609 SHA512 dd408161f4e3776b2d0ade2582255e3d26b8ba24e1474ba413aa38274a2a9c9d0a418eba9b07c4c4e7dbb20170a712bdc9b8248ebcc2239695effa87ac1bd872 WHIRLPOOL 57de0c3b52db03f7d6d198353639cc02702ea36e6825c58a2266444386bc37d842f91796d3ee00f4977a7550bd458b39e4973d80eb64b4ecd74eb2dd5c10f4e8
+DIST spideroak-bin-5.1.10_amd64.deb 20095946 SHA256 88e80b19a4d6265673f565f82bd535549846deb663d641c77074f20f48c9cad1 SHA512 e605219bb055989b4e6a118e9617c6717329b7d3f7e009a6b84cc8dc9b329130b615d1a46e346f661ba39b52ace0eb77f8b61ac13fa3b030cc6163e698151c27 WHIRLPOOL 7155a35bf98eef7f70e2b97225cb4c466621b89c87b243db185bb2d9b501b3cf924c019c3229e1bf33cb8a9c1961f866241cd6745fe83588dbd1fd480640e9d1
+DIST spideroak-bin-5.1.10_x86.deb 19453796 SHA256 6f486db4b9ee8297a46d64041aa20430e5d8a02219ab1527d569342fb0c4b7d6 SHA512 d7b2cb4fdccee60cd542871746c8d03a19d805cea532556a8fc66635a4a6cf5c6e0196b5e966d7a2952079912e27bbaf5b4c986780ae6448eced16d3e59c956a WHIRLPOOL a4e184707e891927ddebc607c4f0de27c8acecfff6b8fafa88a03b48ae348f4b505b8a6c12d507a060090a29808271439da1ee7bec5b26d32c3cbc2ca43a01d2
 DIST spideroak-bin-5.1.8_amd64.deb 20000116 SHA256 b91f3077c2238bbb1123361afc597682a9c224b9ce22422a253fe5212851cfcf SHA512 357e8a45175fd9c92cec733f456452d0e0cd7f369df66a4692d1a9b2c471b4f62c7ee9b72073fc4af5596fa18cf121c690ec960f07f686a78bc7ca4fb76838ca WHIRLPOOL 4721271bef4dbf9563df61ee1d39d1040e9e0cd0528b43753edff995ae9b7a2e67618d39f365b716be1e5a478e2042c3568776ee4077291de28ae92e6953a062
 DIST spideroak-bin-5.1.8_x86.deb 19361954 SHA256 806aae6ac96cb47443c50bfc3bc3f5f7b00abc0b5d978cc2746d10cb1f6b6742 SHA512 43242b9fcd577fc51b838de72215fa971f385ae1f6ea7c606cc198b2dacd0bbca9b693ea2452c2c957c3af6dc97625d6bd15176067542dfdcbc1505a50c8b42b WHIRLPOOL 5f88e3b699be60151471c71998b2aad2d7e5a42a1c179ccb10a168940dd4ea291f812e6d6e9eb475345b53f403aa3a09cd785759413a0cf50edc9b92300af14f
 EBUILD spideroak-bin-5.0.3.ebuild 2550 SHA256 c217b7ada9f8f1d4e476fe89485f712692218494e0def9d7cf452a3e5bd3223f SHA512 9c518a9ad365bb00390010e66ddf7eeddf71b585559dbb16c42aae7d50a9379e542ba8fbcd3004d324d1660ecddaa437d7199041d65b313be6b42b0ac72c23e1 WHIRLPOOL 6edb2a1b3cb3969751519d0a9b2de1f6ab9d6d4b69bf9d3aecfd3e2bb9cd77187c1e57c1f52e911ac3212f5cbdebddaa225480829c4a91fc5124b0d5b72c9cd7
+EBUILD spideroak-bin-5.1.10.ebuild 2479 SHA256 df505612fc49fbd5f51973e2d07bf34d7517c59bf1a73e68bfe72d725a785bbc SHA512 baa5264b6cdf47d9e9f9db33fdb295fd0761cf8834432001d97156abbc95ef1617c2ba934d214ba81b3d97acd67fc9385dc7c7d1f76bcc8e6e2eaa0d029fdb33 WHIRLPOOL d67f52b8587fba4100af52fab00ede752dc71986666aa2ce139a0d47fda3c5898c10cae718a5027196eef9a45568d840f744452c1c98dd26c8f20f1603e8450c
 EBUILD spideroak-bin-5.1.8-r2.ebuild 2457 SHA256 d02ee68460031f105e37e6668153e4bb40cd37528051584ef817569871b74f12 SHA512 48f892c07cfb1bb5ac8bc2c32da5782a0cbf00be9bcebbdfe8eecda4c9e68acff21b83fecf3e4605e52333089ff0f3566ea7066c0120c5c18a66a8efc2ff1e45 WHIRLPOOL dcde37b42c0ff0d5ecfcd3bf7a7c57f954f2eb2fc207b3365d447722375a5940a5890a5b3def04b54a294beaf1cfe463802128b5a9407dac093ca7f061ef71fd
-MISC ChangeLog 9421 SHA256 603f876c7dd02bafc063c60a8db9d2ad10ac88c17876b615261aa8c926654422 SHA512 0d64504d0c214bca392b6c7b01e4815d41f68dd1b3f890acffe09e670bf7b4bfc2cf8cfba3932b0b19ccfee70c86d454edeb264046cfacace13427893657249c WHIRLPOOL 8deeef47b652991e8daec9709d58e8a9c2cd34a104d308d41919bb8dc69d692f66adf20904e5525654063009fb2c20c71f33821ecde1c8d021381f5d420e1dc5
+MISC ChangeLog 9566 SHA256 71936a859b0deff8b0c48455eff99dff2af588e7801cc89bfdd9df55042af509 SHA512 459ba1797552ce85a1b7faffffd871ffc38f837b5b29f87fbfdf47569ed176b5d5d12504da13db1a1d9fcd6cb879b2746460d895c92f7418b0a4506f4ad2eca9 WHIRLPOOL c42269f3136c557927f55fbe355fc7a6d3eee3e9b57fb9b58a62cb1041f9cfddc03d24737f1589e7fe7ffba004b642c02b6c9c10be52f057ba3933c324d4e29e
 MISC metadata.xml 471 SHA256 cc1df516f4dde319e7a5f1679209f19baeb1e38f0af9eae151a7d14ba8b0c4ce SHA512 9d0b18d28c361c5f22817b265ba715a58e9da6ba7f7ab0bd786170839c943db9ded3cab71079400bc7bba881cf21d138342b9a52006b51bda029470e585bfdc4 WHIRLPOOL 9fc301e0aa8666671878086fb4e6680e6dbe33896bc6ad6e64ecf82fce607925d548f286efb8fcc295c520cb84a356a0d05989e3f84130c3e970c6a336bf15a7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2

-iQJ8BAEBCgBmBQJVDScrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir7l4P/jESd742icPocAtSnj+eHEMf
-4rR4qvu6LR+08XYikBU4SOeuEnMB/AZXokv9Z7fQ0neBTlxlKdG0+t9XC+WbIwOg
-VEUI+NSb3/5al7fyT9ggQ/JHSxhgU1j4D6RI26V4iMebcYgWMfhjUILoJX/nEHRU
-75Mx+R09PV/7pqjhkRQXq5zoufZSiIDPLbj4HGVrkjCogrgXDIrnetxSJZBF0msJ
-LW/ZZgEFUC+XZqYtdINhV7atxAdpomaYMI7J6G7JlyayT3SGo3UG0xSYgEzTbg/s
-xsqeH2H2jQSm57YOXU1aUiqgVkdNGA1oHgU01ybR1kkzD9k7qf/Vt97Z0copf00A
-mHjgaXhcTmE/F75TsXFDQgQpE3JupNue1+2dVv7Kt+A4ZYUtk8G9ROF7snytJ9Oz
-Kz1QGDVoI/pNqu9JAOCOI9edVMUMJhOWrB4mrG5T4QSayJJs04ZqxiCYxKVEHbO0
-GXLzIOwOT9GdTgDAXrUs9xGmtYJBsysQ4eNYo5dKAyxDCY2V2yuoYMR4SF1oV2zB
-xEIy4pXOCMfJxMWH1SXG9/UzPVGRGXuTMycsxG7/XJTl++X3YlSaEj7qaD4L6n9Q
-CxNaFUQkyJUVbp9DE86FYbbT3WFU2pDzHeFno7I2kTJr0aPbxXGwm8M3xyWMxb/4
-2nfOVHO3CNeYEXR6WtCf
-=izeK
+iQIcBAEBCAAGBQJVDiFyAAoJEJOE+m71LUu6YDAQAKsOHJG5qOrwyUcCwFLilEba
+wEwTZBXCzj8keOJdVdUIgmClUGfcpYwzPYZYmoTM3p/1SL6+/AcM3RBJtcWyTvvJ
+vKTT0d75wxveazoMVdz/3PJQYlBZ0ODo5Anwa8BRGVtOrPU07mvfH9M3oD/WCJBB
+uOcr2RgLVfmWcCqbl450VVOVTqMwzEmwtGObwui++HqNDRfG6P4U+x/aUxxT74PE
+OXsMSzKuf46DtcUSAXKJdBq3QFWIYSvqK1irm0yZ51q7lOKnOSbGxrhLCKBcoPP0
+PIebTxFsfxqXJXIlEpaphe/uxfar0HmhZ5HFupeZS5dwN5605reimKGUeg2bdmPz
+QqesQFSLUQK5ITrh8MGXAkvCzsAFlgxh2VgoKFHW/qFlzAHuz3PbD1ZCPokkfoY0
+9Xol33iZSPPX/5eEjIgWPLuL7qGS4h4m5osbzf13sijWE39WXiCLCrNl7oWR+a5J
+7gxnliRtlOCbG7YdZZzcfIoewr5qKi+eYsLAjSlWtPCUfj+ukcFQnjjIn7ypTw6f
+dFVcdORzxkBinjCumuWnOv9sem4ZexhCphVP8yUQmfy9SAv80N2Zz1H+fP59x5RX
+LBhgMeqz6unDzqL68FNCbTkNkM+4HxhC/oggEYYGmdcIighIUhxV/XYMaB0TD/5c
+3JkwZPikq2YJWCq7qLmZ
+=g+YJ
 -----END PGP SIGNATURE-----
--- a/app-backup/spideroak-bin/spideroak-bin-5.1.10.ebuild
+++ b/app-backup/spideroak-bin/spideroak-bin-5.1.10.ebuild
@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-5.1.10.ebuild,v 1.1 2015/03/22 01:55:45 blueness Exp $
+
+EAPI="5"
+
+inherit eutils unpacker
+
+SRC_URI_BASE="https://spideroak.com/getbuild?platform=ubuntu"
+
+DESCRIPTION="An easy, secure and consolidated free online backup, storage, access and sharing system"
+HOMEPAGE="https://spideroak.com"
+SRC_URI="x86? ( ${SRC_URI_BASE}&arch=i386&version=${PV} -> ${P}_x86.deb )
+	amd64? ( ${SRC_URI_BASE}&arch=x86_64&version=${PV} -> ${P}_amd64.deb )"
+RESTRICT="mirror strip"
+
+LICENSE="spideroak"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus X"
+
+DEPEND="dev-util/patchelf"
+RDEPEND="
+	app-crypt/mit-krb5[keyutils]
+	dbus? ( sys-apps/dbus )
+	X? (
+		media-libs/fontconfig
+		media-libs/freetype:2
+		dev-libs/glib:2
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+"
+
+S=${WORKDIR}
+
+QA_PREBUILT="*"
+
+src_prepare() {
+	# Set RPATH for preserve-libs handling (bug #400979).
+	cd "${S}/opt/SpiderOak/lib" || die
+	local x
+	for x in `find` ; do
+		# Use \x7fELF header to separate ELF executables and libraries
+		[[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue
+		patchelf --set-rpath '$ORIGIN' "${x}" || \
+			die "patchelf failed on ${x}"
+	done
+}
+
+src_install() {
+	#install the wrapper script
+	exeinto /usr/bin
+	doexe usr/bin/SpiderOak
+
+	# inotify_dir_watcher needs to be marked executable, bug #453266
+	#chmod a+rx opt/SpiderOak/lib/inotify_dir_watcher
+
+	#install the executable
+	exeinto /opt/SpiderOak/lib
+	doexe opt/SpiderOak/lib/SpiderOak
+	doexe opt/SpiderOak/lib/inotify_dir_watcher
+	rm -f opt/SpiderOak/lib/{SpiderOak,inotify_dir_watcher}
+
+	#install the prebundled libraries
+	insinto /opt/SpiderOak
+	doins -r opt/SpiderOak/lib
+
+	#install the config files
+	use dbus || rm -rf etc/dbus-1
+	insinto /
+	doins -r etc
+
+	#install the manpage
+	doman usr/share/man/man1/SpiderOak.1.gz
+
+	if use X; then
+		domenu usr/share/applications/spideroak.desktop
+		doicon usr/share/pixmaps/SpiderOak.png
+	fi
+}
+
+pkg_postinst() {
+	if ! use X; then
+		einfo "For instructions on running SpiderOak without a GUI, please read the FAQ:"
+		einfo "  https://spideroak.com/faq/questions/62/how_do_i_install_spideroak_on_a_headless_linux_server/"
+		einfo "  https://spideroak.com/faq/questions/67/how_can_i_use_spideroak_from_the_commandline/"
+	fi
+}
--- a/app-crypt/pinentry/ChangeLog
+++ b/app-crypt/pinentry/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/pinentry
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.165 2015/03/01 22:30:54 k_f Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.166 2015/03/22 15:09:04 k_f Exp $
+
+*pinentry-0.9.0-r3 (22 Mar 2015)
+
+  22 Mar 2015; Kristian Fiskerstrand <k_f@gentoo.org> +pinentry-0.9.0-r3.ebuild:
+  Use qt4_get_bindir from qmake-utils instead of hardcoding moc path. Fixes
+  #544110

 *pinentry-0.9.0-r2 (01 Mar 2015)

--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@ -7,16 +7,17 @@ AUX pinentry-0.9.0-accessibility.patch 2587 SHA256 80adf350a7fa17ab7d60b36d1d373
 DIST pinentry-0.9.0.tar.bz2 464272 SHA256 90045a07ab8e1a8e1ecf5d19b51691f195525e579fa5d71d7e92c120b05490ab SHA512 2cc53a5c3852edaf6e940228d9b43fe4709344eba5fe230b7afd22b2c0239d0b258917d75661d80590b2d61c6fe9dac8ad15a0b4a0a0e7fba90a9e1c07364edd WHIRLPOOL 3f77a8aa2d44c7206d877e31088ec927473441e61f06e788330545d75ac489e6e9d5bf0026b23d0824304dad54ce8e61c4571d186df7ad0edc2d644ca3af04ac
 EBUILD pinentry-0.9.0-r1.ebuild 2985 SHA256 b2bc39db7bf74f20cce4f14b8ba194e8e9e2d34b9f68f122c8c0487c62541815 SHA512 b17b889479003a87a663103ed78b25476e2af111a21c5bad416706176da100f3ed632f60906ebcab8fa4f2f122430642a97bf2b2a7f1bf4e5143c5e0d94bf26f WHIRLPOOL 6250f45c5ea2cff95638aa276953d0a43f7889c3d8c16bfbb1d10e151df54021af295f7bb048c235bfdeaeee2039fc0032c7bc81777e4fce759ab3c5705c3974
 EBUILD pinentry-0.9.0-r2.ebuild 3036 SHA256 72a38626c655131dce280a2ce630034a0c0c3a44090636033cb4ce77965c5735 SHA512 d22aa5c6cb6285d2248cb8f04d8314350c371b33fe314f2f84f2eebed90a8259f66b8454eb20e0d51ce1dd555368607a0641009cc4a1d9c8c6b871eae4818ec8 WHIRLPOOL feec856fc383095015ce1756d1aafb33a311d56ee469a4a030efafcd367929f32300ed52f9f187bc412a97ea400e4d598310c37063d4bd2d873da61e3a90be20
+EBUILD pinentry-0.9.0-r3.ebuild 3047 SHA256 dfed48a48a406b51414acfc7ca5dbd713a533c4d4dce78738111d00e6ee3caa7 SHA512 2084121f60faf1bd80b806af46f9756b8536448c85b3d7df899de9c9db319c3e8710118c5ce2bfd0cb3e4379d40d0deac2f1c44242579037ed4ab01463c95eb2 WHIRLPOOL ea18eb624225a5dd2ff009b65be49197643096784f7a2d000935720cc9ecc75c1943fe84f8d97ea951345793d3e4101fef775bbde983918abbf1f215c367da87
 EBUILD pinentry-0.9.0.ebuild 2899 SHA256 e47fabd6a6b36a4653332ee1dc81dce47f94d7606f3ac867f247ec2c5d9b41e5 SHA512 9e6e6b3b75c6c8e276b9996c3d22ca35917a44c2bdf67dac49d46a6762b2988be827af10ff950785f92328424a92e965fb96456bcb365fb40b20585af5579ff4 WHIRLPOOL f94e0084731cd592830a760628a42df75bb9215ee80e8120cc8775cc277568a65ce5eb23fbdd02e64931a415ad0e3eb7a932462e29db43abb7445e13c04f0db7
-MISC ChangeLog 22036 SHA256 dc79386c6bbeda3bd22b8289a411651ddf69a5fd35d59c83c82a05b8fb7304df SHA512 f23bda8681993ba2d8240578c7f4d66fe169d29f0f67c6fc7bb62d2525205e7d41a13e585f0052dd0e1f8f2e2f3a07d86bdbaa528c78389499434100677e90ed WHIRLPOOL c201894d4343562d2de881b74144e305cf448c430fa576df9fcee53880fb4ca64f4a518485d358dd7e1f5c8a3108c30def7ce6eb71dbbbba96293bfd6b440c6f
+MISC ChangeLog 22238 SHA256 e0bd4ae6cc32570d784a4e661db676ea329eb1261be9c0bf079016c173dafbad SHA512 286bfc7494c139f4420ef3edb0a8b1465e147a3e8d046947cd448928e1d583c310bdbbd69f3a5586de6467e9032ce12e6da5471ffbb1821c8b23718461c7aeb5 WHIRLPOOL bdeb0aa5e04daf0672a4f19a739fa9ff748b0697c5a871e4da23b52f4b53623368a7b02494225713eb7e6642b9a4528fe8540d2416479853fba4a87b5afc27f5
 MISC metadata.xml 232 SHA256 0f9362f8e4539dec9b2feb1bd93d34e4dff44290f4dac44dd50f9d44de62360e SHA512 79b3d9679dd2d61479a24ef159f6a23758dad2b77679824bae7758c8f47375b4548e0adf135b3dae5c6d6eff23d134f9477a06fd29789d4fb98670431670bb01 WHIRLPOOL 2ac86da5a1d1512f358400d0616ca3baba6ad55d68ad68296975192cf4f60ed55a3faefe0c3290720d61f117e6c8b24b37cd017e8b8c21c77f977dda8d3212fa
 -----BEGIN PGP SIGNATURE-----

-iQEcBAEBCAAGBQJU85MfAAoJEP7VAChXwav68ucIAJUINa2EmHH+akN+DfFtR2Vs
-tStJF4UJ3//mTUUJjZthLMqP6KnhOJ20ADAA1R0HDa1LVXL6dhxHDmGS/OCyNY8U
-CYLfr8oNSAn057QaSkV2Pxz5PideHPEM0cYrjHjVV50G91CaZqhfNnOhGhfk4Mbu
-s5/vTAGFEgL/hkm0Fd90eCjuf2AzgZpaZpwmF7l2TRsJLjjXBw3GvSJ5FfiE1zPw
-nSOst1MoW/cCI8LQN9GmOwwTYuO2MlikYYJKNwBmTKnS9tWGTmoTWPxAQ+MD/iaX
-yUmTaaIUafBSiaFVoFfhtL6aM8SEtipBymvWA/ZJuNhrJN8KhljOa8rETVoCRXM=
-=Bw+X
+iQEcBAEBCAAGBQJVDtsRAAoJEP7VAChXwav6eVEH/i75HmHNY/Qy24tdaSImUYU2
+AhJUobG6RDRjDSndh0gYenVenrKFOelahSlNeP1YiUqUaKTE1JfZTH4No1wGlkKE
+gXwHzlYqPp+7XLZbm0JizkePMC0XdArm9mWTMXKaMDnYUI2ToP33w2Mu/pTM7djE
+fu++vmwsoB6OGhLMp9O6Kxl0EvSMEhx5WgduNinzG2A4/MeNeptuK3sAx0+OswqN
+ns/hM9LNmNk0FDMWQbug9HokkIDOJ4YAoCuKZHz3B92WNGe48DHjmQ3kaxOuYxqt
+xI5U2fJcTtv1pSx2FrgjTQQOMw8fQjdWt/KNKLESVjS7NZKrXeZp9A4ID/nlNFI=
+=YAIE
 -----END PGP SIGNATURE-----
--- a/app-crypt/pinentry/pinentry-0.9.0-r3.ebuild
+++ b/app-crypt/pinentry/pinentry-0.9.0-r3.ebuild
@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.9.0-r3.ebuild,v 1.1 2015/03/22 15:09:04 k_f Exp $
+
+EAPI=5
+
+inherit qmake-utils autotools multilib eutils flag-o-matic
+
+DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
+HOMEPAGE="http://gnupg.org/aegypten2/index.html"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="clipboard gtk ncurses qt4 caps static"
+
+RDEPEND="
+	app-admin/eselect-pinentry
+	caps? ( sys-libs/libcap )
+	gtk? ( x11-libs/gtk+:2 )
+	ncurses? ( sys-libs/ncurses )
+	qt4? ( >=dev-qt/qtgui-4.4.1:4 )
+	static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	gtk? ( virtual/pkgconfig )
+	qt4? ( virtual/pkgconfig )
+	ppc-aix? ( dev-libs/gnulib )
+"
+REQUIRED_USE="
+	|| ( ncurses gtk qt4 )
+	gtk? ( !static )
+	qt4? ( !static )
+	static? ( ncurses )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+	if use qt4; then
+		local f
+		for f in qt4/*.moc; do
+			"$(qt4_get_bindir)"/moc ${f/.moc/.h} > ${f} || die
+		done
+	fi
+	epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch"
+	epatch "${FILESDIR}/${PN}-0.8.2-texi.patch"
+	epatch "${FILESDIR}/${PN}-0.9.0-accessibility.patch"
+	eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	if [[ ${CHOST} == *-aix* ]] ; then
+		append-flags -I"${EPREFIX}/usr/$(get_libdir)/gnulib/include"
+		append-ldflags -L"${EPREFIX}/usr/$(get_libdir)/gnulib/$(get_libdir)"
+		append-libs -lgnu
+	fi
+
+	# Issues finding qt on multilib systems
+	export QTLIB="${QTDIR}/$(get_libdir)"
+
+	econf \
+		--enable-pinentry-tty \
+		$(use_enable gtk pinentry-gtk2) \
+		$(use_enable ncurses pinentry-curses) \
+		$(use_enable ncurses fallback-curses) \
+		$(use_enable qt4 pinentry-qt4) \
+		$(use qt4 && use_enable clipboard pinentry-qt4-clipboard) \
+		$(use_with caps libcap)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+	rm -f "${ED}"/usr/bin/pinentry || die
+}
+
+pkg_postinst() {
+	if ! has_version 'app-crypt/pinentry' || has_version '<app-crypt/pinentry-0.7.3'; then
+		elog "We no longer install pinentry-curses and pinentry-qt SUID root by default."
+		elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes."
+		elog "The soft resource limit for memory locking specifies the limit an"
+		elog "unprivileged process may lock into memory. You can also use POSIX"
+		elog "capabilities to allow pinentry to lock memory. To do so activate the caps"
+		elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of"
+		elog "your users."
+	fi
+	eselect pinentry update ifunset
+}
+
+pkg_postrm() {
+	eselect pinentry update ifunset
+}
--- a/app-emulation/virt-viewer/ChangeLog
+++ b/app-emulation/virt-viewer/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/virt-viewer
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/ChangeLog,v 1.30 2015/01/19 17:38:32 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/ChangeLog,v 1.31 2015/03/22 16:25:10 nativemad Exp $
+
+  22 Mar 2015; Andreas Schuerch <nativemad@gentoo.org>
+  virt-viewer-0.6.0.ebuild:
+  ~x86 keyworded, see bug 513116

 *virt-viewer-2.0 (19 Jan 2015)

--- a/app-emulation/virt-viewer/Manifest
+++ b/app-emulation/virt-viewer/Manifest
@ -9,25 +9,25 @@ DIST virt-viewer-1.0.tar.gz 731635 SHA256 80df4bcde4baccdf248f5004497200e5b5aff2
 DIST virt-viewer-2.0.tar.gz 771874 SHA256 e9c583bcb5acdabac6a8a13eff6ce4e093a3050645771628f832e15ce685d437 SHA512 271ded11e4af3f1dd208c7b8ab7d1c0cd24f641a79e05178d0762a03de3dcf99ae7432acde2b67460e7a98d1fa562587b6b08cf06ab3cf80f025a7b259e8203e WHIRLPOOL aba5eabc490c5b998dfb4b1f5bbac6ae43affc782ccf19072e3a23333607256ce65328e80d46673ab6c25e38ba1bcd8410c270e213d0e28534fd141fd7d90ed3
 EBUILD virt-viewer-0.5.6.ebuild 1077 SHA256 fb1d3246bd04b6a0376717c60bc9f8ff3c0b3c90195dadba3bf40650b0d1ea0a SHA512 0525b3b26ffb045a1c0c8d94f9b9a4f914d1e351f8303fd4cc8b480822be34fc388d41bd8ed0a6b011dc7625ecc5a88704323eb9935cc813c9dd87b7cae1b3b2 WHIRLPOOL cd66a5b1eedd0cf20a579e52418a3bc5dc35a83b8a9787673d6954e215d27437edfc92cd406958752a03f1ba8f5cd810da85df25c49825260110f16a7dca863e
 EBUILD virt-viewer-0.5.7.ebuild 1082 SHA256 fc17c26b049dd2a7ac0ed0c77989a6be90dc25c84433345fc9069371c4f1a975 SHA512 c70291e9e2475d800494430106eb3632c36a17e48379b236605ac76a44f36275d341fb5aa1d19e5cc796733421efd264eaeafa50e79affc824e6b94f74e4958d WHIRLPOOL d45b931535353d25f46d2a52127415529a61758bed06f306b42aab21e479913096f4c6d3c20999fd97bcc7bc3e3e82fde119801d41b1264f695b239bffdf54ab
-EBUILD virt-viewer-0.6.0.ebuild 1209 SHA256 3092c93546e877c8b51165c24c01f233844b42851e8129a82cb9055b49d0ef95 SHA512 ebad25316dbc2a514bbafa098df41baebe965669b0db4de31ed09f6da5d88cf8ecfff74d39c91bd8147b8805fd8dd359945edcb14266c585acd54cee86a1f7c7 WHIRLPOOL bd44be512fb1b4de873857898a32da0c0f757c8ed76983e58a28282741837813493e4a5e5b21ed073841300b093d823b0dd3dd4707617f7e565920ab0abd8d66
+EBUILD virt-viewer-0.6.0.ebuild 1217 SHA256 96e393af5cd88a60fffdb0f3562128bebbe9852a3000da2bd94d81296d9ebd72 SHA512 2a4194036826077bfea1ef493c3a674dc1de2e8d0958d4ce176290c4e69cd0a0a742b1c140ba42e49f82fc26303ce432cc6a76ddcc9db726d82bc35275944899 WHIRLPOOL 603e364c2bd2009231fe37ea964988816897aba103ce5e6c7b18475f1c5c4012d570ebc6f04ca054b5b94e332ea37ec36e9783fc1f2cd90b81264cd875c8d0f0
 EBUILD virt-viewer-1.0.ebuild 1159 SHA256 6a0985ee453295be842d1e100e92bb4becc8dd97748443940e8c4d7e0bafaf4c SHA512 de93837f730b4658798f6dac28bb15da8563ba2bcca4c36cf84d7250a84dcdc4d0dea4d3db6f0ff1b6931410de495d5622cd914a15f22553ee6fc5041c4679ab WHIRLPOOL 5dca42ed9d6f9ecc08f793cac65ff6cb8bfaa905970113f862950ef07ab8f6ac85a1646b894fc2b0d761e05e3a8b25bfd23e5f2b4b02da73d62426209e16557f
 EBUILD virt-viewer-2.0.ebuild 1159 SHA256 0d2f29e0a55ab1bde3607201f413bd03af9342335024a445e8d7d3b0d882ee0e SHA512 3846ba3ecf03a32100769bb67dbf7ad9f3cb898c3b53c795da958e7e876f7b247535a69259d5ff22f3e1185521a98d6b60dab61fda7b7f0332782249363c0118 WHIRLPOOL bdbf03af32168ed3b45cd6d681d13591770b86b5ef328886851ec989574c8cdbb532755e4517116e23c0a82ee6820579be3ffd9a652b2c291b0974cec9127461
-MISC ChangeLog 5558 SHA256 c6bd17fa4b0aa46326c342cb29c1171b71e4e88666507740566422db61a04b43 SHA512 df622462fcd74b1b7793807165774042b877c87d4a8d1ce512a5228dce3ef7687305c5a5d904e60a4021a2825e5ad1a806d9bfebe2e5069493b7bc04f97ac54f WHIRLPOOL 304fb7110719b4fd1b435b5118668a4c92c8f899f05fb24fbd27e0217a8ca4b23420c3d3f155f9b32dd0d58bbc5031ab76b1f017d05070c3ddb83c419f58d671
+MISC ChangeLog 5678 SHA256 58661d790433f3eb94a1999a130a13734b8a9f6f6d91080d65d62ac94b806c62 SHA512 0f14d400c5ec0f14c9bede76f3699af4bcc20e87f3bdec13aa3d8c58ab8698a2559eaa92235e5ecba24c58f487722bddbe146d2b743c99e931f3322a64d29fe7 WHIRLPOOL 5ed95507b2a3965fb046cd79f93cfbc24f7101f2a06f8aaf764db20c6e7f7f04f590f9e67797e6774a0e15d77776f7dffce05de88d779bc87e77a3203644372f
 MISC metadata.xml 350 SHA256 5df7a34e3bbc7f783822f01c7588b85ef9545d5ca162798e079c68e63431ff1c SHA512 883c68c5cdcfd02ae39cf3552780412f55309a31facd8cf7cc6feba5252ae0e4f84aa53e5b028ad32d0aa4814a353e15f676ed00c1bdf7cf798c6a81aa4db41a WHIRLPOOL 581c3f4537cf8cccd977cbaed647fa496727a813f02fae12264b16782ec0fe9b358096cd5ef22bb037a2f4aea396ab8ff2019c05182a4ce1be81286aeb509c65
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2

-iQIcBAEBCAAGBQJUvUEZAAoJELhOzYlK7nn/eDwP/AyJfgsGSSiOgO99jntRlFO1
-fnz2ITnCWQJUVpGnNWh3HXqlW455V7Z/PthmTZMtMuTM2arIogIXF359NEUoonZ7
-OkWQCqx+sIDVg/Go2PzkfnegO6HQd+d/C7nLKihfqzs0mm04ZwKWWPhw+qJW9JJp
-aLn5xndgTCCgMdkIgCgEHnXEPwzIlE5PXAgY6T5n543w0AToUkIzB64+0M3W74nb
-dxZGE/uDHWv5DNC5x6uF1efKwRoekjyFIbs0EfPgHK2uqhGdFKpf0Yy7DGYf/67o
-o80K7BLjyGve5DDXfFSh4WPF9OMCc7x9ZreBr4a0niT02VsEyKEL2t+ZjPDw7MTa
-9db7Ccf1XqkIBwhIKM7NUz2KsIdgW4CQ3vZH9xa7JEIFHWgb+DxWkIb3MfNeR2LS
-FLWh9xBnnagK8k/c7ypuZPqEXuYjVMLtVEZTm4qzoWnXkeaORxBJTFdPhIuuprl4
-8nuHd1orU10SRwltd63Zckrz9V9a/C0c2VfAR2aOpC1SfSdJlmeggZDMBdg8oTeO
-swibFlnwpnyQ2a+gkup2cm1t7gjvZU3vVxwHmm037w1lmNdZKWbTw1zZsDwIrrZ8
-8P3MOGM2HneBBmesGPfoHPfT9MSkYq+ElSwO6Xi9LkIgUEyXm5J55UAGRumwoZH0
-W7XDg2+8FCqvyhF92U3t
-=YBxX
+iQIcBAEBCAAGBQJVDuxcAAoJEIug43o+kWudxjYP/2G1TKBVJ5JjLoxsyAfW6h6n
+gWh8WuP+wyVpI83tdwGNvPHw0q81h50bFn6HHpJL5Iqjy9cE4jBQ3jJHsOVghDDP
+J6mgI2qkakiAXTMWCT9Q7jxNyMKAH1xzJsPMMCBG5podCCJ2B36HnRbUqRy/7d30
+2DgOP/VFTFX0Dp4io24fe94LOEmvlQO6wy4oZSBHsn4NPs5uk6eek1hA+WiNeAqY
+EX0z3nDjpVO7LyqstJ1WBJ9WhI1XuqnAyyD5GjlShXltT5L2HfLiGv5Q9WjROi7k
+Z+p+pnfCBM+68gJSqiHhW6DA0irZauKhpNpD+izf6fQP9dl3UQhUEBincBZfygZG
+BRwfLXBv+a6aBnEURhFIabdlP3cbYmjG8/wwWQLM75aNpKf2Nla05BSoPfwU+vO
+N0lvQbBHDg5xhuBs5xzgEfA0J2cCCmROHTX6+e316wrOmOYugibgA1kBpsP0dfJd
+IoCTiyldarMr1BaKA4wgtlHy6hf1L695erEYenIrCvfNkyjnkPte9oDvEA18wCts
+6dmA98DWK5y/1AJb0WO5dJVkuC5XfIdP2UZMWhrgLu3EZ1IJg496pyE/rLwMV3cO
+c4jaW4hGxjdJg1AyxbJixWSua4PsuwGDB/eKh9XlkWMXpCqOSRNaxgjAF7KFbEzW
+P1p5aRE1mWGqubRWUcDK
+=X9je
 -----END PGP SIGNATURE-----
--- a/app-emulation/virt-viewer/virt-viewer-0.6.0.ebuild
+++ b/app-emulation/virt-viewer/virt-viewer-0.6.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/app-emulation/virt-viewer/virt-viewer-0.6.0.ebuild,v 1.3 2015/01/19 17:38:32 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.6.0.ebuild,v 1.4 2015/03/22 16:25:10 nativemad Exp $

 EAPI=5
 inherit eutils gnome2 fdo-mime
@ -11,7 +11,7 @@ SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="sasl +spice +vnc"

 RDEPEND=">=app-emulation/libvirt-0.10.0[sasl?]
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.529 2015/03/08 20:42:49 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.531 2015/03/22 20:07:55 tetromino Exp $
+
+*wine-1.7.39 (22 Mar 2015)
+
+  22 Mar 2015; Alexandre Rostovtsev <tetromino@gentoo.org> +wine-1.7.39.ebuild,
+  wine-9999.ebuild, +files/wine-1.7.39-gstreamer-v5-staging-post.patch,
+  +files/wine-1.7.39-gstreamer-v5-staging-pre.patch:
+  Version bump from NP-Hardass overlay, see
+  https://www.winehq.org/announce/1.7.39 for the announcement.

  08 Mar 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
  files/wine-1.7.38-gstreamer-v5-staging-post.patch:
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@ -12,6 +12,8 @@ AUX wine-1.7.12-osmesa-check.patch 1722 SHA256 42648efa15040011ef868f92fd615924a
 AUX wine-1.7.2-osmesa-check.patch 1740 SHA256 5264ac291435eb64c70cef4bdccbf8d4448472b4f014ab15ede35bcceebb6579 SHA512 4738a381923df7b45ea68092efb7ccb967907976d6d2f8bb0167af4211c377a73e296481b94092ac232f9ae09edf21447da92a134ebfff9b32acdd9e20340b95 WHIRLPOOL 95a90f8ff5a649833b39cb28de997c3b516cd09a53cf71d616c4fd412dfa6e71c47a1255a4d0597d85a62966cd9d6b9fae1c21c88e67d8650d31d414fca8fd42
 AUX wine-1.7.38-gstreamer-v5-staging-post.patch 2187 SHA256 5dcd005d410f834e89b1c8f77cbaf634ab3434ba782590fb2271a6cd9daaeb0d SHA512 6ab32b2d37442ced1f737b2ae8260f9c7203f4933e5f224f8c01348270d361bb338669f1df2fb6970685daa7c82c7d18888d889d9234db92c04d9f1dfba542d1 WHIRLPOOL ee55c86412af24284bbaf2df137caa4371eba6479fe45a278d4559f02da6695ca228d671b3e973d1612253fc1581f33a79a9b22333ca36ea1ae04a4873f74cb6
 AUX wine-1.7.38-gstreamer-v5-staging-pre.patch 1529 SHA256 891819135df197282e9e5ae4077f2e5ec29f2b50386a0cedaa0cc85633e31988 SHA512 62b55f7330939081aa3c854bfa57107a7e1d930e0ec2bda45fa66af887aec6a7663be1e36b5b6deeeec8f84aa70cbd8221ad83148e702716fecdf7d2c54ee7a1 WHIRLPOOL adc11e3ede16249da846d9980f681458827710db190a7b5e23f87bda8fe4945c655cf21f1dc0de0ce3145ae6d7606bebd4f598892a516f2b78d093c40a79f997
+AUX wine-1.7.39-gstreamer-v5-staging-post.patch 1175 SHA256 034dc11ef6ecb9d4d8a9734266f612e9154f155f80085d05ab0d45e9b237d386 SHA512 c8e64722a8be5725515a568534fe052c8714859d030be102b823588c117ae9649c3637fe905a8c52c8df676d6a1f7cc22dd3d25a1dd397edef516eb07906c776 WHIRLPOOL 9bd0dd5d38b3ebd03f2115f505266baa96b95de9764c57596366ea935f2bca570f9b896de3ce1af53f6d80557a537a8a2630654e1b788b588f335625e63aa4ac
+AUX wine-1.7.39-gstreamer-v5-staging-pre.patch 1237 SHA256 2d5ba5b40d4e6ea48906f48d098fca05ad98ad75bf58f3b5a86f1dbf8353e7bf SHA512 4e0b0a64ae591307569db840968059dd22d3e06fbc766b7215d3b7b6ec01f989bf25a95c3674263b669fa142c2a0736a71cba2de5a57becef0eab40df480fe39 WHIRLPOOL 83f20e69af5f4c17e7fd7c3a3befa9517b4e021d3a5acc6854648647a503cbfafee82a959f67e38e4b5fafc52088f6b94d9f451793ebe88bee937b80c1ab15f6
 DIST wine-1.2.3.tar.bz2 17651336 SHA256 3fd8d3f2b466d07eb90b8198cdc9ec3005917a4533db7b8c6c69058a2e57c61f SHA512 602ae802aa6f94c4498ccae96a67e355a8aa5cdc1e9c1e0f29482f45a9e7cc7af766ade9f2f1fef77ee77d5bbfc5f34cd110b95db244b8cff42998b5b0cf708d WHIRLPOOL 02ac95d8c86d0f2d870c8e4c4789c1bef1ef965f8bb186de23fd3a949126ba2aadd5791d1908bdf11d946d5dc5348b085881c2594cf1b407fa0df44c1990ecd9
 DIST wine-1.3.28.tar.bz2 19626794 SHA256 9a311124a1a911066ab9d3a742dda888487ee516a18eda946be105a1d1135a38 SHA512 b8fb881cf03dce1a40a9212bc6170858ddde38cd2fc282b455ab94cee7ee2e78f5043fee72df3b1e7566c29fb8c8a43726953a8bc5eb22d3ab7f869e6f4e9722 WHIRLPOOL acb6b8b978541e1b0f95f124e95ad9823e73590229515fd40e4e59d5af21c414c4824490710b436370b4d3fda3c477d6c4b626f89c6cc90e2fcf066355c3bee9
 DIST wine-1.4.1.tar.bz2 20104401 SHA256 3c233e3811e42c2f3623413783dbcd0f2288014b5645211f669ffd0ba6ae1856 SHA512 a0fe7f36325a51d9b381ab09a4460cdf59b12b810722d28aa8e98a3d6c3de29bfc62dd0f0d4e5336bfa82a6b549e45c313a714b6d43f562c45ffadb47874058a WHIRLPOOL 81f837ecd31902bc769065de353a92bcdfa1b59b3cd53e700e345b24480260c68daf7075fec685a948a46e66e6f4470ff4158df92e132760013b17ad6690885b
@ -37,6 +39,7 @@ DIST wine-1.7.3.tar.bz2 21489049 SHA256 c66c93c2ffec8d1d9922fbaa226b169d62deb77f
 DIST wine-1.7.33.tar.bz2 21908969 SHA256 e3519d6fa2c0bb91e58da38f14f02607cf366a0154ff1effe528966106d49275 SHA512 a9bb47383b88e9c60edef7883c3ce25f5ad0895b67cdb4393c1c3f9b9ab7245e8d8318df193722a7b8c87ff57cd554df53a24c988566d1dce808b939ed731451 WHIRLPOOL 3747cc9df638e7cba5aaff8cb6bfa26e5588ba87e5bdc9d5e3202f30973bc2c06b0d65027f113066dce82d851c1591ce86421ce6e7d90944f5206d341f7ed51d
 DIST wine-1.7.34-gstreamer-v5.patch.bz2 5703 SHA256 c3bb6f669f46d9f2d7ba494a2264cee457349f559d4b0758db80e39eb22f2aee SHA512 e780394e8739a58593d264322c462bfe9040c1cabce93b84d24f09040026368efb4ac34a6a302beb6048d14b4ac835b87a0c515b52c1a0c143aa4e15691eb01b WHIRLPOOL 1befbb0fbd026d6e833c5d72341064dd6e12157e1b7df58e349b9985648bfbc63f70e9cab45b61155515ac65057968e30ba313e71e183b8027153c9392d89192
 DIST wine-1.7.38.tar.bz2 22027786 SHA256 981ee93e7db6b2b8d1ee16999cdff915a9411b1566539edc56137f9cd4d36bc0 SHA512 36793b8b2fd678b9542ff2c32582234a175e9795682b93c0df881dc1adac65dff8d33509511fe7400d8b099880df8d6f13ecc18e0c8b72827d9ac009770ddc81 WHIRLPOOL 646a36cd4f50c3c81fafc95e11e5c8df68e7c14e7b582b6cd7f5f99d3f37afebd9655e8b0c28bb7995c957d87f96913ac13c2fc425075406e32cbf9a23440add
+DIST wine-1.7.39.tar.bz2 22122289 SHA256 6affb007fe772eb5588c584e3bdb62db96d8291c7fc8e75a5fd0bb098391335c SHA512 0eda88c4c092c2d596097548a341f62128dc39ffd6c88c514378639864dfbeedad3cb436065a85981cb2d9399a4cf439d1c301ec651a7e21eac886931218b6f5 WHIRLPOOL 9cb9d99d94e5abecbf5c6717165b58c7c23784aef0a4ffe2edaca2aef63e5706f17aa1102e00424fd849b30598f5d3b8206ea6b473c4337bb486211d7c3daf46
 DIST wine-1.7.4.tar.bz2 21500746 SHA256 517b3465dbf5b516d3fe886c0f9d4f310dc1d4a38ca4e5580c5d66bab3fb6969 SHA512 4267eb43311fe53537a1864a70e88e4bf444b8979dc858725a1170ed06af4e727604a22bafb3deb448eeb62c170ce67ce8eb8082bce040f5488b1a4c4bc6bb95 WHIRLPOOL 7bb14e0dfd4f9a7411e1d5484dba62f8584a0e03997cc3c6192893dccbc7de316eb79a1e5b0ccf96d20e74cf512ebc79e760076ff4882625bc81b410ad8be0bf
 DIST wine-1.7.8.tar.bz2 21463503 SHA256 30e17f5f863a09416f3d229666566b318dbb40f683d4ca6630012c60bb511804 SHA512 1fdaddb7909f818050854bf351d20f445cf6a5906b1bcc789c96ee8d5058c90815a91bbbc6444f3e4527748764f03ab5297585c174b433093a3354a827402fea WHIRLPOOL 3b5b18384ff04b80b936160c2c6e03676d69663c023f484981305c9272d0601b74cda5c5f7d56008b3900d702b1a4fe1929f16b1fba304a6480b076ffede663a
 DIST wine-1.7.9.tar.bz2 21323337 SHA256 79f99ecc24696915439c474c4953bb77652ab53f16b41daa4da270fe43279c5a SHA512 29f8aa715ebe47c8a06bd5f6a80cac3fb75b2ca7aa81648cc8aed5461cfd825e4da68b6209ca672dce42b968521cfd9bffffaadd2d85b904b55d99687a1c83d0 WHIRLPOOL 333fee72b2a0e9d6ab8a003712c38166bd27aaff384a2b940c089ecc846f7669c59efbeb5cdc2fc87a46d63b0d29d0335873bb7c22f05913bad430b81990241a
@ -54,6 +57,7 @@ DIST wine-mono-4.5.6.msi 53705216 SHA256 ac681f737f83742d786706529eb85f4bc8d6bdd
 DIST wine-staging-1.7.29.tar.gz 8423703 SHA256 27fab2e3a16f1af4580328ec399bd383915cd8827855f7e77d69d8ddddee2ade SHA512 a923c8b46c50f013f2b5f87dc554a9cfeb77b60a8ee7822775f38922a2ef90b30967e2489c77a8f5cecc1771a5b19e81e43e17ca74ff904485e7ea13c115d1d2 WHIRLPOOL 32a0f1c7c7ce71354e2aae5c870caaf2b210f5bc2cfc4ac2ab0a1e14bc2ee913fad5c487cd3cca9cc5fe58482b7b3110bf59c8576b690c68ff5e31fb567b2d59
 DIST wine-staging-1.7.33.tar.gz 8759402 SHA256 30b7ecee549514ecd186689ae8eac15ed37507755025c8272d31e8fd4808b3f2 SHA512 b3b939c8d5af419a9305a16de93486f75197d28bc39be4ca0abdea3e194745bfb401ecf6e092f93c59f68255aa7f051ee847ad3c8521ce87ecbf91abccc900f6 WHIRLPOOL 657bc4d642e1c799c6e0b39ef627c8f6852ab8d511e86f96c54065d87fb144d25a97b1a2572e87a029084d568fda7bbdab7c2ba5255dc07f02691f46e9796960
 DIST wine-staging-1.7.38.tar.gz 9047747 SHA256 b77fc0913c972c0cb2b3fcc3d7627a838ba05cb876396cab526f518564f2f936 SHA512 125937505308a974840d810beb9df10d57cf488b173836c5debf71a96cc11cd3dfee666960768db361edd3b280858f2e6db5eaa8d81f4b487b7c53a0f8fef13c WHIRLPOOL c5cb14dd7527752a0496e343d7b12a53c9df629c027d746e33ac3c25ad20bfebd22c40ceb31bd5e70d3ea2a9188efe076eceab30c3c3f2d519fb31164f189f5a
+DIST wine-staging-1.7.39.tar.gz 9096658 SHA256 b7b3ba39e2a8829a6fd6aef4b3701dd0009eebc85539ac946e31de6d7fe36649 SHA512 d14780c30303a17f575f22adeab5cc026c2f41520d47dbb7ec70b939252eae656070eb8532cf1a42cca2b1c9c589a44081d12b2647b0d97c3c90b896a7433d23 WHIRLPOOL 8d71a49c3172261e83193ccfe85dfbd94421ee20063f4127ecb328450916cddbea742c59c09c34e10035d9f2fa0df0ebd0d68bbc6e90b92c1aa1a1071a26b055
 DIST wine_gecko-1.0.0-x86.cab 8119486 SHA256 7ddf697677506fb164c52771864e32dd69a359ed855b2efbc51340de2376c99c SHA512 0b8f778698f04ed2c01c25a866e54752ff67ad42099179c3c4d161b7f2cba92f262ee6ad909b382e57038428eacddf519b77934c079451eb0cbab6a030eee307 WHIRLPOOL d77903a7fecbc3ecc2d0ddb58fbc98fb401a796fc4d21b216de12702aef38a120c2e7d6f8279308a1d96b66b230973f076f267f246b3b1c02b40e40a518a57e7
 DIST wine_gecko-1.3-x86.msi 13609984 SHA256 4b7559e889eff5ed924d25ce49297aff55f43c4b9d34dafa970261d88c40b5ae SHA512 4d45ec762eba1fc2cc8ac1f6672e88ef392395ecd97a48038845c2dd7b40a49df7460cd88aff432b75bfe75231108710901a4759d2ab3998ed7052130d6bc46b WHIRLPOOL d9afae5ab439612e509fbe2b8a405a0252f872e826b0b6cb2c739c1cea0eb4c3a35e5152ac1ad583d17c21fec5c013a43f13779e92929b93e51ee819b70e73d7
 DIST wine_gecko-1.3-x86_64.msi 13835776 SHA256 07e9885d15ad22629c3854d6bd77094c3f4db1028ebda408ec87b101fa135d75 SHA512 26e596e498368f8307435a85e440205c1105e10538f8e6ddbb24fd022eed495e4f2d7f09b6b06d26b5a3cf1eb8d629f9baf342fcd239b3aeb16f08324e376e01 WHIRLPOOL 9f3502cf8514873ad3fb49aff0c63eda2b8fa3659d4dbecdb3366d4949cc0b256fcfa0e4269f011887e856113a3bf74dfc365348b9ab1a2c78eac98ab990d3ee
@ -101,29 +105,30 @@ EBUILD wine-1.7.29.ebuild 15623 SHA256 5d22df007c1cf7c9b6f81a810e9278cbee403c88b
 EBUILD wine-1.7.3.ebuild 13748 SHA256 b95ba0ae24faee5e10e961971c2e95ae53992eebcda5611304fbeafd7bf81da2 SHA512 b2472fa12bf20743a5f365f3d12bd3ccd0598675b0d72d44c37f192bc2b5879f84ab4561fdc52fbdf0eab9e511133d8acb65f832fd39d4522a8fc841a4662e11 WHIRLPOOL dd88788f464f0829caca63d0f6fc70bc0687dde1c1469d82beaee92558007ff770e84fa453349c7575c7fa8ed8ac78ad3eedcd4d7db33d77ce73c6a2309a5cb4
 EBUILD wine-1.7.33.ebuild 15703 SHA256 0f6f3053d22083530d4275b86171deef127483a156be38d74a1a8fa4aa78b321 SHA512 1a5281712c312cc8d069f81d488173bfc4beb1a4e9a6af1d816d5c63ba202e478b79eaf2e4dd53edf3b15c39a7b136131cd2c33401e2789aca8b5fe84f0c8cfc WHIRLPOOL 7f4648dd862ba23e95779dbe18d469055e2ca4a513c7c58202ad852a6c8e02bbe7c92256bc8ff8ce95ef0a64f7eb655c9fa1de07a29d63896a52372bb9b5aab0
 EBUILD wine-1.7.38.ebuild 16725 SHA256 109072f3331b4fcf52672f6cac418dc4ed43ac60f9dc0f03206acba95e0992b0 SHA512 d30821137953b8874b4c8692ff1af322bfd46ed4f7adc6698414658a3aed6e1554a2e674bfcf77aa45137399387214a81f5647176892cc0cdd780704a92d415e WHIRLPOOL 0b71544018eeff9b90bf77cdce7b5bfc6b64aaf2b24e40274ee830573348c602c5dbf8663eeb8654e6145ea48c774e933d9fc9bbf081ae68637cab8610e10c14
+EBUILD wine-1.7.39.ebuild 16832 SHA256 672917e8204f32dafb354e536f1679267112ba6e67c82f4a6a27566102380564 SHA512 f0e42972dc33ac39338a493180cf6839cff0122c8ab96f9178916d2198f94244eed5b115b713500d1c4bdaf528bd15306c4d115d66f20ec9c423ee3b29b31866 WHIRLPOOL 0b131851165ffb1043f8431bff54c9e6b4fd5c03a32665ad5665a1a184ee8fc5598d6fd8501a2eca615ac721f17699a672ae05a5911792600c73846e17e235a0
 EBUILD wine-1.7.4.ebuild 13749 SHA256 0c4dbd04ae8dd76a987cff7b41c8713a874d81bcf11996172cb6788205d52105 SHA512 40f9b41bf3bc5ce48df3dd94250c0289aa2f840190a935b8cbbd1ad28335d8676ea816f6c0ab023e2c345e9aef8fee1f5ee731fa980d57fe33d837ca84dad79f WHIRLPOOL c1459352f96e75d381806f5d02097fca48c825a40cf6c0b47516581eda442d214e59b03c89d630d188dd9ae4db11a0892e1a1879a91005b398de4c391b4a508e
 EBUILD wine-1.7.8.ebuild 14079 SHA256 834e1a1d3f52e88f56b1d039d786e135a2b9841846b74b76a344e9538690cdeb SHA512 25d96cb05fd39d185afb9c3623fe6e7d9179b387e90714d126e9efd538beaf4be8f6c80971ed3b8217bfeecbe366f82bd1f4347abb30aceb9a46393f9551b8b9 WHIRLPOOL 7e05523f1e531faa813881fc3f0c00a561830c3db02928b164fd0b51167dfdc287cdc7a1b85a5c2095890937a36025075472b33291d8aa498e694ea0f4d5d80f
 EBUILD wine-1.7.9.ebuild 14079 SHA256 23fcbdbc8a3123ba66b5a9ff9b0eb8939c45da7fd520cbb3cea29c96b47462a7 SHA512 7b199fcc1ddd9b9a9a23633906c371e8a083ab66c4c62c7c50e90121e78181cdd56aba0705274ad6df93dcb06002d21c0040a6fbc2562b15a0f22a32becc969d WHIRLPOOL 4d0ee99f9b0c81e57dff869892a96d9bf0cfda7585dff1de68657d62ef987e8fed982cc5b15035299b5b122720c664b187336d7ea11e0a904dc790ad60c74b60
-EBUILD wine-9999.ebuild 16725 SHA256 53f4bb86af11d1eba993ab6073d17ca32b2c90fb8d0e40449b9b3b30ef0f5bd8 SHA512 2879fc93ecd316ddf270e27bdc5dd1441fbf632e1dc410f2017250c7ace479800e93f12ad67e1a244ba5a45295eaa487cdec0d5b88e93726b2297cf2bbfa0e5c WHIRLPOOL 782318d916ce2e043e12f72be73d7c7375016c8437dd0aef4ac8bf0a8720a947f35f9e03119271335937a9398f38f0532af154ae56409bfc46038979b688f2da
-MISC ChangeLog 28465 SHA256 5bac74407fe6f06d1d73e8bd3510ec2e605b86ca06ce56787cf97f4b5aac82d8 SHA512 dbbc5fa90947a74026c0e2001d86f162b954eaf5be443c2a5efcd1e777702c264b3e2221165e5679147efdff8b57c86ab10a6a4178e71918e541f6700b0a301f WHIRLPOOL 7c481292609cb73fd37112ca6b806450ead35c3d2bf6106fb1831fccafd01ad97276dce481358aff495041ee65d15dea0b5ab4e49cbd008b8e920907f8cda8f2
+EBUILD wine-9999.ebuild 16832 SHA256 5f4e705703fd31e3d76f22d665d02d9ca4921c97301a3eb5d01cd3328dd8bfeb SHA512 79e220ad9a18c6579214e0ad70aa38fd4310652613f41bc5a2fd04eb4aab7f51c2bb478087a6aa63ca389e1590acd8411cb64e3dc58123c5a3b8b13186a09be0 WHIRLPOOL a7afe6bfbef17f70cede80089aebd5efa8f457a42cf9cc138f3cd0fd94e54e0a10058cbb4beebbf1d4afa59bfd94254f64f893014880389371d94ec1937304b8
+MISC ChangeLog 28806 SHA256 6acabd99db390a08f55328d177163e261ca501a4543ef2e326193b817a5d83e2 SHA512 ff80294bf9fecc00a94effb6d89f393845abbe3e7e65ca2f6c63e445a4777dfe2a65ab4eec0838cfeacefea1c7baff9884b02d11a4c1d9e9cda37589c5740792 WHIRLPOOL c38668ba393b80b0e140af1707a0d026f43648eaf3f52461e882a63de37e2c892464fc6afd030bda564add16960459fbaad4d1ec53b91e02eb6bdd5d404be0a4
 MISC ChangeLog-2012 100362 SHA256 8e70fc54e7945c1f41e3e0b64fef6b9a7fe89acdaf8c79a06a16048fe8d2e26c SHA512 ca875e847ba100e1f19774b31a2b45a81d776275e3d11944be8a7b01dfcdbf4265b1a340d691bc4fe4054fea006059a06ed52bc0516b1f8b44a1772a1c813278 WHIRLPOOL 36ec708601a25cb8fa93b471112538480b6ef82cc4e6703b3d045f883078b49209ceaeef7bafa8417b881c2d11df84df9c83d1985d0d687a11f3db3de5abb014
 MISC metadata.xml 2753 SHA256 e52a7b0f8c694e3fb8624f80f05fbd19ad0e3e9af654fac7e5ada9596361de3f SHA512 1de3e621614dfd1529e158743c6959834f10a885c0e5efc74bad445ec5930bfd86b999122f5a978f0fc0ac8e64927a02919fb766fe6a701362f9e3e4fe8ffc94 WHIRLPOOL b838c0d1beb4978ad96e280a1a77625c26adb90f0e0f3484acd49c21fa9a2182237ac1d723badafe23f5d82123e187c629ccdc0385cdc6347e7c0c8bfa5921a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0

-iQJ8BAEBCABmBQJU/LRSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVDyEdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
-OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNDO8P/1/9l+TWJK9SFcF2KL3hW+l+
-HOoXMAVVIQdcN3RiyC7JB86QSROs2UZ1phmqtJ9ajtTg99a3kQcbtxdxmm0ZtUGs
-SkaqkaCUdA+BgZonpOhSq5lH0DiFmSUBGOQ3YeBICIiuzopwZMaLfWhsxhrvRb6A
-NLfRWtPqpEmbyCItX+qe3abxm9tE/vs4qu6FFvaJnYsHQfmawHtpZT+NTiGA92vE
-JXc6jyEvfL29QijecO23WEfBokPWNBs1Yib0d7tpyK43R8Thi97HFF1/YnW/kUnP
-uJV+oO2cDvp4nm5CCoMSUwR0pLOEBZR1gPXK72hgwniu5KLClwLX9i3w48M3Q79X
-yK63evT37wLmxqhUVO81+bKZng0EFWShHzmfr4b6m3tTI/PtLwZqylMUHKpM3Oyl
-uofxWT+EHFeZikz3tQr1800gbBRRp9mTHe6kidadiMViCy2oRKfHQUR+PlIVJwmf
-w/2Hj+B1xgQ3RKi9ZC0dYofw0eRII+JiXX7Bx9ssKrpQyOJNd/vyRva9LzRIkT6p
-Tq9nYsF7fy/bwpj6xRbdd85nmG6VeKTQFvXli2ITRdPLPErYkKd+m40tncbiN0Bn
-G2l8q4409gvp8ElGABOMlwa0HkrKoG+8x9C+ELnhqPtk67Jd8LhY2MHD7nNVnf6z
-N8oDzJaBxpV1dwvhbQEL
-=D74a
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNHZkQALt3/pLZ3HlTIW44IZZoqtNf
+8V54UZxS097AlAfw5eMWdIqTSljqyZ+af9zQSPo3qiCE3vNpGHYtUZJ0vHRp3JZ5
+S5OmPD5nHvPSmWQ5+lxECOF9GbnLNbvSgpa+wbOzkRgAho9Njhw2Q07SL9bjG1ma
+15hVkVDY58mXXgmnJqAAg++FMU4FWRRz9hNgEAqTxsE/WxyAIP8nsElxkxX+EBxV
+744eaQNuAG6wrDbQhNe6fUJhvZl44Z0OtIeKgdsG2jk+/HjFlVQFPOjkBkbv+tWl
+1Zm4aIngkv/85aVzDGPfKpLw6mI8gt/smffCr6G+L8y/yTDB3XnSgav88IfLj8P1
+hrXA5Msi0Hw+SGjdlHhEeeXUVwjqqsB+yGgXnbQV2/Q14mcsbGM4VM45FiHjt+Xx
+Vyc1ikJn8nkiha3hvijZo10vYr2LfrVx5qnfCcsG9SjhXJCtL1x2tsRVAhOlFNmo
+mCHUSL9ij18nMACFnC6/Uz0VhUmpoqPnTV6i1cZ/unjHLPjNu6R6tfD5L6pvLq2/
+rldGRQIiUigUdgZUnIsVon1/QhCHYcx19dvjoX7eZXVDgjMwz3+LyQcq4hGt/ihU
+Ftfj8nXi9gJoG+/+u85VL71FhUZ7duEXW47QAHBPiXQQaxuawDPmo2vkBSRSSss2
+bCLhXK9HLxy1qfJMdUa2
+=4SJn
 -----END PGP SIGNATURE-----
--- a/app-emulation/wine/files/wine-1.7.39-gstreamer-v5-staging-post.patch
+++ b/app-emulation/wine/files/wine-1.7.39-gstreamer-v5-staging-post.patch
@ -0,0 +1,38 @@
+From b97783fd33b4d9897c149d7a14747aa4969bd9e9 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Thu, 19 Mar 2015 07:56:04 +0100
+Subject: Reapply various changes conflicting with Maarten Lankhorst's
+ gstreamer hack v5.
+
+---
+ dlls/ntdll/thread.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
+index 1e7f231..cf0461d 100644
+--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
+@@ -461,6 +461,8 @@ static void exit_thread_common( int status )
+     static void *prev_teb;
+     TEB *teb;
+ #endif
+    shmlocal_t *shmlocal;
+    sigset_t sigset;
+ 
+     if (status)  /* send the exit code to the server (0 is already the default) */
+     {
+@@ -502,6 +504,11 @@ static void exit_thread_common( int status )
+     reap_thread(NtCurrentTeb());
+ #endif
+ 
+    sigemptyset( &sigset );
+    sigaddset( &sigset, SIGQUIT );
+    pthread_sigmask( SIG_BLOCK, &sigset, NULL );
+    if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status );
+
+     close( ntdll_get_thread_data()->wait_fd[0] );
+     close( ntdll_get_thread_data()->wait_fd[1] );
+     close( ntdll_get_thread_data()->reply_fd );
+-- 
+2.3.2
+
--- a/app-emulation/wine/files/wine-1.7.39-gstreamer-v5-staging-pre.patch
+++ b/app-emulation/wine/files/wine-1.7.39-gstreamer-v5-staging-pre.patch
@ -0,0 +1,40 @@
+From 1527fb44c331f2c61224514beb758895a5f85c8d Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Thu, 19 Mar 2015 07:51:48 +0100
+Subject: Revert various changes conflicting with Maarten Lankhorst's gstreamer
+ hack v5.
+
+Note: These changes have to be reapplied with the corresponding -post patchset
+afterwards.
+---
+ dlls/ntdll/thread.c | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
+index 30a4720..843be0f 100644
+--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
+@@ -385,8 +385,6 @@ void terminate_thread( int status )
+ void exit_thread( int status )
+ {
+     static void *prev_teb;
+-    shmlocal_t *shmlocal;
+-    sigset_t sigset;
+     TEB *teb;
+ 
+     if (status)  /* send the exit code to the server (0 is already the default) */
+@@ -425,11 +423,6 @@ void exit_thread( int status )
+         }
+     }
+ 
+-    sigemptyset( &sigset );
+-    sigaddset( &sigset, SIGQUIT );
+-    pthread_sigmask( SIG_BLOCK, &sigset, NULL );
+-    if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status );
+-
+     close( ntdll_get_thread_data()->wait_fd[0] );
+     close( ntdll_get_thread_data()->wait_fd[1] );
+     close( ntdll_get_thread_data()->reply_fd );
+-- 
+2.3.2
+
--- a/app-emulation/wine/wine-1.7.39.ebuild
+++ b/app-emulation/wine/wine-1.7.39.ebuild
@ -0,0 +1,532 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.39.ebuild,v 1.1 2015/03/22 19:58:44 tetromino Exp $
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MY_P="${PN}-${PV/_/-}"
+	SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	S=${WORKDIR}/${MY_P}
+fi
+
+GV="2.36"
+MV="4.5.6"
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+WINE_GENTOO="wine-gentoo-2015.03.07"
+GST_P="wine-1.7.34-gstreamer-v5"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	gecko? (
+		abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi )
+		abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+	)
+	mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
+	gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${GST_P}.patch.bz2 )
+	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
+
+if [[ ${PV} == "9999" ]] ; then
+	STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
+else
+	SRC_URI="${SRC_URI}
+	staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
+	pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png +prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	test? ( abi_x86_32 )
+	elibc_glibc? ( threads )
+	mono? ( abi_x86_32 )
+	pipelight? ( staging )
+	s3tc? ( staging )
+	vaapi? ( staging )
+	osmesa? ( opengl )" #286560
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+NATIVE_DEPEND="
+	truetype? ( >=media-libs/freetype-2.0.0  )
+	capi? ( net-dialup/capi4k-utils )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	udisks? ( sys-apps/dbus )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
+	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+	xinerama? ( x11-libs/libXinerama )
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups:= )
+	opencl? ( virtual/opencl )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:0= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:2= )
+	mp3? ( >=media-sound/mpg123-1.5.0 )
+	netapi? ( net-fs/samba[netapi(+)] )
+	nls? ( sys-devel/gettext )
+	odbc? ( dev-db/unixODBC:= )
+	osmesa? ( media-libs/mesa[osmesa] )
+	pcap? ( net-libs/libpcap )
+	staging? ( sys-apps/attr )
+	pulseaudio? ( media-sound/pulseaudio )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( net-libs/gnutls:= )
+	png? ( media-libs/libpng:0= )
+	v4l? ( media-libs/libv4l )
+	vaapi? ( x11-libs/libva[X] )
+	xcomposite? ( x11-libs/libXcomposite )"
+
+COMMON_DEPEND="
+	!amd64? ( ${NATIVE_DEPEND} )
+	amd64? (
+		abi_x86_64? ( ${NATIVE_DEPEND} )
+		abi_x86_32? (
+			truetype? ( || (
+				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
+				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
+			) )
+			ncurses? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
+			) )
+			udisks? ( || (
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
+			) )
+			fontconfig? ( || (
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+			) )
+			gphoto2? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
+			) )
+			openal? ( || (
+				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+				>=media-libs/openal-1.15.1[abi_x86_32(-)]
+			) )
+			gstreamer? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				(
+					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+				)
+			) )
+			X? ( || (
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				(
+					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+				)
+			) )
+			xinerama? ( || (
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
+			) )
+			alsa? ( || (
+				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+			) )
+			cups? ( || (
+				app-emulation/emul-linux-x86-baselibs
+				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
+			) )
+			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
+			opengl? ( || (
+				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
+				(
+					>=virtual/glu-9.0-r1[abi_x86_32(-)]
+					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+				)
+			) )
+			gsm? ( || (
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
+			) )
+			jpeg? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
+			) )
+			ldap? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
+			) )
+			lcms? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
+			) )
+			mp3? ( || (
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
+			) )
+			netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] )
+			nls? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
+			) )
+			odbc? ( || (
+				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
+			) )
+			osmesa? ( || (
+				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
+			) )
+			pcap? ( net-libs/libpcap[abi_x86_32(-)] )
+			pulseaudio? ( || (
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
+			) )
+			staging? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
+			) )
+			xml? ( || (
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
+				(
+					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+				)
+			) )
+			scanner? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
+			) )
+			ssl? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
+			) )
+			png? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
+			) )
+			v4l? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
+			) )
+			vaapi? ( x11-libs/libva[X,abi_x86_32(-)] )
+			xcomposite? ( || (
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
+			) )
+		)
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	dos? ( games-emulation/dosbox )
+	perl? ( dev-lang/perl dev-perl/XML-Simple )
+	s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.0.25 )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )
+	pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) )
+	staging? ( dev-lang/perl dev-perl/XML-Simple )
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	xinerama? ( x11-proto/xineramaproto )
+	prelink? ( sys-devel/prelink )
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	sys-devel/flex"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
+		eerror "You need gcc-4.4+ to build 64-bit wine"
+		eerror
+		return 1
+	fi
+
+	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+		if use staging || use pulseaudio; then
+			EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
+			unset ${PN}_LIVE_REPO;
+			EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+		fi
+	else
+		unpack ${MY_P}.tar.bz2
+		use staging || use pulseaudio && unpack "${STAGING_P}.tar.gz"
+	fi
+
+	unpack "${WINE_GENTOO}.tar.bz2"
+	use gstreamer && unpack "${GST_P}.patch.bz2"
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+	local md5="$(md5sum server/protocol.def)"
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
+		"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
+		"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
+		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
+	)
+	if use gstreamer; then
+		# See http://bugs.winehq.org/show_bug.cgi?id=30557
+		ewarn "Applying experimental patch to fix GStreamer support. Note that"
+		ewarn "this patch has been reported to cause crashes in certain games."
+
+		# Wine-Staging 1.7.38 "ntdll: Fix race-condition when threads are killed
+		# during shutdown" patch and "Added patch to implement shared memory
+		# wineserver communication for various user32 functions" prevents the
+		# gstreamer patch from applying cleanly.
+		# So undo the staging patch, apply gstreamer, then re-apply rebased staging
+		# patch on top.
+		if use staging; then
+			PATCHES+=(
+				"${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-pre.patch"
+				"${WORKDIR}/${GST_P}.patch"
+				"${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-post.patch" )
+		else
+			PATCHES+=( "${WORKDIR}/${GST_P}.patch" )
+		fi
+	fi
+	if use staging; then
+		ewarn "Applying the unofficial Wine-Staging patchset which is unsupported"
+		ewarn "by Wine developers. Please don't report bugs to Wine bugzilla"
+		ewarn "unless you can reproduce them with USE=-staging"
+
+		local STAGING_EXCLUDE=""
+		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+		# Launch wine-staging patcher in a subshell, using epatch as a backend, and gitapply.sh as a backend for binary patches
+		ebegin "Running Wine-Staging patch installer"
+		(
+			set -- DESTDIR="${S}" --backend=epatch --no-autoconf --all ${STAGING_EXCLUDE}
+			cd "${STAGING_DIR}/patches"
+			source "${STAGING_DIR}/patches/patchinstall.sh"
+		)
+		eend $?
+	elif use pulseaudio; then
+		PATCHES+=( "${STAGING_DIR}/patches/winepulse-PulseAudio_Support"/*.patch )
+	fi
+	autotools-utils_src_prepare
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+	fi
+
+	# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+}
+
+src_configure() {
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with ldap)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with v4l)
+		$(use_with X x)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	if use pulseaudio || use staging; then
+		myconf+=( $(use_with pulseaudio pulse) )
+	fi
+	use staging && myconf+=(
+		--with-xattr
+		$(use_with vaapi va)
+	)
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	local l
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
+	if use gecko ; then
+		insinto /usr/share/wine/gecko
+		use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
+		use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+	fi
+	if use mono ; then
+		insinto /usr/share/wine/mono
+		doins "${DISTDIR}"/wine-mono-${MV}.msi
+	fi
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym /usr/bin/wine{64,} # 404331
+		dosym /usr/bin/wine{64,}-preloader
+	fi
+
+	# respect LINGUAS when installing man pages, #469418
+	for l in de fr pl; do
+		use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
+	done
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-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/app-emulation/wine/wine-9999.ebuild,v 1.174 2015/03/08 07:00:24 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.175 2015/03/22 19:58:44 tetromino Exp $

 EAPI="5"

@ -337,14 +337,16 @@ src_prepare() {
 		ewarn "this patch has been reported to cause crashes in certain games."

 		# Wine-Staging 1.7.38 "ntdll: Fix race-condition when threads are killed
-		# during shutdown" patch prevents the gstreamer patch from applying cleanly.
+		# during shutdown" patch and "Added patch to implement shared memory
+		# wineserver communication for various user32 functions" prevents the
+		# gstreamer patch from applying cleanly.
 		# So undo the staging patch, apply gstreamer, then re-apply rebased staging
 		# patch on top.
 		if use staging; then
 			PATCHES+=(
-				"${FILESDIR}/${PN}-1.7.38-gstreamer-v5-staging-pre.patch"
+				"${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-pre.patch"
 				"${WORKDIR}/${GST_P}.patch"
-				"${FILESDIR}/${PN}-1.7.38-gstreamer-v5-staging-post.patch" )
+				"${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-post.patch" )
 		else
 			PATCHES+=( "${WORKDIR}/${GST_P}.patch" )
 		fi
--- a/app-leechcraft/lc-lmp/ChangeLog
+++ b/app-leechcraft/lc-lmp/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for app-leechcraft/lc-lmp
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-lmp/ChangeLog,v 1.17 2014/08/10 17:56:30 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-lmp/ChangeLog,v 1.18 2015/03/22 16:46:31 maksbotan Exp $
+
+  22 Mar 2015; Maxim Koltsov <maksbotan@gentoo.org> lc-lmp-9999.ebuild:
+  Add mtp use flag to lc-lmp-9999, thanks to 0xd34df00d

  10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> lc-lmp-0.6.60.ebuild,
  lc-lmp-0.6.65.ebuild, lc-lmp-0.6.70.ebuild, lc-lmp-9999.ebuild:
--- a/app-leechcraft/lc-lmp/Manifest
+++ b/app-leechcraft/lc-lmp/Manifest
@ -7,13 +7,17 @@ DIST leechcraft-0.6.70.tar.xz 5204940 SHA256 3e7f51da0b7eec6df11471ada409d752754
 EBUILD lc-lmp-0.6.60.ebuild 942 SHA256 1827410224167447c05e1ded4cdb15b770b74baa20353879671e53fdd3e2479e SHA512 caf07b3079c094a216a9dd3b359baf7167840dd69b15fb7282db5c69e48084fc719d134e513a4b3671f946cf17c5520e8e67b5a74e7d9395be51fb4cf95f460a WHIRLPOOL d91368da36bdb90f3752041da5a77ea60ccbcbd1db082146b208651126d638da8b6544b5f8c63d70e82a59805d391a3688907f57a520607b6c6c9c0451dd7428
 EBUILD lc-lmp-0.6.65.ebuild 945 SHA256 fe293ab9279c1769fdb0a41e62e6eb8bc0c9f2f22e13fd280c498fccfd3a1251 SHA512 f2b7a17f2817dee0076d007595614fe659362b0056fc4bff1ba051a196bdccecc569b02da88af066f2431eed7c519e03d4111efebbb8b1022e0a21ab29c17bbf WHIRLPOOL 50a45adc2d0f43d3a54669d18f44acdd1add3a83ce2457ae746ccf17354d4602340e41083c4443e806a9ad84230874b48869a9a0daf350cfcb9481d10cfe8014
 EBUILD lc-lmp-0.6.70.ebuild 1094 SHA256 4349b9d4282128132bdc86d6ecdc395062216aaaaa9ebe4f54780f72cfd61994 SHA512 452fab3b7124d532fe34aa09eda5d83c53af579bf406776f6594439ddc1b6ac200d4aa708cee50810d1e3fefc27b37dbd1e7bef60bd030ad879617a73fe53156 WHIRLPOOL 09d9f67b1f93c3e9433f7d5f5d96b59fa125c247029181b9287c3783c0fe1f58e66977ae373bbd803a60d545d85bf8149ed7bb54351b1acc3bd479e76e17c675
-EBUILD lc-lmp-9999.ebuild 1080 SHA256 d7de12f4707a8148b91c9423f8f993ad37338adea8604fb0374ebf2864c1bda4 SHA512 19fa854bbfefa41e2c97087efc60a580b78163ab95e1a9d84d52dfdb515dd214e06802655b688aeaea5eca3df94379cfeaf721333be2dd0b76fc7b69312cb5af WHIRLPOOL 108b11edde4917f8d0ebb92a38163b61a8f8c52d812f02f9a3c8532f2e870f1d3de771aeb4bddec2a816a00e8e24400e55b4a987f8419d63c1b9d940a7a59549
-MISC ChangeLog 7945 SHA256 0d2a907cf705b6935da644871f1e6b4d75fb87aba007976bdb10ce48b0347d4d SHA512 dd2d58f0ae14150b224d92c2b032017d4a3168ab7dbe327eb8bdca3a30e6762fa3c488796249104bbacf9509aed7d23ba42c6b57cf721102f6a665c4f9e4d8ff WHIRLPOOL c4ce7bbcbf61685b310add9a236c0617bbf77a0b49a1f8311720ebf4fde648930633d571ff37b3a2e6215d4c9940fae4adbc86aebad33e486dfe03b6f8d9b1e1
+EBUILD lc-lmp-9999.ebuild 1201 SHA256 d43b5cddb0c708258802a1593deeb4967b276d76e1db791757da271d20257037 SHA512 370958986673f3ea28746eae3bce0e9d7429180175d09026c295a05cbaff0940b857f579d82185946ea7d0da42057d221d52b724eae958e55087939f4b3b56b8 WHIRLPOOL e3cacf1992267529a8513d3bd845c94a6e3e24e1f414ee1554b528b48dcbc72135e405f8e5e7ebe6d54e722d8cfeee8d20d09616e06510505745b567e786f1b9
+MISC ChangeLog 8077 SHA256 33d3a0b58aebe38d796b4dc837bd13245b659e5f30bfe674ea318bcc30af049c SHA512 3f6e1d2673fbf733f7eef23862b86d9bae70a91732b1d0ff3d90d3d78f3e1dc7e6cef30a5a87827ff721ff962c258516a95ef563ad43c7912538a99cc7d6b519 WHIRLPOOL 1100ac0a6bdd0dac9a70c478101ad74231b900692c84b8ba97f47a4c5072cc0f86e0e47eca5996cd8aff9fe2a0d7b4cb61d4047d9c2be4031854bab675f1e3a3
 MISC metadata.xml 626 SHA256 6df60ab38d47ec01cb7b021afa7fd4ba31ba58ebe06bcaf28b999735306c5f51 SHA512 be946ab174b6d8df8f16d6151840c2d28932fbb658757ec72e0d0e58b66b0ba6721af8765d6478f6d9c495bbf3bafe014fa1ff812bd02b88ca105114f6f93a24 WHIRLPOOL 2119b2699000152b54828df34f3ba209ddf5b262d109cdded76044a51d07d64c4cd1c66e97d8e1e1c304ef85810bf332a35d174454a5854350967d23611e2483
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2

-iEYEAREIAAYFAlPnsk8ACgkQcaHudmEf86rB8gCdEnRRQ7tUz/6rONDiC134o6mS
-VnEAn0OMSqA5Qwbwz5tKicg2ppd8RgS6
-=+viG
+iQEcBAEBCAAGBQJVDvHkAAoJEAmJmMX429reXeAH/ibbcwP5fD15Bpx5rEnamD3H
+TLyVKcJiyFZr40ePL/oDqFRvPQGagjhtKUYC25XwL1n5TR5hlDL109sAS8cF+am0
+RKmsngThE9CWBul6fni4drtKFLg7BfkbJy7EA/SA2f6M665PpiSUJoV6+WQEQXwz
+XtVZcx/x9U8kmXyEo+LfXn7E9qucsFCkJYi/EO9k93n8V7O1CGbGlBcsvAIfRQcz
+TR+i3FmrXa1JCZUTcn/QFJOC1iRKLlJFeaIivuVh1mC+1zmR1xFbUS64o7PWRrvh
+eH51IynavXQ8IdV/yM2ItpENxDpLCRlm/j83XukT+YPIug2mqZ4+Cwht2kEQD4w=
+=kOuU
 -----END PGP SIGNATURE-----
--- a/app-leechcraft/lc-lmp/lc-lmp-9999.ebuild
+++ b/app-leechcraft/lc-lmp/lc-lmp-9999.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-leechcraft/lc-lmp/lc-lmp-9999.ebuild,v 1.6 2014/08/10 17:56:30 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-lmp/lc-lmp-9999.ebuild,v 1.7 2015/03/22 16:46:31 maksbotan Exp $

 EAPI="4"

@ -10,7 +10,7 @@ DESCRIPTION="LeechCraft Media Player, Phonon-based audio/video player"

 SLOT="0"
 KEYWORDS=""
-IUSE="debug +fradj +graffiti +guess +mpris +mp3tunes potorchu"
+IUSE="debug +fradj +graffiti +guess +mpris +mtp +mp3tunes potorchu"

 # depend on gstreamer:0.10 to match current Qt deps
 DEPEND="~app-leechcraft/lc-core-${PV}
@ -19,6 +19,10 @@ DEPEND="~app-leechcraft/lc-core-${PV}
 		media-libs/gstreamer:0.10
 		media-libs/taglib
 		mpris? ( dev-qt/qtdbus:4 )
+		mtp? (
+			~app-leechcraft/lc-devmon-${PV}
+			media-libs/libmtp
+		)
 		potorchu? ( media-libs/libprojectm )
 		dev-qt/qtdeclarative:4"
 RDEPEND="${DEPEND}"
@ -29,6 +33,7 @@ src_configure() {
 		$(cmake-utils_use_enable graffiti LMP_GRAFFITI)
 		$(cmake-utils_use_enable guess LMP_LIBGUESS)
 		$(cmake-utils_use_enable mpris LMP_MPRIS)
+		$(cmake-utils_use_enable mtp LMP_MTPSYNC)
 		$(cmake-utils_use_enable mp3tunes LMP_MP3TUNES)
 		$(cmake-utils_use_enable potorchu LMP_POTORCHU)"
 	cmake-utils_src_configure
--- a/app-misc/ca-certificates/ChangeLog
+++ b/app-misc/ca-certificates/ChangeLog
@ -1,6 +1,17 @@
 # ChangeLog for app-misc/ca-certificates
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v 1.105 2014/10/16 17:48:39 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v 1.107 2015/03/22 14:52:53 zlogene Exp $
+
+  22 Mar 2015; Mikle Kolyada <zlogene@gentoo.org>
+  ca-certificates-20140927.3.17.2.ebuild:
+  amd64 stable wrt bug #543976
+
+*ca-certificates-20141019.3.17.4 (22 Mar 2015)
+
+  22 Mar 2015; Mike Frysinger <vapier@gentoo.org>
+  +ca-certificates-20141019.3.17.4.ebuild,
+  +files/ca-certificates-20141019-root.patch:
+  Version bump.

 *ca-certificates-20140927.3.17.2 (16 Oct 2014)

--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@ -3,6 +3,7 @@ Hash: SHA256

 AUX ca-certificates-20090709-root.patch 2842 SHA256 701da246597154c37b5c9ff6999730fe8b76fe10811f71b2d1eded50a2f4f175 SHA512 d7aa7f51099ffb254184bbe84a9129e2b682311eed585f43286c716a4e1d3857144ebb40074b1ec921a16d6a3a771b37d74300bf581b3ca8427d18998fad8ebe WHIRLPOOL 7c10e00fa48abe1756533f599364aab26253ede01c9b6d0563ae1848ec62657b863eb897ce0c16c53e0a353024025c0c5b9d112fdbfcb3f5754882e4a8feabce
 AUX ca-certificates-20110502-root.patch 2942 SHA256 7f2273b748140c5806c37e954bb27846cb0b8bdddda15ba0f23d3fcae6e77e28 SHA512 972798239229d7d32b4e3c52a962f67db79eaafcbfac03683283861d2ed049daa5d2c77ef05343606afaed108bd8513c9aa588545049263ec8be598dfdb20d96 WHIRLPOOL 667d62670c3e498a69e46ba7d384fdacb37631ed887e7c4b110745905a8a28fdcc69e97778e1d177eb2ce68d724f0852e66f324025ecf059b1bc615c2cdf9d53
+AUX ca-certificates-20141019-root.patch 3307 SHA256 3d1a6f8db5a33e387421e1bb12e2da5a514143b3267361c63569329628d30062 SHA512 4c49945a23040cdf44c8cfe6e8c2e5817474e502823c2389fa82c2cc745bce5c562f5c29c96049d328891475a0c16dc1149b7199005e05a7221f9e2b9e82098e WHIRLPOOL f468bb9a199d1a6d6153e266dcd77f5ecaf0b5721b78780e74a1800f13c321e1bef52039314f85b0c5de9be6b811d9c88fdb0c9edec07ff5c555a760615a5acd
 DIST ca-certificates_20090709_all.deb 154620 SHA256 de1e35997eb39c7ba5713f206aba034ff8ce8aa3aebebfc7eb1823de9968d767 SHA512 2237f03c6794f33e5dde2acc05c04447daf2b8a41fc4182297d971cf4bc1eb2ae1abdf21561fb8fdf9dad27465e63c17b8bd2060d3b270edcfdf22c5c5cb094d WHIRLPOOL 174facc0da0677baae403a0e9234692768d6a6342a1894116561a2c41878850cdc603c3556961641ba743fe347c436adef1d914060b23767549dd40041c4120c
 DIST ca-certificates_20110421_all.deb 176778 SHA256 a60a9c0faf1847df4553ce13ffe337412b88dd1b9d502741ac1760204c0bdda3 SHA512 11c9ba3f483cd17ca964f19e6ec394a2239fd74187f57224d7b13d1c0bf5dc55bb6c66217c1dd8273695ff92710617a897f7a40be6e4ec9960276f1bfe6b2bbb WHIRLPOOL 67dee5217526d5abec740f367fe28ce0f823d3c21b99fc988b73e75859e47beb00cb76e3d83572e704c3924e45bd9f6a7c818a1a1b2dd3bf7594864c9d9b2c5f
 DIST ca-certificates_20110502+nmu1_all.deb 174242 SHA256 d44284ee9b733b9890a54516f66b68a382ac5fb2c0bdceafed4cf229aa3b05a1 SHA512 2ba33346689d21846632390ad55f2a6102a333cc32019a6e00d85c00970a6f744b4a4d548b68bf9b6369d0cfc2b06009db4b4be4ffafd3629bf05737fdc096d2 WHIRLPOOL 88ffbbc68e1299a2b3cc243e1b17160f9862c469279e8dca03841c45defb238c034c8d81abe811a3d32f9968d7754f6d8c64a697cbcba0c2eb4be9d513d527e9
@ -18,11 +19,13 @@ DIST ca-certificates_20140223.tar.xz 274768 SHA256 815b7cd97200b0d76450bb3e7d9b6
 DIST ca-certificates_20140223_all.deb 190226 SHA256 13cb11144a97d95a8be130e4bcdd6c9ffc3df269bb194699bcd21ca377e01df2 SHA512 003b6fd2301eee3ca2119781ee75a1b195f142678d4570b598c4b93847de23c4f659152f834db1f0c8866767324d02b27807260cf43f6ae16207538fa419aa31 WHIRLPOOL 179a0bcf341e7de07d02f6574850614ef221851379945db00018d25f485cee6c11915322ee370e72321d81464d7d6bb96401b41029b8f7215a68e46971671deb
 DIST ca-certificates_20140325.tar.xz 278816 SHA256 c0e3d8c517995db2737f7f1a9b69d654b8823fa6d337871c6ce111fcf083454a SHA512 6645740d61da78845facce6e3881c64f51e945a454cb26cead6e7df4887f1f3797bea217cebaffaae22a76fa3867ee20dee7b1d5200df20b85878a0c6029c2f8 WHIRLPOOL 93d4ff1ac74c6961612ffa0e4da35228636698940fd0a66e4e6842de4e48f5ded74885bfb330f6d106ae267124309d51d49f646959bbae1ef9fa7a55dbb2085a
 DIST ca-certificates_20140927.tar.xz 288824 SHA256 e582724ebb9d5d6fe02d02db1773c9ca76d3aaab4b15375a0d72e9abf88a65c5 SHA512 3cd08559c52aeba763a8ecc0333c7c20838db0111e52d9adf65719f14f858611271d61801a60fb3aea4e74be4a7903c1b462bf889172f5afb774280bb615b98b WHIRLPOOL e32e54b21109b7c44266480a6a5d78693b5ef7ffae1df595c4edfe2cce85d1cd29664e6d916c5bfffb965e4bb01fce6a8327a2ead5bb0ca7cdd8afd04346a270
+DIST ca-certificates_20141019.tar.xz 289092 SHA256 684902d3f4e9ad27829f4af0d9d2d588afed03667997579b9c2be86fcd1eb73a SHA512 5b0e8fb917f5642a5a2b4fde46a706db0c652ff3fb31a5053d9123a5b670b50c6e3cf2496915cc01c613dcbe964d6432f393c12d8a697baedfad58f9d13e568b WHIRLPOOL 6d3c0ccfbd4b1598ed529cb07390baaf741e24c8fd4762aa1786ada7188ec0c4e327513047bca2b93a488681e80b5a8fabc37b98b7f6e5e92cba62580c4cf74f
 DIST nss-3.14.1-add_spi+cacerts_ca_certs.patch 25018 SHA256 82ca25982828fd7153ad15fc6e81408c115476eeeb4045d3a71469380b56824b SHA512 2aafbd972b073061bfd66a66a4b50060691957f2910f716f7a69d22d655c499f186f05db2101bea5248a00949f339327ba8bfffec024c61c8ee908766201ae00 WHIRLPOOL c9fe397e316dac7983b187acf7227078ebd8f8da5df53f77f2564489e85f123c4d2afb88d56e8dc14b9ebfffe8a71ade4724b3c1ea683c5c4c487cb3a64eda43
 DIST nss-3.15.5.tar.gz 6367893 SHA256 1442c85624b7de74c7745132a65aa0de47d280c4f01f293d111bc0b6d8271f43 SHA512 4db27ea98f17f1a5bc6f513455497945fc35957f573b3ac7e730b166fbe0e8fd741c188187c578faf361d969db63d83ff8ccf15ac2b8ca72a367f33a018695ca WHIRLPOOL c3c687ac53dca571d1c45bdf4a80e192ca58da07e06ef56de7ac9736480c97689dd12d14351860764b70a1d823092a1ddbc471328c4bae4a899edd0e331c8aee
 DIST nss-3.16.3.tar.gz 6426732 SHA256 657711ff7a4058043b69019a66f44101d0234eae2b6b80ab900439dbf02add60 SHA512 2e829b021319a9d8c0cedec742f84c54815eed8e3b1042b5045f08746e5768286001e9517d2b69c2a5d705cd632c98f3a9227e651a492bae3ef638cc706fe31f WHIRLPOOL bd8fe296baf79b4cad2224a921bf6d0a6b6a1f13df5b64131f59964541d2ec1ae506a79a5a3b8dc08a47c8fcdfa5eafb866727fcf26c37d4e5e91a7ebb7886b3
 DIST nss-3.16.tar.gz 6378110 SHA256 2bb4faa200962caacf0454f1e870e74aa9a543809e5c440f7978bcce58e0bfe8 SHA512 e3dcde8213f7f131fe2f714ff2f45c6d7b9b2167e51dbf0e1a750cc4f83d9fa35e69408850de6600f55fbc9e26b29dc344548cb64849d6e3252476eadd7ee57f WHIRLPOOL d30b53ec36cacff9756b43780d904e32760cd5d0b75f1888b6fb80e0a87ce828f4e6189de63880ddce90bdf5d90123ff7e9fdf600f4df02ce59702898f08c11e
 DIST nss-3.17.2.tar.gz 6927414 SHA256 134929e44e44b968a4883f4ee513a71ae45d55b486cee41ee8e26c3cc84dab8b SHA512 a3d165bb2c578e7b5d90349729e85a2fce09260d069093080c76cce3b8a996c6489232324fd6a0c69b959321bcdf5f1806054f165cd6ce851fe4ffeb2883ae7f WHIRLPOOL 01b3cc546aa2dd0974caa2267aa9874b01cf6096f307a114393ba5a98adc216e0f2b217631b89b20752be5881f70fc1a7e94e0e90618707d5f9b9d18fd55d859
+DIST nss-3.17.4.tar.gz 6924699 SHA256 1d98ad1881a4237ec98cbe472fc851480f0b0e954dfe224d047811fb96ff9d79 SHA512 dfc44e28c303743a72b4553f471089bc991c3cb61d5f3071082c16400d5e4f216f84a2e44536570316fe0e798c14ca370c875dad791a873034595b9e4dd70b89 WHIRLPOOL bb6e1027c5237d12fe58b4c520536022d8d4e83183a78c3421fd46bf9c3503b1f0ca4644240e383f216ec1e5174c0ae4148372db68fb9f1c10275954559d5bbf
 EBUILD ca-certificates-20090709.ebuild 2126 SHA256 86820ea4d33d9e0e779c0a0d631242b12821bf4135ec6bccd2c284e948c51b19 SHA512 5c47bd113f19d733219b57c5f5845617fd37802a1a2556af928c6affdb30a210ce91d2b9f97a55c13a22c586f20abe0865a8ec7237ba1841bfadd5cba4184e3a WHIRLPOOL 472cffbb69b7888aeca35faf6e03ae7d862f839b74fef6617d2008f12d8ed6b5f9451ea0f536141b7fd80fd6a121dc8617ad1b87634127fe95557c95f74e1089
 EBUILD ca-certificates-20110421.ebuild 2119 SHA256 1223e4710e2d72fbb97f93bfa77351912b20b6ea07e83c7672bd24b1d812a634 SHA512 324615e914c150b991576df567b5f5042e527d05cd4674e44060771cf7e0e68cfa8495e432fa925d074b6602334d9b80cec50fdad7ae64cb3633c4c9726b42d6 WHIRLPOOL dffadcbc624cee7b9203c8ff6bba375508679c8d87ebb8a12da543d68cc937159b3f26b95bca94c444522e40c30b5b06741f1116233a6af3c6df5a428218fa16
 EBUILD ca-certificates-20110502-r1.ebuild 2116 SHA256 39b705809344be81df5d717a63f7909127481f9ec052c2169d74ac2eda508e68 SHA512 570c7611404cb2cd230bf5925967230aa9e2f90f84bad157d6da522ab5d49c08ae8e6a2170694a094331c549373b2d253388d67a69032f775f9a94dfe476c794 WHIRLPOOL c24f06ad859f69187caacb83ff2835d40d17a7e1e6c03c16cbaf7794c9eab1a2cfb01b7b58290d72abb4f36cec6a655e79efb9a9acd53e99ee5c6d75caf8193e
@ -41,23 +44,16 @@ EBUILD ca-certificates-20140223-r1.ebuild 6173 SHA256 16c147b61edca6daff8dce71ca
 EBUILD ca-certificates-20140223.3.15.5-r1.ebuild 6300 SHA256 a27cf48ebf50dd47571613da3d322f7a421154385e2345a568917fcd6f46cf2e SHA512 7511f43228addda16b4b53dcf9bfd4a9762c63520c8a90e6717707c87e8020a3b4a267d6d7343bed4f497aa97fc59615054e8ef8cea98c05d87523c45a2a5c33 WHIRLPOOL fe70d60cbbe289f5c0d55f84ab7ea5ab640a0165a8112707120ea13d29c03c69f5458fa3974d9fd74123016a873111700fca53d6a4edd1dee51e83489db4bd97
 EBUILD ca-certificates-20140223.3.16-r1.ebuild 6298 SHA256 bf12b98d046654227427e091d3af56abcd358a17713e5004e51a56ab11da392e SHA512 180f46e3cb916a625da0cab7808c674c4dcc8ec3a0244d7ff2586604a384355d9e9e7aa6e2422e4632e0fab8af2e3788ad3c4f249e63a4175c2a2996cb044475 WHIRLPOOL 872584b604b8deb5f77cc36b85dc209196f1fefb8e9097e03c51a3c6bc6ca883c8a62dc4186c655f5c55475e8c19bc7d1060b1831f9864eaf6a00cb67de31998
 EBUILD ca-certificates-20140325.3.16.3.ebuild 6291 SHA256 f35a9a2d1dbf40a6fc9da488d566bea236d86d84167dbb0a197874060d2acfd5 SHA512 51234db2b011b857e46d71be9b2befd27a9fa27336e580f12bfdd8eeb957dcb7134596e6e47787e90df829f84322b9ba0b264ed917c25bbf5945c9a8c4e2bb91 WHIRLPOOL 1d5ca40fc11b001884e4ec68a333007cea7ceecdd4c70d8562c08a25fd2079d1353dad2fd8f85a8e50921ce74d6efc49da86863a7361191eff7695aa6f190885
-EBUILD ca-certificates-20140927.3.17.2.ebuild 6318 SHA256 742d940aab7a79b2deb3b9d67659cf7ac6fe88552c1e83a3ebf92b3c8f2a28fa SHA512 7148a6ce42a074851082bff11db5736edaf7a4611ee0a5156fc50be8d946460dd993473a5e951c9a058c47dfd8c9b8918437b312e19a3bb6c142e40f325ad78c WHIRLPOOL d7a62d831f60de9fbe1f67d05cb237cc9d01f37ba995e6ccbc4778c7c109498cc7b14f20e76e57e1eba60de33f8b0fdfc0ff04ea1f550138d2b326c82b2f8e5e
-MISC ChangeLog 16512 SHA256 4a4a06f40f1f266551b0858eb8e675c95adf9512e1052266034bb0546dd0840f SHA512 c6d9fb93dd8ad971213f97cd1f706cd33557e9cf07977effde19e55408d41cde80d375037af5d3d021ec0995d221949742da0a20b69e2642907e9651ca536f88 WHIRLPOOL b95596ab0b6b801838de2e738d9156961c07bd931b63580c4c7e790a157a02eb5e1b238c4f053c991a97a37319129f55a4e01bd8871c1f8cdb6d1ca5063b0f51
+EBUILD ca-certificates-20140927.3.17.2.ebuild 6318 SHA256 ea83657eb4b5928685240d0eb65629cf0ef6e2cce06cea18c114c569b169df8c SHA512 58802d78814ab147ab049129e4ba1cf5c9db2a98ade4d1e89c0a768c525b3fd352bb7fe3a7d65a68d31ffec3683e34e8edaf7816f1b9d8a9bdeb27286bf03685 WHIRLPOOL 67dd83a5fc871b295b4f284931636acb46dc2ee75637496f2c02c6cbd70edc3ad59208a7d1dfe7ef806be695dac0354c7580596f6d087e95a9e78952830ff276
+EBUILD ca-certificates-20141019.3.17.4.ebuild 6312 SHA256 a31adaabcb4e9206b959fd642cfcf7b1510c6c061b33f75fd06ab5ebfa9391d0 SHA512 0b61196f6165f74e62161dcbd93b05ee8c20be197b396f78cc7e08ea619a73a62e89713db51f44f88edf52909505bd2944326d9f2f5123a514b46ceb625ec273 WHIRLPOOL 92112115f527ed2494e0d546240f72ed19ecacfdc688da9c65893e8467bc5e0703b1879d56152ca73be495f7fb05aea672da0e11db84ec734745271b57550ec7
+MISC ChangeLog 16841 SHA256 c254b40d04929b8e7f85f704751ff8d8af16f3004fa5b1ddf47d847a4a4693cd SHA512 4ed8094333f98b70abb68596cd6cb14fcb4f2efffb72e2d1090033330e5b273a6e5adf84471a402edd231fa311c3c118e2007e3f8c7b47a4f38a9b40b49c8666 WHIRLPOOL 534c8ad671378d4d57cfe4e9bacf390e15a8f6bfcb9986814678c9f3699024904eec85ba3a5c337e1ef48ce02a57efbe6ae029664ec38e4621bdfe4867373a65
 MISC metadata.xml 343 SHA256 770e903b1433ea49a4d4e8fc47084cfa0412e76d2ab59f973d80d2e3db2eaae9 SHA512 3d72166eaf516edbd6d68652f9debbc864046ab548f6e7c171c2790add07f436fb426781f5ef98bfc4b9c3f36e3b616c8b8973e5c601b13f2fa4bdf2bba3f89d WHIRLPOOL bbffa556e696d62479bcdd2d67b03368f412859a1eb9d47ae93f4b364d6e44aca229b20649f97b3a3fc0ad51e2b831b2e1cdd1da84b3abf8ffa17c5e75305088
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2

-iQIcBAEBCAAGBQJUQAT4AAoJEPGu1DbS6WIAcj4P/164Y0NbRgZ1AtSj2guH6uk8
-ByTA+TI/dWDZRbPr+WW35lRe6iEFnvSdrC4ve8l2Y5GOjagLF5rHoWY1maSmc3F7
-6cHlFqD3Aw4qgQkB4rUwnjBW0sxbFtjbXfOIKeGh0Fghff3z93oybFfeyo9mn55f
-zOjmuy3yJUt3JwgvJr70SNAeloVIOnUIN7aDO8Q2kotSG8VN9T8CrlLYu0E/pPjO
-4NT2SYWtsenilpSR5dkf87Xk6nqDFto5RqnxoefF7wzvc5NvTDLjBdJBx764YRUK
-cGCEF5pWBwhuZtOHDlj7PiAaiRt7FgnaSUF++X36xHYcQS5Q8iZUpZfLS3nRpMPi
-a8rCJ56VGHKsuluw4AU6hAwkKToSMLf4g9+rXht+BQDJ7QhhNmnw4B3O5QJvDPQb
-FRVHVcRbjc0inYAZXvlUgEhI5bJK0BQ0ngiugJS1EYp1ORMmtSjw2OEV3231UQRT
-biWp5yR0zlwT20rQqvvSXc1Vb3rVzC3knq4BFNwJzslgY7gCmHpZdXwzFrj8N9do
-2+K8YJMKSd6eRrx7iwiWflFLRtRJqKchHBv7Z54aUd7vT2eFzJnOQbHaJiX39Jbp
-LmnwiQ2S+GMEmjYj5KsADxu7m+eM1+lX4189f6wvWMXRVO8iifbCWLJryJq8WuXW
-5t26B7T0C0SJGNmhVK4M
-=whBC
+iJwEAQEIAAYFAlUO1tkACgkQG9wOWsQutdYBjQP+MH/aNlxmQv8fMmztZSIOzlix
+pZDxSsbwNeyqGIzwLiNoHeSsxHctiAJl/lThrnJakGxi77Ko4t9/jB/wBvdR/Ydf
+2Pgq+NrOt4e54MZfVzFw6qSlsnzjXCC/cw4/aU6+zU5mjZTD1xDQlsbejjO5wgsC
+aBC8acm06yTsrc48ocA=
+=8xTy
 -----END PGP SIGNATURE-----
--- a/app-misc/ca-certificates/ca-certificates-20140927.3.17.2.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20140927.3.17.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-misc/ca-certificates/ca-certificates-20140927.3.17.2.ebuild,v 1.1 2014/10/16 17:48:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20140927.3.17.2.ebuild,v 1.2 2015/03/22 14:52:53 zlogene Exp $

 # The Debian ca-certificates package merely takes the CA database as it exists
 # in the nss package and repackages it for use by openssl.
@ -57,7 +57,7 @@ fi

 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 ${PRECOMPILED} || IUSE+=" +cacert"

--- a/app-misc/ca-certificates/ca-certificates-20141019.3.17.4.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20141019.3.17.4.ebuild
@ -0,0 +1,186 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20141019.3.17.4.ebuild,v 1.1 2015/03/22 00:07:09 vapier Exp $
+
+# The Debian ca-certificates package merely takes the CA database as it exists
+# in the nss package and repackages it for use by openssl.
+#
+# The issue with using the compiled debs directly is two fold:
+# - they do not update frequently enough for us to rely on them
+# - they pull the CA database from nss tip of tree rather than the release
+#
+# So we take the Debian source tools and combine them with the latest nss
+# release to produce (largely) the same end result.  The difference is that
+# now we know our cert database is kept in sync with nss and, if need be,
+# can be sync with nss tip of tree more frequently to respond to bugs.
+
+# When triaging bugs from users, here's some handy tips:
+# - To see what cert is hitting errors, use openssl:
+#   openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
+#   Focus on the errors written to stderr.
+#
+# - Look at the upstream log as to why certs were added/removed:
+#   https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
+#
+# - If people want to add/remove certs, tell them to file w/mozilla:
+#   https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
+
+EAPI="4"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-any-r1
+
+if [[ ${PV} == *.* ]] ; then
+	# Compile from source ourselves.
+	PRECOMPILED=false
+	inherit versionator
+
+	DEB_VER=$(get_version_component_range 1)
+	NSS_VER=$(get_version_component_range 2-)
+	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
+else
+	# Debian precompiled version.
+	PRECOMPILED=true
+	inherit unpacker
+fi
+
+DESCRIPTION="Common CA Certificates PEM files"
+HOMEPAGE="http://packages.debian.org/sid/ca-certificates"
+NMU_PR=""
+if ${PRECOMPILED} ; then
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
+else
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
+		ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
+		cacert? ( http://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch )"
+fi
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+${PRECOMPILED} || IUSE+=" +cacert"
+
+DEPEND=""
+if ${PRECOMPILED} ; then
+	# platforms like AIX don't have a good ar
+	DEPEND+="
+		kernel_AIX? ( app-arch/deb2targz )
+		!<sys-apps/portage-2.1.10.41"
+fi
+# openssl: we run `c_rehash`
+# debianutils: we run `run-parts`
+RDEPEND="${DEPEND}
+	dev-libs/openssl
+	sys-apps/debianutils"
+
+if ! ${PRECOMPILED}; then
+	DEPEND+=" ${PYTHON_DEPS}"
+fi
+
+S=${WORKDIR}
+
+pkg_setup() {
+	# For the conversion to having it in CONFIG_PROTECT_MASK,
+	# we need to tell users about it once manually first.
+	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
+		|| ewarn "You should run update-ca-certificates manually after etc-update"
+}
+
+src_unpack() {
+	${PRECOMPILED} || default
+
+	mv ${PN}-*/ ${PN} || die
+
+	# Do all the work in the image subdir to avoid conflicting with source
+	# dirs in $WORKDIR.  Need to perform everything in the offset #381937
+	mkdir -p "image/${EPREFIX}"
+	cd "image/${EPREFIX}" || die
+
+	${PRECOMPILED} && unpacker_src_unpack
+}
+
+src_prepare() {
+	cd "image/${EPREFIX}" || die
+	if ! ${PRECOMPILED} ; then
+		mkdir -p usr/sbin
+		cp -p "${S}"/${PN}/sbin/update-ca-certificates usr/sbin/ || die
+
+		if use cacert ; then
+			pushd "${S}"/nss-${NSS_VER} >/dev/null
+			epatch "${DISTDIR}"/nss-3.14.1-add_spi+cacerts_ca_certs.patch
+			popd >/dev/null
+		fi
+	fi
+
+	epatch "${FILESDIR}"/${PN}-20141019-root.patch
+	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
+	sed -i \
+		-e '/="$ROOT/s:ROOT/:ROOT'"${EPREFIX}"'/:' \
+		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
+		usr/sbin/update-ca-certificates || die
+}
+
+src_compile() {
+	cd "image/${EPREFIX}" || die
+	if ! ${PRECOMPILED} ; then
+		python_setup
+		local d="${S}/${PN}/mozilla"
+		# Grab the database from the nss sources.
+		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
+		emake -C "${d}"
+
+		# Now move the files to the same places that the precompiled would.
+		mkdir -p etc/ssl/certs etc/ca-certificates/update.d usr/share/ca-certificates/mozilla
+		if use cacert ; then
+			mkdir -p usr/share/ca-certificates/{cacert.org,spi-inc.org}
+			mv "${d}"/CAcert_Inc..crt usr/share/ca-certificates/cacert.org/cacert.org_root.crt || die
+			mv "${d}"/SPI_Inc..crt usr/share/ca-certificates/spi-inc.org/spi-cacert-2008.crt || die
+		fi
+		mv "${d}"/*.crt usr/share/ca-certificates/mozilla/ || die
+	else
+		mv usr/share/doc/{ca-certificates,${PF}} || die
+	fi
+
+	(
+	echo "# Automatically generated by ${CATEGORY}/${PF}"
+	echo "# $(date -u)"
+	echo "# Do not edit."
+	cd usr/share/ca-certificates
+	find * -name '*.crt' | LC_ALL=C sort
+	) > etc/ca-certificates.conf
+
+	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
+}
+
+src_install() {
+	cp -pPR image/* "${D}"/ || die
+	if ! ${PRECOMPILED} ; then
+		cd ca-certificates
+		doman sbin/*.8
+		dodoc debian/README.* examples/ca-certificates-local/README
+	fi
+
+	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
+	doenvd 98ca-certificates
+}
+
+pkg_postinst() {
+	if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then
+		# if the user has local certs, we need to rebuild again
+		# to include their stuff in the db.
+		# However it's too overzealous when the user has custom certs in place.
+		# --fresh is to clean up dangling symlinks
+		"${EROOT}"/usr/sbin/update-ca-certificates --root "${EROOT}"
+	fi
+
+	local c badcerts=0
+	for c in $(find -L "${EROOT}"etc/ssl/certs/ -type l) ; do
+		ewarn "Broken symlink for a certificate at $c"
+		badcerts=1
+	done
+	if [ $badcerts -eq 1 ]; then
+		ewarn "Removing the following broken symlinks:"
+		ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
+	fi
+}
--- a/app-misc/ca-certificates/files/ca-certificates-20141019-root.patch
+++ b/app-misc/ca-certificates/files/ca-certificates-20141019-root.patch
@ -0,0 +1,116 @@
+add a --root option so we can generate with DESTDIR installs
+
+--- a/usr/sbin/update-ca-certificates
+++ b/usr/sbin/update-ca-certificates
+@@ -23,6 +23,8 @@
+ 
+ verbose=0
+ fresh=0
+ROOT=""
+RELPATH=""
+ while [ $# -gt 0 ];
+ do
+   case $1 in
+@@ -30,18 +32,23 @@ do
+       verbose=1;;
+     --fresh|-f)
+       fresh=1;;
+    --root|-r)
+      ROOT=$(readlink -f "$2")
+      # needed as c_rehash wants to read the files directly
+      RELPATH="../../.."
+      shift;;
+     --help|-h|*)
+-      echo "$0: [--verbose] [--fresh]"
+      echo "$0: [--verbose] [--fresh] [--root <dir>]"
+       exit;;
+   esac
+   shift
+ done
+ 
+-CERTSCONF=/etc/ca-certificates.conf
+-CERTSDIR=/usr/share/ca-certificates
+-LOCALCERTSDIR=/usr/local/share/ca-certificates
+CERTSCONF="$ROOT/etc/ca-certificates.conf"
+CERTSDIR="$ROOT/usr/share/ca-certificates"
+LOCALCERTSDIR="$ROOT/usr/local/share/ca-certificates"
+ CERTBUNDLE=ca-certificates.crt
+-ETCCERTSDIR=/etc/ssl/certs
+ETCCERTSDIR="$ROOT/etc/ssl/certs"
+ 
+ cleanup() {
+   rm -f "$TEMPBUNDLE"
+@@ -66,7 +73,7 @@ add() {
+                                                   -e 's/,/_/g').pem"
+   if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ]
+   then
+-    ln -sf "$CERT" "$PEM"
+    ln -sf "${RELPATH}${CERT#$ROOT}" "$PEM"
+     echo +$PEM >> "$ADDED"
+   fi
+   # Add trailing newline to certificate, if it is missing (#635570)
+@@ -79,36 +86,36 @@ remove() {
+   if test -L "$PEM"
+   then
+     rm -f "$PEM"
+-    echo -$PEM >> "$REMOVED"
+    echo "-$PEM" >> "$REMOVED"
+   fi
+ }
+ 
+-cd $ETCCERTSDIR
+cd "$ETCCERTSDIR"
+ if [ "$fresh" = 1 ]; then
+-  echo -n "Clearing symlinks in $ETCCERTSDIR..."
+  printf "Clearing symlinks in $ETCCERTSDIR..."
+   find . -type l -print | while read symlink
+   do
+-    case $(readlink $symlink) in
+-      $CERTSDIR*) rm -f $symlink;;
+    case $(readlink "$symlink") in
+      "$CERTSDIR"*) rm -f "$symlink";;
+     esac
+   done
+   find . -type l -print | while read symlink
+   do
+-    test -f $symlink || rm -f $symlink
+    test -f "$symlink" || rm -f "$symlink"
+   done
+   echo "done."
+ fi
+ 
+-echo -n "Updating certificates in $ETCCERTSDIR... "
+printf "Updating certificates in $ETCCERTSDIR... "
+ 
+ # Handle certificates that should be removed.  This is an explicit act
+ # by prefixing lines in the configuration files with exclamation marks (!).
+-sed -n -e '/^$/d' -e 's/^!//p' $CERTSCONF | while read crt
+sed -n -e '/^$/d' -e 's/^!//p' "$CERTSCONF" | while read crt
+ do
+   remove "$CERTSDIR/$crt"
+ done
+ 
+-sed -e '/^$/d' -e '/^#/d' -e '/^!/d' $CERTSCONF | while read crt
+sed -e '/^$/d' -e '/^#/d' -e '/^!/d' "$CERTSCONF" | while read crt
+ do
+   if ! test -f "$CERTSDIR/$crt"
+   then
+@@ -151,14 +158,14 @@ mv -f "$TEMPBUNDLE" "$CERTBUNDLE"
+ 
+ echo "$ADDED_CNT added, $REMOVED_CNT removed; done."
+ 
+-HOOKSDIR=/etc/ca-certificates/update.d
+-echo -n "Running hooks in $HOOKSDIR...."
+HOOKSDIR="$ROOT/etc/ca-certificates/update.d"
+printf "Running hooks in $HOOKSDIR...."
+ VERBOSE_ARG=
+ [ "$verbose" = 0 ] || VERBOSE_ARG=--verbose
+-eval run-parts $VERBOSE_ARG --test -- $HOOKSDIR | while read hook
+eval run-parts $VERBOSE_ARG --test -- \""$HOOKSDIR"\" | while read hook
+ do
+   ( cat $ADDED
+-    cat $REMOVED ) | $hook || echo E: $hook exited with code $?.
+    cat $REMOVED ) | "$hook" || echo E: "$hook" exited with code $?.
+ done
+ echo "done."
+ 
--- a/app-misc/toilet/ChangeLog
+++ b/app-misc/toilet/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for app-misc/toilet
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/toilet/ChangeLog,v 1.23 2015/02/27 10:01:26 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/toilet/ChangeLog,v 1.24 2015/03/22 22:34:30 nimiux Exp $
+
+  22 Mar 2015; Chema Alonso <nimiux@gentoo.org> toilet-0.3.ebuild:
+  Stable for amd64 wrt bug #534882

  27 Feb 2015; Michael Weber <xmw@gentoo.org> toilet-0.2.ebuild,
  toilet-0.3.ebuild:
--- a/app-misc/toilet/Manifest
+++ b/app-misc/toilet/Manifest
@ -4,15 +4,23 @@ Hash: SHA256
 DIST toilet-0.2.tar.gz 862528 SHA256 76301f651f2cb4172010c5629e43c2d54ce1541fc0de902a52cbcb1cc306a4b9 SHA512 a41696855b5fd1a49bbc1ade105307c345b3da9458e8a12fac54df02be25a023ad17d1afbc904ee1f2cfaaae08c3a15f7d7a49ece6a9ae9d6730976e91831d41 WHIRLPOOL a99652a161f948a71e88de7948a22ce66cf5ee4bd1f31fbbb7fb5e76bde991ce8ee0c0c3bb525db6f6089657cde7c6bb1ffd001d609f186ac9c625c0d7492571
 DIST toilet-0.3.tar.gz 864880 SHA256 89d4b530c394313cc3f3a4e07a7394fa82a6091f44df44dfcd0ebcb3300a81de SHA512 64b9389562a51e7dba6e3f1dd27c5340f90df25d8fbf1e041b539f5243b5b6b7af1ebf033a511053ad72a73908d496a1f3d14c4ac656425aefb8364a0664ceed WHIRLPOOL 0c85602851649e3168706063bdb772820e6b4b15f16a982ace772499fbbdddab5baaf8cf6d1cdd1d352dc8a4de667a756c75b22fe270ccb9d3325decba8b9e0c
 EBUILD toilet-0.2.ebuild 773 SHA256 a93b4427261f361af927908bae442e819990064a372402326262f6789f201767 SHA512 61a1f76de748152ef3141a6c531355210948bd610ec9f90a7bd15651a261b4d7b8acbc98b67b0c151b9a274874bd29633bd18be1d5e65352dc1cbaf03ca6c3bc WHIRLPOOL d362e374d2177fac6e52c4bc379ec74d6b8fc586911bef59ac286195a99f43463d9263b44ecd425e13b0d5276ace0d4f6341b5a394c2b9fd1301674febf06db3
-EBUILD toilet-0.3.ebuild 769 SHA256 880e440bb2c01fbfe804ccebc5d5846333ceb6426ad6ad1c391836f74dcf3ee5 SHA512 79a7002459520ee573da0229b1c13b0984a3956e652eba6402402c4e82f7847ac42904419a55197d474cc7a82db08ce8115d8243618df110e87e4c981e6c1b51 WHIRLPOOL c3ff633c134cfc77bdad73cdb4d2ab2380e849c63fb2eb3a99a0bba848d0eb6e40d1cac3b4f66ce7cfc2adc961c7f5d7b289faacb2d43f5ab132bff0418898a6
-MISC ChangeLog 3288 SHA256 9e8d1e05fd859aed5da8445a2c52bc8539f99112a136c5e46578dd6bdd29bb1d SHA512 cce3a1311b678e172610c465f883bc4c41d3aa3b7691d98dce190a6d2efa4e7ced6bba4d185861917d9ac83c8899404fb5fe2576175d2b5724ac79da523a2821 WHIRLPOOL f3bdb107791bad1e5e0d927ca9cef103819168e4b3e64bc56b0a5702079c8da8abd9ba45c8c02e214ce382ce51e0f85a234696b38811dc34fbbff397eaf7d365
+EBUILD toilet-0.3.ebuild 771 SHA256 6a329a900f81d7ea5e7a6413c28e7ac4c345c4cd172938d8b1b46c924104f6ae SHA512 bd45e58a76211adf9bea30eb3c339f7219b0fa5866700ed4455fc598940b46933d325432e30ee5473468f68a637afbf63ab812378a1a3370786fb5c3f3662c6c WHIRLPOOL 760107ad71ca72c9c0423d9f3dd72a3c6b952df27f5a23fb6c1723b2bf414ab07fc0ddfb3b63e14ef18be8b60ae6e07e52113a4141899b4c9d1861be16af15c0
+MISC ChangeLog 3394 SHA256 1da3739d75c0767156ff99d819b3e048dcadfd56add486176ff2eda582dc0fa9 SHA512 42bb55f92ac24d340ebb62c67d49eebfb791f1d04119237ba689d18dc62f302958953933b61a8b9444824eba6ec10bf8b3bc93ba2abe2f1dd0b0be6762f40b00 WHIRLPOOL 09cc3aacf9ce379e30cccc805bfb8034b829f3606be85d4792f0a75dafdd652f9bf2c3cd67c60e72f5dcc6d14d31fdf4b6c8d94b6cf38122338c4af433fe6b6e
 MISC metadata.xml 235 SHA256 5a2c1c7fc74310dd0f611cf623b467a4ffb465e6be2caebf88132963771cae43 SHA512 aa6841d794e7f30a9a62cd506f192a37e4858e69a722ed61b34804c20d71c113001daba7a4701b27f403351859ec2136c2888f5fde9b9e4dcf6f9c0b557a0871 WHIRLPOOL d67f900bffd2a730e6ef26aab435e4671a48972d682ca17ab5ec627c4292bb174539f520dd5cb9a98149813d904d1e1db343c71565dcfe589ef3ada4a059bd99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2

-iL4EAREIAGYFAlTwQHxfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky
-N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JBl2AEAjlZWBh5VMcVUuXAVlTO9DUfq
-3fy5n4XuGzao7ytWM9YA/R5KWhcOTOvDgz+1ZElTen27gDMTkQ1UOQzreg9gUR7E
-=xnBz
+iQIcBAEBCAAGBQJVD0QfAAoJEH/rgyzyU9sV4AsP/0nL1OuaSHFAETawAh2K4SCP
+0HTHOeQWc61tbmnhRv6tbUk2m1UWkxk3aKcZhaBknttG4hpzymzMVAyX6ywOsrpC
+jEt4rXYC+dwiWF4Zoxv0RnTEn4kdyahC2Y/VrI9S05y5XQbsE9c1FaroZYV+FuTU
+4pkZJUggS4f/2RJevt+YI9cm5Wi0kvAThk9XMGWsBjdpx9qJ0Ff2v2n240Hcu6Ij
+d7o5EjJAkX9TpDK9JrXS5r7xo/50TJM2sLwzzLfO0tGMMZc/wHtF+1PR7Kgbf6OH
+0Q8nL6cokyFzrgl/NRVk+Wm/NSAW3AlK1/p3aAnC4c/tYk1AR8a+ELK8ateLvus+
+34KKUDyAd5KN/MR5ayl49q3lSAQyND/FwFxmVXOCZePF5iK5qJw2X2++ZfGOJ4Ps
+5rO/CGVC1VaylPsw6tvzBZuK19dG2EDz5LWBGLB9pKgp8Y6xbU9pYWCMq1jHtLzz
+zKO/UrnTVgq2rSwpsJuFcVtuBJOdcPBKJ0NhLFHpemhDWdtibBQaIMJkq6PeIx72
+oQedpZI+60HV1zEvcyN2+VLzDv3T5nJtSEOUwgcq1ozAAUn9pxbS1DfISAooK+G2
+L9lmegduXh3RM7VXA7fhu5pN+t0n7Ykhycv6QsQiE3VGaNYLjWujyZLuEMNdb1B1
+rXxcswPfTG+qIyZjWBzr
+=zitO
 -----END PGP SIGNATURE-----
--- a/app-misc/toilet/toilet-0.3.ebuild
+++ b/app-misc/toilet/toilet-0.3.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-misc/toilet/toilet-0.3.ebuild,v 1.4 2015/02/27 10:01:26 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/toilet/toilet-0.3.ebuild,v 1.5 2015/03/22 22:34:30 nimiux Exp $

 EAPI=4

@ -10,7 +10,7 @@ SRC_URI="http://caca.zoy.org/raw-attachment/wiki/${PN}/${P}.tar.gz"

 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""

 RDEPEND=">=media-libs/libcaca-0.99_beta18"
--- a/app-portage/gentoolkit-dev/ChangeLog
+++ b/app-portage/gentoolkit-dev/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for app-portage/gentoolkit-dev
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/ChangeLog,v 1.138 2014/11/18 18:17:28 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/ChangeLog,v 1.139 2015/03/23 02:25:31 patrick Exp $
+
+  23 Mar 2015; Patrick Lauer <patrick@gentoo.org> gentoolkit-dev-9999.ebuild:
+  Whitespace

  18 Nov 2014; Michał Górny <mgorny@gentoo.org>
  gentoolkit-dev-0.2.8.3-r1.ebuild:
--- a/app-portage/gentoolkit-dev/Manifest
+++ b/app-portage/gentoolkit-dev/Manifest
@ -1,6 +1,3 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gentoolkit-dev-0.2.8-tests.patch 902 SHA256 607369c98bfa0beeb0dcff96132ccc92d5c98183a049921a833d2c98105423ed SHA512 00b6fcc56db74bef1281c360d1af477e888a6aff4e9d69059a0e1a5b5976f46fed7aeb500d7faab270eb5c9f434a3943cd7fcd87e91154252146c9de6abbaf04 WHIRLPOOL 333a31a61c924d6ed8cc6c0a028b81beaca59ed50dfcc104a797aa5fc0e5f63bee97c9f0293a56ab166bcc24504548d62e5b329d09b9a77dc79029bbb72d0fe8
 AUX gentoolkit-dev-0.2.8.3-tests.patch 897 SHA256 993cf921d0e03806199fee9734a656559a6d7bf20b4427a2ef11f578cff3dc65 SHA512 0b5f3555a8374c1765770c27a950a26a3e7f7f222a5cf1cb1a5ed326d1d7757fd40639eaf58c54daffc668929bd25e76fffb108c75f20e5f0a2937f74a03e8cb WHIRLPOOL 7247d88f8ec56be1312f6978dc157721cd62336bc639cb29f54a729a336253485655fc6aa8be1b44373fb0be4dcc56b72a7f2e2185a09f84bd9f3c44a14bfff1
 DIST gentoolkit-dev-0.2.6.14.tar.gz 56556 SHA256 df1e6002215e8397c39924c550bfb3d984e6e087f402dd3f52965b4885219d8f SHA512 3e28e3c5d2c6e763a22d50826492cf0f7532d70063bea830ef64c68e41b4cf99b6cfab001d7e6d711061d20f54582350ba8391128b30751313f2887cea13a97e WHIRLPOOL 06edcbc2f90b0fbd0488ca3d758c78f64ff7510ebaefc9fd382e3125bac8e26d491e2ce1087d301e79311920fc579dbdc8d78fe554875ed215a748d96e4b3f58
@ -12,25 +9,6 @@ EBUILD gentoolkit-dev-0.2.7.ebuild 1184 SHA256 6dcc6d1f8fe6296c17835b5b6728f06a1
 EBUILD gentoolkit-dev-0.2.8.3-r1.ebuild 1510 SHA256 299785c7a68f552bd7bd1e4d6b9dd5a3d6129f287c0ae4f844e086ee50e87ae4 SHA512 cf3a199ece9a780ae4366741ecedcb3c5773beabbafbf16e3571995f8b3767e8398ef0a9a3540b5c9fe8563c8770ad810f75852241c189f254401d673fa03adb WHIRLPOOL 9b77264ac1914de9ee2a3493281a323c02a19d902dfdad73661b92ef15a1b8d00749627dfd8cbcb20285b280bc2545bbf4d6dc2efb87f9df05709257a8ca357f
 EBUILD gentoolkit-dev-0.2.8.3.ebuild 1273 SHA256 f166a3cef3a570f8d788917fdfe105c0030bec858140c6c8416e658c12dc2f72 SHA512 bf51a80e78d59ea514defcdc887a02a263c9fc5b47ff4e7376a73477eb7962bbe255151d712c8e260acc782a26629bc3a9a11267ba4bef86573cd12e3e94745a WHIRLPOOL cc61211c78e8eedc6e8c4ac1771ad649f1dbc9f72acf56ce9849dffde19c726945acaf410249fec10d94806327c3744b1e72b8146c0b66c595c6238ecc3dca5d
 EBUILD gentoolkit-dev-0.2.8.ebuild 1248 SHA256 d96195658437431ec741da28eb22f12e59bb807a7866af44d463a1bb7bc8ce45 SHA512 e62d6a7bdb53228cd511ecfed5e5731c62b5f9a589f6bf95d002ffaeecc932b3711af3c523ba8a78469a9bac5ac3d8ae1c6c1fde0f54fbe8c8ce0702611d4c6a WHIRLPOOL 099be6a1042a1b08bad35a44395b6286641326627aece0d62c9c6101ac6a7fea253e2938b6758c6fa71846c57556893670efea148fed4c957f57aa60c0b3354b
-EBUILD gentoolkit-dev-9999.ebuild 1275 SHA256 af76bee5d08b92fe01765c2882123cc63fbb29abc4a7a0c2e00bdc0523f9d76b SHA512 f02938a85bfe5e6bc9c357821c074ac2169143113347b49e424788998fea1648c5f125ae64098f47c14f3f3519c033abcde8f60d307471cacdaee4a3cbb59d8e WHIRLPOOL 83ac5b10e5d32d40da9c2a5cee1054004743e85c0dd84c2afd3579db1b4d3fc0648311861e014f6230b65bf602a320e909da33624ac2b8ded4f5ce6ec4ca0a2d
-MISC ChangeLog 21360 SHA256 7b451f1cf315aa93a933031f48ea5f33cfc8e07595d1c1d29c8fdb99c8582f8d SHA512 0809b165ac22514c9651c2676bd94863ab8af96ad98260c4768ea702c1d0eb44a26fd0978bb5de32bde4311d3d043680868896877722c87ac482c14c51cccd8f WHIRLPOOL 05555ac68b5cb9d4711b6a0dbf421fe97a57a2d9350fbd891c88e7bdd6c0652ed59e505648641a2c17d60722c5bf6e0490b03980987e0b8d487de8b90d12ded5
+EBUILD gentoolkit-dev-9999.ebuild 1275 SHA256 73b2056e623e3150bbef8dc394405ea7bb053602fbc475679e2d752294c81905 SHA512 02670b36410cdb8f8af1c54e0315123892660b5dc0956ae936ccc0be1ef4b484a596881539c859e8d681299766a6180d8f555f6646f2f7f268ab6624d51fdb91 WHIRLPOOL d020780e954eaea6e188ca4fe63900e40b1e3dc13213f0e4b441e2cdcea0a6d8a479a9e333d0530221cfe8b5069c581e801d53fa105859581d3c17c37c449277
+MISC ChangeLog 21453 SHA256 69a81e310a9cc0140626ba38dc76a3a1d650cdadd7ac8aab439d34eef7873c96 SHA512 d6effd1587157ad4731a8b0fb6214fb31cbe30b4c50a11deacde2e8960d2899bf5431adaf8bd29cda4bb95cfa1982c8539ec9443103f64bd5f5e3e0aa74107e2 WHIRLPOOL 0b493b31daa8972f824190f7ea0784fd3b9cc7cca2ebe42e02b13537ddf9f5af42959fc3b468fd5ee67a9f279ea4b5e2682d762d1d3beb510c47050a4522b1dd
 MISC metadata.xml 289 SHA256 f87d734bc9e4ddaf3323fb85a5d36e80395d2eda5ac3f8e0c1f1ee0b74ac4604 SHA512 b1f377b70097383c03f567902fcf9f96571770861ef489381c6db0fa139528e519631e87ee9832c95a35bb3dfa3752c7ae4c9fe5f597b783bd58fe6a69d8449d WHIRLPOOL ff92b728d58a85f4ff1c02576545709c931c95ffa0a7d3820a5a5012e3508759c1494879bf0093be830de2f905ce51772a2b7b38f9b5a310712ed8b55989e625
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQJ8BAEBCABmBQJUa405XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOj/0P/jIQdUgyscDMB58p5HkUWlav
-F/tlksYZBSM8aEXTdTHdGGmzhIExGAwbq5c4gBCNnUw+TxRqJwLm8se4clKidUmd
-eUNgCl9IHumDW3yiG1fNdk02CuXHCXoWN9QFFN2k1D2fi0i0HLzuNx2HoeS/2Qae
-CKZ2I+B3pMGZtUUgda1T1g2+AAnHokeXosTfTtwDhCQFs4I3WUVwCpEDiaRMKfxn
-oN58p/31+KzuHc0g+JMWn23qhZB5+cGvofzv57JNq7kARNj4EzjA7q2QSYwzHbqz
-acldCub/bLdM2IdEu4mP6INry8YNupnzwnBsZiL+6Sf/41Eg8lJzQyI2Ft74rnbC
-uhST1toYjkzN9qnzPxcCIPb8jlukgHg5IXkls398uwI3lzy8cifjL/RaOT9lyARa
-cEtzpaqpH+y6MHmHju2f/fFbx4nNKfLKy/Mz6BmN55w3bbKWTh8Nr9jKUzqRCuZW
-sJ1YcvwoRa7c8iQkivgttmweViaj+1XWTxaYxod0I5z70+OzYweX2xXCI+BUO/ef
-KjJzr2MU4w3hm9CV2RF7lXqCMmZy6qqbGPiv/cdrEsLlohxYZMuq0rr0jz3KwGCx
-AQlbvCACQQeHrm+VLmZurflf0t3xZ6enc8hmNfa2GkVrg8625WjEw3La4hOqwNOs
-pfZKSLfB5bKHBowLDM72
-=aiPz
-----END PGP SIGNATURE-----
--- a/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild
+++ b/app-portage/gentoolkit-dev/gentoolkit-dev-9999.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-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild,v 1.13 2014/11/18 08:53:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild,v 1.14 2015/03/23 02:25:31 patrick Exp $

 EAPI="5"

@ -33,7 +33,6 @@ DEPEND="${PYTHON_DEPS}
 RDEPEND="${PYTHON_DEPS}
 	${CDEPEND}"

-
 src_test() {
 	# echangelog test is not able to run as root
 	# the EUID check may not work for everybody
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.285 2015/03/15 13:16:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.286 2015/03/22 19:47:18 tetromino Exp $
+
+*evince-3.14.2-r1 (22 Mar 2015)
+
+  22 Mar 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +evince-3.14.2-r1.ebuild:
+  Make browser plugin optional (bug #535704, thanks to Austin S. Hemmelgarn).

  15 Mar 2015; Pacho Ramos <pacho@gentoo.org> evince-3.14.2.ebuild:
  x86 stable, bug 534012
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@ -19,13 +19,26 @@ DIST evince-3.14.2.tar.xz 3089840 SHA256 4c591d0b879092a5f6c9140b75f15bdea3665a3
 EBUILD evince-3.12.2-r1.ebuild 3079 SHA256 eddee9e7f9b38d446d45ea8787b195b440193c0b63804ff2743f5cd8b2f2b842 SHA512 97c30cd18809a709aa03ec72fd30cce1c56841948d19e38fbd2a62bc67bc197cb6f59fe6f8ddf8c19cb8ac32388d5f6bd8d649f67e22e854735a01bacf9d8fa5 WHIRLPOOL 95abe41468ebf09d7dec931326266a83a8ef7204b2c37f75f835a18ef717a0c459ec8c2666b83c5c94ebe60a5356cb77661674f0568c2f765d02939a12b510ed
 EBUILD evince-3.12.2.ebuild 2721 SHA256 3d006e1dee77402054fbe99956455c6d453971ef86593ace3d22f59bfc837809 SHA512 3e7e7f36856ce2a4a7fedb7344857aba1b1ea16946be2fd5076bdea2b42c092f1cdd26b1860ca0b8828dc8cac6b442dcc156eddff64c7b08eb4853dc4395b817 WHIRLPOOL fc352d151c630d229da75e0a3ac37c3dff2ac0d1a0b9d1ba087c847608ed438d53f7d959d252bb46b49cef9d4af888404f7becf078463a9fc8a5f7df8b862980
 EBUILD evince-3.14.1-r1.ebuild 3899 SHA256 2ae35b7c209aa0f7771bd41197e5b103d93e43fc436d9ec93e78375e68503027 SHA512 45cbd2c1e3e3c083953c18fccb913126667b18e1b74b5032923903297392c4a2f6d07c7b7102373f6287d17684bf510782fa163e3436ac7ed969d90ab370c0fe WHIRLPOOL 1f51abafb20a2a953e0df9bc71a0a09e44c2ea8a4295a476e1c83b2ecf7c2cf45fcd554b9784de3cbfa933b3c8186e16226dfc68e203f8599fd5809898319a27
+EBUILD evince-3.14.2-r1.ebuild 2953 SHA256 a49addfbb9c231a43ef505a202744ca6ac977ce0dca2409f795091013cbf4c37 SHA512 7fc4db02efd88f80d125f518b1d49296ccf76cec5167b89ea70d60f698bdbafbd6b386d00260d4cc001538be690e8fa2539a42a3fdf9875332976ed84775c9f8 WHIRLPOOL 8eb9264bba876f10151f56b50791820aa3e138c8d05e1345a7485d24121fbe072e19493b7102ea7b98726ebf989a2813e227c023b3bd9758d4456a9b7a4c5c4e
 EBUILD evince-3.14.2.ebuild 2921 SHA256 ed36e1f0e8619a4d27191f762ad467deb168043fb24220add5358560e824e509 SHA512 329dc842703abe34fd7b68f6e24de4fd7adcd9633de467e16c0dab072bcafd0a52b6ab927a26f627af1c7feca938f55680d8ab367da9d7587da62f75ea1b90f5 WHIRLPOOL 319cc1981044a09f5a6b0ae431d5ece62eb36030a40b6612aa3e215ed801ddd0e9ecd36d0f4e409e037c7f24c16855e21b4d33f0cdb23ed4a1f0af40b92b5642
-MISC ChangeLog 43855 SHA256 f9c6f9a165edb5a1cdce2d737e0c3f1ed6ffb5c5b0c98319cb597b8276727f52 SHA512 a2af61a7b0a90ca84c41dd2c567618d69cc28ad8b3bf806250be9c889a0e229394e1a35cf0b0573df87dde77a687026150ca7feb898ef7ce033a5ffb43cc2fb8 WHIRLPOOL 75cb97ee348b960a7c30a301c24134d30e4834f218515d48e256ea94e47d26b434ce84ff295d62715bfacd633628f76b7b432ca52f340924bcd7e5a5108e3276
+MISC ChangeLog 44058 SHA256 f80c35f074391fe444c6a69e8fdd12b7c29f3077e777556163bf375d2a841f38 SHA512 ee02ebf5f8381bf4e2972216194f223822af609b9817bedb4edefbcc0d9308f42c265eca8fdbcfb8503fc9ee7c4579b6af0ec4d9831cdc3191b68e2ea54c21b2 WHIRLPOOL 93ec1963d18ee8fdc8977a187bde8edd75a300d95e35bc42f7be94311b3bd5621f55976c3253d7577558a2666ac4b0e98848b9c5a1f758154e876e8fc7ca7c71
 MISC metadata.xml 587 SHA256 6977b9daf0c11361cb1a1e8f44990a728c1420da4daeb5b8aacb0c4aa315ba34 SHA512 234effcc88c91018a986c4513dc7e1436123f0a4b25725bed5c704ae18143bd2827c3d97e39015d0f6b7b0218d32adfbc4f483899493cfbc47de6648bad21020 WHIRLPOOL 52deb1b8aa08dfcb8e4b655a10b00a83221b1a9918e0e26128718e50e89fe0fb3dc2b45dbf362534d41d31134ae5620e449704a7342eef74c9f3be30d8480056
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0

-iEYEAREIAAYFAlUFhgMACgkQCaWpQKGI+9Q7EQCfcr37LkrnTC5pXoPecIbGLAYH
-UIkAnRl19U+H29Gfe+aHA07cnnJ0R2Pc
-=vIwV
+iQJ8BAEBCABmBQJVDxxHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNIcYP/Rk1Ut7IxaBZxquqLvD1j/Jj
+Sa8BB+RNP0wh33tE2zzqerqyV4fsLPT2yDiPodVMGzzgQ0bMzy7IirKrORHiM6m6
+vvUtkImoGCb1sUQTJSQGnpMxXyocL7EeBZmN/s9za3t+2smeIPdqdGw7WMxRpNxj
+O3kxiHl9TEkEIguQpVDzFkis4jLKR8YYJkKeTa2mJgzIDyAe5jLN6vYUwuqbgBjA
+B3pzILnG69l/0ypkVmZo2ZiM59fN/VJHkPl9dyhzSsUXHVe/hNqTaxoHqrDVPg3i
+IC7YAv3BzzLqkv4qJInH6/uJFAaLTyIxNA+rikIGhOGo7IrOmsX/qDPcmwIXi9KV
+GaOTbaNUSNECmlYJFG0bExCu0Z6lWiWYSBrMC0XMA/2hEL+Z9oDMr3UWd4dcWb1f
+NVeURmZU9I7Pz8zF99xIzkbkYk80Fv9IptVwSlCRzk7O7TNR9ubLCv7TtGToHDLY
+9a9BHbC0HaPS5P9FLomHcF0wGuyVPIWV2+vKV0/YAwwuN12lxh3CXUuXqrVLsYJx
+rUZSYuQnDyCFXUTiy+YA7OWVSKnDokZPskIT9WPhSnAoQ9G7kw9IcHxXfA+OVQtb
+0S+Fhk2KxrqnMsEwnE0w0wpvgnCD1+TSVZzpbzWrslXuX0NjWu8Vm4/x6QOZglrh
+P+Da4chByeHfesGmW3cb
+=0kZS
 -----END PGP SIGNATURE-----
--- a/app-text/evince/evince-3.14.2-r1.ebuild
+++ b/app-text/evince/evince-3.14.2-r1.ebuild
@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.14.2-r1.ebuild,v 1.1 2015/03/22 19:47:18 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
+SLOT="0/evd3.4-evv3.3"
+IUSE="djvu dvi gnome +introspection libsecret nautilus nsplugin +postscript t1lib tiff xps"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
+
+# Since 2.26.2, can handle poppler without cairo support. Make it optional ?
+# not mature enough
+# atk used in libview
+# gdk-pixbuf used all over the place
+# libX11 used for totem-screensaver
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.36:2[dbus]
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib:=
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.14:3[introspection?]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/cairo-1.10:=
+	>=app-text/poppler-0.24:=[cairo]
+	djvu? ( >=app-text/djvu-3.5.17:= )
+	dvi? (
+		virtual/tex-base
+		dev-libs/kpathsea:=
+		t1lib? ( >=media-libs/t1lib-5:= ) )
+	gnome? ( gnome-base/gnome-desktop:3 )
+	introspection? ( >=dev-libs/gobject-introspection-1 )
+	libsecret? ( >=app-crypt/libsecret-0.5 )
+	nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] )
+	postscript? ( >=app-text/libspectre-0.2:= )
+	tiff? ( >=media-libs/tiff-3.6:0= )
+	xps? ( >=app-text/libgxps-0.2.1:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gvfs
+	gnome-base/librsvg
+	|| (
+		>=x11-themes/adwaita-icon-theme-2.17.1
+		>=x11-themes/gnome-icon-theme-2.17.1
+		>=x11-themes/hicolor-icon-theme-0.10 )
+	x11-themes/gnome-icon-theme-symbolic
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	app-text/yelp-tools
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# eautoreconf needs:
+#  app-text/yelp-tools
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Do not depend on adwaita-icon-theme, bug #326855, #391859
+	# https://bugs.freedesktop.org/show_bug.cgi?id=29942
+	sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
+		-i configure || die "sed failed"
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-pdf \
+		--enable-comics \
+		--enable-thumbnailer \
+		--with-platform=gnome \
+		--enable-dbus \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_with libsecret keyring) \
+		$(use_enable gnome libgnome-desktop) \
+		$(use_enable introspection) \
+		$(use_enable nautilus) \
+		$(use_enable nsplugin browser-plugin) \
+		$(use_enable postscript ps) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps) \
+		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
+		ITSTOOL=$(type -P true)
+}
--- a/app-text/ghostscript-gpl/ChangeLog
+++ b/app-text/ghostscript-gpl/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for app-text/ghostscript-gpl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.178 2015/03/15 18:13:54 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.179 2015/03/22 07:18:33 ulm Exp $
+
+  22 Mar 2015; Ulrich Müller <ulm@gentoo.org> ghostscript-gpl-9.10-r2.ebuild,
+  ghostscript-gpl-9.10-r4.ebuild, ghostscript-gpl-9.15-r1.ebuild:
+  Fix previous commit and actually add the bindist restriction.

  15 Mar 2015; Ulrich Müller <ulm@gentoo.org> ghostscript-gpl-9.10-r2.ebuild,
  ghostscript-gpl-9.10-r4.ebuild, ghostscript-gpl-9.15-r1.ebuild, metadata.xml:
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@ -6,22 +6,22 @@ DIST ghostscript-9.15.tar.bz2 28826065 SHA256 e65daf25059e2f3dabd3535df3d936a42c
 DIST ghostscript-gpl-9.10-patchset-1.tar.bz2 5099 SHA256 f5b515295db2ad70a196ff2aee382d1a01c471ba64671f5b05f504f1109c97c1 SHA512 ae984dae5c426c488480c7c3f0e2eaf473c521c47b968ee91880264f5dbf1df8d992398bbf4dfdc82763953a9ad681c098da3561b203e596ed1ac0edc35d84da WHIRLPOOL c3b353f6f102dd79e229a92770720e50729228baaea950a2b5364541631958616b2d3d55c584875efd75f6c31a5b787bdba87ce452779ec9040966e6019a463d
 DIST ghostscript-gpl-9.12-patchset-1.tar.bz2 4940 SHA256 5c0e99a192a6d0e142c4c5f38a2d80ceeeb4a8e2265264d31360b06f3d94e0b5 SHA512 e3daf758c75ecb6a38dbece91b0f44ae06985920080b376384a9b3ad2ad35295530c144832158af2933d5fc49782c1fc6733efc60106193499c615a502f5e656 WHIRLPOOL e9436e1681e95a4b578a9de577d9b487ad119893c141baf840cd5dae0b89f5eedbde6d2f1225fb97c425a6dc3f3fb7f1ea6a02ab02b799438c3002fb933575c6
 DIST gsdjvu-1.6.tar.gz 207122 SHA256 6236b14b79345eda87cce9ba22387e166e7614cca2ca86b1c6f0d611c26005df SHA512 57f3866f1f863fa31f066b45ee679cfbdf2c6a9bec922f24fa9f50dd3ea52f192b4c9889b0c9657e96ca9e3528d3fea7dcc53b4d1ea87dd49d138ce9c9684884 WHIRLPOOL 66e5222412d9da2d616ba0a3f73548d031b3e6726eff7bc60bea703b02ce4d22e100adad1faf3fabaac379b4ef8324324eabb8b5320f74ebafe929b577dd6c8d
-EBUILD ghostscript-gpl-9.10-r2.ebuild 5859 SHA256 05beead85668de5eeb3aaae4b604757ad5f8cddd1e6f859fe4b140a92565908a SHA512 539e3240dad7f7d74f39feec11ba6d2549723acc562f953739ee918ae5c5173328b0ef40947c31dd107d47e76de4b63aee2be72797abc5af5f2ccde42685df3f WHIRLPOOL 1bb30e762d6011daeb9a4b48c4c73e8d0c3f73a8d8337723a2402c1d6828931f1620ad2dd0d9b7d6e73d818310ecc307b46af57463eacf8ea1942c0d01aa61ed
-EBUILD ghostscript-gpl-9.10-r4.ebuild 5903 SHA256 da3969b443761877bd3477fee72cda8213f0d2860deb030eaccaab646692dc2a SHA512 5771a2178370dbccde278052c2acba897a32006b8e81adfa61418e0ed4d48dd0c46fa15b1cd5372dfba752d63800f51161d57122de31be70d15d266deb2ec356 WHIRLPOOL 8e7aab30ed4f491d146c8cf52fcfb09ed3d5e40bfedfbec144206ae239c6dee3c536b5ae56c6f258ae969ad395bcf6de2e4945ed2caa8a631027aa5aeb2bb717
-EBUILD ghostscript-gpl-9.15-r1.ebuild 5822 SHA256 d3687bd054194cddf626d6f4e6b5ce73d1df1a7ec00b945a7246ab09cd97da85 SHA512 3402eb46946e19944ce93436886ba544b2c22935114c01eff4203c55911b615aa986db43384b1374a12f8e8eb75fe121a32fe5a6d67644467974665889cabd81 WHIRLPOOL d6217673b922a39ac1ead54716cd6c76439b7fbf41b1420f248a28d88db21fc447991020c834ae479612c298e8721938d94315b5817522f8fce6ce67b10427a6
-MISC ChangeLog 31671 SHA256 e3254b4944d4526aa662ba382108785a5411c7e96695a9866dae6efc2a447adc SHA512 c5b44ffe3decfcb27cba2a67a0e4afe60caadc50369166db3442adaf0e1d815e532e2b60b50b884c2066ff82874b4b831904671f7f012d9c4674352998ae0d49 WHIRLPOOL 89f8c27ac42ad3d5627b5903f811a8903f53e969269cb5718f5d8bd9874b44b28bcf5c61f3177fcaa14c0db645af84d27b1b3186b62ad4b3bb7b954640cf816a
+EBUILD ghostscript-gpl-9.10-r2.ebuild 5888 SHA256 35d4e1e3fa4afd61dbc2bc987da99d4353e8433bae702071e56099e34d683de0 SHA512 de00830ccf7152e510493e444dfbcd8580f3b14936e3e5288d89903d1d8f6ca91a884a851cd47542990d74b87fac30875fd5074ab89d48794917af366cf3a0ad WHIRLPOOL cb6f94951ced249b7bbe2f641b29bdebcf9873e24f67271e0598f7c1525b45cb79e4ce20fc901982096e0bbd4721a71521bec45ebf1efa5e73f39b82eeb730b8
+EBUILD ghostscript-gpl-9.10-r4.ebuild 5932 SHA256 cbfd8cf031b4d91444dd1f47d2535e2796cf9b85ef6fc081be4eed1d30c8030b SHA512 da4a67cab0bb40f26cd3681ac7c65a3c7f6dc6f15865718a5d9d03878ac17ce6fb078a45be4e14e12a4a4f963944157386ec21b103cfed48fcdc5eacd788bc91 WHIRLPOOL 4b1a7215252ef2a58bb2b206d0e838e1d1673852521f0483b06e790653ad6250ce820d8fcee774b9f5df6d4826dfdeb641d65cf52614040f66c09772d45d7c2a
+EBUILD ghostscript-gpl-9.15-r1.ebuild 5851 SHA256 9c6e73e7c71b83a4c10ff4ab59cdf76f4a1b4f74a572ac3df28e7b97e44f6910 SHA512 a85c7f60c96b71de9cd5373c38ac3ea278f8a901e3371eec503c0f0c726db21134d7428b296c6583567e98c5b34acfd055f79ae7af6418d209e506d7ff97418b WHIRLPOOL b6d7ae26c04a62c91ac5662a17f91152d0a7f23291e1196c42ee62539d66638b96a545f587833c4a370d93d994afd85ac528a753d3d474d93af20ebe702bee67
+MISC ChangeLog 31881 SHA256 62595104735cf0f532daee293771133be4ae1c39eaef757a4047e98849d27e55 SHA512 bd0e0030bb20d07acd28234f5841c2bec9bf8528f8d09a5945b08828cb608f61c672b1093b0144b9e06be897816c59fd4ffbb7944c6852681c220c354d8d2e95 WHIRLPOOL b4b02f7a9e38330a353bc594847648e1f5a95817218e786d284e9ac4e637d7d4e6a514e6248bd952b9b460cbfaf873ade3c850afd5689aa430e103152085c5cd
 MISC metadata.xml 162 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051 SHA512 ff7cd6e9d088c1ce0107a86a693abddb12d1385e8f9abb2614aa5cb8ed0c046a1387ccab1643fe711e84df1fa23659ce490f68f0504bbb908b7662a0ac490a03 WHIRLPOOL ccbf59144f058b49de3d54bbe6d92e2d2e8b605df10d5143ccfd7e4a021069ca025e87b4179179a60091c03d8bf1e371207c35f1102c2c1f848bf6697e9c2bb2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2

-iQGcBAEBCAAGBQJVBcvuAAoJEJQzkH1pP7W45fgL/04/R+tsX03gf++r036nOVZZ
-ZojmGtmZzPvwrT1bHIz92xG4Hp5I1G8O/zxZX48MolgF5Uv5yQtM6jphJiCRAiZM
-5e16DIA5wwCVGNI4T7YkRcgXXdcxY43Z2hRuPaDGSct75qlIKB3Ao2JQh43jlsRR
-r/hF4BOVYzde3EGgvmukUDd/sKOzdL/fgiCUvf/TQz9ztN/KUdrfFymuTv5kQjsV
-tI4SmIB35Jvl/VCtx6fiLzZWOX+BndPdK2n2Z0fNtTUKh1wmEYLCK6Mr3J1Y9d0h
-DRJrnnzNYjJF30IX4cJXI1EmiKdG4O5wroQncZaBEeUR8GZGHj93AJ13XktxKEOp
-/nm/qidExABmnV+ulptaQY0HN6/0OKKOKJRMqpbf6SHv9+/ea7mAqTNz22ripQwc
-692kwkzY5QOd9+t4gL0BWkqfmep/HzpuCgfR/sipr5X/YVjtBJMVfRzW4KltljF9
-BqTcNeuEv8uqYcT0dRtn4rH/UhvEV6VGmQKDJuE+7Q==
-=w5ej
+iQGcBAEBCAAGBQJVDmzdAAoJEJQzkH1pP7W4VQwL/2t6rantsxbyCf+VUdH18Nk4
+mPvw5SIoZmbG6qd7neIGpOx09+o4gbGY/EtDmnvVI5viqzhBrHNNdm8pb3mXrepS
+aqneKoy/0QlV8XUpxdwhRAsifp0WmOFRXpaDihvBPxrbAgbx6seFf4HDsj4fVJrj
+vu9EAIcceFz7B3q7bITKsR42K0DPa6GWEETQ3C+hEJgMcHYgvmq8qQ0U3FNZf353
+HXZErK2Kiu46ttbdU9jUcZ7/w+Q2GhA5KpcRhfENyJnE50Hwbl+WcUwAsZjyOJRb
+snZKrlMqR3PzrHkXu4zPLBqe8B5BHM7Gjr0cf4AVJCLye6VWCnWAvli5BurRifK9
+KWbGsn4a5WzV9QACRyjxRqQz9tUQwQYLOTl/H588KV8xPpIqIbtLdpK/UYguGGKU
+F9dX75g4wPZkaINhrPB3LNKxSLV1dVKDoRYl6suvt0UsX7hfhElnocpZm+h+O/Sb
+u5NLEnr6fXMbPUVzV0CnTzxbWZy8H+w0kZlPEB09AQ==
+=A3Ec
 -----END PGP SIGNATURE-----
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r2.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r2.ebuild,v 1.12 2015/03/15 18:13:54 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r2.ebuild,v 1.13 2015/03/22 07:18:33 ulm Exp $

 EAPI=5

@ -21,6 +21,7 @@ LICENSE="AGPL-3 CPL-1.0"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="cups dbus djvu gtk idn linguas_de static-libs X"
+RESTRICT="djvu? ( bindist )"

 COMMON_DEPEND="
 	app-text/libpaper
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r4.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r4.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/ghostscript-gpl/ghostscript-gpl-9.10-r4.ebuild,v 1.2 2015/03/15 18:13:54 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r4.ebuild,v 1.3 2015/03/22 07:18:33 ulm Exp $

 EAPI=5

@ -21,6 +21,7 @@ LICENSE="AGPL-3 CPL-1.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="cups dbus djvu gtk idn linguas_de static-libs X"
+RESTRICT="djvu? ( bindist )"

 COMMON_DEPEND="
 	app-text/libpaper
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.15-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/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild,v 1.2 2015/03/15 18:13:54 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild,v 1.3 2015/03/22 07:18:33 ulm Exp $

 EAPI=5

@ -21,6 +21,7 @@ LICENSE="AGPL-3 CPL-1.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="cups dbus djvu gtk idn linguas_de static-libs X"
+RESTRICT="djvu? ( bindist )"

 COMMON_DEPEND="
 	app-text/libpaper
--- a/app-text/pylize/ChangeLog
+++ b/app-text/pylize/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for app-text/pylize
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pylize/ChangeLog,v 1.20 2015/03/08 23:37:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pylize/ChangeLog,v 1.21 2015/03/22 13:40:20 jlec Exp $
+
+  22 Mar 2015; Justin Lecher <jlec@gentoo.org> -pylize-1.3b.ebuild,
+  metadata.xml:
+  Drop old

  08 Mar 2015; Pacho Ramos <pacho@gentoo.org> pylize-1.3b-r1.ebuild:
  x86 stable, bug 540290
--- a/app-text/pylize/Manifest
+++ b/app-text/pylize/Manifest
@ -1,16 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512

 AUX pylize-pillow.patch 375 SHA256 bc0418683b27603039f51268ad929ff223be901d321d47d4936f7dc461c34cd2 SHA512 5e6beeb1a0192328039d581eeaf568e606a1fa002f8d91ddb397e27d873e23834fda67cd88a5afb24563a515cb37c234ed2d8c913472ce9fccd431249be852dc WHIRLPOOL e4028c39276230ebbd2356034d00e1935789478628a466e72a695e399a570aef65b18ac8b340111ca71939a0a603dcf3cedf28e11e3266e32559cb536d8c337e
 DIST pylize-1.3b.tar.bz2 70979 SHA256 8de876e2581a556e23d538b3ed5b970929a51c236b24c1fd5161c26c8c42bb44 SHA512 271be57bdebb605566a7ee0340d34247f8ede4df7ba729c85c23f6df1ca24cadb25c870cce5b1ac35544205d90e716742cd31e150b9a8f98b2dcfae441a76454 WHIRLPOOL cc81f7000fedf10d3aae1922c3334bd00575a45c0a17bcdcb899e6b5229c621637b3f7815e5af8c08303ffa57d7db9073be675419fd8e9afe0e70e4eecf7f679
 EBUILD pylize-1.3b-r1.ebuild 1151 SHA256 7883bbbd04a2a9c7d111ad9d60c6a33345cc313b476c9bbae4ae8cd95b53595a SHA512 06383cea6bd7c2b6cdfabb1396f5e8b03a8e1bee0424e2b8e1ab5d626ae15596c6adfbf9033a58ea1849bc28d1fe5cf2ef7c0bfedd2053ae8875b22e3307a2ef WHIRLPOOL 07d193bdd44b0ca64431522e65ac8641229ea0983b20130f307d3aa584fd8547da5f6ae4c4ba4d501bf49bbea38b45b9da24a7111d75f5858106dcd8763379fc
-EBUILD pylize-1.3b.ebuild 1343 SHA256 fbdf8d6660f5befdd5c43bba3ed465b0f75f95e43c9a80dc332f3d0e68548b4a SHA512 3ebc3599e1f1a3257f064cc5ca2816725367110c78801699caa59278a64e548ea4a5f875341b3e5eb763763fa1fb22eb3001aaf3c985a1f3d157817f1d497207 WHIRLPOOL 0e066e54f7d8a9a15a8620b16d511d9cd4dad685c2034e8689905b9b0b20551f271671338cfcc9f67d4be2e639a7a55aa18e850d78aac8afe1970cab1e196095
-MISC ChangeLog 2381 SHA256 f6a45af157155042b3cbce226f038fc08a1871084044c3c2aa71457440df869d SHA512 90a3f804bf742c293a8ae59bf8bcfa09f069f4b4886daf4d76d096a0970fa54638b873d472722edbef7d7816a8b216952a7789c0f9b9e04f4470ed9449bf833b WHIRLPOOL d85ba8a9ce95c53ae3401908f9731f551a61dd265d5ca6309e5b56b1e1711ac5881e440ba03c22d4e27c97cf4fc6a5421f542499e4cfc245efe5dc2992ad7b08
-MISC metadata.xml 536 SHA256 8c9933d9f6a4cd262ef6ad324eac510a3a374af22cb6b2ff01a06eb05a92b2c0 SHA512 26e4ec412d7542d7a6dd769cd4e40c739003f1d1619d066a222017d09502432b4c8502d533116c9001d3d863a295e2b6fe90765f1b49dfc7d1409c8173376483 WHIRLPOOL fa0f997a6f53d2be8e6eec28bfa2ad0356ad88b9ccb31ca8a21463bec4af6218daf73579d25bfef99eccf20ed9bfde3f317a5c0dde13e70a0144c0bbf21daba8
+MISC ChangeLog 2476 SHA256 a81e2363b105f984b63153a7460bd57b68f9f3d88c6a9f1b55f518fe049c6887 SHA512 61c2360ecef9dfabe162d38175755b550bf4310602e3dfa8554c227232ce8dba78ac98957b4545bc5268671131537174990a1a4a962bb3acdeb03b289e97898b WHIRLPOOL 9257cb166de7ee8fea7a5d1d2b208a0b1fd7a4751c000ba22bf51c60daf9a855ff5d937d26c12c6a8812e3b4449e26e44071f7f99d2d8f7b20cff5de74a100d0
+MISC metadata.xml 540 SHA256 627d220d57fa2abf351ac6adf9d0738818296c071d64fe26ee4049524809d5f4 SHA512 eeeee0bccb69d8143e528472b7b05604f347487cee02e2bdda71c110d23d1b3f21fbd301c400709baebd63e6907269c7283deb50db616626da01004624edbf0a WHIRLPOOL 6127c65a9076b77191023d3e082d3258adda57d882f8bede0573eda99455a9231fd751ddf117d83654c4cfdc04672ebe3cdf940f28c034781856cd3ae510bef6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0

-iEYEAREIAAYFAlT83UsACgkQCaWpQKGI+9SO1QCfc9lqTQYtNH6VTHh3+1IsP6ih
-1icAnAkHaka1jprRfx/adjczAPTgQZjb
-=A+Ms
+iQJ8BAEBCgBmBQJVDsZIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirzGIQAIuIwqF/0QwHQW6bmG5+VtiQ
+j+pA7wsINMZJk28CA1wYrJo+jdMsLuDx5QKiMgofwLPGTG5cWsRSGw0MldQlZBZ/
+00IN+3kwI968h5jg7NW6TqYTyg2KT3+xk3J/NR476yk0CSGCrXQf1C0Fd2k+yiLN
+yCOoQshCf9NNzxrjIjbaDyFhFtQ1ZYyR691gz8I6tc6of5qG/BTT55BEBcTUeMLZ
+VxDrM7KHeiXYtDb+GZHE2m11WyNrA86DM6Bae1c33/RS2CCAsIvolb/vHTrcbY2/
+NdrIdqW9UKl3v6xxBAWJRUXq9q+//AHPdeB4+MwYX/n/Y2vj0B1Df54Yo56K8B6J
+zPbfa0U/wWTyHPDRNTeyf1FBM+ZpYzxPiGOkRTUJRh7DxME7+bzyaHn2119Jfdqp
+a2aQL5FBOG4G/tVi7vy+OAvwn2JNE/EqGMqZOU7szRVfYswqLx/nNU8D6uqE/5d+
+5W1uEss32iuU3CC0xKh/cAyCWAz4O3W9SgFqYgAp08zmW6Z+iGUfq0FGK299pcmt
+SMI+VKhOwpZdik0nXrc8ysoLLI95TrzEjo8KSYqppeeUCo5CXZmj5a6FIbescJK/
+N4BIB9NqqD0ypf42AKLme9aNKHuj7CWA4WvNVMuEos3SsimaR7f3Axkc5S3ZYx/w
+qu4f78x7zs0pA9H1vc2l
+=dxFP
 -----END PGP SIGNATURE-----
--- a/app-text/pylize/metadata.xml
+++ b/app-text/pylize/metadata.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<longdescription>
+  <herd>python</herd>
+  <longdescription>
 pylize is a Python script that generates a set of HTML files that
 make up an on-screen presentation from a master file. The HTML files
 can be viewed with any CSS-aware browser. The master file contains
--- a/app-text/pylize/pylize-1.3b.ebuild
+++ b/app-text/pylize/pylize-1.3b.ebuild
@ -1,55 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pylize/pylize-1.3b.ebuild,v 1.4 2010/03/29 20:50:03 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-
-inherit python
-
-DESCRIPTION="Python HTML Slideshow Generator using HTML and CSS"
-HOMEPAGE="http://www.chrisarndt.de/en/software/pylize/"
-SRC_URI="http://www.chrisarndt.de/en/software/pylize/download/${P}.tar.bz2"
-
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-
-DEPEND="dev-python/empy
-	dev-python/imaging"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	"$(PYTHON)" install.py "${ED}usr" || die "Installation failed"
-
-	# Fix paths in pylize.
-	sed \
-		-e "s:^sys_libdir.*:sys_libdir = \'/usr/share/pylize\':" \
-		-e "s:sys.path.insert(0, sys_libdir):sys.path.remove('/usr/bin'):" \
-		-e "s:from roman import dec2roman:from pylize_roman import dec2roman:" \
-		-i "${ED}usr/bin/pylize" || die "sed failed"
-
-	# Rename roman.py to pylize_roman.py to avoid collision.
-	rm -f "${ED}usr/share/pylize/roman.py"
-	insinto $(python_get_sitedir)
-	newins lib/roman.py pylize_roman.py
-
-	dodoc Changelog README README.empy TODO
-}
-
-pkg_postinst() {
-	python_mod_optimize pylize_roman.py
-}
-
-pkg_postrm() {
-	python_mod_cleanup pylize_roman.py
-}
--- a/app-text/xapian-omega/ChangeLog
+++ b/app-text/xapian-omega/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for app-text/xapian-omega
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xapian-omega/ChangeLog,v 1.55 2014/12/05 10:17:51 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xapian-omega/ChangeLog,v 1.56 2015/03/21 18:42:42 blueness Exp $
+
+  21 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
+  xapian-omega-1.2.19.ebuild:
+  Stable on ppc and ppc64.  Bug #531758.

  05 Dec 2014; Agostino Sarubbo <ago@gentoo.org> xapian-omega-1.2.18.ebuild:
  Stable for x86, wrt bug #520794
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@ -9,24 +9,24 @@ DIST xapian-omega-1.3.1.tar.gz 649601 SHA256 66295583349d4bf21758df06b17806c74bf
 EBUILD xapian-omega-1.2.14.ebuild 875 SHA256 0e9f55331621e7204163bafeec682def3114e525235e4ecf4c0a150ebc19c2fa SHA512 22b68baf375321492b211b4498b26c8cae8440fbc441151c729b35b22dccca83a3f3b9ce7334a9b02bfce21903bfe8afd8d37d25b5dd41804e5e86a5b611f4ca WHIRLPOOL fe81bb650d1abe011f168a90b5f18227d24a3c1a4858c61e009b609900c6f830d7c7337f29923b47a67d8123a847e085025e842be51d1b8123f9927a77dcce85
 EBUILD xapian-omega-1.2.17.ebuild 875 SHA256 56e12ad2e684982e8bb604a5cb93d8f10923712b62759847cfefc406a79aeb65 SHA512 5c33d4f6ea1d5336a5aff978c30d1bc72c5e8524bdd17437c473a3b952f174b7fb268b9b19e9d51d96beacf3d920aa2b0554bbf14dac508bb647cc5f58330243 WHIRLPOOL a697f5749a1d9cc090e9f7e40c2e4316ef96ece39ba69f963561776c537c9a0027c54d3452ac2f7a9115629f14e89ca7b1445571d99867413fc6d915fa956cb4
 EBUILD xapian-omega-1.2.18.ebuild 875 SHA256 c52ae3d5a014a22041cc816d16a5e2f2b248fcc4b93034b222fb17d1d0687ee2 SHA512 12bbf2c12eb4d241168ce256a1ecae74a1f539afad63721dde9b5be85c7d4023345f3b1360dd78ae93888ef6dfe60d70d491fc7b75c535045bfcbbfa501125e3 WHIRLPOOL cb0c1ca8c4752a606544f351675250015d1a0b5be72c8090c50b35c36a95c92c8eb779ffa96d064a7288b0f39ac2e3566dbdef2977fe241786866546afd50eea
-EBUILD xapian-omega-1.2.19.ebuild 888 SHA256 333496b60736039fc3e419f4023d62abdc7e6b005a4ee19acd641490f5f99a1c SHA512 af5fc8907a281da7bc1d629377606f76475f1a486b35fffbce8bbe8a5af775c29307ac4be448cfbeafe4e0a4cc4005ce4d16fd10d871489808e3e955bfdf3c4a WHIRLPOOL a5b9c9ae128f853ca93def06836ded69674aeb432ce18865dd3321bb80938703c6c4ca7413a36f5c73d99f1d752634f2e3f4687a3557aa39c8db39c6e5b2fa0e
+EBUILD xapian-omega-1.2.19.ebuild 886 SHA256 6412011c1cc39bb1d6e4765cbb76d5cd6c51cc1e43b1fe68e2305c1024946a26 SHA512 85f20a44e142ff693df9c8409636242bbd3f23b1b5aaa5de58a67393960a89d7f761ae901f241b3f69603bcf74b1228b5d70966812d051834c39b40492687b08 WHIRLPOOL b780aa888933b6b7ce10d36fc57e66fd580323edd4755f8459b85f99a107260aafe101dd3ad4d88c5ea101e95c1cc8f6b9f1407b02220a6399ec4025279b7a3b
 EBUILD xapian-omega-1.3.1.ebuild 867 SHA256 bff70ea269a6b76c92736d17950565336b9ec28cebb765c303c40aec5d62c40f SHA512 7c58e677f418f8b23c7501e2c8aabe6e66e37fc8ca0178ccd6a99e647e1ddadf766f8d1fdc3bc28b051bb82e7a2816f7d49ab5cc27c9dfdb37c06420ae2b4ed1 WHIRLPOOL 15913d9992ee5a8e533c317f0f879927dde777c5d80b414c85f3db9bd3b70ea9130f8910637454c45f2473c5b44253b008592a2d9f8600fc1c35ba0904672a04
-MISC ChangeLog 6999 SHA256 6bcebc8fe8f07dbe32b304fd539584fffabf4f507e33c0d70fdde83d0c8f160a SHA512 56e45be241b88b9cf0f88a15d9a4235a49800f306cdbfa692a3cbf701c6c6b5501f39a47933fb4dc4f2695a3cef73b77cc01d334a8bf76838f493d837ca0c159 WHIRLPOOL 069fd4f0f9b613d2d9e8e0220829fc2568e58d231c6ec3703458b36e0778df2c544212e74d29c77580685c1659b0a1cb3087b59728596bef17e3424ce108385e
+MISC ChangeLog 7131 SHA256 40188a191aec9af54059f0dbffb000ec74d77490153c5bfacb13b23e74d6a008 SHA512 e0b41ea9657e1d0ff10adcc99c0d3d0006ed8667e11487ed1e5cbbabd42d3c463bae350f7d632035391d566a7e06a814857fb7c038e4d344d635d136883f8be4 WHIRLPOOL 2ef5bec9b17984b2267f90d582ff33593fd9b7f1e86e60c8c88e28b2cfea65bdb3c5ac2f0536b6026209d567698a5f597b13957e4b8b558edccb16670bd2fa17
 MISC metadata.xml 367 SHA256 e757cf120c1188c0010caaf7449e89deee52d8aa275f4f0c3b9cc0c097d28596 SHA512 e562b4dfbdcf62a3f860cd185dcd5fb2cf4067cb9b6c11c94669027c9cbae94bc437fa63e68b3b982a6bdda624087a60b24a269031fae2f3f975efb3d8e85d44 WHIRLPOOL 1314776082f07f5fdf74d15ad6b5093276b58f47e4dce35c0377e6a7baef0941bf567e43047e4ff80a726e2078d506c9029cd033cba8aeba9110b75cbbffa036
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2

-iQIcBAEBCAAGBQJUgYZQAAoJELp701BxlEWfhNsP+QG0oVFp0aYRoFEBqkswmxqC
-ljBFlFm0hpU/If8o1i0Ms5K2jX5kZ8+/Zm0fpTWHeycq6jcEj40nAKKlwd5PouLZ
-qP+BzgwA6+5UizOT3fbiUkhi3vmLWFvHZsjHMXdH6R8AT2Sd4zNy6piYg2jlxy+V
-k6vn9UrG3VxcJ2EjK8PhG2aARGhq+5m9NKRAzMiLTOjsovkhaW06EFvi8dzPmMUA
-Z1buzoNaCBbFBRcpJVx4uVD3PgBpMdXGadGGG0wIxmSz3tW/65r0lfdHCmzIUsxA
-qU+mmRsNR4/AvsPNr+BYsHCh2d85HdO8dBPolbvrlcTED+6upSNCmJORNfxDRJVt
-1UsZG6TBF/McarjRxkG4mtwS5++9fjMzw8kxcuBl/BrkcQW6TX1woeKQ0ohdSxzx
-rivgB6m0uWbs17HjxtCsY2hIkeomNkJs2T0l4OUuXg3wBxz07vdX9g8sbB9OJ//T
-kgKFnvIQ02yFH4Uf8QleMvX5YUHuVfQOkdZv1i6nNyo35/H9yDJmcj20AyEqxJpC
-ASR0KLVA/2URdbAToRnp4qTKXufuPF/kC8h8PuA2SGEYXW5MhOld7GVvmKD7WAw0
-4a5HMIdwLODtGVgAgOIBXaD2Dp0QsrwHG3sr8g/Jaa4gXSKs/BUAP/KfS+zTPGqy
-w3pAA/+Q2rrH6A4yI12b
-=Ph2c
+iQIcBAEBCAAGBQJVDbvzAAoJEJOE+m71LUu6oBIP/0/xCZct5oR/yY0Mtc1LfCHm
+S31kV+E24mGnxOFRp6R0/ysHBksS9dfeJzxYFQebTHHfg6kUjkXUyihVEgFoLD0+
+d0Av0Aso6my4Lr+7C6E+rj1fbnpPBpbwMBJwjP69hrm26UnvXVCcg0FqTHJLm9BH
+aCJeapw2jQ788i0KiTnYhcqbustHecYwRV2c0tGo+wnivd/+Dt55U+ItWDGWHDZ2
+93/6KPmvd8yeUvHFjEGDVQno3HeHqUOt5i/OQf8yBjs4S/vtDf7hz/AWzce8vOa8
+EDgRVzKQKebXUYKXCZjbHevC6dtxeMvEWP6t9Jru8RX32cXXIr9v2bAg8AaDUV91
+ibxPpbe0VYkH+TrrNjwCA+KdpzLfjPWiPDCxW5ORUM2Ic89dZnQ7eC5QidsGxeMv
+r4uVnbX78vZUfkBV4nJZZbsyf6JQozkHLRj85hKboQUD/zgL6pmZh+yZ14PTuOs5
+fEySvMhisBmwcbsw9qAdpPtJfGjME7wzxeERAMobwtGw208yUOED1/G2WOfVR6TE
+JMOA7poN0SjguiJJkzk2NfZpT8GQLP7rJseknoY4rvPqW+kYwER4EBxmOfqt/rgo
+6zJOTc7z52Z/UNuRFMtztcqr2uBXEEpP19SmhNOd2RvEndzmtPHkaRyaZ2ahlINb
+clMVsUAv/Za2Kn0wmWEp
+=d51e
 -----END PGP SIGNATURE-----
--- a/app-text/xapian-omega/xapian-omega-1.2.19.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.2.19.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/xapian-omega/xapian-omega-1.2.19.ebuild,v 1.1 2014/10/21 20:49:51 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xapian-omega/xapian-omega-1.2.19.ebuild,v 1.2 2015/03/21 18:42:42 blueness Exp $

 EAPI="5"

@ -11,7 +11,7 @@ S="${WORKDIR}/xapian-omega-${PV}"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc ~x86"
 IUSE=""

 DEPEND=">=dev-libs/xapian-${PV}
--- a/dev-cpp/libxmlpp/ChangeLog
+++ b/dev-cpp/libxmlpp/ChangeLog
@ -1,6 +1,13 @@
 # ChangeLog for dev-cpp/libxmlpp
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxmlpp/ChangeLog,v 1.132 2014/06/22 18:43:47 maekke Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxmlpp/ChangeLog,v 1.133 2015/03/22 20:08:22 tetromino Exp $
+
+*libxmlpp-2.36.0-r1 (22 Mar 2015)
+
+  22 Mar 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +libxmlpp-2.36.0-r1.ebuild:
+  Add multilib support (bug #469180, thanks to Karl Lindén). Install docs
+  where upstream expects so other *pp docs can link to them.

  22 Jun 2014; Markus Meier <maekke@gentoo.org> libxmlpp-2.36.0.ebuild:
  add ~arm, bug #511566
--- a/dev-cpp/libxmlpp/Manifest
+++ b/dev-cpp/libxmlpp/Manifest
@ -2,13 +2,26 @@
 Hash: SHA256

 DIST libxml++-2.36.0.tar.xz 861456 SHA256 bfdf327bf9ebd12946b7aa6a152045f209d5c9fecd06ebfcdf9b3e7c1af6e2e1 SHA512 52372b3a969dc4a16d1ec70275e3c97ac20acc14703a2875ba41d1eb8fe3f318c10e02d601ceac1a0d35f47e7d7033ebd5e87c122db6b373e847d543eddbe9a6 WHIRLPOOL 19804748859cbf6144e56f1ee1746cf2b30995c70e5f74a0dd3b51b38982832a9ece6a519f43e83dca424110f98bd86e8d3d4120ce8ac59b4b837f2d4f132bba
+EBUILD libxmlpp-2.36.0-r1.ebuild 943 SHA256 900ce5d084b04cd0f1ff414a9506650c2f799a18e97add678407bcb11fb0216a SHA512 6563cf1d624203649da3e6499d9657ce59f61702d4c05f49bde5fd2d73abd30e6385b7482d88d5cbd985ddc2fad246a6e5e91710e67142d087f6f0f6f516bf48 WHIRLPOOL 21856fcc0ef72e52e0f3f690a3ffbfceb2a9095b111aaa56f4b3d275dd73d9f55f4170244832b0223aa3f5a51357db7852fe94aa742b9f80ac8f1e8795ce8c17
 EBUILD libxmlpp-2.36.0.ebuild 920 SHA256 539c5845676dd3d0f61af5f78ae592e4f43307914538dec7a6637b6e04e476ea SHA512 7d5a4604a9dc53210383fa7cc823e185d333b7dc837a0816d4717dc9f9411ab5bdddb27a93da529037709490d3c13fdcc8630f3e3a08ae344589d4f43379c0a3 WHIRLPOOL 2c1de0c8759e67683d6c27e21a5254b2bf556cec85f8070f01e94fc873ab0a260606349b5ebe47ab56fd30b6262257cb52c3e0b7cc0d05444fb74ccd7aac4edf
-MISC ChangeLog 18580 SHA256 3cb09c1158b33bf6b2882393c21f1e3ba15fc040e0454295880c1834e11895f8 SHA512 5b5b5201409e02182161b2bae3b8ece942d9132baa56ab30d69c0df660b738aa3ba222b158f595acab637bcd30b618bc1e936918a201d0622ff2f7898699e959 WHIRLPOOL 647dfd34ce701fa0d6fbccd10afa1f9a507b8968ec80ec52922d3b22e3e179d0639b88c2b5e4d50ab5a6dbe98c406764230cdf17665348675c7d6b8b403460af
+MISC ChangeLog 18844 SHA256 8adacbfd25c29b7889291a63147e2a824cf0ebe362280e9bbae86be6202bdd3e SHA512 7ff78d35046aa209cf7b1fdb3ece95a083a19f9cf5bef630e0f962d4e12015c11f3694d90849d670c24dddc51b4e0d93ec97bc0f36e3ab09d6d9b284eee115a6 WHIRLPOOL caaf94140e2165ba78085eed4746e51a8a9f7e11465e7ebd0375231dc3a3168164ec443e5960fcb49df94f29fe699213f7cb0fbcb14a8fcf3f6075690a16e1ef
 MISC metadata.xml 162 SHA256 7d0ce82d5ca3b20cb1c4641c7b7aae7082fd6be059b85fab9699095fd965f2e9 SHA512 baf4e2f4c64ab0ecc4985c069e360293c4394ea6a87c1baed2e9e91df8dca76e2371eb4be2df5ba009beb3de9a0e02561dd01accf2645e1dc5d0a23edbd8f8b6 WHIRLPOOL 35e7795de1da836c4969acee5aac0cfef4c461b1e5dc124d7f751e46efd1c3816b70824aad884fe77258b16cf3476b92b983593089aa7c152e701d0181a0e6be
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0

-iEYEAREIAAYFAlOnJdsACgkQkKaRLQcq0GLu2wCgpVtAk+3gW7Fsr2BGeMVa2SQi
-N4kAn3OLurdt5mZkd8NOoyZsiIfFXbE6
-=9Rba
+iQJ8BAEBCABmBQJVDyE3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNnYIP/R1GsPE4yPfrppwFu0ZdwIf0
+l7MQi6tno9Felonvu2iwENkGoyOmv+9RzHqziShd4Tu7Unqe9+8EwybZodQzTYX0
+9/VH0bZ+cB1ji+6Qwzz57nlNHxbw0J+6zAhzGwd0nM5kPS9MwJetoU3iHoFXjt9U
+8pHwK2zgaGQtXTzccH6MbEZmaxd6IdGYRFVlhTCuBb1lbX36dXqlAI+QgK/LKpvK
+VmDjoTW2t/RPEf5ew2IcUf8NzBUUVzOyXTN6TnzMiT5z2laK8FeFw/nkShBZEOJN
+qtoYKDkuD73glLtSgNgxaivujmGGP36TG58hI7uSJDiOZbSrqIysZ2ggomY0Ku0u
+Y/0zFkUwKAZJiMjgl52zFjbJFCMEEY4blbpIb5siq8/6Mw7x4ymBwZWBg5uKV8Bj
+QObbJ8qB16r77O9zfhV0rutwnKdIRxd0GinvB37ujr1IleclX11uRXaITKEyyyGQ
+h4FjD5QCPl18/hiRPLaP+S/1auj7T5pKZTwCtsF5kqcoTGgMs8V8U3VsGuGP/sqI
+U0yHc57gAZXq9/fw/t4Qe9rEm89caEN33shXTlwI7p8+9NK/ENTgkCO1MkVJIuH4
+KvvQMrwdK+BfEsHnNhO9jhp7qClRN6rRZYOtO2zHLvmT/4k1uRSKiv8CICPSgBu8
+cAhX+mFJEHTyCLLoYVv9
+=d1BE
 -----END PGP SIGNATURE-----
--- a/dev-cpp/libxmlpp/libxmlpp-2.36.0-r1.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-2.36.0-r1.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxmlpp/libxmlpp-2.36.0-r1.ebuild,v 1.1 2015/03/22 20:08:22 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_ORG_MODULE="${PN/pp/++}"
+
+inherit gnome2 multilib-minimal
+
+DESCRIPTION="C++ wrapper for the libxml2 XML parser library"
+HOMEPAGE="http://libxmlplusplus.sourceforge.net/"
+
+LICENSE="LGPL-2.1"
+SLOT="2.6"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc test"
+
+RDEPEND=">=dev-libs/libxml2-2.7.3[${MULTILIB_USEDEP}]
+	>=dev-cpp/glibmm-2.32[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+multilib_src_prepare() {
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" gnome2_src_configure \
+		$(use_enable doc documentation)
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for dev-db/firebird
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.118 2014/12/16 10:14:12 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.119 2015/03/21 14:57:55 jlec Exp $
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> -firebird-2.5.3.26780.0.ebuild,
+  firebird-2.5.3.26780.0-r1.ebuild, metadata.xml:
+  Clean old; Clean ebuild

 *firebird-2.5.3.26780.0-r1 (16 Dec 2014)

--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512

 AUX firebird-2.5.1.26351.0-client.patch 554 SHA256 afc61661c47dbedaac6b4d2582990712c8fbfe907340359c4eae12c4a66d1408 SHA512 dd1a62995b09f56db09b41b3a94bfb476b10018992b24e4cd19fb2ae95b557acb00b6a22c5bb28c4d2364aa424aca3ed717b9e9943e55fe8ef5412037b94c8f1 WHIRLPOOL fbe1281c31cace1cde2aad55f22203940e7c6703d68fee62f256dc7b4d5af54d5d2ec70d53b1c0a2d1584f7fcea05d59da2415160b8ef0fada86f8e21cce6be2
 AUX firebird-2.5.1.26351.0-deps-flags.patch 3025 SHA256 ff6d2c832b9b1705e14ba8f083a65a774742375c9d4588c3a921cb5806d72be2 SHA512 269d44934e0477283190802e887b6ddfe4eaaf44f878ae19ba1e473804163cfb55593cca9a6dc4ef8f86e25a6557383e13939907fdd3406d8469822a4586cb7a WHIRLPOOL 004c905e0029adaec69ae5bed4f6abec17adb616b4bf725f1635f1f13487acea933a8db2777cef46ccf94a4bda3af7c26cc2c3b96568626f2727049ce0abc204
@ -11,14 +11,25 @@ AUX firebird.logrotate 169 SHA256 462a7273c4881b66d31fe44349aae45d1f7085ff4db848
 AUX firebird.xinetd 199 SHA256 c0ea0c66e17c41633c19f7bed8cc8f818a3e1afad796d8d493c3b532b498da48 SHA512 4fc963b213e3cb13f1314129a7f5e04c44e3abd3b9cd6b28ea70219e34ecceda24995dc2f1a0a8ea342b016a897726f655604aa2ae6e7035e387d706515d1bfb WHIRLPOOL 4ac8ee679d07329143d9a98fb1acf432876c65695cd188748b3d4a2e4d693817fa6ea759f0e58ca7e75aa6cee8e902b097bcfe4a66715f825bb5379492fa8ad9
 DIST Firebird-2.5.3.26780-0.tar.bz2 13798872 SHA256 0c4b500d189aa9b4c12a7d2cf310a0b770118967c37ebe0edf8581cbcdad7aad SHA512 b8a0bef492d15739ea9a156225ac738687241a11571ce52ee6c644e5017dcff03007945aeb19b0537aadd1de01b339645871ff1905edf41c65679db377c69e98 WHIRLPOOL 0321763e79882dcdd2175191e1cbf6c82d656bb16e5ebd4a3bf0f08c77ee0494f06ffb08205b583c4a9990c33d652ac2fa73683e4c7ccebe900236975c8d60a5
 DIST ib_b60_doc.zip 10530848 SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d SHA512 59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a WHIRLPOOL 5c3e17eec64d835bac8832a51acefe04c3a5ff818d1d1e69a032bae1a730fd73996a2be073d2e22bcd4ad4ee1ba2247da8271cd3a03c0326acf46eef1073033f
-EBUILD firebird-2.5.3.26780.0-r1.ebuild 8383 SHA256 ad2d0504a4e0dc679e04cf7fb28cfdf7e64dd4510b117123cfe09fef5003f610 SHA512 9d1a038646d651af9f22cc33808e36e7763fa8328fadb09495ef7c575d34473795b575fd3901f65dc63482c9f76ec29a31c77c8dc2a29abcdc01a849747257b7 WHIRLPOOL ba1e969479d43eb8986990e373482f2543dda9932a6121bc515493fec3a92233e8aed9b042c7cf4afb2168b26a7c8d185e844bd7fcfba7ca972d3fe3bb91e847
-EBUILD firebird-2.5.3.26780.0.ebuild 8380 SHA256 4dbbd68dc4482dda58d647899353cd284267c58b0caea47c3d5ec589ed47f7ce SHA512 f68902ef814cc4a24b8f6cd4e1a5eb00f989ded1799937542787ed39874b69f3009c2c5f7ab32e508a08ab05459bd2d891303a1e384ee091c2dae41d21f5de8b WHIRLPOOL 7e8f8e3ea9745723922fbad9dc4dcd861335459591cfff074777568c2fd4e1963ddd56aff56a03f30015794ed710ebb683f38f3005a4204caa3078afcca52ae9
-MISC ChangeLog 27389 SHA256 65259b897ce1c1edd6a9c01ffa6e9058766cfcf031d3c555c45aea0e048e9171 SHA512 4cb67d17f090dd78924f833329cca438235df21fdf4947852f4ba7838fb671b3873649d6998554fd15fbd8292281c0c135f7694ca592d5cb343ca4dd12076ec0 WHIRLPOOL 601194c0927e6467cfa9a4db4fe0f319151ec655b4874eff6426f69db918efe9adf1516ca290e1f0a1576263a320731489acafeec2cda0431c94d9974dee28f0
-MISC metadata.xml 787 SHA256 6f5285eb2893a24ee779d1b1cf1840d0e34e38d152e65fdcb0244bfa5e6eceaa SHA512 2924fa1236aa39e737fce9d3c937bc8fc78ceaec165f45799bb07851c702a8f7be794907b2b7601abf3cd1a52db841c92403c03ba69626348f6c3bee7cc47a66 WHIRLPOOL 8d7dd3e4c7e4944458bdd5c7dd874d674ba12cb3dc868d0e451c29d1621a311a65519fae725f907060a88ecf792ccef44ec49df10d76d664a490e28cf78edaf0
+EBUILD firebird-2.5.3.26780.0-r1.ebuild 8349 SHA256 5d1e9198b7859bb4da3d4e9a568cbb96cf7736cd6ed8108ac9b68cc2d1662bc7 SHA512 bf97b1ad235f99381f5fcd0abd0f9570c2dbc9087004f6c9825d41338f824e4d1b4e418b06f57df50142418616b63e1209c59d4fa255bfdf67e8de77d3fb295e WHIRLPOOL 65d898bdbead10a2c94c93a25b6e69bc680f77ac03d1191831dcf4e729a9fe214810d286e5200ced5e14edb8109b01c14fc4628fb6aa7e4608bf976695080ac3
+MISC ChangeLog 27544 SHA256 0c1e9fa93d117c0e3d9b74ae4cf3054ad6021cfd2ce282a7b8ded8ef3b659a21 SHA512 11d140f0385e07ba8e57d874eb69d5a564c99f066bf78ecf703658a9f301066b894b53aad95e6b39ca899285d43eb91b551f3bbfe56c3fcb3c610de56e43328a WHIRLPOOL 4df9a1997dc25099591dd28e9b64a4ba25f82195e29ec642b386588e3fbc6a3fad535a529fe80a4397baf028177522c5466d8e2c7bb416409986afe930192fd5
+MISC metadata.xml 804 SHA256 d808eb2ef45124cf6a5b81b892b9062354a5752ce91498372d95a3625ad7ee2b SHA512 e204434a733eb1b2a41306eac93bec1e980913dff58cfa2b883932bfee40c92a1556e8b2acece0868849192496d3d7dda8de481a4e559a0f41e3785928f70ec7 WHIRLPOOL 21ea1ff6546430c0583e4f21cb0c868c7d98aa13e2d4595317e42fa5977d1dbf41fdef6eb4bda469852fcf10a25538c4f561af4d53186d92daef43a3cfe6e465
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0

-iEYEAREIAAYFAlSQBfcACgkQCaWpQKGI+9TftACfTdYggT/CPJ305MtHZ+203e2X
-N/YAn1aGABxW38o//NxNqbvOziSkbXzS
-=VRvk
+iQJ8BAEBCgBmBQJVDYb8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirSLMP/1EBHq9hOuYTQlStUqhRtLmj
+Tp/UQHP1c/TokTWUT3HzRowrAmVHnp4xWbdsx7/9fwd2kpCHpGjWzVJL0NwVBKqG
+Haw2TVnjrx5we3UuNQ17kpnO4UfPb9AOi9GZG4Y47LbnRyx0b/hxwP3sjpMah7SC
+ePyJeb+k09p9Gke6oowa1m42PD86HaCIpmy4AXd7T9D7jkXGCQchG8RfSuGoLrCl
+Q4VQLCnZI8Szp8ni+rkSKzLWfcMMdpgqGJ8ipIbTDZW86dQb9LVZYEweMtmHrXen
+Pnj61QKJGQH3WNmKlc72lff086GHfRUDZiJd+O4ZZc2d3ofri+K+j0HnvzLuUULa
+1yGNcR1vcSgDge75q9Kj2pVb0uWqslsijEkEKMtbxeHp0rpJAaoMNHWfVOxklTFz
+9IVusm1/050apcITdNmprkkSoMgEwe0LlZBI5kahKNJRcc3/OR4b+YHn+TqR8kO3
+uK9/3c/W2pwXR6XIqprsYOug9C98KplPq0usskDhCjMrL1tfnu9+IkdJbrXbVSn0
+0Ur5GLw93ZkePZasMswkYG7eJxy0DXbwk6KRFXbZZAWyiVC44VWRAiWkS7ZPNK9A
+x5fx76odeGIfCgGTf1iMBFy1lzH/Oq5K56U8UvPHD4UPOX1rJs1+/W23LIH3Mp15
+lVpmEz91yAg+Qvdx7Uft
+=zi5D
 -----END PGP SIGNATURE-----
--- a/dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild
+++ b/dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild
@ -1,8 +1,9 @@
-# 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-db/firebird/firebird-2.5.3.26780.0-r1.ebuild,v 1.1 2014/12/16 10:14:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild,v 1.2 2015/03/21 14:57:55 jlec Exp $

 EAPI=5
+
 inherit flag-o-matic eutils autotools multilib user readme.gentoo versionator

 MY_P=${PN/f/F}-$(replace_version_separator 4 -)
@ -10,7 +11,8 @@ MY_P=${PN/f/F}-$(replace_version_separator 4 -)

 DESCRIPTION="A relational database offering many ANSI SQL:2003 and some SQL:2008 features"
 HOMEPAGE="http://www.firebirdsql.org/"
-SRC_URI="mirror://sourceforge/firebird/${MY_P}.tar.bz2
+SRC_URI="
+	mirror://sourceforge/firebird/${MY_P}.tar.bz2
 	 doc? (	ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"

 LICENSE="IDPL Interbase-1.0"
@ -24,21 +26,21 @@ REQUIRED_USE="
 	superserver? ( !xinetd )
 "

-RESTRICT="userpriv"
-
-RDEPEND="
+CDEPEND="
 	dev-libs/libedit
 	dev-libs/icu:=
 "
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
 	>=dev-util/btyacc-3.0-r2
 	doc? ( app-arch/unzip )
 "
-RDEPEND="${RDEPEND}
+RDEPEND="${CDEPEND}
 	xinetd? ( virtual/inetd )
 	!sys-cluster/ganglia
 "

+RESTRICT="userpriv"
+
 S="${WORKDIR}/${MY_P}"

 pkg_setup() {
@ -53,26 +55,21 @@ function check_sed() {
 }

 src_unpack() {
+	unpack "${MY_P}.tar.bz2"
 	if use doc; then
 		# Unpack docs
-		mkdir "${WORKDIR}/manuals"
-		cd "${WORKDIR}/manuals"
+		mkdir "${WORKDIR}/manuals" && cd "${WORKDIR}/manuals" || die
 		unpack ib_b60_doc.zip
-		cd "${WORKDIR}"
 	fi
-	unpack "${MY_P}.tar.bz2"
-	cd "${S}"
 }

 src_prepare() {
 	# This patch might be portable, and not need to be duplicated per version
 	# also might no longer be necessary to patch deps or libs, just flags
-	epatch "${FILESDIR}/${PN}-2.5.3.26780.0-deps-flags.patch"
+	epatch "${FILESDIR}"/${PN}-2.5.3.26780.0-deps-flags.patch

-	use client && epatch "${FILESDIR}/${PN}-2.5.1.26351.0-client.patch"
-	if ! use superserver ; then
-		epatch "${FILESDIR}/${PN}-2.5.1.26351.0-superclassic.patch"
-	fi
+	use client && epatch "${FILESDIR}"/${PN}-2.5.1.26351.0-client.patch
+	use superserver || epatch "${FILESDIR}"/${PN}-2.5.1.26351.0-superclassic.patch

 	# Rename references to isql to fbsql
 	# sed vs patch for portability and addtional location changes
@ -85,8 +82,8 @@ src_prepare() {
 		-e 's:ISQL :FBSQL :w /dev/stdout' \
 		src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines

-	find "${S}" -name \*.sh -print0 | xargs -0 chmod +x
-	rm -rf "${S}"/extern/{btyacc,editline,icu}
+	find "${S}" -name \*.sh -print0 | xargs -0 chmod +x || die
+	rm -rf "${S}"/extern/{btyacc,editline,icu} || die

 	eautoreconf
 }
@ -129,15 +126,14 @@ src_compile() {
 }

 src_install() {
-	cd "${S}/gen/${PN}"
+	cd "${S}/gen/${PN}" || die

 	if use doc; then
 		dodoc "${S}"/doc/*.pdf
 		find "${WORKDIR}"/manuals -type f -iname "*.pdf" -exec dodoc '{}' + || die
 	fi

-	insinto /usr/include
-	doins include/*
+	doheader include/*

 	rm lib/libfbstatic.a

@ -253,11 +249,11 @@ pkg_config() {
 		chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}"
 		chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}"

-		einfo
+		echo
 		einfo "Converted old security.gdb to security2.fdb, security.gdb has been "
 		einfo "renamed to security.gdb.old. if you had previous security2.fdb, "
 		einfo "it's backed to security2.fdb.old (all under ${ROOT}/etc/firebird)."
-		einfo
+		echo
 	fi

 	# we need to enable local access to the server
--- a/dev-db/firebird/firebird-2.5.3.26780.0.ebuild
+++ b/dev-db/firebird/firebird-2.5.3.26780.0.ebuild
@ -1,290 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.5.3.26780.0.ebuild,v 1.1 2014/12/11 11:51:32 pacho Exp $
-
-EAPI=5
-inherit flag-o-matic eutils autotools multilib user readme.gentoo versionator
-
-MY_P=${PN/f/F}-$(replace_version_separator 4 -)
-#MY_P=${PN/f/F}-${PV/_rc/-ReleaseCandidate}
-
-DESCRIPTION="A relational database offering many ANSI SQL:2003 and some SQL:2008 features"
-HOMEPAGE="http://www.firebirdsql.org/"
-SRC_URI="mirror://sourceforge/firebird/${MY_P}.tar.bz2
-	 doc? (	ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
-
-LICENSE="IDPL Interbase-1.0"
-SLOT="0"
-KEYWORDS="~amd64 -ia64 ~x86"
-
-IUSE="doc client superserver xinetd examples debug"
-REQUIRED_USE="
-	client? ( !superserver )
-	client? ( !xinetd )
-	superserver? ( !xinetd )
-"
-
-RESTRICT="userpriv"
-
-RDEPEND="
-	dev-libs/libedit
-	dev-libs/icu:=
-"
-DEPEND="${RDEPEND}
-	>=dev-util/btyacc-3.0-r2
-	doc? ( app-arch/unzip )
-"
-RDEPEND="${RDEPEND}
-	xinetd? ( virtual/inetd )
-	!sys-cluster/ganglia
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup firebird 450
-	enewuser firebird 450 /bin/bash /usr/$(get_libdir)/firebird firebird
-}
-
-function check_sed() {
-	MSG="sed of $3, required $2 lines modified $1"
-	einfo "${MSG}"
-	[[ $1 -ge $2 ]] || die "${MSG}"
-}
-
-src_unpack() {
-	if use doc; then
-		# Unpack docs
-		mkdir "${WORKDIR}/manuals"
-		cd "${WORKDIR}/manuals"
-		unpack ib_b60_doc.zip
-		cd "${WORKDIR}"
-	fi
-	unpack "${MY_P}.tar.bz2"
-	cd "${S}"
-}
-
-src_prepare() {
-	# This patch might be portable, and not need to be duplicated per version
-	# also might no longer be necessary to patch deps or libs, just flags
-	epatch "${FILESDIR}/${PN}-2.5.1.26351.0-deps-flags.patch"
-
-	use client && epatch "${FILESDIR}/${PN}-2.5.1.26351.0-client.patch"
-	if ! use superserver ; then
-		epatch "${FILESDIR}/${PN}-2.5.1.26351.0-superclassic.patch"
-	fi
-
-	# Rename references to isql to fbsql
-	# sed vs patch for portability and addtional location changes
-	check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
-		src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
-	check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
-		src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 lines
-	check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
-		-e 's:isql :fbsql :w /dev/stdout' \
-		-e 's:ISQL :FBSQL :w /dev/stdout' \
-		src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
-
-	find "${S}" -name \*.sh -print0 | xargs -0 chmod +x
-	rm -rf "${S}"/extern/{btyacc,editline,icu}
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -fprefetch-loop-arrays
-	filter-mfpmath sse
-
-	econf \
-		--prefix=/usr/$(get_libdir)/firebird \
-		$(use_enable superserver superserver) \
-		$(use_enable debug) \
-		--with-editline \
-		--with-system-editline \
-		--with-system-icu \
-		--with-fbbin=/usr/bin \
-		--with-fbsbin=/usr/sbin \
-		--with-fbconf=/etc/${PN} \
-		--with-fblib=/usr/$(get_libdir) \
-		--with-fbinclude=/usr/include \
-		--with-fbdoc=/usr/share/doc/${P} \
-		--with-fbudf=/usr/$(get_libdir)/${PN}/UDF \
-		--with-fbsample=/usr/share/doc/${P}/examples \
-		--with-fbsample-db=/usr/share/doc/${P}/examples/db \
-		--with-fbhelp=/usr/$(get_libdir)/${PN}/help \
-		--with-fbintl=/usr/$(get_libdir)/${PN}/intl \
-		--with-fbmisc=/usr/share/${PN} \
-		--with-fbsecure-db=/etc/${PN} \
-		--with-fbmsg=/usr/$(get_libdir)/${PN} \
-		--with-fblog=/var/log/${PN}/ \
-		--with-fbglock=/var/run/${PN} \
-		--with-fbplugins=/usr/$(get_libdir)/${PN}/plugins \
-		--with-gnu-ld \
-		${myconf}
-}
-
-src_compile() {
-	MAKEOPTS="${MAKEOPTS/-j*/-j1} ${MAKEOPTS/-j/CPU=}"
-	emake
-}
-
-src_install() {
-	cd "${S}/gen/${PN}"
-
-	if use doc; then
-		dodoc "${S}"/doc/*.pdf
-		find "${WORKDIR}"/manuals -type f -iname "*.pdf" -exec dodoc '{}' + || die
-	fi
-
-	insinto /usr/include
-	doins include/*
-
-	rm lib/libfbstatic.a
-
-	insinto /usr/$(get_libdir)
-	dolib.so lib/*.so*
-
-	# links for backwards compatibility
-	dosym libfbclient.so /usr/$(get_libdir)/libgds.so
-	dosym libfbclient.so /usr/$(get_libdir)/libgds.so.0
-	dosym libfbclient.so /usr/$(get_libdir)/libfbclient.so.1
-
-	insinto /usr/$(get_libdir)/${PN}
-	doins *.msg
-
-	use client && return
-
-	einfo "Renaming isql -> fbsql"
-	mv bin/isql bin/fbsql
-
-	local bins="fbsql fbsvcmgr fbtracemgr gbak gdef gfix gpre gsec gstat nbackup qli"
-	for bin in ${bins[@]}; do
-		dobin bin/${bin}
-	done
-
-	dosbin bin/fb_lock_print
-	# SuperServer
-	if use superserver ; then
-		dosbin bin/{fbguard,fbserver}
-	# ClassicServer
-	elif use xinetd ; then
-		dosbin bin/fb_inet_server
-	# SuperClassic
-	else
-		dosbin bin/{fbguard,fb_smp_server}
-
-		#Temp should not be necessary, need to patch/fix
-		dosym "${D}"/usr/$(get_libdir)/libib_util.so /usr/$(get_libdir)/${PN}/lib/libib_util.so
-	fi
-
-	exeinto /usr/bin/${PN}
-	exeopts -m0755
-	doexe bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
-
-	insinto /usr/$(get_libdir)/${PN}/help
-	doins help/help.fdb
-
-	exeinto /usr/$(get_libdir)/firebird/intl
-	dolib.so intl/libfbintl.so
-	dosym "${D}"/usr/$(get_libdir)/libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl
-	dosym "${D}"/etc/firebird/fbintl.conf /usr/$(get_libdir)/${PN}/intl/fbintl.conf
-
-	exeinto /usr/$(get_libdir)/${PN}/plugins
-	dolib.so plugins/libfbtrace.so
-	dosym "${D}"/usr/$(get_libdir)/libfbtrace.so /usr/$(get_libdir)/${PN}/plugins/libfbtrace.so
-
-	exeinto /usr/$(get_libdir)/${PN}/UDF
-	doexe UDF/*.so
-
-	insinto /usr/share/${PN}/upgrade
-	doins "${S}"/src/misc/upgrade/v2/*
-
-	insinto /etc/${PN}
-	insopts -m0644 -o firebird -g firebird
-	doins ../install/misc/*.conf
-	insopts -m0660 -o firebird -g firebird
-	doins security2.fdb
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/${PN}.xinetd" ${PN}
-	else
-		newinitd "${FILESDIR}/${PN}.init.d.2.5" ${PN}
-		newconfd "${FILESDIR}/${PN}.conf.d.2.5" ${PN}
-		fperms 640 /etc/conf.d/${PN}
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	diropts -m 755 -o firebird -g firebird
-	dodir /var/log/${PN}
-	dodir /var/run/${PN}
-	keepdir /var/log/${PN}
-	keepdir /var/run/${PN}
-
-	use examples && docinto examples
-}
-
-pkg_postinst() {
-	use client && return
-
-	# Hack to fix ownership/perms
-	chown -fR firebird:firebird "${ROOT}/etc/${PN}" "${ROOT}/usr/$(get_libdir)/${PN}"
-	chmod 750 "${ROOT}/etc/${PN}"
-}
-
-pkg_config() {
-	use client && return
-
-	# if found /etc/security.gdb from previous install, backup, and restore as
-	# /etc/security2.fdb
-	if [ -f "${ROOT}/etc/firebird/security.gdb" ] ; then
-		# if we have scurity2.fdb already, back it 1st
-		if [ -f "${ROOT}/etc/firebird/security2.fdb" ] ; then
-			cp "${ROOT}/etc/firebird/security2.fdb" "${ROOT}/etc/firebird/security2.fdb.old"
-		fi
-		gbak -B "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gbk"
-		gbak -R "${ROOT}/etc/firebird/security.gbk" "${ROOT}/etc/firebird/security2.fdb"
-		mv "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gdb.old"
-		rm "${ROOT}/etc/firebird/security.gbk"
-
-		# make sure they are readable only to firebird
-		chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}"
-		chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}"
-
-		einfo
-		einfo "Converted old security.gdb to security2.fdb, security.gdb has been "
-		einfo "renamed to security.gdb.old. if you had previous security2.fdb, "
-		einfo "it's backed to security2.fdb.old (all under ${ROOT}/etc/firebird)."
-		einfo
-	fi
-
-	# we need to enable local access to the server
-	if [ ! -f "${ROOT}/etc/hosts.equiv" ] ; then
-		touch "${ROOT}/etc/hosts.equiv"
-		chown root:0 "${ROOT}/etc/hosts.equiv"
-		chmod u=rw,go=r "${ROOT}/etc/hosts.equiv"
-	fi
-
-	# add 'localhost.localdomain' to the hosts.equiv file...
-	if [ grep -q 'localhost.localdomain$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "localhost.localdomain" >> "${ROOT}/etc/hosts.equiv"
-		einfo "Added localhost.localdomain to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	# add 'localhost' to the hosts.equiv file...
-	if [ grep -q 'localhost$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "localhost" >> "${ROOT}/etc/hosts.equiv"
-		einfo "Added localhost to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	HS_NAME=`hostname`
-	if [ grep -q ${HS_NAME} "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "${HS_NAME}" >> "${ROOT}/etc/hosts.equiv"
-		einfo "Added ${HS_NAME} to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	einfo "If you're using UDFs, please remember to move them"
-	einfo "to /usr/lib/firebird/UDF"
-}
--- a/dev-db/firebird/metadata.xml
+++ b/dev-db/firebird/metadata.xml
@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
-	<longdescription>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <longdescription>
 	Firebird is a relational database offering many ANSI SQL standard 
 	features that runs on Linux, Windows, and a variety of Unix platforms.
 	Firebird offers excellent concurrency, high performance, and powerful
 	language support for stored procedures and triggers. It has been used
 	in production systems, under a variety of names, since 1981.
 	</longdescription>
-	<use>
-		<flag name='client'>Install client library and header files only</flag>
-		<flag name='superserver'>Install SuperServer</flag>
-		<flag name='xinetd'>Install ClassicServer</flag>
-	</use>
+  <use>
+    <flag name="client">Install client library and header files only</flag>
+    <flag name="superserver">Install SuperServer</flag>
+    <flag name="xinetd">Install ClassicServer</flag>
+  </use>
 </pkgmetadata>
--- a/dev-db/mysql-workbench/ChangeLog
+++ b/dev-db/mysql-workbench/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for dev-db/mysql-workbench
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.108 2015/03/18 19:22:56 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.109 2015/03/21 21:38:10 nativemad Exp $
+
+  21 Mar 2015; Andreas Schuerch <nativemad@gentoo.org>
+  mysql-workbench-6.0.9.ebuild:
+  x86 stable, see bug 505798

  18 Mar 2015; Hans de Graaff <graaff@gentoo.org> mysql-workbench-6.2.5.ebuild:
  Add missing dependency on virtual/jre, fixing bug 542576.
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@ -16,16 +16,26 @@ DIST antlr-3.4-complete.jar 2388361 SHA256 9d3e866b610460664522520f73b81777b5626
 DIST mysql-workbench-community-6.0.9-src.tar.gz 22899136 SHA256 dc88637c62336dd3e68fb2213090c66be0ca81986b7659af934e63599e778e1f SHA512 a99156feed82ce61ff127ca4a26f825bde332c68ac81558b9112933f1eda45ab1a3e5faadada336f22ba4cc4197dbb9d48a33cb6a827823660eb8350119d492c WHIRLPOOL 443350529989336c978feb9b6cbd5b3fed300ecf534941eb4e000a49936f23d3a569a6e26e605f71adac8e7b36b9e95bff8aa8e92b90f4ae202d213f2832792c
 DIST mysql-workbench-community-6.2.3-src.tar.gz 14576661 SHA256 4caba8cf1f8dc0fc57e98a6170ad4718ba44c8f6622ef2359c7a550d080b3846 SHA512 c7d4130e6aeea842347ebf137502159fa17e2baf28bf36e1cb2d39dacf07671b53cfcb54d4f6559ee01d3945d453bedf81b3e58d5f805df15e63bbf113acee27 WHIRLPOOL 15e7624e29cc1a2cf1a786a50c02c2124cbeeb7577be617dcdb3751613d7bdf1cd26a44a430cc08861d3f0416a46ef7bf82abd7d6b03052f651c6a963b858688
 DIST mysql-workbench-community-6.2.5-src.tar.gz 13037465 SHA256 40a5dbf72b55441ea3e9466dce2de47611777c88da2b65b748f10b06dfa0794e SHA512 6cc9ba91a9fd4d19bdec157084fd5b510cc274e2851b54855441ad97dd042009064a00aa330a5689c18ed70a0996bf23411be475339ee96ba2ff5252c49d7839 WHIRLPOOL 74de61140edd91ee85c222338c02d3672869a0231bb25eb5f37c43a9cad2e280db521261a4ec6557e237c3f48cab84e92838a100949835fe85db924b5a382cba
-EBUILD mysql-workbench-6.0.9.ebuild 2202 SHA256 e99c7657c57a8622a070a3371b330418810f8fb7aef117530eca4443eb69606d SHA512 69e9e62f29d966ce4834aba225f52f69e111f308e9a40aa0cd17e53b80f3f8ae2da329ba03e8ae925cc2ace597540367cd230fa2f42a944954cf04a3b7eff019 WHIRLPOOL ae85393cb5849d208c88008e0708520c55262b31922191b12fa477f4b224ac9e4d177a228b2e6eebfb2b6e20a4fef1083b8de551d3d1e858c37c7905287a79e2
+EBUILD mysql-workbench-6.0.9.ebuild 2207 SHA256 61a08c3a7852a9601cfcf895a111c17a5ac1fa1d81f652766bcfc4cd49042a4d SHA512 1817cf2d07f4bd19eed93c018c9f3af4bdd6a00825725c8134041a71bfc362908bdb1e43cff7a6b6c772a1eaba9b92dfeb411063c1aed913379a02a469be7ee2 WHIRLPOOL c6037f02a02706c5ec69f8b906895d731cb806194d851aa1d347824a0acfcd1fe2c1d0cd63d591f93bd4141a43d236f5e6672dbb17608f2b866104f9a6c7739c
 EBUILD mysql-workbench-6.2.3-r1.ebuild 2588 SHA256 fbb8c1404177b4d9a853c2c4f64512fd39ed3b08ce84a95eeacfca322d916d1b SHA512 60c3d3b1e2a0eebb15d23cb5b99617e72ade2b224d4ab200fe570ff5337e6dc376bd3b7c7331ae812929ffdd41bfe936a5df7f2e1d036c80e0f0d0e881035d23 WHIRLPOOL fc7c2cb41709fc1a8f84c04cafc53c79ca0b1aac86f5430def5a3de89226f4d3e4b577ee2e3311c58e3c8cf3c598ec9aa24804476fb4482c8cb376e73d9605f5
 EBUILD mysql-workbench-6.2.3.ebuild 2499 SHA256 fc2c5f05139545823c646f72b6402a71373d3948b1a58bab245bc1774759457b SHA512 9b84e8eb10ea27f87b17db3ea199b0dd73621e7867e1538557c028b2003346cc33176e90c3f76268b6318ce03e02c7ffb70405f6f1cbb06d2628b560b14dcd75 WHIRLPOOL 1cf8be3f3b2c98cec1f3a954d976a2bd3df3e33416209da5258df514e4eb134977aedea90f10faf44e8eb3ea893dee2e0a78f21e41cf12c604fec2b841889f1e
 EBUILD mysql-workbench-6.2.5.ebuild 2698 SHA256 13a9d5935adc4594f71af831ee340bc58ce1dfdb080e85c4b179d8ead2a30350 SHA512 42c799727d3c31951f0ce62c640c05760d5f8e6b9ca42fb24dec23fa835cb8b8e5f2158e43e4f3488c9d69c0c1cb1e03b7cf01bb33aa30fae623649d6bb3fbdc WHIRLPOOL 5f60497a9d3d54401bb953726cb2c894c388b043d839544679f8b8b2116d930e09ac372f680240a52d487ede31430f7d455f7974d59377a3661d0487e1ea818a
-MISC ChangeLog 18951 SHA256 d1d21744b8c791d0eeadde44070cba01c975c07e73ffdebf0dcb3059e70944dc SHA512 14391a8ff8b7de34a6289ffff51f3a01236ef05f270b15ac7647ada14e54b7b4df4eac0091f59c972eeda1b8d8386dbccc73453c8b21b01837a52bc369e3f10a WHIRLPOOL 607a7b1e90d603e9c79fa18bc3ece6dc7b36abf0348d994520f49fdb804bfae8cadb98dcb07c1e6b78c77325f2b49667545e6006e6cabf8c1295c0326a068951
+MISC ChangeLog 19071 SHA256 183761f931ee0cfc3eeeac485ebfaf571950f9f688a1e636f90442b923df1ad0 SHA512 3c801432d899b3d3455dd0e25d97e1558eabfd5fea7d54690198637c23c6aec0c9ccd3a13c26f44b7b151cf1af5fb1b3af2d305b34ca91caf7dc3a31f8864a2c WHIRLPOOL b0059aecda65eb6a74e8e678ec13870f12b9e038068d643c888873723f947c714964dd4b49f031a08ff895b22043f97a62a60e573288e8fca6be0863841d9d9d
 MISC metadata.xml 201 SHA256 c90b12c6600840878686d4544dbc51d97b0715add76b40d9400415cdef6324ad SHA512 3131e5281b343002ef359d7199da425d3f9f5406ef4ddd9332eccad6b78e3ced62adedd4dfe14538db391d2590811df6f2a15cada5a1e924479a0189cd69b7d3 WHIRLPOOL 8631f9384237d55afedca6bba2e9e6b80f5d260ec195de52a736072d4c743579e435c363404e0561a05708c07fbb92e21d69aaff1273b9f724d25b3f59b26fe6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2

-iF4EAREIAAYFAlUJ0JIACgkQiIP6VqMIqNfiOwEAhA+WIFY278dT4ToHEBuoIYxF
-QdHVGBtHuGVXqn15BQYA/jndfEPrvNmox18fpNzjfoxqb9NwYHSmHM1zH2O4RcSM
-=Ujro
+iQIcBAEBCAAGBQJVDeRDAAoJEIug43o+kWudbVkP/0ifTWTqDF+oFkYUCnykjryG
+tvTnEBs5tDEU/8LQdsBomEeIf46VRsZJ8CH67eksK9pkGl3C6wwr07QB7heSGhg6
+5D+aatvTkv1O+PCDlTKu0bfitxB4sqUFZKOS+VrfzrPeZMrjJKWjVh1/rrHYw37s
+Ye79nmSe1XYoZNseadEuJJx6YAZssERvksTBOAiKbUcInd7qxc2cpYc7eHi8AIhs
+qUPKWTtO5PwioWVfLduqahu0WY73XyBwuq8xAEGpDdD0CJy00VMOJrucWv6HIGIS
+qtAblcZopgsQ9OEkMcXzdJycxNEDHMXWKbh2tKv/j/eOK/T1X/HwwaYIKcBV0Yll
+GRVFshNDyOOd3jyR4Fg7RejEi8frbmeVBYUUrQErzMVt+bttP0caZifsXC+mlhkH
+cZNnPel9WOdLX4q6O17Y5q5EAPJ8IhMtYCIKzb6P0plFhWj7zQqtEAxM3NleLmyi
+UeWV0L93ccmmgzq4cSoqdL1ycguwG9qIjjZSlO8zjctO8PYc3bqQLuHx93L85qhv
+J0gz8QOiY5V4ysGZ8iLRgNfcLrXBoF+gDXEMbueqBH5j6F5ShHXc8osW5PJsAcAv
+jieKB2WcklgYZXyKHPyoY2JuSnMXyl4RrCLfl1Gjw9nw+ism4szoLB0nlTnJUr0o
+0TeBGqd5i1Bfd6sMACBI
+=uCj2
 -----END PGP SIGNATURE-----
--- a/dev-db/mysql-workbench/mysql-workbench-6.0.9.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.0.9.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-6.0.9.ebuild,v 1.3 2015/03/02 09:27:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-6.0.9.ebuild,v 1.4 2015/03/21 21:38:10 nativemad Exp $

 EAPI=5
 GCONF_DEBUG="no"
@ -20,7 +20,7 @@ SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc gnome-keyring +iodbc"

 # glibc: deprecated mutex functions, removed in 2.36.0
--- a/dev-db/vsqlite++/ChangeLog
+++ b/dev-db/vsqlite++/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for dev-db/vsqlite++
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/vsqlite++/ChangeLog,v 1.6 2015/03/07 08:05:56 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/vsqlite++/ChangeLog,v 1.7 2015/03/21 21:35:07 nativemad Exp $
+
+  21 Mar 2015; Andreas Schuerch <nativemad@gentoo.org> vsqlite++-0.3.12.ebuild:
+  x86 stable, see bug 505798

  07 Mar 2015; Hans de Graaff <graaff@gentoo.org> vsqlite++-0.3.13-r1.ebuild:
  Add ~ppc keyword since previous version was marked stable for it.
--- a/dev-db/vsqlite++/Manifest
+++ b/dev-db/vsqlite++/Manifest
@ -3,14 +3,24 @@ Hash: SHA256

 DIST 0.3.12.tar.gz 23720 SHA256 655d53abe7b21b024111565cf9da8ccaa90540e5ff36d7d227c2eaa22305e925 SHA512 5e134de01a3f2c8adab40ae4f598b5c3b095b7503bf1bcc1aae012d3b087ff68b7cd1fc4dbea74b8cfeac82e9a18428efccea3c1e5a229c2aec05f8228c28344 WHIRLPOOL 66c1252ecc2d05ad2a3690141efe4dace892a839b8b649cbf7b96e55de30bc5d384bd22394d94ca112b0f26380baf6b5db0a6c94d469b9cc5777986e9ae61842
 DIST 0.3.13.tar.gz 28195 SHA256 73dea3c0b4b7769254da17182efbf9fc16893c50ed0d544abfdde127b69467d5 SHA512 70fcd16348e3b2a0854b1d496c68fda7e354068aefbd6a5ad21d7a42afebd2bd746f604240475acfeebe00898ab156f9dfd687346fdf5c77d775262db3a5666e WHIRLPOOL 02d79a14dabbc7a2191f40370d94071c95c4dcb72f4eb6ba68b38872296a92473ddfd06a702bb6862fa2a5eac9ac921dd93e3312615bc587b319cf7a64ee5427
-EBUILD vsqlite++-0.3.12.ebuild 1006 SHA256 c8d066ee906ff8402c95219c7c66ff469fe089fc117ff6a7e26d5883f9501f0e SHA512 6911e3552e01bb6ae3a50128837cd4bb02b85b1270d7a82647ec477f50d6115386302667a52ad6dc4c2f041a256541aa2448b14310277c92c810f8bcf3d16eb1 WHIRLPOOL 630e4ee5587e8179c8126c1c7f441fcc0dc371e96deefe9c1ba987fc375eba685fc6d8644426576578e56bbe4c07a9242daa839d2fe9cde222c1214341b90ec5
+EBUILD vsqlite++-0.3.12.ebuild 1011 SHA256 46626a585845db3943986e2003851541429add0379dc2d91f5639ccbc076ee17 SHA512 b91440ecdea6b842710c6ccbc17145860fc2c218c1356992f0ad00a8b0974d2ece6e8611dcec8981213ab4f1b8e69b72fb64dfc882e63a5e9b5a2f7536684d24 WHIRLPOOL 4f590a79a6be1dd61fdbcf5548956961fae5fa39a3daebfe57e39cbefafd97e1305bc20388880b93ca42dab3cce210d5d0d9e55aca6df41c445d7ecdd96398db
 EBUILD vsqlite++-0.3.13-r1.ebuild 1017 SHA256 53b546ff5c7673fe6b3031913772044437c0dcfc39a8965ab791c020beb41b7b SHA512 58391d1bbd24cdbfbb92d88d0e593935319fbbdf82341417960a915e2f4342358c101e3c1f0de57a2921609ffa32b0ed906b86c7afae8813fd7f0780499e3860 WHIRLPOOL dfcf46b38033a29e69b804caf8e0afc6e6896550625431776e1d6bb9c6777b9d19d6466193d0dcb5cbdb17469dfb8273f0daad10608a894c6402de64a14efebd
-MISC ChangeLog 1162 SHA256 120182e3731507970ac899f87a4c0eab0b926297ba00f8cfa74b77a2ed4eae69 SHA512 0b0c07beed71a94e68131a6c15249c868249a031a808ff5279e6afb00577a089ae6bd141e5b84bbd580ad1c1865656bb949b510663db14c09f8ff38be2fca05e WHIRLPOOL 5c06ea7a72f282db88bc4783d9a4a1e679743854da8c9408928242a11f3aaaace2fc9e1e98f39e41b2dff8be93563c8e03b0daba57cc0d60dbd91967d9351158
+MISC ChangeLog 1275 SHA256 bd35739c13f6f87cdc6b53cbe3b2b0fb66f7c8a560502ae5f65d6b4109efdd14 SHA512 2b646dee7f6e4821f3efccaebde47575e9a3fdd666033730ce51fd1ec37c1a45b4f6710a7c46c6d2b33bf8a51000b91d249979eb73bce53489271be522200e74 WHIRLPOOL e8f70d5f372c42161632b0b26c21b51db8236e723f8de3db0cc9ebadaa0e9b3b8d931a3362f59af269951585933f0d8cbfc65dcabf0260563899665373ddca49
 MISC metadata.xml 201 SHA256 c90b12c6600840878686d4544dbc51d97b0715add76b40d9400415cdef6324ad SHA512 3131e5281b343002ef359d7199da425d3f9f5406ef4ddd9332eccad6b78e3ced62adedd4dfe14538db391d2590811df6f2a15cada5a1e924479a0189cd69b7d3 WHIRLPOOL 8631f9384237d55afedca6bba2e9e6b80f5d260ec195de52a736072d4c743579e435c363404e0561a05708c07fbb92e21d69aaff1273b9f724d25b3f59b26fe6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2

-iF4EAREIAAYFAlT6sWUACgkQiIP6VqMIqNfbjgD/ZWesKEPdHikhL2MTgCjVfGIg
-yjTahAwywz6GANEHkKAA/iLo2/9r4eDk1OSDbKICg96khTx6WLYEeLLjg+C3gAhD
-=4kG1
+iQIcBAEBCAAGBQJVDeOFAAoJEIug43o+kWud2iUQALlH1WqPfliCVNLzRr2fyu9i
+i4YU3zMEJff4VDk85h5DXjDkTwerI7MTTX0vzoQlQ8NOXpZmVFO4NC/vvOdBRRbw
+H1ye2RtYYfcZc5tKFSt/R9+W8znSJPewqJHiwPGpFrtemwIAN3390bVC5rAFyQ8I
+QR4BmlXnUJ+W9T/lkJktiL1/afouT+DAnXKVhWYhioQUEltB2sQen97vxc/0t5sP
+haHeshvrtfbFmZwBRlzWWEUavEF/5k8BYhek1b0xL19j3OlF1bQn0sUKiK1yAgua
+LerjJDKWzeLUXziPDYbgyr6VbmeMDnYJGrRv8RG2XiuBT5eUdARGqoBXsOnaOoQ7
+ULp4iQv1qFnbKzkqVAfqqvensQoIyalMnwKgyn+5WsEaf4Tjd/h1EmxkJJV7C1ZV
+yp6NxqUOL5US6CQs3IY+pjNBqGPEYSN20eCsNeGs4ZI6pb9sCOcA8EIqeQmhipFM
+LS2aK39ewPOeyz6vTlPOqOVHGLT0u6e33ShV/LDfYM+62ZSb9BRDMiaJYL6sChql
+MFrmw0ZQWNYObmEcq6IO+45ro6aTGimefHoua6mRku3N0s6jRHehnfMcpRAcTBid
+nWIBrUkoge3Z6w2vVRv7LDPTPgvXTh19sg+1Z+qsXdLdjPPgAfTSkIoSzLBIkzEv
+sAuiPoCjJPZUb2qXuvxZ
+=0R5u
 -----END PGP SIGNATURE-----
--- a/dev-db/vsqlite++/vsqlite++-0.3.12.ebuild
+++ b/dev-db/vsqlite++/vsqlite++-0.3.12.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/vsqlite++/vsqlite++-0.3.12.ebuild,v 1.3 2015/03/02 09:27:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/vsqlite++/vsqlite++-0.3.12.ebuild,v 1.4 2015/03/21 21:35:07 nativemad Exp $

 EAPI=5
 AUTOTOOLS_IN_SOURCE_BUILD=1
@ -17,7 +17,7 @@ LICENSE="BSD"

 SLOT="0"

-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"

 DEPEND=">=dev-libs/boost-1.33.1"

--- a/dev-embedded/pk2-la/ChangeLog
+++ b/dev-embedded/pk2-la/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for dev-embedded/pk2-la
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pk2-la/ChangeLog,v 1.5 2012/04/29 16:49:04 josejx Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pk2-la/ChangeLog,v 1.6 2015/03/21 15:06:20 jlec Exp $
+
+*pk2-la-1.1-r2 (21 Mar 2015)
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> +pk2-la-1.1-r2.ebuild,
+  -pk2-la-1.0.ebuild, -pk2-la-1.1-r1.ebuild, -pk2-la-1.1.ebuild, metadata.xml:
+  Drop old; fix correct installation and dependencies

 *pk2-la-1.1-r1 (29 Apr 2012)

@ -23,4 +29,3 @@
  28 May 2009; Joseph Jezak <josejx@gentoo.org> +metadata.xml,
  +pk2-la-1.0.ebuild:
  Initial commit.
-
--- a/dev-embedded/pk2-la/Manifest
+++ b/dev-embedded/pk2-la/Manifest
@ -1,7 +1,26 @@
-DIST pk2-la-1.0.tar.bz2 18990 SHA256 2099e33508dba7d000107f2d1cc68ed7f83e10914086f2add132496ea64e76fb SHA512 ee2cff63afbb0d39335e88c0696c0f3b29aee1ac07d2e892993dece54aff18d9c9ca6001628a525974b020067bb4f9df69b3ada64734a5260c10a00d206b5bfd WHIRLPOOL 20b2a0ec7fd42613369752b5e256c49814cb586a30f732f1f82a1d08a5e22a8046b4e15e4fd1d3328537b2e8aeaf1cc7be25d8bf4b1b2c0639bc4205b66b2efb
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST pk2-la-1.1.tar.bz2 19222 SHA256 62de53e9543dd6a940a0c1c681422431ca2fb823919a29c4a1f2bea5410be2b3 SHA512 50e5b16149437afe92e1e987d3020099b1278f8ad207192e9b197f72ec1ab26c77307efd99976a1c6334bcea1899f38997fce27bd1e4caf70a04f851a8136f0d WHIRLPOOL 370d73c79ecce0a0da1f490fd61bdf484d30ad768636d8ad8faee0d28787ee1f5b2e7772f4f773b701969da67b0334295be034daa2c11b0e62446ada8a42d3f7
-EBUILD pk2-la-1.0.ebuild 741 SHA256 b167b76e410686efe17ba38e09dbdef80c8f81985628e37593d30d01c910089d SHA512 c390cae0ac7fa7767fa2634fda651e3cb39364754d3b10fe3c2d6331a9ff456b99fabb6268956144883b8048965107e4d0339abeba9ad447b4fc3d71302769a9 WHIRLPOOL 16aaf681edac74c513c4430e015c2d233fd9972c698a05b50657bef9ad0e683cc5a1fa0474c761893aa9f99393c71ff8a7f1f4ab34630bc5a439c4eba37dd89b
-EBUILD pk2-la-1.1-r1.ebuild 756 SHA256 12c44270cefb70fd28f6195384bf30680e656c9b1cd25af47deb0905e67f479a SHA512 7338a4a72a07f58fdfd19dc6b49dc1bc4d5b9d3c7050c57e98500b95bf96e52b5a76226c25f644c3f0c63aa53d9e6f14229ee6eb1d72c5403f402ca82ee01a1f WHIRLPOOL c0ccd045a1e39b301d2c1c80e13ab442dfac41a6376cc7cfcda69bd1ee1420f1fa6f22927b1abab40fae795fa96c7f37434e50a71d9040cb33b9bebb845da906
-EBUILD pk2-la-1.1.ebuild 741 SHA256 951de9ba3021502c61d44bb25ff29a179fd484fb9c7649ed63d9d2c9b9e4fd21 SHA512 865f84108b6fedb5e5dfbbec33ccbb44eeaad2880bc1333b7bcda231259df6d1a5c73a793bcc41b76e24f419ec0b247ca36ed74b4914c526db4737bbc13916fa WHIRLPOOL cb868d9b24d00568c42375211a78b72065037a7d91e2e98264e059adf5ae2c019ac0ee69ed7f0d6237538437ca3f0be344127d0fe0c6d5a98abf09c49a7fc35a
-MISC ChangeLog 796 SHA256 a6a2f2e38c614331a841a8f490242ad6b7b027313774871c8e895725be3261b3 SHA512 2f15c2abfabcd5526460ce87899445e732cb48d815060bad21b1028923909cb088bc880aae1c295bb007d0b69e429e718c29f745ca33ee3828ff4bc80e73c7b2 WHIRLPOOL eab5a7ddd2f7a96c96f9e307718714b61670912076a34888433e3d350c5bbe44fb134cdea9829914aab8bff8b60f4c08e9d4a36cf6b5af5f0a6af846e24b6689
-MISC metadata.xml 382 SHA256 ca565d7ca92af185680ea512d7fdc709ff2f1cfe059a3cd68ed62bd6542f6fde SHA512 5b460c27794f85a863dade7215346ad98739bb7e38e40ed1e65604b1df5163eee5fe5cd067be89585387296ae864d0c128734c113aaa4c0ba229b73bf13e3009 WHIRLPOOL a5ee271dc0ec8b21cdc75366bee9232c8fd5bbe7c7f2fbfa02433e9ae33d6e852088812f26d2875dcb96f9051e609fef6c528552aabab5b13ec7cbc552d531ff
+EBUILD pk2-la-1.1-r2.ebuild 732 SHA256 cfd29ca520a4694088e2efc7fa88f0e26198a97c708ed2c9ea7da1f68ef9855d SHA512 d16667ccd0e4369dba2500e4dbd3668c9d68b738bb5507e0fdda9c09c6eef782e390e97aec4288168015d430991b4e608da75f6422c19413135c799083ee8952 WHIRLPOOL 638bc03bc8b914f792f04fcc66971d21a6f0fc6d3d017a7c3ab7f1ca739c6c85fb5f60d9f1bcde72ded6c032d7b2c67ccbc45988cfc36ff3d4c8ba68de6cfdab
+MISC ChangeLog 1027 SHA256 a7fe19f74dadbd55e0a65fb0e7d5415369c133a8d1783785f2c995f16a17aec2 SHA512 54f27841999317a93f6e949108bae3532cfa7296d031f6698deeee0a0946b66177300d5391518c71b1a8e808f8fff6a983528b065e961c75e93f8cffd168f1bd WHIRLPOOL 6ad92449adaa5a285b25c1c0ea432381c669a80991f3bda5dc5f140123bfceb994f783822a364ce95323e56a434a5c8bb2042904cddb56ef1898d1d14aa85ba7
+MISC metadata.xml 398 SHA256 b95f31badf56d252d82eae91db4335c959a42aba39dd64f87c6f6ae712f06593 SHA512 3fa4e3d8c5f4b09a946d6c0c33cf02598f836611baff0e7833471ef4f67f4e18bfe7887ab11132f5c1f5bcba7d4f5167e7c2a7a225cff0cc73c4f5ef0824e46e WHIRLPOOL 6bcea41c9acb9263d8e586553b8977dc21913ba554b97ab3f1c43cdeccbb59934b2a03902fc74c72f4ac2af4399d6a235be5a0691766b5cd7fa14633c3d7df79
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVDYjtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirw7UP/jTcUaWaLRUHLgBvkb0DSo75
+o6GDqWlG+oAdtBeIorNcVp+I1a0s98fKBQMFQpeF1n+ggNz9jQqUZgSAA+adgsJl
+nBOCza6Prka/S42F01Tm5rFFv6uWui2OfbJCEUPQ1Q/5ml5nvD4mdRYKURY0MAuJ
+dJSyDzsXaJ4CemDhe+dfDzQwNZ+hy3i+5bcxvwVyUDuBxQjDMNtKRPZkwf8uk3HE
+zN3cNqGOfV391HzQeT1gI2+Ws173KJFas+I1IseOBzg/60pOSY6ciNGfhMaCabUT
+uO71VsAWWoSbqVpWYNv7ElkIMMCcXZlXCYazlZhxDgm6G9XV3afIHpM76iB1uqmE
+k/Hb/ycelCqpqi/2w4hlcf+5B0moKX8NBUEP8CjfmIB2nMSVE/0NrPoAj4a3WpKL
+8VN0w+UXSXHzSjv8tbN3uVbrClFdDzDZkUJkeyIR3k7lTyTGG9igueEYtQw9RJxC
+DsUt3IyIf35MUPgAOK7/V1MwInBa3VKsobOpvL+36YiR3XGiYQVlzp2yf2M8o2Iy
+NWDdOX8cyeG+fAE/EJjBGCtB1y3slO+4f6G84KKYflJLLrKTv6opiF7JAGtidwtx
+G09S6YCaRJ7KrUEPVtIVVYHS6/G5fHdNIxlrfZXcPj5xXhOMm8Of8Jk+UO3PUvsl
+aNa0fdI6SMgSgSV8pFIf
+=OvoK
+-----END PGP SIGNATURE-----
--- a/dev-embedded/pk2-la/metadata.xml
+++ b/dev-embedded/pk2-la/metadata.xml
@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>embedded</herd>
-	<longdescription>
+  <herd>embedded</herd>
+  <longdescription>
 		pk2-la allows the Microchip PICkit2 programmer to be used as a
 		Logic Analyzer and I/O Probe.
 	</longdescription>
-	<maintainer><email>josejx@gentoo.org</email><name>Joseph Jezak</name></maintainer>
+  <maintainer>
+    <email>josejx@gentoo.org</email>
+    <name>Joseph Jezak</name>
+  </maintainer>
 </pkgmetadata>
--- a/dev-embedded/pk2-la/pk2-la-1.0.ebuild
+++ b/dev-embedded/pk2-la/pk2-la-1.0.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pk2-la/pk2-la-1.0.ebuild,v 1.3 2009/05/29 17:55:32 josejx Exp $
-
-DESCRIPTION="Logic Analyzer and I/O Probe for the Microchip PICkit2"
-HOMEPAGE="http://sourceforge.net/projects/pk2-la"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-python/pyusb
-	dev-python/pygtk"
-
-src_compile() {
-	### Nothing to compile
-	echo
-}
-
-src_install() {
-	### Install the program
-	exeinto /usr/bin
-	doexe "${S}/pk2-la"
-	### Install the documentation
-	dodoc "${S}/README" "${S}/LA-Format" "${S}/IO-Format" "${S}/CHANGELOG"
-}
--- a/dev-embedded/pk2-la/pk2-la-1.1-r1.ebuild
+++ b/dev-embedded/pk2-la/pk2-la-1.1-r1.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pk2-la/pk2-la-1.1-r1.ebuild,v 1.1 2012/04/29 16:49:04 josejx Exp $
-
-EAPI="2"
-
-DESCRIPTION="Logic Analyzer and I/O Probe for the Microchip PICkit2"
-HOMEPAGE="http://sourceforge.net/projects/pk2-la"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-python/pyusb:0
-	dev-python/pygtk"
-
-src_compile() {
-	### Nothing to compile
-	echo
-}
-
-src_install() {
-	### Install the program
-	exeinto /usr/bin
-	doexe "${S}/pk2-la"
-	### Install the documentation
-	dodoc "${S}/README" "${S}/LA-Format" "${S}/IO-Format" "${S}/CHANGELOG"
-}
--- a/dev-embedded/pk2-la/pk2-la-1.1-r2.ebuild
+++ b/dev-embedded/pk2-la/pk2-la-1.1-r2.ebuild
@ -1,6 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pk2-la/pk2-la-1.1.ebuild,v 1.1 2010/03/07 02:38:48 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pk2-la/pk2-la-1.1-r2.ebuild,v 1.1 2015/03/21 15:06:20 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1

 DESCRIPTION="Logic Analyzer and I/O Probe for the Microchip PICkit2"
 HOMEPAGE="http://sourceforge.net/projects/pk2-la"
@ -13,18 +19,14 @@ IUSE=""

 DEPEND=""
 RDEPEND="${DEPEND}
-	dev-python/pyusb
-	dev-python/pygtk"
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/pyusb:0[${PYTHON_USEDEP}]
+	"

-src_compile() {
-	### Nothing to compile
-	echo
-}
+src_compile() { :; }

 src_install() {
-	### Install the program
-	exeinto /usr/bin
-	doexe "${S}/pk2-la"
-	### Install the documentation
-	dodoc "${S}/README" "${S}/LA-Format" "${S}/IO-Format" "${S}/CHANGELOG"
+	python_foreach_impl python_doscript ${PN}
+
+	dodoc README LA-Format IO-Format CHANGELOG
 }
--- a/dev-embedded/pk2cmd/ChangeLog
+++ b/dev-embedded/pk2cmd/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for dev-embedded/pk2cmd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pk2cmd/ChangeLog,v 1.7 2015/01/05 15:24:14 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pk2cmd/ChangeLog,v 1.8 2015/03/21 15:01:13 jlec Exp $
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> pk2cmd-1.20.ebuild:
+  use dobin instead of exeinto /usr/bin/ && doexe

  05 Jan 2015; Manuel Rüger <mrueg@gentoo.org> -pk2cmd-1.12.0-r1.ebuild,
  pk2cmd-1.20.ebuild:
--- a/dev-embedded/pk2cmd/Manifest
+++ b/dev-embedded/pk2cmd/Manifest
@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX pk2cmd-add-share-dir-for-dev-file-1.20.patch 668 SHA256 c59040ad6b5d840f3e55990fa58230610aac9164196ea0b3255fc1f4616c882d SHA512 f586c7eed0eac0d68e495d582c85c802c98ac8c84f7f21b00616edbbace74b877d21fd43334e5accfd02413d4a6d9d9811241feec1eaeae3a7647c745206d638 WHIRLPOOL a22205d9a8b1c95f9fc341e5f3db41df47ec0787ea44267c19c58f7ad47f3beda411d1fcdf003380b41960a34a0c83cd03fb6bd62cb4bca05669484d6e48257b
 AUX pk2cmd-add-share-dir-for-dev-file.patch 671 SHA256 50c304a9b6465639df02599f2bdff7c3d8c45d4aa68be00727c649d43e65b078 SHA512 9e9a7fcbec7ca3c9d0f2204eb60eb8d984248f21a6b7a2f6c11ff8fbd8da64e1bb5a92a0e5283542c7c5cc3e4cb0ea0438687c2bbe449804e6c86426307f4d44 WHIRLPOOL e6eaa2c352f694442f2483a195dc9a3238320ded41659bfb364ad935b6d10db3bcc07cce0ae7e1f64d4ce258431a4d42db471439f183e99c8630e6d336cfbddf
 DIST pk2cmdv1.20LinuxMacSource.tar.gz 223175 SHA256 903027de5036eda3a648decece4acfcefe91e754ef0d4eacba0e5ba8b18857fa SHA512 72675eb287c1410c82ff49b4922afd28a8017b4e8517d10e77e0f0b111630f90881f778d754a47c97453f45412e965e281435d495fc70a047bd7357dd64f7b24 WHIRLPOOL f4f36412d4e653a20866bcbe9ec25b94e8ff4e75c1ae2e4944a42682832c9b64b683248bc559e73b976902906d2959492867f055291588cf66d9b83838174c75
-EBUILD pk2cmd-1.20.ebuild 1381 SHA256 b767fc8e830893bfc42a8dc31ada4879d485e21f84adca1322ecdbfcdf3dabae SHA512 7e6ff60fa63af700a8547a471b62dd7f57a8a48f06a4743fbcef24eed4bd3c83c7ecabb5aa71a40007f623539326cdfcf768493398a0b75b2ff689de1a239843 WHIRLPOOL 5a82cb51d642765b50af71e0ecfb0cc677aeef37e5ef1e31acfcb103e14987def6b985de3ca3c0ac8fb96fa8e5307ad884e71f507e91e5257a0db16e9ca6621f
-MISC ChangeLog 1456 SHA256 7432abba7fb3a4350091d81f338bb162c4137b6c9354d5f1bd3af4050373a0c4 SHA512 c8a3f96eb0190b5c643407d028330a512be924eee977c2cfcad7e2916a9d45dfb5ececa53f6de594c891d52317d2958bb500d4b29d972ff0fe4c6a899b79a558 WHIRLPOOL 0baf36c2d24d87c6e085576dd33f42055a941d8a860f5e28b4c6a0dee5cf87ab8969e25ff9b5a141e6e66c4ecc1272a00c3e4b5cc854110263b29427b3911d37
+EBUILD pk2cmd-1.20.ebuild 1323 SHA256 84c7d129ed7221621ce1412a73440089d70664cb4182ae49e44c1caa3a0edb43 SHA512 5d384679dbd875d28835390eb4aebb9f15e46c28f9a485ec1341aed0d22320f5d319be25bf44975105f12c407ca890a1752f5ead95c660e72acebed2e38f8114 WHIRLPOOL d9142f852bb8db93229a17a35db30245d090c6f977b268787aa504037bd6aa1d46264c417ec6fe8694c254d7ce665f04c12609055dbd03ff1b016a5e0f869bcd
+MISC ChangeLog 1573 SHA256 935b921421cee1487c5fbd7bdd137a777e94c5a24b7d392a6ef6d504f5aa8e8c SHA512 c1103c0518e48e13b1c4697c90f452a6c5f0edefa59013225b703e7b989520df2224e6a2e47fc9cc528591437cf6796ff37de07701dd5ee62b7fd734921ba407 WHIRLPOOL 9bb6a499a9809728ec99ca84cad330a7e67ed28c2ac4310557b6073661e28ad92d14f0d53f8cb5c73a2d2c3841d9ae4ebd2bd2abe8c3568031e4a5835e9a81a6
 MISC metadata.xml 346 SHA256 08e2004b3b21d1731124186daca5cbc2317b664b41ecde75a470d9af910e5fa7 SHA512 d8a82aa40d3f8af7b7e43e84f7fa883705f72b424bd99ef7304a6b2773c130319f98b5ac317f7b693acabe9f8d5e47adafb8682fde3a655b9a190da34f255d1d WHIRLPOOL 6f11339ed64e32c96970f02111b1845e3037b715f0660575e988009c2e41259a987c47b43a335e504af6640a315289c85f7dfa0c0989599dabad32c6a09f8218
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVDYe6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir9/wP/RoUCsw6wvPGsGB7kx2g4JLn
+JoaqinHu2myVkJhB+djtfsklVZZsJU6MhO9Zz6cilEIfGoUGkC1w6s42qEkj+OOT
+CKmngU8T17wlf4dheVzTPzJH+Fp07K8sAbIDT8Gl8x5c+X/RA4s0hag0p+3Jj0PL
+bcbQknhaI03MDR3UJDoLbp1P9fqugAs3cQyf2DzVOqbh2OHL3/PXp9CcPzWMMcCN
+VslRtWoRVMfBEZnvwn8O+UHO+LeofED4sjo0fOw4g+cxLvbr/XwwAJr0pUCO/EF
+xsJ0RNGyJZB8IeSYWE/N9NJJpSsKaZRw0BftAG2TpbH/EiOMdXcSaEv6buK9Aq1l
+lVW5HXGgtuel5KXgCSqXQIs80TlHqc3GLjHkUhnuUDRVKVJanCjgaZ3J1WX05igB
+qOpSgnsdU1YZzs1cQTIJrE2pnZDAF9E8T9i2Pn/mQ790Ce9q0TFdrGMoLw97YKGf
+g19gOBq2Yt++gmm5yvMYUUqramF1RHuIxIx0RGOv1TYA4EAjOd8qGaVA09h8GxEY
+yZT3FEV7LhYkguOPEeGA7vLzgKCE0K74tLH3f4dbbmu3ODh4nw2hr0kgEdp8awh5
+8ntVzYMQmUm3oWy8Q4qQg1tumuY+Y9cD5Gq7BYJcTjaeEY357pDEWmmok8S9fS8L
+XH1a2vL+FELYpFxiRM7G
+=Wnu+
+-----END PGP SIGNATURE-----
--- a/dev-embedded/pk2cmd/pk2cmd-1.20.ebuild
+++ b/dev-embedded/pk2cmd/pk2cmd-1.20.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pk2cmd/pk2cmd-1.20.ebuild,v 1.5 2015/01/05 15:24:14 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pk2cmd/pk2cmd-1.20.ebuild,v 1.6 2015/03/21 15:01:13 jlec Exp $

 EAPI=5

@ -25,12 +25,14 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-add-share-dir-for-dev-file-${PV}.patch"

 	# Fix up the Makefile
-	sed -i 's:#TARGET=linux:TARGET=linux:' Makefile
-	sed -i 's:DBG=-O2:DBG=:' Makefile
-	sed -i 's:^CFLAGS=:CFLAGS+=:' Makefile
-	sed -i 's:^LDFLAGS=:LDFLAGS+=:' Makefile
-	sed -i 's:^LIBUSB=/usr/local:LIBUSB=/usr:' Makefile
-	sed -i "s:^CC=g++::" Makefile
+	sed \
+		-e 's:#TARGET=linux:TARGET=linux:' \
+		-e 's:DBG=-O2:DBG=:' \
+		-e 's:^CFLAGS=:CFLAGS+=:' \
+		-e 's:^LDFLAGS=:LDFLAGS+=:' \
+		-e 's:^LIBUSB=/usr/local:LIBUSB=/usr:' \
+		-e "s:^CC=g++::" \
+		-i Makefile || die
 }

 src_compile() {
@ -40,11 +42,9 @@ src_compile() {
 src_install() {
 	# Copy the device files and PicKit2 OS
 	insinto "/usr/share/pk2"
-	doins PK2DeviceFile.dat
-	doins PK2V023200.hex
+	doins PK2DeviceFile.dat PK2V023200.hex
 	# Install the program
-	exeinto /usr/bin
-	doexe pk2cmd
+	dobin pk2cmd
 	# Install the documentation
 	dodoc ReadmeForPK2CMDLinux2-6.txt usbhotplug.txt
 }
--- a/dev-java/antlr/ChangeLog
+++ b/dev-java/antlr/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for dev-java/antlr
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.103 2014/09/04 16:08:10 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.104 2015/03/21 15:08:20 jlec Exp $
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> antlr-2.7.7-r2.ebuild,
+  antlr-2.7.7-r5.ebuild:
+  use dobin instead of exeinto /usr/bin/ && doexe

  04 Sep 2014; Michał Górny <mgorny@gentoo.org> antlr-2.7.7-r5.ebuild:
  Call proper distutils-r1 phases. Fixes bug #521368.
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512

 AUX 2.7.7-gcc-4.3.patch 383 SHA256 de68d3a12a03d7bcdbd3e1cf5ab7d773123a55b4d9e8bb9f3a873fa2c2be84e2 SHA512 904ba9c0e4ca4980b415c1095b774d1f1eade009080372ae86b6090db9bc55998bed2536b08fe84e70e11a05f503636b1acda06064814ccb67b04aaf673d6910 WHIRLPOOL c69791355368a62938504f5b6356c59b36e3eee96aae0c4b879f27dc8bf86bda8799b77b0b57fe163e4e32914ae4e51464fcf9cd8a0bf1eb1fb80eaeb7eed339
 AUX 2.7.7-gcc-4.4.patch 257 SHA256 4d1c713424893be36f5b29f73a9e7f491274abe6535af31c26bf0aa8dbf00256 SHA512 d93af8f5c8dc415bab85f320bd39fcbbcae0e30c17dfa87b531599610b251c3472b72a84d5aa540d74342762d9a6ac510dfbf6001464d997b3753cac6ed85542 WHIRLPOOL f66210f8e129b9694340c996e41fa515c0b56981b9cf4393a5d091a98ba989f5278f2141b9bdf6da2258d3cc9f6e143c0fac3e76bb6315c35f6a75ab83ed3f57
@ -9,27 +9,27 @@ AUX antlr.pc.in 155 SHA256 31bf717831c33e3088958712f2c6629427a505ee0a48030e65b4f
 DIST antlr-2.7.7.tar.gz 1816180 SHA256 853aeb021aef7586bda29e74a6b03006bcb565a755c86b66032d8ec31b67dbb9 SHA512 faa72d2ddcba434ef1233e70c1549e63eba67c00793966322e821cf7f015cccb804448cb92d8fbef0429f59928fad65ec954f8ffbda0acbb8e983de0806d349d WHIRLPOOL def5ac0ddfe5a65f9f7d5489d039048c5d630b46cd5626593bd12e9b393d5ec26884f90b013bcdf58511e26abbf06e0d7b3789a11298b017f7e70af2ec8dde4a
 DIST antlr-3.1.3-generated.tar.bz2 47167 SHA256 ed326de0f1f92dd72e8d9644e8eaf59d02b9725b4b5218f5c54e12100f8d05f4 SHA512 4ea01ad0d5fc99607ffa445fb99ae424648b713dca293d05ff4ec064cac0a0fe5073df3834f9b6990e99f3cefc5cdd191a1ee3c3951d97615908b94630070bba WHIRLPOOL 61f7829811251a35528c322952830dc5a6e82e23e36f664af179b41955734e771aaad070298666a15be0f41982dbb8b19955b5967987582c6b666e602384d060
 DIST antlr-3.1.3.tar.gz 10743515 SHA256 1fca0fc7304140807e64ec263a58d93ef1b380cfb6407084e6909f8220bc1039 SHA512 6814b970740bd61e6727f81b1a2fb4249f8f029e756694d852224eee54e0231540f8e23d2fa8f78eef234d6497f5fa1411e76020ffaed737d8c1a5178321a062 WHIRLPOOL 9d9a1caf39595dbb9b300f730091cfa38a12ab10b8a59d58c7bdd9ba4674bce9f49bc21b5b170129216ff9d880dbf5f0bdb5bfe614b003a4ffe948948b5413c9
-EBUILD antlr-2.7.7-r2.ebuild 3731 SHA256 f5199cd75d5811dc537ee2cd4d96459bbf4e535ec26f423117935cc09f2286ce SHA512 6b02cd123a5b7b7edd78cbfd2484d9bfb5875704e75b75f94abe9fed51f8780f10d060332bc2b464b4a23e0ba173d58017d365b6dac007249e665c035d818084 WHIRLPOOL f1885fdfb324221db9db8e95678dc825bc9c3887b4a58be7dfac19da6bd53620024ec5388fe658acd5e7075ee55918826cfc413dc33e51875c62636454c5fbf3
-EBUILD antlr-2.7.7-r5.ebuild 4677 SHA256 0061425b205c8f91c32fe62eead4230458b52ab3bbfe821ebae799298c6f53fd SHA512 dffe569c84b11b6c53224263eeee08b3eb6e27a9200b6c13ead2f58c54f479f80eb9a9f6ce3321586d9b4bec955d6cece4bb70fb771f3cc814fdfa1dfe6bfe3c WHIRLPOOL fb9694d54a4fa168cd1e01487938a90a526bf487b634ba6394bc29d0ba005d4b29ecd6895831c0f42d15e3f55e7163a30b8e372225351f1763423bb82200f937
+EBUILD antlr-2.7.7-r2.ebuild 3715 SHA256 4dba1fa489cd71217632f283affa1cafbeec8fd3655c7c59ff3ca3f7e69e08cc SHA512 25f74491fa4f7c3dd2db759c39378979c6fba7c5afd8ba565aaff0da78919a3da19612a184e094b2483ebcdb687f21cc1826966852ef9369335581859f0ef964 WHIRLPOOL b43ef6b9f01374a238c6c10023b1af69ab598d2a918a4a42d50c2bfc73175962c5a36fdfa82b131c0d71044d6cc7ffafa3497017abc8f6b57b8352495ee0443f
+EBUILD antlr-2.7.7-r5.ebuild 4658 SHA256 7821eed1830f0a54aa66717e9c741b37c24f22e9c197861c6f332f571747fcf4 SHA512 e3a464e46c7c2e2e4b6d9a44a66fb16c0d91c1bff2d88a97d510cb340c8ea6ed7a1489ca998165ababe1b0a1879106c1bce2029e7f9852e4e6e292e3d6ee9a83 WHIRLPOOL 0df134f74a3a629dfc026c597b3d19575d508791649ce6bb94e8793a1d3d88cb75eedc74b0411f073774f8380377856168fb21aaf6d4142b04f68dc23b49509e
 EBUILD antlr-3.1.3-r3.ebuild 3494 SHA256 b1d0fd97562b3f012ec6bc53f5c632daa9c394c7c1b0043e6a71a8ffdf5d97c2 SHA512 5afd4e0fbf492e278c6f9af1733e97ba0b31d7f62db37d32300f27829fdbdfa392a901b4a8b065480dc91ac679e926c17eed76873f2e9bb5e24b3d119514d994 WHIRLPOOL d52fd17e45075883ab2e62eaaa4c250427478ce2828e47bfbb2195e60993e37d35f792de9e625ebc59101041d3c0ea09ebfa10167b662581e8a0dc71134c2c59
-MISC ChangeLog 14595 SHA256 53b14c9b9fb7704b4b05eb9410f07149013f53d5fb79c57d72d13f3da475befa SHA512 8306a582994f5a539ac1d86749f1e8fc6054aa14b08a120c0ebee628ae9295ff0ce5359ec42fb73545d7a207a41f49962a72145d6296daaf4bd20711e8ba8301 WHIRLPOOL adaa7026d2ed5fcea704dcee8aeb13bc466fd9025f102e7141abbca8b866b9861791ea8b6ab4ae583322d7f99d8bb7c22f574ba204e8176d62baea1053def4a6
+MISC ChangeLog 14739 SHA256 990441b5f4d684249e0bef44dd4bf57fdc04072149e064e36bad876ecdf3cc44 SHA512 d76ba9148031fc26b9f6173080989c01eaa0c2bb917a39fd96389310ab7ca9a47222d4bb28860d39f1d0560efde6f70255de9740ed51d9049a09da99c3beab45 WHIRLPOOL 3dde5c2eacfbb5c2ebd936d2fd97940ceeec56a7bb162ce87f22a3a51d0bf71b061dadb788b2e006c1166acf0f18719c5b4670cd8fb72d2563e4b53e0851c353
 MISC metadata.xml 368 SHA256 d99bf0fafaf8217795bfdb4e7a52a4f6b79fc93e2b86677d534dc01842b9d3f7 SHA512 e471350a12f506a43ecb7d673c7046ea7bd3f24e7836f130e5f182f37f351df97b166944bdea89461b8a67dbcdfe7a57fedac9feb961a84c54ed4c21d8447b5e WHIRLPOOL c47bc84abde9309de32f304d1a3e919fe34db95fd250f4cb2be8b34c41f3b4f5469d083707c607cb43bcd6ccf10a3f0330124e6eb0e836fbc1d3a32f31b76209
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0

-iQJ8BAEBCABmBQJUCI5yXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOmlEP/RQAjvkBFZWlXQq1SSt63bvh
-0iWvRrehD3KvfqPGwAQxkNL41r09ZFEU0/hzwJt1HdXabdBiNCblIg7JUqayjAwl
-P27oWnleP9kFX1O9a4UiCkFFCrJ6cVTc1DLB7f3buA0yHACX7YpWarIWLWdqDfmV
-RbtMmDA5hqxchyLYT3UZSW+rDviKzaRq1XFqbDKniQGFn2SF0JedFuZxnp2+Z4UD
-hKmlw1y+US55pCO3GHCprgN9PeFHz69CIctd6ck5PJxZvI2g8OY2YojNvboLrGP5
-HC0Iwjo7FQSA7+uZflLfnXC7oRDrv9HhtI2ruD0lLUJuUHxIKKxr40SMt1K73hSr
-vR7ttL1EHco3FioBFRIEp3tPxmRqp/VdFAmk+QoogH5kv5Us/fKDQ9l6KEhVKoYl
-HWBwVvCLozQtYy6gYbZ8J83rGg4InOizY5QyqqflG/vpSq1TZ/5eDZKBb7Erom7U
-gePeDsYoMr8xzBf/hBvNwqemyE8dxGAbQ2NWBFvUQnLlP04jI+t/sxOG81KvJI+d
-I7xX8/mT41ebmXsP7l4Ypkvj5Lujc3Xvyd10rTfgTDFKE1CA2JqYDG7UNXtbXNCk
-En9wUtvukQ5asOrsaew7kMFxniZ/ISCUqHFnlKNCPh2V2echMir5w19Yc94cqaon
-soaQUE1R2m6d7J7/K1fg
-=iUE6
+iQJ8BAEBCgBmBQJVDYllXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirBRQQAJTNX7Axze4rwziRVNGVhce8
+76STo+fyFFLFkgEGV7qkcMGEcxhffZPQB1ybOIq90qtpmRJXLVvnC5bXa/pesSGE
+Nw69qsL7aj0q73/yycDEevtn952wfC7f2zw15usgWz7FmhaxOv0H3hn5/L9OKEB6
+7U8k5O0iSaSw4FcvPpHInEj4X+TSBaUhFob+pCK6GBTsKuvSSlQTMfxlAuBO8GWH
+rhX/pjfU4O8NlbNdbzo2Z0v8EEUlaMNjoB+vEU8D9ul/Ah1Ewf7ha/U0DCsBNlq6
+w0diozndsOsTIBVVvrJeCM87+7zNCHtpXZU/5JQ9MYGQ16JN8HNPDxpVqTJCL5NN
+pM3aq+1HUvtKTgJ8yTSnHCAMSpwIV8P87VjTOOx7dWnA3oIU2I2WvD8ejpeqL547
+qi3UJQ1W/BDnaYeWaoRF9QGd9CnLiJExeSrf+2TMlrwmJmiQFHIIR7a2ZzQAAfVp
+x4950JisIF6xParYA7anrIt0iHAB1OV2O62RSwXZ7JEr22OX8McxGaxVviJqL1Vk
+V3O1t/PVKtcEd/2aRylzV5zfHnG7jIcHqern2FyPim46fyBQUx8fIejNYFIrFsZQ
+lKCM2GDHWv0aj99GRdiQAsF2uq/z+NxFZYT1SMgKArOrfQ73liaI4f5jxOCbb52f
+CoZJPcQCx8gZWxwWzzUD
+=+pl9
 -----END PGP SIGNATURE-----
--- a/dev-java/antlr/antlr-2.7.7-r2.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r2.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r2.ebuild,v 1.9 2014/01/03 15:43:07 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r2.ebuild,v 1.10 2015/03/21 15:08:20 jlec Exp $

 EAPI="3"
 PYTHON_DEPEND="python? 2"
@ -85,8 +85,7 @@ src_compile() {
 }

 src_install() {
-	exeinto /usr/bin
-	doexe "${S}"/scripts/antlr-config
+	dobin "${S}"/scripts/antlr-config

 	if use cxx ; then
 		cd "${S}"/lib/cpp
--- a/dev-java/antlr/antlr-2.7.7-r5.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r5.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-java/antlr/antlr-2.7.7-r5.ebuild,v 1.9 2014/09/04 16:08:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r5.ebuild,v 1.10 2015/03/21 15:08:20 jlec Exp $

 EAPI="5"

@ -114,8 +114,7 @@ src_compile() {
 }

 src_install() {
-	exeinto /usr/bin
-	doexe scripts/antlr-config
+	dobin scripts/antlr-config

 	if use cxx ; then
 		pushd lib/cpp > /dev/null
--- a/dev-java/gnu-hylafax/ChangeLog
+++ b/dev-java/gnu-hylafax/ChangeLog
@ -0,0 +1,9 @@
+# ChangeLog for dev-java/gnu-hylafax
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-hylafax/ChangeLog,v 1.1 2015/03/22 08:27:39 ercpe Exp $
+
+*gnu-hylafax-1.0.3 (22 Mar 2015)
+
+  22 Mar 2015; Johann Schmitz <ercpe@gentoo.org> +gnu-hylafax-1.0.3.ebuild,
+  +metadata.xml:
+  New ebuild for gnu-hylafax
--- a/dev-java/gnu-hylafax/Manifest
+++ b/dev-java/gnu-hylafax/Manifest
@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST gnu-hylafax-1.0.3-bin.tar.gz 1742697 SHA256 1e35853af20d74e1c3acbc460ef7fb04f76fc52be11ff0b560abe14b3c4f0a61 SHA512 7af66dac5a1b98eddc3d60aa439809f4e683a39a795ca50d0f99f92d4fb17704ab5c7528218be1f4698bca0749efd46c5ec3510e8a10a68b1b77faf1997dc4a2 WHIRLPOOL 2081d2238ca8ec5709ce7520547370b6a8431e33e33fb318612eb43cced6edfb1fc02836cca4bfc1d7c3edc24a3ea63bc53ac34cd573da436f10031c7f7b1ccf
+EBUILD gnu-hylafax-1.0.3.ebuild 1112 SHA256 e53d56c6809965709068ff91a3a07240d938a7fe81362524d9c8e4c7bd6af8bb SHA512 da963a0be7fb43be46f0c2e6e130392964b0483d590d28769c8167170663225d622a551f1c616c5d990c448ab56b6ac7382842e4a360321a8a78926353644bb1 WHIRLPOOL 8b949ac617785bb965179c1d7a2fcd66de02631c3b2dc0267c0be1b9770bffdcd7137653e9555afc641af5c9914657cff9c27deca59eb322da98c502d226cfb7
+MISC ChangeLog 368 SHA256 3eb7375cf9fc3d1a48322a580a928ad075727dfd8b2c8b6d0c53e24a2a5fbb57 SHA512 d18e8468fb8c502509d0467b46e865fac8942e6d9bea190399b2f572f6546f3d62afd8ab5751bce66d858a769db089e94bb75f05c3629edb13043341411b2f18 WHIRLPOOL f6b4af77f05e8497a82d4e66b65984ea9259a98c09e0862cd52df12433a29e555bd6d9a84fbb775ca13d6c6a7b042c23a88d249ab1ec6e93865bb0c90a8eecff
+MISC metadata.xml 159 SHA256 da2aaa3223c5418688dfbba6f899648c5bcb2e4610126519a1a862913c4f8fa6 SHA512 f5bc77a4e168cdb5a9f9c347f6f437b16bd28978351ec692d4f7e406ba93479424e2272de70fe85d2e0668172de8ccd3aa096f49d5912ed91d17bea11756865b WHIRLPOOL b0cba2d5917cc20d7409ccfedc345ab38c71df76c5c030df578d6db718f8a60dcfc1927c20e7062fafc62e955a90ec9f21cdcef6d7a566fddf374ce766ca64cc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJVDnz/AAoJEKCEBkJ3xQHtfv4H/3XuHc5HNyOkngurZyh1Uvpy
+mXLHdxixRqiZoXYdZHB5hty3s+UjeVLwOZKlYcvR8NBu6ui/i2XmP5TPU8IetmL
+Y/+tANxh2pZE3US3IfpXRsRWWghIjPmlDP3PkS/RYrq81StnJ9xkQWRzq1zAnITa
+wBXPsa2JgnCc3z4Q2xDpescfEW0M1nQFiTmu1IK5fd7YS9bRwM+OeFYNyZh8zjLk
+Ygn6BlpQPUcXkd9MSzyV0sptu2KpNzm+rTQkIyuReJBKteyS3svNJUk3LuxAXRrl
+lvL6gUCANOoSxI46iNjiA6wPNwxUwufquieZU8+/ZrKXx0kdhBOvSwZW4gen2/w=
+=MK9d
+-----END PGP SIGNATURE-----
--- a/dev-java/gnu-hylafax/gnu-hylafax-1.0.3.ebuild
+++ b/dev-java/gnu-hylafax/gnu-hylafax-1.0.3.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-hylafax/gnu-hylafax-1.0.3.ebuild,v 1.1 2015/03/22 08:27:39 ercpe Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java API designed to implement the client protocol portion of the hfaxd server"
+HOMEPAGE="http://gnu-hylafax.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}-bin.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/commons-logging:0
+		dev-java/commons-cli:1
+		java-virtuals/javamail:0
+		dev-java/java-getopt:1
+		dev-java/log4j:0
+		dev-java/concurrent-util:0"
+
+RDEPEND=">=virtual/jre-1.5 ${CDEPEND}"
+DEPEND=">=virtual/jdk-1.5 ${CDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_GENTOO_CLASSPATH="commons-logging,commons-cli-1,javamail,java-getopt-1,log4j,concurrent-util"
+
+java_prepare() {
+	rm -rv "${S}"/lib || die
+	find -name "pom.xml" -delete || die
+
+	# tarball contains the same sources in gnu-.../sources and gnu-.../main/
+	rm -r gnu-hylafax-*/sources || die
+}
--- a/dev-java/gnu-hylafax/metadata.xml
+++ b/dev-java/gnu-hylafax/metadata.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
--- a/dev-java/jffi/ChangeLog
+++ b/dev-java/jffi/ChangeLog
@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jffi
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.38 2014/11/20 08:03:26 ercpe Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.39 2015/03/21 18:29:53 monsieurp Exp $
+
+*jffi-1.2.8 (21 Mar 2015)
+
+  21 Mar 2015; Patrice Clement <monsieurp@gentoo.org>
+  +files/jffi-1.2.8-junit-4.11.patch, +files/jffi-1.2.8-makefile.patch,
+  +jffi-1.2.8.ebuild, jffi-1.2.7-r2.ebuild:
+  Version bump courtesy of Arfrever <arfrever.fta@gmail.com>.

  20 Nov 2014; Johann Schmitz <ercpe@gentoo.org>
  +files/jffi-1.2.7_no-werror.patch:
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@ -9,30 +9,34 @@ AUX jffi-1.2.6_no-werror.patch 382 SHA256 24fb274a3ec39eb94d6f9d3401df2127518b00
 AUX jffi-1.2.7-junit-4.11.patch 700 SHA256 db896154d8f55aae69f564a908ca1ea79c96af44f561bd2a1cc47a99226fef4a SHA512 9cc2d41665ec3c2271d6c1c2e66dbfb506922a290e906df51fa66c61c918e1835dcb93313077fac92a8a622f132dfee08cf3b79ebce0be3a4b104c1cbcda5ea9 WHIRLPOOL 910bfba3cc1164bc2f7197195dfb9d739e32eb406185e8027f9d47a3e3cf6759fadac01b8cdfb0127d74ffd0f487280d5dacc360a81595f3aa5e93414197081b
 AUX jffi-1.2.7-makefile.patch 2097 SHA256 09174463a2fbebfa8db08bd8baa3fd049d77e241de3a950a311d67ca2629d68e SHA512 289181a6f0200caf8aff7a923039df7a6da7044e3b0f73aaa306cac5f74543f4992a016acf2a087a9460eaebc8642ebab6cec1608619e965796f7aa2e8db89b6 WHIRLPOOL 55485ca33936f8d2e7fd79226fb6c25b49a346ebd8283e6d4880a383bc5221cd39addf47a33a8705ea04e64c2e167d827f5ddc966a08f651050bbcca62574cbe
 AUX jffi-1.2.7_no-werror.patch 1137 SHA256 3b35971546edf9a9d389ebe3a677690285c0f440af7c09b9f5124f9dd2c101c8 SHA512 c69db1badf77a3b0d3621655d45b41c6f5bfae2f396e51f1adf9516934fb8fb57b1a065550409f6448964c246fc4b9b59afaae985a1fef3d10a1d01e4b6eab71 WHIRLPOOL 7de52a8da4240f3e0a6e5fd2329a01a9bd3376cdd67e4401cfe867e02f8ea2562216fb46399eec9c012f858ce6e8835eb193e08085be3b1642d42e8e9bbefd7f
+AUX jffi-1.2.8-junit-4.11.patch 700 SHA256 db896154d8f55aae69f564a908ca1ea79c96af44f561bd2a1cc47a99226fef4a SHA512 9cc2d41665ec3c2271d6c1c2e66dbfb506922a290e906df51fa66c61c918e1835dcb93313077fac92a8a622f132dfee08cf3b79ebce0be3a4b104c1cbcda5ea9 WHIRLPOOL 910bfba3cc1164bc2f7197195dfb9d739e32eb406185e8027f9d47a3e3cf6759fadac01b8cdfb0127d74ffd0f487280d5dacc360a81595f3aa5e93414197081b
+AUX jffi-1.2.8-makefile.patch 1443 SHA256 377dd2eed51f174041a2270877dd35352b0d4d7b5898a967f5d8bbaed908bdee SHA512 02f28b00e1ca6d16046c5f25c38268f78a41b5b202c4f284e8dac10dc245ad150f4639849c0af8c20f50dc3e7cf715bee6dfd2f1edc48496f822d78aaef01b39 WHIRLPOOL bedaa91b31190f703385654fb4211c7a01634fd019d96b7f11359df73e74975fc98004808a870c6b00e9182bf76c47565f52495fef6009d7a4ad9f6dd2008ad0
 AUX jffi_maven-build.xml 11287 SHA256 fa81bee544d5304731268fd807c5176ffeca6d50c0882aebd2d9510118782a0b SHA512 56ebbb915d359f3eacf170d08fc1cf30f6efe900c91df0259a1fb69c6873ae839df829227b55e1538b4435387a82ec3e774180cfb531eb747e05a562aa7b97c7 WHIRLPOOL 42f50c85cad6673cff32b41593c3b30c5193b1ce204a1df6a97d68d70ee6a6cd61f2b6d887bc36002e516849d91139fa1254a76b8951e839a483865e875964a5
 DIST jffi-1.0.0.tar.gz 1627422 SHA256 9950edbaf897cc1fa10fb944336a86ceba92674f54a1eaf59b2ab4881825d25e SHA512 cb37052d0a2dc719d1f2ab2620c1a1908cf51c5d1e04d13caaecb3659916a59e8e46fa90c2b6ddb9a63f7b78f224233b9316908456aaf9ebbc1432e7592006c7 WHIRLPOOL fba9c40a55cef900ccb5207f5d93345869693fd7ba027388797499cf65bc584260c37fd0962c0037a83c2d05eb7958c193482a8967501bedbaa2f1465644494f
 DIST jffi-1.0.11.tar.gz 1899655 SHA256 b66781a07e095dbaf9d568b77762e06215da4458d963956ea22dd5adb5f3126a SHA512 0f98c1aa55dfd9fd9338399e173f118ef12d01a65429a49ed5264a23fa6700e7ebdf13ffb6b6318fcd8ea9dce66a47524c5cefa50f3f11a251ca44a4f38fd6aa WHIRLPOOL aa8c3f88b75a26221b3c41ed552fdd83c551ae05fc7455f072b8a3d7f3190cad26a638d1800a67b09d8074b5dfdd04f2be73287a7f22c0cfcc5dbc8df0d2ae12
 DIST jffi-1.2.5.tar.gz 1798081 SHA256 2101c48855558902f2e21baacd0b2c8b7098feb3ca1487a195c2bc3d9116ebd4 SHA512 2613a1874899e1a734ad54d68f7d969fe3bc12bd1ae1aaf5a63a17d63ac6ac6b9812740b7c7a771e66ba0e4ff02105c6a2427771d4571be40ae869f3d6f077e3 WHIRLPOOL 174303fc9f10cf295e009ef2320f9b13295f5e96187ab2ae4599de891b27e1279645ea47409eb8aec9a8b247a5568cddd6f8566950b64be37e399cb0eda0219f
 DIST jffi-1.2.6.tar.gz 1850410 SHA256 b568d832828bf0cb980c545e8fd16147034048ca2d3ffc62cae4f844c8cc6cec SHA512 df178691e6894599f2a45146950cca7e4c81e92c38fc751c40b39e660970c19d0dce41c9192053dddf07f42317d28033f59b7140c904784c477526e7471b6938 WHIRLPOOL adb57b9ac981177ae7d697aae41bbaaff3a38dab4c4364258b13272023076dacdd93a751eb24a339ae17a4162d4511685a4aa67afd5d8fab2f852e0403ee73f1
 DIST jffi-1.2.7.tar.gz 1908203 SHA256 25f1930f294cec9651447edd08a51a990b7c92c69eca87257233e86e4dd5f979 SHA512 837ebb0085ec2acc5dc688c3e1883a7c986df62a32a41887196b88f5b5714ee667f918f2bdf005f019faae02df2f7903f291fa32c5ec3cabc360d9b1d8e4548d WHIRLPOOL 0e9824d54b21eb61142f4a868cd10122d9837c34732fc4ff9ba3093c0d4c11ee25dc0e045a40a4157faed201de9498e7cea28df85e7f14d07b58d2f4d1fb26e1
+DIST jffi-1.2.8.tar.gz 1988785 SHA256 445263cd24dccc34e2bd7fb3c488aa182697b1bc3f86d3343e07183161e2986c SHA512 c6622a2cc0cd040d871417d66a074aeaad57f266559c8135692e2b76bb00f05287a4e4c4f17e8e4225c4d5e7e8941d9c883fbb4cfe5db920a79dd9a29ffea105 WHIRLPOOL 165f44b195310cf2826359d00ba74bb0eac66a47c566ec1a522df50627721c6564bd1730459098a8aa973433978fa815b3a418bbcf787b75ebf1cc3cd585909d
 EBUILD jffi-1.0.0-r1.ebuild 2337 SHA256 16b7b8d99a4842a373ba2c793759a93339e7316da2ed88ac89c36dafdddbfb16 SHA512 00fa58f0b6817fd7f7070047a640a83dfbda3e7dc413043ea7893d30a105acd6d7ce066e8d00f733181e291f456ec6305585755638d211080f5f14d2a87877bd WHIRLPOOL 40d298507d308e40495040cb7a1106054c82bfae1486095483d1524261bfb563d3618aa4a80084c16a29fd10a70efb829af4b118bc223c5d4240060316508c1c
 EBUILD jffi-1.0.0.ebuild 2274 SHA256 a5fe1144dacf4f666105ef56cec8a8bf7b246a68dbde639ec4a0c9c867a2d4b1 SHA512 35894dc27f8b0d0f672d1d39548af68057f79e252663cf2c9ec8802e7dabb6d721afd3e1d030b37f7c7c37e395c39cbf5cda2a5b4b97f95d17fa3aa9b4d642cc WHIRLPOOL 986db534860b62f5dce5a12667410dfeb7c120a0a3f9e4fc5c57dca37d694204a4ac2b4b3d2b76bc7a961d15a88c7868c2290eab253a46f0f1b64a32d48191b8
 EBUILD jffi-1.0.11-r1.ebuild 2634 SHA256 f7d5d3069012f7839f3b5ae2a6f20cff965c3e9a28c0760992de258c355943ff SHA512 b2ccc23c5c13bcbba4de45df9bf551db5d59974805dfbc48b26a5d4f54bb29d98a7f2851c28502f6e60ea1fdcfb6ac83366e71b9483ee15a322f43f4214f44c5 WHIRLPOOL 01c81fd03063a061369bdef4fa0328f4262c2464598bb594c001c09f8b0bab2268728c49cb6b8907871b82049fd025a4c363802729227f90626b93682a73feaf
 EBUILD jffi-1.0.11.ebuild 2562 SHA256 e925f71ef49b9fb710f5f6ab0493a0099c57fc218aa939addf06868f51032092 SHA512 a99c55469211698e24257216249550d6f3d83d37a3a61c6887f3bc0e87ec1b5d88badb75af1eeb7955ab58da5f58621ea7e460b0b6355f4473e05c643e5ce0ab WHIRLPOOL 43eea302b639890b69014f1c3e97866a5afa5a80f84c5db0c15f872276846304c27ed966743426ba783f030060f0c85101148bb4e2275525a69ca10033fbf6cb
 EBUILD jffi-1.2.5.ebuild 2358 SHA256 89636672db08de6b69c64d1da78cad1e05679323d812900be1325202e9540707 SHA512 6df150b5bb15f94f937676b93a720c407a07dcaa646a6f72fd9bb706b61729da2332deec464f7cff0ef99c6d5716ca26dfc8ce4e821f9733db37e6387ab12a98 WHIRLPOOL 6c82cdc180b1cf9fce413facb9b4bdfcbc649f25fb5ae573b840d4deed72d0f3c66f5d459eedb1afb5b3dbf8cd873d8e6fc680c4eb944989605ec23e3914f737
 EBUILD jffi-1.2.6.ebuild 3069 SHA256 52af5d368eff758bc0a6bbd7be7ac7188d13a473f0905744df1c37eb25dd7bdc SHA512 7329dd7ed5f7b9ae10a38684a9dcd3c5f725432aee173cfbe82602198292c91a084c02e90bcb413bd307c5e17abfabf710830189a4a8d09c214ac8543bd4836f WHIRLPOOL 7b770a7c295d3c5caa5fcf8ede7d3254090049a4d11b7c8cf5c01537cbcfeec5b7f9a11d1baed8af1a8eef3fa8ad968838e515e74d8dd66b711eb04514f9132b
-EBUILD jffi-1.2.7-r2.ebuild 3184 SHA256 4229daa0a3ce3ccfd095550093c85369063e32cfc1b5d9aef17f4d41949f79fb SHA512 8ec1eb9c114f22ca309cc90fa5f111892ff0a6f003f1d35b580f930fe907eb188cc5b4131658e4ff7e0b0660125ca718eaecd8c0e594578c3416012d6ce1ef80 WHIRLPOOL a87c049d18d20e5cc9d16a59e72d0683f3ee0c99015fee29938570816b14df4f9561c0f85c381335383e42d28f20c836ed693abeaaa84a48051d8ce45e800920
+EBUILD jffi-1.2.7-r2.ebuild 3188 SHA256 0fce8b9a9a3a90bf41584c16ac720c57f64315da9879061573ca3eb4665dba4a SHA512 f884fa1d0d6a4dfd9ac12c2ca0f7d5044491e958edfecabc5fec2b2254ff12365ce5b4e8015d4cbcfc0a025a7ac6e474bf869da72aaa0189c8bb87c521ba2221 WHIRLPOOL 99ad24fa8b24dfe03f0913080cca13eff0a70b552bb1383a89f38b2ab81db5aa7f3449d793c45818b36acf9ce687f13085142502e312913339a977fd61ec4786
 EBUILD jffi-1.2.7.ebuild 3115 SHA256 2627fbcedfa190b18fff8d122c7e401ce4293b042ab9724f3493ace323ba2bbd SHA512 9cd1a8b99943de798b527ef6b4e9be420aa7c4d258217e7504a2680675778c79e0e3ba4584cb74cfdb5ff5a4d5f88bc776c72778d0e63511dca696b3084e6caf WHIRLPOOL e4ee6cd5c6d5011c55c605031049e419697ad34a81d420a1f22814bdc7839eea1cf3a6e9633f79961ebdfc85579efd214aaa2964bd0205d93a51aaa98640fd64
-MISC ChangeLog 6528 SHA256 9899ff8414472131aa720282982ac9a09379ba687db644204d1c0cc3db066c0f SHA512 21281015c34f130d41699411b71932a87970ab256cf0c242895d49e2834fcbd067025a4aeaeb1466308844e7f76d288b4dd88816a462f9fd6375d4c636925b1d WHIRLPOOL cfdb3da3eae3d0a504bad55c6fa037cdafd9bfa3af0313f0f5346254aa0f4560b5177070e194337fabbe791ea37c6f2de6c6229f65a3f5b3d4274f26b0371cb0
+EBUILD jffi-1.2.8.ebuild 3194 SHA256 d73c9c685b155708f0a0aa38b4c7eab61d21ce9a2b29dcd76696c0ff6680a304 SHA512 e191faa1bac35d34a2cf705392e51275a99501d0ea895d6ace491741162e1b2a29c624e7317e857fab8bcfc4973da9aa93be8d11761f04e94d63563b722c08ee WHIRLPOOL 0993d531678a9d7f69bbc3ac6a0ac8bdc1bda3d596e0f23e99d9aec89574758a9bade56c78e39743d0a1da95a17ddf4bc7d5bbecf18d4ea0f09b6e31f7027ba3
+MISC ChangeLog 6792 SHA256 1776262b155fbe45b56d222c59af52702b755c103b39b60f9423b8210469f0af SHA512 dba9026eba53881dc89e25ef8522c0ec40bb11ab20bd57d5aa1f50fccebc21f40f2c45a5bb543c138385cfb14cf4d4dcccc111b46b5272152e08501458aa4edb WHIRLPOOL f39c9c924acebdc728386df5724288bd97cfbac695ce85292393839a12ad188363f85d86ac7bef587fbc3312b476c5d0f0dc40df24b29534d61cf3c4b13a2ed9
 MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2

-iQEcBAEBCAAGBQJUbaBkAAoJEKCEBkJ3xQHti4YIAJuxEFJ/EPZb8DjpscubEkNr
-x0jKE5JTqpX+6v/LXOuju4LF6ooL+UQDBTdmUasIM4Kniva86Q4uWY/me+DkIgjc
-zv6+AeMlBiZfd7Qhn46ta4YwmpcaK+78LIwupPsHDXda7XR3cMd6BV7O+lxh+OPS
-/YLAoCu7lBCXwhDkqmU10PN9SIQFDnCr2Om9Fc85Y+du7+vMM6a7HG8gXIm70JZO
-5M3+vAl6M7mcMYdOVCciKHyIqOkmH0AVklSrYJ6lJOli+NvheRx0KGEGs48aEXU5
-pHYa8NIUxGwSc3kTdMy8oEfj7FMgmttRXV+zTRji3nKJuxazoCW/NFG/YTWvTVE=
-=6Sra
+iQEcBAEBCAAGBQJVDbiqAAoJEJGRpfGTSRu4oGMH/jXEvSARFH58uktB4CfMf1yY
+WaKNX1H7xTUPmSvodSvbN3CmxFsIN0KFpi+doYpmtvvnqWggpF/gy3Qc2YGLKNop
+fgRPEJnyCS5W3YxRIhU4frCQVyy11A3YShZ3BgA/LFzUvFQioe+UojomcyNTK0fE
+12OYqwewrraEQSdLGifBjnLjQMXQ2s5tMCccJd4xeFJ6q6gh+1/TEzSQehLYFIif
+pAYjlLFmfTFfZ/S/r3AvG4ni+ovgSaxUDXoveuaIlndog61g/Wvvv4Cdspm+ZIsS
+JIukx9DNx9WC8qEPegcJFCrif5q/0gPilE3mp9PMN3sjlqqnqnQ+5penbbyBUso=
+=N81E
 -----END PGP SIGNATURE-----
--- a/dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch
+++ b/dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch
@ -0,0 +1,14 @@
+--- a/src/test/java/com/kenai/jffi/NumberTest.java
+++ b/src/test/java/com/kenai/jffi/NumberTest.java
+@@ -234,9 +234,8 @@
+     private void returnF32(InvokerType type) {
+         LibNumberTest lib = UnitHelper.loadTestLibrary(LibNumberTest.class, type);
+         float[] values = { 0f, 1.0f, -2.0f };
+-        for (int i = 0; i < values.length; ++i) {
+-            assertEquals("Value not returned correctly", values[i], lib.ret_float(values[i]), 0.1f);
+-        }
+        float[] lib_values = { lib.ret_float(0f), lib.ret_float(1.0f), lib.ret_float(-2.0f) };
+        assertArrayEquals("Value not returned correctly", values, lib_values, 0.1f);
+     }
+ 
+     @Test public void returnDefaultF64() {
--- a/dev-java/jffi/files/jffi-1.2.8-makefile.patch
+++ b/dev-java/jffi/files/jffi-1.2.8-makefile.patch
@ -0,0 +1,52 @@
+--- jni/GNUmakefile
+++ jni/GNUmakefile
+@@ -41,6 +41,7 @@
+ JFFI_BUILD_DIR = $(BUILD_DIR)/jffi
+ 
+ ifeq ($(USE_SYSTEM_LIBFFI),1)
+  LIBFFI =
+   LIBFFI_LIBS ?= $(shell pkg-config --libs libffi)
+   LIBFFI_CFLAGS ?= $(shell pkg-config --cflags libffi)
+ else
+@@ -64,9 +65,8 @@
+ OFLAGS = -O2 $(JFLAGS)
+ 
+ # MacOS headers aren't completely warning free, so turn them off
+-WERROR = -Werror
+ ifneq ($(OS),darwin)
+-  WFLAGS += -Wundef $(WERROR)
+  WFLAGS += -Wundef
+ endif
+ WFLAGS += -W -Wall -Wno-unused -Wno-parentheses -Wno-unused-parameter
+ PICFLAGS = -fPIC
+@@ -279,7 +279,7 @@
+ 	@echo "JFFI_BUILD_DIR=$(JFFI_BUILD_DIR)"
+ 	@echo "OBJS=$(OBJS)"
+ 
+-$(LIBJFFI):  $(OBJS) $(LIBFFI_LIBS)
+$(LIBJFFI):  $(OBJS) $(LIBFFI)
+ 	$(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI_LIBS) $(LIBS)
+ 	$(STRIP) $@
+ 
+@@ -291,7 +291,7 @@
+ 	@mkdir -p $(@D)
+ 	@$(CC) $(CFLAGS) -o $@ -c $<
+ 
+-$(OBJS) : $(LIBFFI_LIBS)
+$(OBJS) : $(LIBFFI)
+ 
+ ifeq ($(OS), darwin)
+ build_ffi = \
+--- libtest/GNUmakefile
+++ libtest/GNUmakefile
+@@ -44,8 +44,8 @@
+ # Compiler/linker flags from:
+ #   http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
+ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing
+-OFLAGS = -O2 $(JFLAGS)
+-WFLAGS = -W -Werror -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses
+OFLAGS = $(JFLAGS)
+WFLAGS = -W -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses
+ PICFLAGS = -fPIC
+ SOFLAGS = -shared -Wl,-O1
+ LDFLAGS += $(SOFLAGS)
--- a/dev-java/jffi/jffi-1.2.7-r2.ebuild
+++ b/dev-java/jffi/jffi-1.2.7-r2.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.2.7-r2.ebuild,v 1.1 2014/11/17 09:09:28 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.2.7-r2.ebuild,v 1.2 2015/03/21 18:29:53 monsieurp Exp $

 EAPI="5"

--- a/dev-java/jffi/jffi-1.2.8.ebuild
+++ b/dev-java/jffi/jffi-1.2.8.ebuild
@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.2.8.ebuild,v 1.1 2015/03/21 18:29:53 monsieurp Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 versionator
+
+DESCRIPTION="An optimized Java interface to libffi"
+HOMEPAGE="https://github.com/jnr/jffi"
+SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="1.2"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+
+COMMON_DEP="virtual/libffi:0"
+
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	virtual/pkgconfig
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/junit:4
+	)"
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+	epatch "${FILESDIR}"/${PN}-1.2.8-makefile.patch
+	epatch "${FILESDIR}"/${PN}-1.2.8-junit-4.11.patch
+
+	# misc fixes for Darwin
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local uarch
+		# don't do multiarch
+		# avoid using Xcode stuff
+		# use Prefix' headers
+		# don't mess with deployment target
+		# set install_name
+		use x64-macos && uarch=x86_64
+		use x86-macos && uarch=i386
+		use ppc-macos && uarch=ppc
+		sed -i \
+			-e "/ARCHES +=/s/=.*$/= ${uarch}/" \
+			-e "/XCODE=/s:=.*$:=${EPREFIX}:" \
+			-e "/MACSDK/s/^/#/" \
+			-e "/MACOSX_DEPLOYMENT_TARGET=/s/MAC/NOMAC/" \
+			-e "/SOFLAGS =/s:=.*:= -install_name ${EPREFIX}/usr/lib/jffi-${SLOT}/libjffi-${SLOT}.jnilib:" \
+			jni/GNUmakefile || die
+	fi
+
+	find "${WORKDIR}" -iname '*.jar' -delete || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+src_compile() {
+	# generate Version.java
+	cat > src/main/java/com/kenai/jffi/Version.java <<-EOF
+		package com.kenai.jffi;
+		public final class Version {
+			private Version() {}
+			public static final int MAJOR = $(get_version_component_range 1);
+			public static final int MINOR = $(get_version_component_range 2);
+			public static final int MICRO = $(get_version_component_range 3);
+		}
+	EOF
+
+	java-pkg-2_src_compile
+
+	# generate headers
+	mkdir -p build/jni
+	javah -d build/jni -classpath target/classes \
+		com.kenai.jffi.Foreign \
+		com.kenai.jffi.ObjectBuffer \
+		com.kenai.jffi.Version \
+		|| die
+
+	#build native library.
+	local args=(
+		SRC_DIR=jni
+		JNI_DIR=jni
+		BUILD_DIR=build/jni
+		VERSION=$(get_version_component_range 1-2)
+		USE_SYSTEM_LIBFFI=1
+		-f jni/GNUmakefile
+	)
+	emake "${args[@]}"
+}
+
+EANT_TEST_GENTOO_CLASSPATH="ant-junit4,junit-4"
+
+src_test() {
+	# build native test library
+	emake BUILD_DIR=build -f libtest/GNUmakefile
+
+	_JAVA_OPTIONS="-Djffi.boot.library.path=${S}/build/jni" \
+		java-pkg-2_src_test
+}
+
+src_install() {
+	local libname=".so"
+
+	[[ ${CHOST} == *-darwin* ]] && libname=.jnilib
+	java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2)${libname}
+
+	# must by after _doso to have JAVA_PKG_LIBDEST set
+	cat > boot.properties <<-EOF
+		jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
+	EOF
+	jar -uf target/${PN}.jar boot.properties || die
+
+	java-pkg_dojar target/${PN}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
--- a/dev-java/jnr-constants/ChangeLog
+++ b/dev-java/jnr-constants/ChangeLog
@ -1,6 +1,16 @@
 # ChangeLog for dev-java/jnr-constants
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-constants/ChangeLog,v 1.11 2014/03/03 23:41:11 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-constants/ChangeLog,v 1.13 2015/03/21 23:16:56 monsieurp Exp $
+
+  21 Mar 2015; Patrice Clement <monsieurp@gentoo.org>
+  jnr-constants-0.8.6.ebuild:
+  Set required virtual JRE/JDK to 1.6.
+
+*jnr-constants-0.8.6 (21 Mar 2015)
+
+  21 Mar 2015; Patrice Clement <monsieurp@gentoo.org>
+  +jnr-constants-0.8.6.ebuild, jnr-constants-0.8.5.ebuild:
+  Version bump courtesy of Arfrever <arfrever.fta@gmail.com>.

  03 Mar 2014; Pacho Ramos <pacho@gentoo.org> jnr-constants-0.8.5.ebuild:
  amd64 stable, bug #495396
--- a/dev-java/jnr-constants/Manifest
+++ b/dev-java/jnr-constants/Manifest
@ -6,18 +6,24 @@ DIST jnr-constants-0.8.2.tar.gz 110511 SHA256 924b242877a8472e5828a5ae5f9d5a1f0c
 DIST jnr-constants-0.8.3.tar.gz 110622 SHA256 e4dec305fa7c703dd9a693f9d417d7a16cec8b690c122078fb3518b0f4c258c8 SHA512 1d37596b1a791e4b727c51de4732512d4dcb14ab8cfe6ff0fe4f42c8c253cf8e69c5808f8e408a14d7e752fe13bf6c39b015a81bc3c3610f43ca4bd8161a7694 WHIRLPOOL 40d2d3309984971421bcc7bea7331860bb3875e50b4b57e27f6a10e5e360c55e30623af42de65b171be00244919f81f35b96ca98dd8cd474f6bebc081400cefa
 DIST jnr-constants-0.8.4.tar.gz 70498 SHA256 39be80c7f5506a0e1ac13cd9f751347fe24486956240c2aee8f3693ab7b04a1b SHA512 aacd59e43292486653d758705e8952ded6557415298487b5c708efdd1eced539747bc0d8654a212b41f39ea086de14f6a595f85a3bd831587d67006205bbd51c WHIRLPOOL b5fa3a99e93a5d303cbe1f41619e362d3552f8b79208d70b5c57660d77ca9f3d3818a1751b2e36b326230e90b5a9a3fde7bc81d578d5fb7fa1e0c3bf265b9ce6
 DIST jnr-constants-0.8.5.tar.gz 70543 SHA256 d8fe01855bbb5b2a44985b7d6df62b9879b54a413bd5421a2d684500ad83552f SHA512 aee055c577df8a436bd97198c4c19ae7d3e59e1c14615cdd8c4a6d0df36c0690af8ed1d83bf4e2008d7af0edc160cc672114012ff3fc9fdb0ef2daf5859dbe35 WHIRLPOOL 93367c6f39b3fea2e21fd96b53cca8670f4fa0c2b254194ff0b4f799d3d9c110594c1401abcdf712349016b414680f6463bec3de3679f27b019a2d1b24dd6a4e
+DIST jnr-constants-0.8.6.tar.gz 71080 SHA256 6c90abaa12004962032dcc4958adcb256b663840b082b07f3fee8e038c30cf26 SHA512 2098f8e1869b9c018ba3afa70ef386fce2609d9c650ee851dcd7cf7dc9d4d87dbe26886eb2e744d96cc11425f6b66144a018826360b7bab48a4b99e323f3717a WHIRLPOOL 108fbe7cceb25b21192047761e418e56e6939e62116a8896f14a804f56c541e58b43c5904df972075b8307dabb8134b83555c13a2cce5af294677ac5d0e6591b
 EBUILD jnr-constants-0.8.2-r1.ebuild 1198 SHA256 46051085e01674a2f8bbc85a4a80ef7e9361c30638061541a3779cc6daff1ae6 SHA512 92f42a0ae2dc26941e74d8b34672a9ae42cb1b297e7964128a8f70fd7f322419aa142455a82f55ffabcf8b86199903a2493bbe8d8d81d168697f5483364da9da WHIRLPOOL a6a1cf1164e88766710adedb3b5489a74d568d50c5cf0d0a9dbcc56d41c67162e6a91291740d65359b6686ea4c7a62354875da064c0813f7a0f07b749ceaf411
 EBUILD jnr-constants-0.8.2.ebuild 1195 SHA256 c2e9fdd325a9832bbd22a6f21fbf3e50acbb03f55c6399beccf1f13e223b5fd7 SHA512 56c33c01632848bb4519c3e468c1d11731233898e5a721578cc4677def46a49c2ef2a8fc8aa692f19cd12cc1ae9bc4db6235d5dcec54e42afde6d94d8634c8b0 WHIRLPOOL 32303a30fbfe4b5949290c365f085324f03f9d804fbc2b7bc09c49ccfe38695b75ddcce8edf4ebfd06443e590f2fc264bf6a0d05c3638ebf634750094a4cf0f4
 EBUILD jnr-constants-0.8.3-r1.ebuild 1108 SHA256 d35164d1e948aa2ae0ec91528e50dc5e33d06d5155be46eb0c290bd5e712af5d SHA512 fe0235fd6ed4114adc541160d8f0facce0fe0f3c9001b87067898bfa0e9c0d45e78085378a49ce09a78bb4d0cb0e18db9e6288692dc976f97ec1ee52ed7b5e76 WHIRLPOOL b587f5a18bf92b290d70c6d5bc91aba4efafc326251ff5156d27ac3148ef3c1b686ab8c52cb931a3e25aafd0666d9b23d6b276ecd8a3c87701bb88ae747e12f8
 EBUILD jnr-constants-0.8.3.ebuild 1099 SHA256 244320df5d05ab76d335aaa5a62606455f71bcd3a53e58f4ea223e312d58f407 SHA512 0ee7b57d801353fa2b689e3c7171d1d77624f404578b7ab5cb2d5a6c5de4732899f2b06ae4e778e3237e4c37e8de1e9bffbb78e11f73aefa52579a252b2574c9 WHIRLPOOL 78a16228096ba86fce74e8daa5e88cca373cf91216c6b1aa9cf53b3c5e99cc9d52a585b442b528f7c7c40b8a9d9d4783cfff7a801a56db2c01cc8fa90b618e8a
 EBUILD jnr-constants-0.8.4.ebuild 1096 SHA256 01ed819af6fbbf4589d781cc79699e59a8befe4e859f4cf0054aa72160090dca SHA512 b9fe4a12ad1055d83ef4667aceac1bb35dd5d5afea4760f465573c97c711967c302f769f175eac25133b481647358c8f8b92314690b8804871da75605164fbb9 WHIRLPOOL a41fbbea5049e7b1e9c8e18a99da9ea63ddc86eff41ccfb7bc63d3545cd47ad12b3e4a70fce5bff497e986d79299ba785919b24116469c111d502d4ff82c78e7
-EBUILD jnr-constants-0.8.5.ebuild 1093 SHA256 8d1b8e8ca9765f931a0d3685c1878c98020fd64690c1d2c6c1090bdd3e10f659 SHA512 0133dc9c0924f53c6272b708a10b70b88a29eda998ca6380f8a1626f0f17aa8f2771bb421cb97056ee9cfbebb14096f21f2dca8179416d87fce19d865c7d0da7 WHIRLPOOL 84fb3a96ee03cf39cc93cf92842b3de8685d2b0b5fe5bc3a7438814f0797d085a32a89b9eb0b87765fce0d30ff9f080ffbee5f4ebf7b773065c4db9d5b0d798b
-MISC ChangeLog 1855 SHA256 94493476e09bf288b03974a29d00501ca41f414d154f96ed57215a159a4515d4 SHA512 0036cb184f06bc25a9e34336a2904b1b59647658e3d6ec537b3a20bb0cdd8c7ebc48abeeb8e99b155f3b61565de0f363a72bad416c0c08634b5c08eb585296dd WHIRLPOOL 7d7964c5444fcdb578acee339dfb6e5bbec6142f7376972fedfb212cb9a7535509d431089f3fb8924dc2969175c85209f94de86f964d42807c91cacca0d62b5a
+EBUILD jnr-constants-0.8.5.ebuild 1097 SHA256 4dc5d572c73c77d81755a7a58468b13b1a5294df813c1a4930b30c6db9befb97 SHA512 4d896132110fe6b42f6d8bd74871858ac06bbc8e8309f90f05c57c0d4c0e81e0d109bf9fc18facd4289d196fda0e15884f9b56c431df8ab9e1e3eb99a2f1e1f8 WHIRLPOOL 863cd01704b8565e38d4dcce8b62b9eb8695f8edc32d0d4b4f1d3104c54bca120d6cb13d6ed9c792744d0fdcdaad1e216937a698386b430c02abf252aaa72b9e
+EBUILD jnr-constants-0.8.6.ebuild 1182 SHA256 c22b1d6bc2f17e1ba2e460b6f18df5fc1a731a5e16292b8bc734029cfa2b9a43 SHA512 7aac77864400bb2ee6e6ce0673578a43624668d9a8fe61d75d831718cbfedbc94cbc106d764c687bc7bf9e36247fcbaab8446e67887611afb83d357fa7b3b7ab WHIRLPOOL 004c680269ea915b191d26595757abdb37990183e60c824d07975c74002f75c9f28343cd2cd81c8395aa8a14b30fe01182b6d968025756a480cd508ab69d430b
+MISC ChangeLog 2195 SHA256 3726466e6fdbec02656a47217b1d2b5aa8c2408ce20d8611d5b404ae71510f6c SHA512 bae4907608c42f1294656cfe9cb066b25f9014a4c769a1b4481f699391cb2b716f2d5f406268f654d49e5b267d1aaea4d9e0dcf8ed713d064fca147d33bea10c WHIRLPOOL 5b31533e2b7410a5aba947c4591c56fa7e4b9a4595bab94a304f431f18587c7a1ad28d3bc33e7a9e3800c9864ff0867b3552fd93450fb8a6c0bceee1e5063682
 MISC metadata.xml 205 SHA256 e319f1701f6be29c8e077049d77738b69b72be0458754ef90ad9a684f2ec1722 SHA512 fb7831a8a05e9995888eaef748c98a12adcb911ef1c9901a3555765782d87cd3172cfb2c47ffa89d8a5454e7aa1f5bd27358b88a035c97f1ff388d7fc85a9d7e WHIRLPOOL 673d7b564054942d04b33cfcd01f7c5ff16ad9f9f2a60586ccc54c60443bf2dc34fa037e4e1de889539838342eea62022a3b9a7cae65b0c2f34fcbacfcfd0c73
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2

-iEYEAREIAAYFAlMVExgACgkQCaWpQKGI+9RPVgCfbfwe2tXeXl7xTTlHAgLJbW1S
-rKAAn1d1tJp9pJOwggaZ5B8IpPufP8mu
-=Nqq4
+iQEcBAEBCAAGBQJVDfvsAAoJEJGRpfGTSRu4XxMH/0mVJA9LkNcf40tQfGXqG+3A
+1xRQkFU5+WDcVZ6PJFnbZK0MY1nxR4FSdw4RuG14FktwFJURXEeMeKj5ShLLqK+M
+fyHDn7jXYQA3DjtWjdBk15IRxlGaC8+o48A4ZVH4bwvAFCFFJmgtBDJpvJD/lyYU
+QUeyE1FhjjF/O8YKdEqUSM1KwAish3FfjisqDT9WOGnSuEw7yu5sfe5j6UCHH2HN
+olgYp321zlmXXw1s2G5DCS7Yr7+Rm6tzxfJuZq/vbSkx90LVb+EYdz+g3nV7vump
+tGgWdwcux7SPANmyMWr46JIUe6qq+x8ulH83ol4d5sBOAP1mgN+dHdvh0rBfBFI=
+=6R4r
 -----END PGP SIGNATURE-----
--- a/dev-java/jnr-constants/jnr-constants-0.8.5.ebuild
+++ b/dev-java/jnr-constants/jnr-constants-0.8.5.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-java/jnr-constants/jnr-constants-0.8.5.ebuild,v 1.3 2014/03/03 23:41:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-constants/jnr-constants-0.8.5.ebuild,v 1.4 2015/03/21 18:37:49 monsieurp Exp $

 EAPI="5"

--- a/dev-java/jnr-constants/jnr-constants-0.8.6.ebuild
+++ b/dev-java/jnr-constants/jnr-constants-0.8.6.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-constants/jnr-constants-0.8.6.ebuild,v 1.2 2015/03/21 23:16:56 monsieurp Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A set of platform constants (e.g. errno values)"
+HOMEPAGE="https://github.com/jnr/jnr-constants"
+# SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+		>=dev-java/junit-4.8:4
+	)"
+
+S="${WORKDIR}/${PN}-${P}"
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+}
+
+JAVA_ANT_ENCODING="UTF-8"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+
+EANT_TEST_GENTOO_CLASSPATH="junit-4"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
--- a/dev-java/jnr-enxio/ChangeLog
+++ b/dev-java/jnr-enxio/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jnr-enxio
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-enxio/ChangeLog,v 1.2 2013/10/23 18:21:45 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-enxio/ChangeLog,v 1.3 2015/03/21 23:43:08 monsieurp Exp $
+
+*jnr-enxio-0.7 (21 Mar 2015)
+
+  21 Mar 2015; Patrice Clement <monsieurp@gentoo.org>
+  +files/jnr-enxio-0.7-build.xml, +jnr-enxio-0.7.ebuild:
+  Version bump. Fix bug 525342.

  23 Oct 2013; Tom Wijsman <TomWij@gentoo.org> jnr-enxio-0.4.ebuild:
  Fix compilation by rewriting the classpath.
--- a/dev-java/jnr-enxio/Manifest
+++ b/dev-java/jnr-enxio/Manifest
@ -2,18 +2,21 @@
 Hash: SHA256

 AUX jnr-enxio-0.4-build.xml 17106 SHA256 829c0be95bf450895de453e8ea3e0eefbbe82a310d2cc794456dc155f6aa2c48 SHA512 13862d59655774ee503f4e5531b548292a1eb509060d3e2488ae9e9a5580561e24639523b2f57e33e889190567f3b240bab8a6065f720eb294a17b6f11752b16 WHIRLPOOL 35016ce4b404877e1f1583653b8038fdcd7a66e30a284f2d3f026a15ca9cf8fdc350d3bb06690ab39ffcd71121d285ca1ea44dcc6f59d64bff52a51cede59cbb
+AUX jnr-enxio-0.7-build.xml 17106 SHA256 80963afb03b7738fc888ebf9388492d58ade76530fd07e3b964e51a56717f042 SHA512 e655b5c8900ef050f45fc2a59dbfea520061fad94380d2e43757ed35f676a59f0816d006b4c6c3100cb063c29b44eb6e168edee65027a4a86f9c523ba018ba5e WHIRLPOOL 4a4f974b608197086c5cc93322498ca9cbd37d1f28799e641de6a54073cf7005041909a881ec7310a0174c874d570f691d3b177cda5d67d4ac25673520398807
 DIST jnr-enxio-0.4.tar.gz 10508 SHA256 691ef92ce8567cb9cea77647d8373573c04bd0020af7f5e424ec5038575227c3 SHA512 148bbcaa3f394492c6013dbb54593056a466844b482d57d8b4a57adb61f7ff2e0c6c74105384d3c8464b66e981b5d6a25303577c20c8318e90c2b6cb5888b3e1 WHIRLPOOL 73a652445ed0cf3a9229c70133b0c1b5e1ba4f93368de6aeea7b156854a6bebfa16abfac66b317db8cb30120a8e44ae20018ecac66dc8c8095885ca853899219
+DIST jnr-enxio-0.7.tar.gz 10520 SHA256 6fa9757b7bea93e780f536a124d73dbabecfe0a3badd78cca33021a9ac8244ee SHA512 ed8c13ae4de2334aa9ddd9a13534e0c49fb1bde48e3bd5085a62c96f2b9fe6970b4ba08fe6b27901c5e6db1b360511265ac276ca56f89fddf5e18db9726bd834 WHIRLPOOL e5d0d4f3408578e5f92e2b7dd330f19b484018ed1ab90221164a947e938adbe6e8b679796f5e21a2c031484fb974c2b5bca591b5d3ef6cc0a0c9cd9be65b2b18
 EBUILD jnr-enxio-0.4.ebuild 1059 SHA256 109050ade8cacc74204c30fc948146c760208ef089846867b7c06d3ac8318bf5 SHA512 ed6675de5a75a96948373a5e0c31d91a381afbdfd1b818992ea4adb442286b55a04b4244f9bfeee7d70752440ca06744d9341cd75e7512a59e2cd1de1c8c530d WHIRLPOOL 39dbb844bed271fb517e5045e2188257fb9a604fa6055a7507d51c72c564608cebfeea0da991d6372a39a2771eccccb1ec60b9ee9e22977b6e1e81bc7bdbbcc3
-MISC ChangeLog 588 SHA256 ff3ad75b75273001f58622034fa6518b6c785ded902f234cc3016fc168d0747b SHA512 8d87d59069ce60d31d5ad9afd24d0895e02cc196d82d4c1f7e2d1fd4b8844d414050c073d5fb28258a0e696a9c10d6ce7384659a6ef76bd394d5018334b8eae6 WHIRLPOOL 3ed74f5155914c15e9711f69e0366f28740631960d611a791f3d7d82a6e97b89ee63f00e4520f2c1327fca219869f3ae053960857ecdfdc76e0140fa69b8b01a
+EBUILD jnr-enxio-0.7.ebuild 1061 SHA256 8ef77a155665f5701df10bbef0bfd16d01efdc2317339e958078a6506a4257c0 SHA512 f34d51d09fd153f59ac4b35a23b0daebb07e79bfc5981b181a0bddea7befca5a809ace2928ef0878be597f598e0c79400b95500b44c5ef04dec21435f9d4d030 WHIRLPOOL 0df10f07d992446a1ae98ac6f3ebcabd8828c90b9d27f3998a72deb943d9fb6a8fede4f028a52eb1159904a61a182e911fa2e3c8250c58fd6c34915f0a44d8d6
+MISC ChangeLog 765 SHA256 d01381a53753a9c13e2606a18c9b6ffbe0f8bb3708218273925b0036c19ec4e6 SHA512 fed746769c3969a24101749f552c0299126d6db44a7e1f20ee732dcd31b8a1db5ba2be70faa5b3df5550a56662261b54dee03cef180ad17ee12e62a530a545cf WHIRLPOOL c919b89da09fe42707e66ce13fa58c2c063977947a7ed7459ecdc4b44cbb3c00ba2f406b1969f96bc265b38309696fe2a9d3a6095f17854903c6c3582111e0f9
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2

-iQEcBAEBCAAGBQJSaBOtAAoJEJWyH81tNOV9VfsH/R9uS8HC/BFlmR5E85u+1Gso
-055/ZiwqpcAQb4PcLbTBdcOj5NPboFs4b9FDE+TgwLhY+xkXYAtK1Hpz7AA4EMWk
-x/IbKlq2IfrOs2saRNHNWfyMz+NfXEBPTNx4ana1SuLjEYNIr7qP0Jy6HWEO/yMv
-tpzlq6VGBx+hgOCaxt50pwwvHyTaFPSoh1zggLs39yd4/Ts7Fkoim8g5sp5B5Wb8
-f0k861j/HhwTCh2QBH47TyjV2kcG68PwA0RxjBqmXa5jCaXPRSmOofd+B5l0h9f5
-3KiQV1O5yCES6+eay8KU65L/B4gujoEthMPXc5cAgOyzh2gb8QtTZHpU5OM/8CM=
-=Sid2
+iQEcBAEBCAAGBQJVDgIQAAoJEJGRpfGTSRu4KWUH/ihTWZcohTLI9uBtps9BUZmq
+dMJOEC/K+6oo1twlHAT+rwbp6kVN0zvlRLVultMFCBrwoaglrQJZ0B10J3hnBCcr
+x2q6wpuEG5H4WbFTXmj1XsiauIonEN1J1IHMHe4p504XUaQrk6S1E7B1Lxwv4Mlx
+X1zhptlo4F59uvr9ZkEWIQCh0xEh27z9Q1+ZZB4cPkJNNbqGzExRIxvuKZAGwdTx
+OjYnVOEpBm1268QMueMIfIKDJ/IGr3OEwXnz6Sl+Ol+JGJagvLcJuqeqcne/lbJx
+hcm9X9wIHni6d3t/B0sdioNwoaw3tFhR8M8TJX1eoAi05IoaJ/GUBMNu03c623I=
+=5N4M
 -----END PGP SIGNATURE-----
--- a/Show more
+++ b/Show more