Sync with portage [Wed May 23 10:01:51 MSK 2012].

2012-05-23 10:01:51 +04:00 · 2012-05-23 10:01:51 +04:00 · 7dac1e24df
commit 7dac1e24df
parent 62280b70c1
947 changed files with 8640 additions and 4839 deletions
--- a/app-arch/gzip/ChangeLog
+++ b/app-arch/gzip/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for app-arch/gzip
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/ChangeLog,v 1.112 2012/04/26 19:25:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/ChangeLog,v 1.113 2012/05/22 22:04:35 vapier Exp $
+
+  22 May 2012; Mike Frysinger <vapier@gentoo.org> +files/gzip-1.4-no-gets.patch,
+  gzip-1.4.ebuild:
+  Fix building with glibc-2.16+.

  26 Apr 2012; Alexis Ballier <aballier@gentoo.org> gzip-1.4.ebuild:
  keyword ~amd64-fbsd
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@ -3,14 +3,25 @@ Hash: SHA1

 AUX gzip-1.3.8-install-symlinks.patch 280 RMD160 31a85a5adbc91fd664f3c5f3635483b5b39a6f0e SHA1 4019708174e1cf3b80df3413c478148d10e9d8c2 SHA256 f8b8c8548ae32975ba8e5bbc79add0f951954e1b4a21de55575274de177925d1
 AUX gzip-1.4-assembler.patch 1703 RMD160 807f1428cdf9342f912422ce0b0afec628d0ec6b SHA1 16311f87fb8e13881b04a38447ee7e820f000731 SHA256 4d05f0c6df2fcca0dcc6f72f4545ea89e0cdcb92d1f6b9e9e2bd1942da46cf81
+AUX gzip-1.4-no-gets.patch 779 RMD160 5d6fbfe2fe1e26587d542f18a2a85c6073b45251 SHA1 fa6cff43349c853657ded4ed3459737fb1047c56 SHA256 adf17732f03e1a794018da083ad9a2f754176d2590dd1671a4b33d1ef788d474
 DIST gzip-1.4.tar.gz 907411 RMD160 a74f782960387e3f05373acc258becb564eda82d SHA1 1d398dac6a7920a7de6e2685fe472a840eb2ce6e SHA256 d166cfd3da380da1bd535633e8890bfb5664f9e68870a611d1dc01a3e9f711ee
-EBUILD gzip-1.4.ebuild 1318 RMD160 d25500642470b4d07eee9d8a2e6a725a221a9419 SHA1 9d86ac3dcc4ffc345c66cc6ecfd194402b7b8466 SHA256 7e879809a96dce37baf683bdc41ec9100297939d026928755b4addc050630325
-MISC ChangeLog 16085 RMD160 7682cfaaaca8515d556630e78eacdc3115c7bbe0 SHA1 c46c99a44ba9be657a290035b31a0ca11fd0eb46 SHA256 136679e3733a53702b7e1f5c9ee40a46efcb3079e81d3c5e230591adc55eaa3f
+EBUILD gzip-1.4.ebuild 1357 RMD160 c86a4a719eca63708025b98427c15057b0620729 SHA1 54e7566134aa06bfb3fece4dafc0ea5dfb08052f SHA256 5406356e9d38b7e5196bebfbd557c2665c9688cc453e14d21fde24ce1ec8ccae
+MISC ChangeLog 16217 RMD160 04b27a9956cf6120028b6cf26154ef281266b702 SHA1 e3bfd08aa7e59cdfc02930058d994fa6b3174a3e SHA256 3cc617f01f7bf61da4e1d25570a7f071fffcfb47958776eb2a89b6a0116c037a
 MISC metadata.xml 258 RMD160 fb52cbd38f7a8c9d7fee81f2db5dde7e3b17e045 SHA1 27fbcb42e87ac32af5f2a864ffc330b23b7b9f70 SHA256 3e8d2c98025402bd29168f46db0e4ed14ae2d64ee8e75508d87b136d06ba044c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iEYEARECAAYFAk+ZoS8ACgkQvFcC4BYPU0oM4QCfaWUpwVQky8HPKwhN03VLheHl
-jW0AnAyyqYX106X3BFqi5b5fLNQ6I2fb
-=cyrf
+iQIcBAEBAgAGBQJPvA27AAoJELEHsLL7fEFW7sQQALlkwMzKurxgK9clcXKxbdDC
+OoHnpjSbxmxRx/eGz7Bb5SnExtynWBBS3tXramjgRjUPprz6Ih2n2gysHbXvOZ3g
+dBw5TNPL0UBqgYYFaa/Gd9jkUAHyCbRYGZn05jYYlnhxrGdA1BSss3otT2QRZ9CW
+JME0H9Ln7PYxFOABlIfuKHQFSXsbfRg+pYIOE91SzKcGWl/cALgYWgkiBP+x9BY3
+1McZDGO6i8gmGohdQhCAdv/gmegy0tR9a50xqaqpwCPdI9B+sOK1iyuX6d7UGFxy
+2odpdPtU9SfQc2zmHsGylBBhIlKg3EnNILAN0xW14qrQrc84PcoLosY/FA7s6uCC
+Z4I0GH96rKwkVzhMANcg4+kh1ffFnar6a9gixDtKrRzR5sB37hqCgrmet4XEkd4D
+vsSjGv1pT68bBEMMkcHjGt3bmDjALcZwM6rvtcPoTOeiIqoRuSVP3OkWe9BobuUF
+ZmkjBcSL8QZX/tCQqp1GsAvzBTeXJSDnWi/dHzZkIj59RQB6oDMfCPwD/Tig1OBw
+TZS2wu4mE39XRb7jgnyCZN5Dzq3w4mrkv468Bi6eVkHqNVDbPr6LMrAHvEuGYKpV
+Y+qxGLDdzULK3Cm8ZtdLKhN2XW0Wl+9pVz+pu67t1mXL3Ty63BaQnnxzt4A5F5pa
+mVCpkva2sruZDVLB3zzR
+=V0uw
 -----END PGP SIGNATURE-----
--- a/app-arch/gzip/files/gzip-1.4-no-gets.patch
+++ b/app-arch/gzip/files/gzip-1.4-no-gets.patch
@ -0,0 +1,22 @@
+hack until gzip pulls a newer gnulib version
+
+From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
+From: Eric Blake <eblake@redhat.com>
+Date: Thu, 29 Mar 2012 13:30:41 -0600
+Subject: [PATCH] stdio: don't assume gets any more
+
+Gnulib intentionally does not have a gets module, and now that C11
+and glibc have dropped it, we should be more proactive about warning
+any user on a platform that still has a declaration of this dangerous
+interface.
+
+--- a/lib/stdio.in.h
+++ b/lib/stdio.in.h
+@@ -125,7 +125,6 @@
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
--- a/app-arch/gzip/gzip-1.4.ebuild
+++ b/app-arch/gzip/gzip-1.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.4.ebuild,v 1.10 2012/04/26 19:25:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.4.ebuild,v 1.11 2012/05/22 22:04:35 vapier Exp $

 inherit eutils flag-o-matic

@ -25,6 +25,7 @@ src_unpack() {
 	#epatch "${FILESDIR}"/${PN}-1.3.5-rsync.patch
 	epatch "${FILESDIR}"/${PN}-1.3.8-install-symlinks.patch
 	epatch "${FILESDIR}"/${P}-assembler.patch #309079
+	epatch "${FILESDIR}"/${P}-no-gets.patch
 }

 src_compile() {
--- a/app-arch/rar/ChangeLog
+++ b/app-arch/rar/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for app-arch/rar
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rar/ChangeLog,v 1.79 2012/03/04 18:26:14 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rar/ChangeLog,v 1.80 2012/05/22 21:39:09 jdhore Exp $
+
+  22 May 2012; Jeff Horelick <jdhore@gentoo.org> rar-4.1.1.ebuild:
+  marked x86 per bug 417149

 *rar-4.1.1 (04 Mar 2012)

--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@ -5,6 +5,6 @@ DIST rarlinux-x64-4.1.1.tar.gz 952748 RMD160 c81ff0fe9f1d001db61a0b8f92357b0b529
 DIST winrar-x64-401.exe 1569316 RMD160 94f83d8eb2d8e504c723a24ec1d85ff0e3f019df SHA1 4679f735c743177dc94604d27b665e9a5aca5c20 SHA256 d21297ee40e91e72c2028f7ab0e7e5b922ffb6738b66aaad3bccbc0b8036c685
 DIST winrar-x64-411.exe 1639789 RMD160 8d136c5fde4b559b769e955018fe6f77d5cc6624 SHA1 f6290dcda790a6eae9d9793d8c6c17afe5e68a2c SHA256 822717b5b6f858ee0d00157e0b79368d88f6822684008ceaaac4a89b755f2e5f
 EBUILD rar-4.0.1.ebuild 1864 RMD160 9974d6d8e6d83d602a1203c3ff3d041e6704c713 SHA1 561375c0ee1f34d5cbb13ebc8e36acd7135742b1 SHA256 74041c94824538e5197c3177cc92abf2f4da334370d64be5886c076aba4d1976
-EBUILD rar-4.1.1.ebuild 1869 RMD160 552acb0545012bccf0899f2d474f9e28098be9cd SHA1 72648be79ba5d086ac91a0220c048629d87e8383 SHA256 4643742252e09bc7db5af02abd83714b8bbe83e95f36054826a581436f8c7713
-MISC ChangeLog 10115 RMD160 97db149195d63baf80d95ef46e16d80416534b7e SHA1 672005a4213cdfc74bd3ba27404b19446a419b56 SHA256 7239880eb4908f8059ef599b91df682718b7d8b63315779f2c73706d00439372
+EBUILD rar-4.1.1.ebuild 1868 RMD160 62c831c2600296b4cd6e56ed058652a443692c7a SHA1 91c21b191fc6e4956bbfaeba9576685116c696bc SHA256 e7c622943ab1247742f876df9dfcab701653713b73c5c4a9404593f5fa9be500
+MISC ChangeLog 10211 RMD160 7e542ffdca082d10fd115a301a7a813e4ee0d686 SHA1 eb05142420d3531db015c2f608458e101e5b0272 SHA256 71d9f3788a274b17128a818f7997d08a303cf28f0e4297ba25b2f3d0824e8bd5
 MISC metadata.xml 405 RMD160 e5d729516c83fcf84d8789dec08c17d4c3d93f18 SHA1 1c083d1f84ac8a92bf5943d1d61fa161e25eebaa SHA256 ae8303218412e63bd203ecc7b4412e6812e87e46838a1f5a3450ca767aa88155
--- a/app-arch/rar/rar-4.1.1.ebuild
+++ b/app-arch/rar/rar-4.1.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rar/rar-4.1.1.ebuild,v 1.1 2012/03/04 18:26:14 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rar/rar-4.1.1.ebuild,v 1.2 2012/05/22 21:39:09 jdhore Exp $
 EAPI=4

 DESCRIPTION="RAR compressor/uncompressor"
@ -18,7 +18,7 @@ SRC_URI="x86? ( ${URI_x86} )

 LICENSE="RAR"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
 IUSE="all_sfx static"

 DEPEND="all_sfx? ( app-arch/unrar )"
--- a/app-arch/tar/ChangeLog
+++ b/app-arch/tar/ChangeLog
@ -1,6 +1,15 @@
 # ChangeLog for app-arch/tar
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.172 2012/03/19 19:02:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.174 2012/05/22 22:17:10 vapier Exp $
+
+  22 May 2012; Mike Frysinger <vapier@gentoo.org> tar-1.23-r2.ebuild,
+  tar-1.23-r4.ebuild, tar-1.25-r1.ebuild, tar-1.25.ebuild, tar-1.26-r1.ebuild,
+  tar-1.26.ebuild:
+  Use just mirror://gnu to shut up repoman.
+
+  22 May 2012; Mike Frysinger <vapier@gentoo.org> tar-1.26-r1.ebuild,
+  +files/tar-1.26-no-gets.patch:
+  Fix building with glibc-2.16+.

  19 Mar 2012; Raúl Porcel <armin76@gentoo.org> tar-1.26.ebuild:
  ia64/m68k/s390/sh/sparc stable wrt #358749
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@ -9,23 +9,34 @@ AUX tar-1.23-tests.patch 662 RMD160 ef87a9f5c25240abddde45be4fb0a932c1fd2ec7 SHA
 AUX tar-1.25-incremental-fix.patch 4387 RMD160 b4ca004367e6a5ebd289a8237bb9efaeb5061c90 SHA1 2e54ce1a23a707110a2e440328f0d81743e49b32 SHA256 da801c2550a837b95ccabacd269cc9360c1c4f9d7f27fd80537c608576a112e5
 AUX tar-1.25-verify-check.patch 2083 RMD160 ef237dfe85a0f95c81d9715c791069574ef5342c SHA1 54dcaa661de4b601f6e5cb025720d3dccdbf5cd9 SHA256 4604f596b097d75c063b74c27c75c9cd5528941e2b8f904bb0743767e592c09d
 AUX tar-1.25-verify-fix.patch 1400 RMD160 e20ae093a3449bcf22a8d9591eddfa8027f7f4f0 SHA1 d39aae9a0a9e58581568e2292a41dc10c8e824a5 SHA256 eb5d28b4c10938e287476cbf6bf56a32d13043c9f6ff6ea96f91bcef46a36515
+AUX tar-1.26-no-gets.patch 779 RMD160 775797687f6205e52cce06ad10569a340a3cd84a SHA1 2c59b89b2323e432873a223ce843a0e80f07d70b SHA256 80533a828c8a657ec1d585a6d3b7b2e8fcae6ba1d93d778195a185805f9a2a39
 AUX tar-1.26-xattr.patch 29828 RMD160 e753e032645f3fcd694030bbfb1c43c548c53a6f SHA1 42bee36afb989c493a665fd3902747e828c89b94 SHA256 ce2b67c9fca5e610e117e11485f11bea5d4c6b053392c97825da7f7e65e9d043
 AUX tar.1 16744 RMD160 1d4e8430d6e76aa22f747e1e7b5fa893d092faea SHA1 3823ab407b38ae1fe6f867e01e1eb21977199b08 SHA256 47100e0f1dcaeee56b99083d8bb6fb398be701030f0a72439a1b4de31ac701d3
 DIST tar-1.23.tar.bz2 2189324 RMD160 e79062b7f69d80b734445306f69fb8b96801e909 SHA1 6f3b1443a019da02e4ec20a1446d4aa54b488071 SHA256 c9328372db62fbb1d94c9e4e3cefc961111af46de47085b635359c00a0eebe36
 DIST tar-1.25.tar.bz2 2327460 RMD160 4798d95b8816f5b7a90af8f0596a2e6b70cacb5e SHA1 0f0c090e51d127cbeffbb9aeeb90db1181d82aed SHA256 f3f6ce41b8e0f327abd05c95990f113ddafbae131e10f79a99728ed46458494b
 DIST tar-1.26.tar.bz2 2339773 RMD160 d507dc5a57a823701cae5cdd2b98aba48ec74d3f SHA1 70f298c3cd997b694864c55e6d8655324c87a0cc SHA256 5a5369f464502a598e938029c310d4b3abd51e6bb8dfd045663e61c8ea9f6d41
-EBUILD tar-1.23-r2.ebuild 1754 RMD160 966ad98020c44e3a875f57bf7f68edc6c010e74b SHA1 e48cc4c05030e991b5e31a9363fabf6645d765a8 SHA256 11d9b023e978cad769b499e9ee5c6b489031932e64404faeb5b4fcd48db960be
-EBUILD tar-1.23-r4.ebuild 1821 RMD160 5061b656b4dea0993300e4cf7b3e4cb1155372be SHA1 d75a2c7efdb6f04d7f484a4c33747bd323a70323 SHA256 2d616116dda51fba980445233a4f9ef56b286d9d1fc40188dfb070dfc6b49b49
-EBUILD tar-1.25-r1.ebuild 2247 RMD160 7a7ff02b93af7ed8c719ad98ea0f974a9cc4270a SHA1 a18d2792a92917ae8906e43e782a0129b7481fc6 SHA256 8581851553c93c60fd656bb62337d9a39c7af1bcd47e09463debf5271f8468c2
-EBUILD tar-1.25.ebuild 2089 RMD160 463fc4490bee03980cc7f2496019c3918bd9bd9f SHA1 f0b4569c446e506fa988e1ae8bb35bbed2904b94 SHA256 deffd530e4dbdd72cacfb1ca2de401d8dc7bb9e3bcae501a45b701308b503364
-EBUILD tar-1.26-r1.ebuild 2111 RMD160 9ef4f204709f89dda13e83e4c650df6b24ce379d SHA1 a732dda61efceeabb5f9a2350e607a776dafbcdd SHA256 2754e6c3ae60e0a39972fe4e354d908f1ec984b47a2f019665bd0a8da73d25ab
-EBUILD tar-1.26.ebuild 2076 RMD160 6ca0d15a8dcdade75a875e5c9304464d1f642533 SHA1 8ef08a040f63dadf91cbbd2959db79de620f6ceb SHA256 db8bd6a54b997bb4ba1e72b754abb763c423a2e4661baf095d51aa25864ae2c4
-MISC ChangeLog 25840 RMD160 74fd0436eabad2abaf3215285291e72d0f71b525 SHA1 4b403bfbfa42751f66d4ec478a58b799d8500477 SHA256 3c6ed3abdd8b5266865cc87dc6a5411f0d95578ea970832be13e5d35ca05e092
+EBUILD tar-1.23-r2.ebuild 1711 RMD160 e70a44f2acd2f0d5f6f54103784b31e6eb6ae519 SHA1 302957444cc52ffd5d345e84c48128163b25d2ec SHA256 b54be6b134ec86cc69e2730a580e688767fa0102e1b0170f7959b3d5734de5d4
+EBUILD tar-1.23-r4.ebuild 1778 RMD160 1fec95f77531e9858c0a44c362dc2a69692b0ad9 SHA1 dd8b1167b466f3147d69882e7173bae25c57ced3 SHA256 d30b091b9f0910b78193aff2c98d4ca72b37fa434f87cf5ff193a96d72315ec5
+EBUILD tar-1.25-r1.ebuild 2204 RMD160 fce1d7c9931928b3f45437a147bdb23cb39a2de2 SHA1 40c3521ca49db1e3b91514771d55ce8af0933fd7 SHA256 44468ac3eb799be856a313cdacf9a0fb87b018ce06a9c03a4f4f72f06de673cc
+EBUILD tar-1.25.ebuild 2046 RMD160 574d7316444ff475631e14778a6a9bc52fcbc645 SHA1 ad3f5f75d14cfe56463efd1bae9a6b2158b10094 SHA256 641913056b4b75a35a7d15313e39470feba3bbd5260d7758de677fba905bec53
+EBUILD tar-1.26-r1.ebuild 2109 RMD160 a1327c5d7b5a04950496d6a8af769025ed526fba SHA1 f4c55b0c6db113f415501e58e438ba489f606bde SHA256 3f9c52c8a534b60e6f4269a1420d72d9c7e3090570faef47ca7a883b8e0274b3
+EBUILD tar-1.26.ebuild 2035 RMD160 595654df7cc11396b03cc887431000784e6b33e6 SHA1 8264f74ddbb6ad327aa66d1d9f24bfb4fc2ea1ab SHA256 6c8b737d476ed473e06c274ce8a255a9313df1428858f95bdb6b85f4129172ba
+MISC ChangeLog 26189 RMD160 8aafd33b04048105089e3cce7a502cb2c79bba5d SHA1 a373bd73170fb1e630767f665a542635dd0118d9 SHA256 d1933f6a776e970265b8427a2d6b966bdd3200337d753e8bd2b9aa427c9311b6
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)

-iEYEARECAAYFAk9ngs8ACgkQuQc30/atMkBlNgCglOD2vpXwIYDkroQYk1o1i3jf
-3wQAnjMXMRZPpumVFHNhmOKJnzaZvxs7
-=R11s
+iQIcBAEBAgAGBQJPvBCwAAoJELEHsLL7fEFWNg4QAJw/oWbYZm4ZzHEpJ/yCvlDY
+NF4tDIlCmBlvKxWdi62l8PsWjv72nVUPSKR31xclf3HYS0wKRgtI0IqffMXd4xKF
+F/Ql59AASFAm9EGgOL0N4NSONwt2TjFoKFNl/cskIZkmQgsewiu/Hu2u6rbdxKUw
+5K/kXZmBrUovD6GKKc98lgLn5mRo7m5OIymeeO6vB0w7h/H9ronSYqQywUjdKU1v
+CJuhncODe5X9PsixWarVPUc7xisn66nnglCEkZbMCk1vxiBZmh+yoeX5yhtB4dSt
+qtp7vhuRwdPQ3cJXKlvV9DhkDT8PmdVcz+ouuVNeYiFQd/oYlPnaWHsA2wflLEvx
+MBnvfVXBcHD7SjLfKBYowzldhDdlnV64J0wt2ToB9v3BKnU/JkiX6OXfxjQ2QmYo
+6wFsCISySvVVW7uJerYJli91smqILojKRcC2C9ubfUVO9xxyMPrT/Vfd2QtfS86J
+s6ynMyn/lWEvdRuWacS3dvKdg68Y3K5WVKXNZZimRyOF51TvGD8NLntDiG29a+MD
+YpfEAo47Z0IhI2Tel+j0pr106uNv1szZjAdMZDmR+6txcvW3ckwVpj8NO5LUnMiH
+a3GaG0lpkCGv5DzN/FxV+UIqeUnmPkz26vW7H3QgnjPeNprY2u5/PXKxkJ4EObSl
+RhBI1mI8lL+rB+0sg71d
+=jrPa
 -----END PGP SIGNATURE-----
--- a/app-arch/tar/files/tar-1.26-no-gets.patch
+++ b/app-arch/tar/files/tar-1.26-no-gets.patch
@ -0,0 +1,22 @@
+hack until gzip pulls a newer gnulib version
+
+From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
+From: Eric Blake <eblake@redhat.com>
+Date: Thu, 29 Mar 2012 13:30:41 -0600
+Subject: [PATCH] stdio: don't assume gets any more
+
+Gnulib intentionally does not have a gets module, and now that C11
+and glibc have dropped it, we should be more proactive about warning
+any user on a platform that still has a declaration of this dangerous
+interface.
+
+--- a/gnu/stdio.in.h
+++ b/gnu/stdio.in.h
+@@ -125,7 +125,6 @@
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
--- a/app-arch/tar/tar-1.23-r2.ebuild
+++ b/app-arch/tar/tar-1.23-r2.ebuild
@ -1,14 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.23-r2.ebuild,v 1.8 2012/03/04 15:35:15 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.23-r2.ebuild,v 1.9 2012/05/22 22:17:10 vapier Exp $

 inherit flag-o-matic eutils

 DESCRIPTION="Use this to make tarballs :)"
 HOMEPAGE="http://www.gnu.org/software/tar/"
-SRC_URI="http://ftp.gnu.org/gnu/tar/${P}.tar.bz2
-	mirror://gnu-alpha/tar/${P}.tar.bz2
-	mirror://gnu/tar/${P}.tar.bz2"
+SRC_URI="mirror://gnu/tar/${P}.tar.bz2
+	mirror://gnu-alpha/tar/${P}.tar.bz2"

 LICENSE="GPL-3"
 SLOT="0"
--- a/app-arch/tar/tar-1.23-r4.ebuild
+++ b/app-arch/tar/tar-1.23-r4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.23-r4.ebuild,v 1.2 2012/03/04 15:35:15 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.23-r4.ebuild,v 1.3 2012/05/22 22:17:10 vapier Exp $

 EAPI="2"

@ -8,9 +8,8 @@ inherit flag-o-matic eutils

 DESCRIPTION="Use this to make tarballs :)"
 HOMEPAGE="http://www.gnu.org/software/tar/"
-SRC_URI="http://ftp.gnu.org/gnu/tar/${P}.tar.bz2
-	mirror://gnu-alpha/tar/${P}.tar.bz2
-	mirror://gnu/tar/${P}.tar.bz2"
+SRC_URI="mirror://gnu/tar/${P}.tar.bz2
+	mirror://gnu-alpha/tar/${P}.tar.bz2"

 LICENSE="GPL-3"
 SLOT="0"
--- a/app-arch/tar/tar-1.25-r1.ebuild
+++ b/app-arch/tar/tar-1.25-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.25-r1.ebuild,v 1.2 2012/03/04 15:35:15 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.25-r1.ebuild,v 1.3 2012/05/22 22:17:10 vapier Exp $

 EAPI="3"

@ -8,9 +8,8 @@ inherit flag-o-matic

 DESCRIPTION="Use this to make tarballs :)"
 HOMEPAGE="http://www.gnu.org/software/tar/"
-SRC_URI="http://ftp.gnu.org/gnu/tar/${P}.tar.bz2
-	mirror://gnu-alpha/tar/${P}.tar.bz2
-	mirror://gnu/tar/${P}.tar.bz2"
+SRC_URI="mirror://gnu/tar/${P}.tar.bz2
+	mirror://gnu-alpha/tar/${P}.tar.bz2"

 LICENSE="GPL-3"
 SLOT="0"
--- a/app-arch/tar/tar-1.25.ebuild
+++ b/app-arch/tar/tar-1.25.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.25.ebuild,v 1.3 2012/03/04 15:35:15 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.25.ebuild,v 1.4 2012/05/22 22:17:10 vapier Exp $

 EAPI="3"

@ -8,9 +8,8 @@ inherit flag-o-matic

 DESCRIPTION="Use this to make tarballs :)"
 HOMEPAGE="http://www.gnu.org/software/tar/"
-SRC_URI="http://ftp.gnu.org/gnu/tar/${P}.tar.bz2
-	mirror://gnu-alpha/tar/${P}.tar.bz2
-	mirror://gnu/tar/${P}.tar.bz2"
+SRC_URI="mirror://gnu/tar/${P}.tar.bz2
+	mirror://gnu-alpha/tar/${P}.tar.bz2"

 LICENSE="GPL-3"
 SLOT="0"
--- a/app-arch/tar/tar-1.26-r1.ebuild
+++ b/app-arch/tar/tar-1.26-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.26-r1.ebuild,v 1.2 2012/03/04 15:35:15 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.26-r1.ebuild,v 1.4 2012/05/22 22:17:10 vapier Exp $

 EAPI="3"

@ -8,9 +8,8 @@ inherit flag-o-matic autotools

 DESCRIPTION="Use this to make tarballs :)"
 HOMEPAGE="http://www.gnu.org/software/tar/"
-SRC_URI="http://ftp.gnu.org/gnu/tar/${P}.tar.bz2
-	mirror://gnu-alpha/tar/${P}.tar.bz2
-	mirror://gnu/tar/${P}.tar.bz2"
+SRC_URI="mirror://gnu/tar/${P}.tar.bz2
+	mirror://gnu-alpha/tar/${P}.tar.bz2"

 LICENSE="GPL-3"
 SLOT="0"
@ -23,6 +22,7 @@ DEPEND="${RDEPEND}

 src_prepare() {
 	epatch "${FILESDIR}"/${P}-xattr.patch #382067
+	epatch "${FILESDIR}"/${P}-no-gets.patch
 	eautoreconf

 	if ! use userland_GNU ; then
--- a/app-arch/tar/tar-1.26.ebuild
+++ b/app-arch/tar/tar-1.26.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.26.ebuild,v 1.9 2012/03/19 19:02:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.26.ebuild,v 1.10 2012/05/22 22:17:10 vapier Exp $

 EAPI="3"

@ -8,9 +8,8 @@ inherit flag-o-matic

 DESCRIPTION="Use this to make tarballs :)"
 HOMEPAGE="http://www.gnu.org/software/tar/"
-SRC_URI="http://ftp.gnu.org/gnu/tar/${P}.tar.bz2
-	mirror://gnu-alpha/tar/${P}.tar.bz2
-	mirror://gnu/tar/${P}.tar.bz2"
+SRC_URI="mirror://gnu/tar/${P}.tar.bz2
+	mirror://gnu-alpha/tar/${P}.tar.bz2"

 LICENSE="GPL-3"
 SLOT="0"
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@ -1,6 +1,14 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.270 2012/05/19 17:38:23 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.271 2012/05/22 21:28:00 kensington Exp $
+
+*k3b-2.0.2-r3 (22 May 2012)
+
+  22 May 2012; Michael Palimaka <kensington@gentoo.org> +k3b-2.0.2-r3.ebuild,
+  -k3b-2.0.2-r2.ebuild:
+  Properly avoid automagic dependencies, fixing bug #416675 by Petteri Räty
+  <betelgeuse@gentoo.org>. Add REQUIRED_USE to prevent use flag combinations
+  that do nothing. Remove old.

 *k3b-2.0.2-r2 (19 May 2012)

--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@ -5,17 +5,17 @@ AUX k3b-2.0.2-ffmpeg.patch 3298 RMD160 0e7cff12151cfa33f87f4d4d425921e01fd1a9ba
 AUX k3b-2.0.2-libavformat54.patch 917 RMD160 5cf3edb1bb46ceee8ff6c47fd8342e044488d40e SHA1 5b35bff3f7670686a32bd71afea2deaca4331631 SHA256 516efa7ad0d9806c603f761769f8d1457fe9fa047a7475e7f11615db89ee1271
 DIST k3b-2.0.2.tar.bz2 12833321 RMD160 a0289eb9ccec9607c2bdac3fc7c69102eec5ee40 SHA1 8b30a4d07942e82559b01bc07dea6bcf2defd532 SHA256 af176f29c1d2339c4648d461476227cb07bcd0c75056f2a4006f253e3ef5b7cd
 EBUILD k3b-2.0.2-r1.ebuild 3412 RMD160 bd84124d0d845017c79a930d30105381e2f20d4d SHA1 1226cf144b964ee0025fd029b445c7e1e450bbd9 SHA256 fdc5088812ef0d71b0ae2de0705318fb907e08c8da80316a6dcaf4149fd95cee
-EBUILD k3b-2.0.2-r2.ebuild 3305 RMD160 dda9a2e09a7b806cd53822b299184dd1e9263da9 SHA1 409b344b8a45dc0d3fb602777e7de202f8787b5b SHA256 ea9833c08cb8fd09516c59eaab8fd1f83645066a48e64966a6c98f629d625aa5
-MISC ChangeLog 39236 RMD160 cf84eb5c7b887722b3e631f48becde1d646aa88f SHA1 1e9cf26d1392036fadd712fd7f986d69e0da4cf8 SHA256 1d867e3713fe999fca735cba604eeb8d38d065004519667a1bc3c864a4bd0148
+EBUILD k3b-2.0.2-r3.ebuild 3506 RMD160 1984e953069764b8465e479782897be0eb46e51d SHA1 28ba4b6f918e8f45f760ab3c70a8d91d099a83cd SHA256 003ae19dd7a81dda772881c7087cfd75301203819ebefce0648b4b08bda4c09e
+MISC ChangeLog 39553 RMD160 63b0457f42fa3d90d7566a0eb03909078725af88 SHA1 04164be406feda51361c02cbdc59bbd028626ca6 SHA256 94b726627866cc50f3f786d4d59b2ae5d6205ff43b9d4a225ee00c7a410cb366
 MISC metadata.xml 328 RMD160 5b743e23199d1fe9055c726d7d177ee0e2f7e915 SHA1 73b1368091e675957fe43af4c9ce71b6049def16 SHA256 c7ade5871825684e83ad0a4126a78df11f40cfb6d7ac6578c8b65f3491ef01a0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iQEcBAEBAgAGBQJPt9qKAAoJEMbwO6tnXQ0swYsH/jcXJMNbilR7uv7mxWvQxm6O
-nO2AaDllu79F5Arb7NHZ/vHR1szbcdawQW2dSjzoit9gkEfBc1WsNbHxw7SGe2i/
-2KIgR70dLRRg4m4Y8BembjDmbfZX6mGVFCl75wn3A6l2PAbo6lVBbWjtqhexd31f
-Z9Q9tcISYfiNP36Qf9BrWjG99zkRoiaH1jnd5kG8BIAb8VFSwITGxXET+8lT9o74
-tgPX/xqkjh3XBglQG1BhtMnAInQ/S8Ll2o2gUIquCQaUq9WuaQWf7WoCyvHAULSd
-rJa2hrSqG2I7fminzuaQGUzPiTo7h6WoNp+7DnC00XuI4IASpVD22fF9Nh/TTs0=
-=mrvR
+iQEcBAEBAgAGBQJPvATTAAoJEMbwO6tnXQ0ssA8IAMqUgnPwVrTZWsVAS3Y+a50u
+pdoRRMITvwVQlcAeRNQe+s913zeHLiXww52qyCbR7fnay2ZID9OPNNCzuClwdw7m
+tQme9AXyqcr2P/tIqdhe3ZzQvH0NWUuVjRztiJEFF029ejCvmVLcCC40JeC63SuK
+Ci66RJjv4JyDSYvh8v6hars8dop2FCoDnXhiyEKdRAyB5y7C6pkgwTg6sYr86tXE
+7MXOCDyMK12qQx2ZP6ir90qnLv34jdYSl2LFfliURDfYCSApm+GVonAfJUyyVwxJ
+LYwMFVuHwvNltuIgOTyrgzjhmh929oKtXPRXwGFBUroeE5CdBoDf5p+hyJovq0s=
+=5a3e
 -----END PGP SIGNATURE-----
--- a/app-cdr/k3b/k3b-2.0.2-r3.ebuild
+++ b/app-cdr/k3b/k3b-2.0.2-r3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.2-r2.ebuild,v 1.1 2012/05/19 17:38:22 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.2-r3.ebuild,v 1.1 2012/05/22 21:28:00 kensington Exp $

 EAPI=4

@ -66,6 +66,11 @@ PATCHES=(
 	"${FILESDIR}/${P}-libavformat54.patch"
 )

+REQUIRED_USE="
+	lame? ( encode )
+	sox? ( encode )
+"
+
 src_configure() {
 	mycmakeargs=(
 		-DK3B_BUILD_API_DOCS=OFF
@ -91,6 +96,12 @@ src_configure() {
 			$(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN)
 			$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
 		)
+	else
+		mycmakeargs+=(
+			-DK3B_BUILD_LAME_ENCODER_PLUGIN=OFF
+			-DK3B_BUILD_SOX_ENCODER_PLUGIN=OFF
+			-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=OFF
+		)
 	fi

 	kde4-base_src_configure
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.428 2012/05/13 11:34:57 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.429 2012/05/22 16:41:57 ssuominen Exp $
+
+  22 May 2012; Samuli Suominen <ssuominen@gentoo.org> gnupg-2.0.17-r2.ebuild,
+  gnupg-2.0.17-r3.ebuild, gnupg-2.0.18.ebuild, gnupg-2.0.19.ebuild:
+  Remove dev-libs/ from elog message for libusb.

  13 May 2012; <swift@gentoo.org> gnupg-1.4.11.ebuild, gnupg-1.4.12.ebuild,
  gnupg-2.0.17.ebuild, gnupg-2.0.17-r2.ebuild, gnupg-2.0.17-r3.ebuild,
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnupg-2.0.17-gpgsm-gencert.patch 1079 RMD160 58fdc7454cd23bd9731866f1350eee1d166487d0 SHA1 3f6710fb83de85c34c8edaf4c7aaddeb1ccc771d SHA256 aec0ea30d898f7f7369abac9a61a0713b6b9b89d231b9beff1ee82041983b7ed
 AUX gnupg-2.0.17-libgrcrypt150-bugfix.patch 1125 RMD160 529bd214cb1883e318fae40cfc582ec24d6ebfc2 SHA1 f4119372ae2dece42606eb266211ca7d4a8354a8 SHA256 a909e3d044292ec0869385a529dab5095ae788ea68a9cb70e63054266eb8cf0b
 DIST gnupg-1.4.11.tar.bz2 3407075 RMD160 9daf2dedfd4c6211fc13b8cdee8f08b8f5925378 SHA1 78e22f5cca88514ee71034aafff539c33f3c6676 SHA256 d18ceeac16e554a501170b9bfde611625252d0fe9448685a69c93bf149ee6ef6
@ -8,10 +11,21 @@ DIST gnupg-2.0.19.tar.bz2 4187460 RMD160 026b5c5fa2b21c3586f325f48ff1420c987b88a
 DIST idea.c.gz 5216 RMD160 e35be5a031d10d52341ac5f029d28f811edd908d SHA1 82fded4ec31b97b3b2dd22741880b67cfee40f84 SHA256 309928da34941dff1d6f6687542ff3d58306d85be9e1a9906bc4f9f8e6011844
 EBUILD gnupg-1.4.11.ebuild 4448 RMD160 fdb1501d418e7800e587d04e40869f106bd90af2 SHA1 8b8b7859da3cc91afa7e1654d60574fe0493b7d6 SHA256 908b82979bd9d683eb8dcf4813492ff968e0738f7792e44f01ce9963af01d728
 EBUILD gnupg-1.4.12.ebuild 4458 RMD160 31843ad31df07319b3b7bbdabbb128d4f5532e3e SHA1 af5cd354e25aabd47560ac9ffb8bac687a7a620c SHA256 3126fc9af47ba4e36cb5d5d136455c9dc76d359a06ecaf86e20e08b5f8dd035c
-EBUILD gnupg-2.0.17-r2.ebuild 4323 RMD160 9928e119d78d31c4e2f47029071267288582c860 SHA1 56fd511dd9eeb7bd7cc8696690f60e3c0bb5f031 SHA256 52fffeb857c0ddd4cbe638cdcb75c53b2eaff8fed7982b1b071a5c8cc30a2a31
-EBUILD gnupg-2.0.17-r3.ebuild 4377 RMD160 65ccf7fa07589399ef721f0612e5a623c04496bb SHA1 e6b56ebb0dfa2de3fba8b94305ae41248b6335e1 SHA256 010d8433853dd6ade6d5aaa70a2e1bbd5225364287643c96166f5fe0e0adc547
+EBUILD gnupg-2.0.17-r2.ebuild 4318 RMD160 d57f41409f7fff6825776d639de39376a5fdc86d SHA1 39f9adf36740a5bb965695bf38392c9db3a1524c SHA256 050a63fdcae4ef5f7cc64c2d0d652fbb0f7485f2413bdb6e26ddcb3dd3baa7c8
+EBUILD gnupg-2.0.17-r3.ebuild 4372 RMD160 ed8c8f422030ebbcca5b0e3efa1c8354bee687e6 SHA1 e6017be6cd05e0e2ef2fd02fac5c1d7536af9e25 SHA256 8427dbcf096d7963791ff67191f888138f3abd0bdd62b9ab40fe77f0e578de48
 EBUILD gnupg-2.0.17.ebuild 4541 RMD160 0b0b904476a52b2da361bdf1739d33ed7d1a1633 SHA1 79ceed9366387d027101098959bfd3ac26f1a736 SHA256 1446fbb23702497fe625476dca396b52d860c490014d58e39a35b62077899be1
-EBUILD gnupg-2.0.18.ebuild 4491 RMD160 f5b627d25db9cdfe22821a1b00d8d5aac4226cae SHA1 7413314721e4d1970f1a1e86c071397a1f93ef9b SHA256 4d04ebb7b0c95640e9e349f4a529e1866160f5d71c47963f32f95180f838ef4c
-EBUILD gnupg-2.0.19.ebuild 4482 RMD160 fa53cbd7e7a5f3859a76d61b09ec88b5594f5712 SHA1 4a1b6d1d03c563f41882636ea5d1976ff2013761 SHA256 7ba5ab6ba34c231308b27aab01e921f41b24e795bf1bf0e0219a6f24421f48f4
-MISC ChangeLog 65243 RMD160 b1692e20d90f00c98051c984650adfc121adb447 SHA1 11506cfff5ca32cd3589ad5f34b443998b56bb87 SHA256 e9d49587fc6849b329caaccf85bb68a857f08a2c36d8a278e020f543cde36456
+EBUILD gnupg-2.0.18.ebuild 4486 RMD160 2b86238f6686b3781cf93d3010fd9a10ee10c16b SHA1 f43760abc09d4d6d1b8468ce96cdc2cd14b18f88 SHA256 b675d811106cf5d0b5571e345036179a931351dbc659ca796b24d47c884d8962
+EBUILD gnupg-2.0.19.ebuild 4477 RMD160 05a447441c2fba6c83934602be8e33e40233986e SHA1 cb58fc022f1d28f2d784143f3b01d9ced95583aa SHA256 0b5e99f3c056c5d64f5ff0349f4639592f22a7cba4a56457051929ec3bb89030
+MISC ChangeLog 65443 RMD160 a7dbcff165e316e0def493049b31639980fce96b SHA1 16f864f009f400dac797aa43863ed06e87616af4 SHA256 3a31f4624a9d3d6616fbc87fd45e72ba971024d0dd55340f049848700e09be1a
 MISC metadata.xml 1389 RMD160 bdb5faec4d748978c3560b8d576fcf20644117be SHA1 e251d4c2c7b3e9ece77941ec2a0b6e85c2e6029a SHA256 533eecf8b1099f22d1fc298fcb0618bf5e243a77d0be9360aa56ff8397cb5fb0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPu8EbAAoJEEdUh39IaPFN3CEIAJH3xh/gdA0ie0I1cNmsu/M3
+c9eIZRFZJO4pLi1ub8u46O0mPwS1uowHHuQQA7/noWyQQeD3GiTFckFLmnsrKVMu
+6yA5DveEsGyARVUXLnBtHvXQ/CLy0o879NOqv2CQziGea7Y57JtdRH2LO6bcW80X
+VCm/PWmfl3eJwa5y3EfGK0dvyGgQlzt8OrrQ2aYMejEMYXk8skbytD6wiOs9JoVG
+AbzK5vNRKeGh4OQtkn8271E0FNqrp/K0Em6MGxxEHPtzk3/CKE6IUovgQ8Y4nwLC
+EMvTW17Fpqlq/q9PAENAS0zcHZxUGib9vAEUQEbCEDmClOcFWMRvYRK1JZPdE3Y=
+=7sM0
+-----END PGP SIGNATURE-----
--- a/app-crypt/gnupg/gnupg-2.0.17-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.17-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.17-r2.ebuild,v 1.3 2012/05/13 11:34:57 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.17-r2.ebuild,v 1.4 2012/05/22 16:41:57 ssuominen Exp $

 EAPI="4"

@ -128,7 +128,7 @@ pkg_postinst() {
 	elog
 	if use smartcard; then
 		elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
-		use usb && elog " - a CCID-compatible reader, used directly through dev-libs/libusb;"
+		use usb && elog " - a CCID-compatible reader, used directly through libusb;"
 		elog " - sys-apps/pcsc-lite and a compatible reader device;"
 		elog " - dev-libs/openct and a compatible reader device;"
 		elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
--- a/app-crypt/gnupg/gnupg-2.0.17-r3.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.17-r3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.17-r3.ebuild,v 1.3 2012/05/13 11:34:57 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.17-r3.ebuild,v 1.4 2012/05/22 16:41:57 ssuominen Exp $

 EAPI="4"

@ -129,7 +129,7 @@ pkg_postinst() {
 	elog
 	if use smartcard; then
 		elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
-		use usb && elog " - a CCID-compatible reader, used directly through dev-libs/libusb;"
+		use usb && elog " - a CCID-compatible reader, used directly through libusb;"
 		elog " - sys-apps/pcsc-lite and a compatible reader device;"
 		elog " - dev-libs/openct and a compatible reader device;"
 		elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
--- a/app-crypt/gnupg/gnupg-2.0.18.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.18.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.18.ebuild,v 1.7 2012/05/13 11:34:57 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.18.ebuild,v 1.8 2012/05/22 16:41:57 ssuominen Exp $

 EAPI="4"

@ -132,7 +132,7 @@ pkg_postinst() {
 	elog
 	if use smartcard; then
 		elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
-		use usb && elog " - a CCID-compatible reader, used directly through dev-libs/libusb;"
+		use usb && elog " - a CCID-compatible reader, used directly through libusb;"
 		elog " - sys-apps/pcsc-lite and a compatible reader device;"
 		elog " - dev-libs/openct and a compatible reader device;"
 		elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
--- a/app-crypt/gnupg/gnupg-2.0.19.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.19.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.19.ebuild,v 1.3 2012/05/13 11:34:57 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.19.ebuild,v 1.4 2012/05/22 16:41:57 ssuominen Exp $

 EAPI="4"

@ -132,7 +132,7 @@ pkg_postinst() {

 	if use smartcard; then
 		elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
-		use usb && elog " - a CCID-compatible reader, used directly through dev-libs/libusb;"
+		use usb && elog " - a CCID-compatible reader, used directly through libusb;"
 		elog " - sys-apps/pcsc-lite and a compatible reader device;"
 		elog " - dev-libs/openct and a compatible reader device;"
 		elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/heimdal
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.192 2012/05/03 18:16:39 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.193 2012/05/22 19:37:07 eras Exp $
+
+  22 May 2012; Eray Aslan <eras@gentoo.org> heimdal-1.5.1-r1.ebuild,
+  heimdal-1.5.2.ebuild:
+  Fix broken symlink - bug #417081

  03 May 2012; Jeff Horelick <jdhore@gentoo.org> heimdal-1.5.1-r1.ebuild,
  heimdal-1.5.2.ebuild:
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX CVE-2011-4862.patch 456 RMD160 e28419dffda573918ff5d6e0da1dc51fd5324629 SHA1 b927c7cb3f8a69fcfac34615c381b118d4c91a53 SHA256 856ef749a795087582849e6e14921d36271c110b6e1039e7e073e8b508031a08
 AUX heimdal-kadmind.confd 151 RMD160 25ae05e118d61a06871d4b7cea4caf3bf8b28cc1 SHA1 4187aa7ec5ddbc79f25d30d65c1f0d6dd2ab0992 SHA256 892f9650d4eb631eb1ea435dc8d3defd3805e6d1f2fa59a698d424c44915d644
 AUX heimdal-kadmind.initd-r1 553 RMD160 aaa2e4a8918254f1f663089ef2f63161cebefb0b SHA1 fdda38fda6ad81e3dfe31aa20b8948a57d940ae5 SHA256 cb598a34926c9152072f77027da0106684245e6c53cb931233de32a2c8011a79
@ -14,7 +17,24 @@ AUX heimdal_missing-include.patch 255 RMD160 113517789c643163acec3a2f09870a87074
 AUX krb5.conf 424 RMD160 80a0159824b8a44698d97d911c701bb05f2f0688 SHA1 7602cc72576d144429cae5cf568feb25a5906ab7 SHA256 3acbae7a561b0a76c90ab53f41d5ffb5b811a39049c5ed15b1e7a34e8c889c6e
 DIST heimdal-1.5.1.tar.gz 6800347 RMD160 d66b09bddcd762e91092f862ea084abbcc3670ca SHA1 78421d3f80d3bd1f2eccfa0e5a690e964842b2fb SHA256 bd69940e67ce985589451d868354a959eebf96d8a059f513b23d40e4aa101d5f
 DIST heimdal-1.5.2.tar.gz 6798615 RMD160 1ab2f835309a916dfbba667d3d0d38a57c312fde SHA1 dd0920a181d18236432e4b3e5eab6e468cda4b89 SHA256 22603f282f31173533b939d289f3374258aa1ccccbe51ee088d7568d321279ec
-EBUILD heimdal-1.5.1-r1.ebuild 3742 RMD160 55f4890fe7ba41ddfc3a67dec5d88f2c4f12d080 SHA1 6291490f4b705b2dc77ed231a48e3fb44e126bbd SHA256 26317f99cb3631b6aaa009b691c032cbcc07286740ba83cdc7f98a8d4e808c5c
-EBUILD heimdal-1.5.2.ebuild 3709 RMD160 90d7feade6d80f893eb1a6ea5c6cf5dd03877174 SHA1 f121777bc300a6c5be969593352ad5c48d0e0d9c SHA256 dedfb2eecaf6d4cc91f98c68791070534043b5ec3a525636aa0538353cf361d7
-MISC ChangeLog 31368 RMD160 fd116f9d9b9600dc6e681c507a8e8b46465af181 SHA1 385aae2d799c28ee7bd4be3bc7e47b91f7211cb6 SHA256 b09b36fa1dabe5f2d7141951423ba4c72512fda6ebc88bb5be25bc9b58e25096
+EBUILD heimdal-1.5.1-r1.ebuild 3871 RMD160 ffdd6496050a335fdddd1c74d3372d8b24868026 SHA1 9b72517c8bfdc07cb12136501db2ff5505299cd5 SHA256 81959a8560d6d056f3797603a651c5bd6de8b6e7319bce841e6140cbdbd03bad
+EBUILD heimdal-1.5.2.ebuild 3785 RMD160 6da1879d3a77403b03949a777f5b484975b70e61 SHA1 f140eda4ed110544ab51ad83624cbdb3bcee1a5c SHA256 79c40ff9ccedc266267be3c846ddb682f604d089bb8f65dd48121a0eb506de9b
+MISC ChangeLog 31495 RMD160 ef5722ae3ef5af5c000ee5aee7f0c55e64922ce1 SHA1 ce452ce54a1e1800759d8e63e5ba5fcb668913eb SHA256 48eebcaf826d41d68c791f8d0d7629cc7afaf393f2599c88e1645b68fb17e6af
 MISC metadata.xml 469 RMD160 2dc8ebb842bdde2d766a1d35335d97581686cccc SHA1 f87ee646d52dc65e1c232b5ca15f7cfeef213304 SHA256 8d648750dfc00c8726d98166f672d9d35396cdad6f1ebed89e0ee4a29045abad
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJPu+rpAAoJEHfx8XVYajsfH6UP/RaYdOGz/F4bBxuQgo5qGFHD
+BxdhD2APj0fAdVVOWlMqs0HuYFo3qfKYjB/twpVRRgsyc8xJvQ1Wz9OFzwaZ3k5K
+26KDiyWWBFWor8i4QmndqnF8DeNZhmQTvRRmcKH7kMrEzGBFyFrYlXv4rNGKs7qs
+jbdw+1pIlFDWcIWoNcd6MRDW/3muKvUzwr0Pt1nyci7YuBpS0RMUpSPItgc81SXY
+6DNvrSmXVLAjoDPscHf+uLaJ4zEfTkLXTUxKokOAllu5KOwt3XL3UWWw3VYZTmxJ
+pVhG3WBgMpN/ugGJ3zRg2BT/ldaWJ0wQepxpuMQoE9L1Uklr+fofhbL9CAwi+vCE
+FWKPOdThb3AyszfUjmHk4yXdgZBDeyNdBOOaA3838e4H37SF64Kxjqb43BykhD+7
+JWvty2k5fd+bQ1Q+i6pdbXZ98MZ/sSD4jTO4zLU0bt38aws+qIaJjfj0PwAf4ubR
+moL8h68DScGf7xUvTuw6otVGpDWvvjQaOwOrtwFPloBvPgS7+oY+fplEmo+wvO6K
+bBizwzQG/5sgnSgY9lkoQsexkKvb0YTsXYMGESThjVua5VXANLR1yTm2bXKB8yJU
+gRxhSX/YVMVdFcqomVC0f0LTTmpDyy/XmO2fMsvpdjbQ/O85+5YjBdFQ0vWNCVvl
+ZnVibHGdejxrvT4Y/IHM
+=dxBs
+-----END PGP SIGNATURE-----
--- a/app-crypt/heimdal/heimdal-1.5.1-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-1.5.1-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.1-r1.ebuild,v 1.9 2012/05/03 18:16:39 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.1-r1.ebuild,v 1.10 2012/05/22 19:37:07 eras Exp $

 EAPI=2
 # PYTHON_BDEPEND="2"
@ -133,6 +133,10 @@ src_install() {

 	# default database dir
 	keepdir /var/heimdal
+
+	# Ugly hack for broken symlink - bug #417081
+	rm "${D}"/usr/share/man/man5/qop.5 || die
+	dosym mech.5 /usr/share/man/man5/qop.5
 }

 pkg_preinst() {
--- a/app-crypt/heimdal/heimdal-1.5.2.ebuild
+++ b/app-crypt/heimdal/heimdal-1.5.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.2.ebuild,v 1.2 2012/05/03 18:16:39 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.2.ebuild,v 1.3 2012/05/22 19:37:07 eras Exp $

 EAPI=4
 # PYTHON_BDEPEND="2"
@ -86,11 +86,11 @@ src_configure() {
 }

 src_compile() {
-	emake -j1 || die "emake failed"
+	emake -j1
 }

 src_install() {
-	INSTALL_CATPAGES="no" emake DESTDIR="${D}" install || die "emake install failed"
+	INSTALL_CATPAGES="no" emake DESTDIR="${D}" install

 	dodoc ChangeLog README NEWS TODO

@ -132,6 +132,10 @@ src_install() {

 	# default database dir
 	keepdir /var/heimdal
+
+	# Ugly hack for broken symlink - bug #417081
+	rm "${D}"/usr/share/man/man5/qop.5 || die
+	dosym mech.5 /usr/share/man/man5/qop.5
 }

 pkg_preinst() {
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@ -1,6 +1,14 @@
 # ChangeLog for app-editors/emacs-vcs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.93 2012/05/19 15:58:54 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.95 2012/05/22 20:33:37 ulm Exp $
+
+  22 May 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.1.9999.ebuild:
+  Directory src/m is gone.
+
+  22 May 2012; Ulrich Müller <ulm@gentoo.org> -emacs-vcs-24.0.94.ebuild,
+  -emacs-vcs-24.0.95.ebuild, emacs-vcs-24.0.97.ebuild,
+  emacs-vcs-24.0.9999-r4.ebuild, emacs-vcs-24.1.9999.ebuild:
+  Call epatch_user to allow for user patches. Remove old.

  19 May 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.0.97.ebuild,
  emacs-vcs-24.0.9999-r4.ebuild, emacs-vcs-24.1.9999.ebuild:
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@ -2,32 +2,28 @@
 Hash: SHA1

 AUX emacs-24.0.92-ns-appdirs.patch 1538 RMD160 354b2726d80435aeb8b0e39616682df6774e7cf2 SHA1 50044a01c4c125d394308ea371f9a0337ee11609 SHA256 588b276284c7a56494fdba935a975c66edb668e5431bf25f1396696950c8f804
-DIST emacs-24.0.94.tar.gz 51251891 RMD160 3593d6a003b556f3755ba6ea3f8a92ba1b5ba2af SHA1 d70fe6da2d2b943423fcf16badb0294566710eaa SHA256 238dacb608e74fce088cde61b82907ba6ae5d975e88f38a0b199dbdbdb28feb5
-DIST emacs-24.0.95.tar.gz 51371928 RMD160 14a0ca326c18dc549495e862d83eb9e1917d2ead SHA1 09c1eaed7400f8cc0e5dab9fb2337c3c4cee5449 SHA256 434b8e4a27d376257a6fe93b35936466985ac45c90310e6041e0a0577752df64
 DIST emacs-24.0.96.tar.gz 51433984 RMD160 ae8f46637b5cdadf7c401f6fc7e0240937becdb4 SHA1 15f932ad8c6a77107bc19ab3e3a8c8af27259ec2 SHA256 18ed15ff63cfa1ae929ccdb3a39cdc589420bd17dacc5af144c5eb717200f21a
 DIST emacs-24.0.97.tar.gz 51474077 RMD160 95ba986c3b13eabac0fc807d9b9e4ddbf64dde02 SHA1 dda4e06125dc35085f2b4c5d0fc4a9fb2a44adc1 SHA256 393620e822fd739344a28a4ec6d4e403e0301ad83cbb2d936b51043bea26afa8
-EBUILD emacs-vcs-24.0.94.ebuild 12096 RMD160 050b2618a55dcb870e5e0d3bdbb6679ea366f3db SHA1 4e02837568a4f984aa500c769f7c4c7b975edf07 SHA256 acd1d157916d19f4a760a3538b73eed5ebb4e5ade785622fb88e629e9d738c88
-EBUILD emacs-vcs-24.0.95.ebuild 12096 RMD160 cfc5f5ec6cca6aefe314764a51e00bbc255df7e5 SHA1 ac541028287e0e119b6537b35b29ebcdeb6ac70b SHA256 29e6058b2f5a9a165a7190acfac4335026bfb8f9283d4147bad56d06d1a053a2
 EBUILD emacs-vcs-24.0.96.ebuild 12084 RMD160 4720f897611c673713d6c1d05d0e47743b618928 SHA1 260e58ae264dc9b00ff6ace1994d2da1bdb9482b SHA256 e864be530ffeeb4a7e8fd9e67d0ec35722251473bde70bc42c32281d0031fe0f
-EBUILD emacs-vcs-24.0.97.ebuild 12117 RMD160 0c1af82425d4692d6b74a122314c9dd7847b5463 SHA1 079b499e6f2a76190f63e25d1998358e569ae8c4 SHA256 312088b38d728a11b36953d9b6d6f2dd5744e5eba5b5ccb9e288cbc15ab114f9
-EBUILD emacs-vcs-24.0.9999-r4.ebuild 11491 RMD160 e44b1d7dfe8604bae51d68340dfafc250e5e6cd5 SHA1 cde5fd146c4244e2c4d2d007a9152275873f2246 SHA256 f22bb8d3b3f029b35038f5623648b665a3833aeeed1d428cdb6067cafb3c6157
-EBUILD emacs-vcs-24.1.9999.ebuild 11485 RMD160 52f7d52d4fc869d8e6293b8489fc168e50fbcbd8 SHA1 68918db5fb4ff41d0d62fff338830d7c8d47a00f SHA256 9e292f4e6adda9fcfea7454f6b8c93ea044999d3c21f61a6cc53364c5eafe947
-MISC ChangeLog 66081 RMD160 362c2f1100b56f84a7aa117ca10e57d2091e49fa SHA1 3f8fe7aee57837bd1ae64139a94293c3fbd7811a SHA256 899ab07c970faff3e36ed51abaee88be686a03b0edd7226c5849ff457fdd341b
+EBUILD emacs-vcs-24.0.97.ebuild 12130 RMD160 a518bb559d63ea66a4570445096c0259e85da4ea SHA1 c9be4c135366f794a340684577734b05dd4c0eef SHA256 143a31b3f9ba12bb984fb609f4b50e2d905d774617028fd595fc0e775bbae603
+EBUILD emacs-vcs-24.0.9999-r4.ebuild 11505 RMD160 03b302276936e109f4e6746e760e8cf90791b0ef SHA1 71166757754ccc98747ed904db4ca93f62a83b43 SHA256 4988b479d5d68926449c82476fc77eaef708cceb06e4def95601b71eb3e13b03
+EBUILD emacs-vcs-24.1.9999.ebuild 11491 RMD160 150a686c576621aabec775ad22f76ce7a5b52797 SHA1 9b91aa0141b43aa1d57ae17113b0f3a47a2b3e09 SHA256 6f32c0e77cea5173b29fc4c74e5718db73ae4c675cc6ea22ee88335a393d5a8e
+MISC ChangeLog 66433 RMD160 c984231cc22468efae658fcf6434e548c4ff6653 SHA1 a493f8ddbdf1b9e31366853fc7e909c6d790164c SHA256 22ff29ec90114c6743d6663c43ade5085f80002c348a69cc963c25023380467c
 MISC metadata.xml 2159 RMD160 c0ec88f19a4e19271ea414b5e4429d0ca3ec4548 SHA1 3f8c32f164afe13baf231c60a2b64ca9912e5bfb SHA256 b1008bb18ce3aacd84175d61ac8254d017a4a9ba67d5b376f21a39e5699be3ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iQIcBAEBAgAGBQJPt8RMAAoJEDxpGckxwJCBKUEP/1UWxqEqf77CbfMCoOYP5oui
-iI4wWXeEGkHPivbJyg5TrXWYJ940EUQU8HkNzJDdD7hpv32j93doTgyc6NeiMPqu
-sdz37aHxwlPzeO5/cau/cqXlZDinaMq+1OtnOZ73mToJ8SYHX5CQbZzyr5Lv4+54
-6Dsh2INVqBeClDj0J7wAUKMgCFtQfzH6cIQCexdO/dkmsO2StOnTq1E9q3j4YqUS
-5jJCpQBj6opivznNiLTNlRGipCSLEGSCjFs9AuPtRqhLuSRi5ZbUF2Lt+ehRDoUk
-1YCiZ8NSMaEBkDwMQ23N3+BwowVJ7s/jYx3svvxCZEP0GCcImWaD6jwujX1nA15N
-ylpCFsaeJngFsmfirTeNDW0dF17FokgUwiW5Eaub4BxpZoySrf2IBPS17+6dJD7O
-e2Mow7nx65n0bIt62kLgbAJ2A35g1RLhqOdz2vZBjVo+IrfLGwVwAUYwi5FW91Zg
-Dh7MPh88v+erbq6wmcK/YvIOYecwL2JxtsnHimIdfOnxGHGZ87UiE4PrZSB8r7VJ
-gR/hC4U71cq4DF2R9W+jjvF9HcijC040Yl4xuVl5B/tGbYYM5dKZrj4zbWnfkr+f
-NIvizS9Gngkm2ZtSCe3ByfGjn4mW8FDrwciwIJ8eaoGMKf5iYqkIEEDvda/3y+s9
-LZX9t/KOtRvIMOcZMccB
-=UNqL
+iQIcBAEBAgAGBQJPu/kzAAoJEDxpGckxwJCBkDIQAKannUvv0+36I5e9Tn4Zdl3C
+rqeWuleHq5cRxpiYlZ0c2FWrq7xb6Sr63QkZN5q081pIB1h7nXjJksWeaLr9a//L
+0vF7zBmrjvwYBlYiLbXykyjbtLQj6aw27nvLMEmU6GCuEoeaPyVNe68VEgKW5dkn
+/q8looHA8z6l/4DrO2gfMFYWLIWVTeA8Xi5sYwV8hVxXtZ6h7F1Ed/HgF58I002Q
+J2V/ZGojJtSRt4AlFXN6D11HabrUJB6SIe6ZWDyC1GWIW2oiFTPnBrtbVZUIc3JM
+UkBE95HMcmd1UcWN4lsvLesGT5UyykW0+bfrpnmzYYBUiEEjCVyHLXdFHkwcQcgs
+4RxFLdsLPb26WU1BX3vIBtxILei3YDKB36SKODDd/2BwDouUGM+PV0aMkD1+mLc7
+FP3Q7f6S6pgHOsqCMJ8nqt8CbwESjZNjlPs3MGQnPeHLOCQbYQoN5/HM0Kq1xRg/
+4PnB9+DmHAapDTKLhuulUKh9uWEa8GoorPKZFBcfkaJzZLncibQoJaJ54pBuKIgB
+IN/EpEGt0P7dwnNnN21t24pU0jgoyKgDvyPHhNESwgVbkJRPA8yqtYGNiVOECljX
+05hITChUkbrzibSQJBgbASipisqOY40t+ipyeMUa1r+fOs08iaFtWsGJwXlya1kp
+7cZP5Z0I9MSxYwFvzYan
+=0h9e
 -----END PGP SIGNATURE-----
--- a/app-editors/emacs-vcs/emacs-vcs-24.0.94.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.94.ebuild
@ -1,369 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.94.ebuild,v 1.3 2012/05/03 18:33:00 jdhore Exp $
-
-EAPI=4
-
-inherit autotools elisp-common eutils flag-o-matic multilib
-
-if [[ ${PV##*.} = 9999 ]]; then
-	EBZR_PROJECT="emacs"
-	EBZR_BRANCH="trunk"
-	EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/"
-	# "Nosmart" is much faster for initial branching.
-	EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}"
-	inherit bzr
-	SRC_URI=""
-else
-	SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz
-		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.gz"
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	S="${WORKDIR}/emacs-${FULL_VERSION}"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
-SLOT="24"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="alsa aqua athena dbus gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
-REQUIRED_USE="aqua? ( !X )"
-
-RDEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-1.2
-	net-libs/liblockfile
-	hesiod? ( net-dns/hesiod )
-	kerberos? ( virtual/krb5 )
-	alsa? ( media-libs/alsa-lib )
-	gpm? ( sys-libs/gpm )
-	dbus? ( sys-apps/dbus )
-	gnutls? ( net-libs/gnutls )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	selinux? ( sys-libs/libselinux )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib )
-		jpeg? ( virtual/jpeg )
-		png? ( >=media-libs/libpng-1.4:0 )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk3? ( x11-libs/gtk+:3 )
-			!gtk3? ( x11-libs/gtk+:2 )
-		)
-		!gtk? (
-			Xaw3d? ( x11-libs/libXaw3d )
-			!Xaw3d? (
-				athena? ( x11-libs/libXaw )
-				!athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	alsa? ( virtual/pkgconfig )
-	dbus? ( virtual/pkgconfig )
-	gnutls? ( virtual/pkgconfig )
-	libxml2? ( virtual/pkgconfig )
-	X? ( virtual/pkgconfig )
-	gzip-el? ( app-arch/gzip )"
-
-RDEPEND="${RDEPEND}
-	>=app-emacs/emacs-common-gentoo-1.3[X?]"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT(emacs,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.in)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EBZR_BRANCH}"
-		einfo "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	epatch "${FILESDIR}"/emacs-24.0.92-ns-appdirs.patch
-
-	if ! use alsa; then
-		# ALSA is detected even if not requested by its USE flag.
-		# Suppress it by supplying pkg-config with a wrong library name.
-		sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-	if ! use gzip-el; then
-		# Emacs' build system automatically detects the gzip binary and
-		# compresses el files. We don't want that so confuse it with a
-		# wrong binary name
-		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	ALLOWED_FLAGS=""
-	strip-flags
-
-	if use sh; then
-		replace-flags -O[1-9] -O0		#262359
-	elif use ia64; then
-		replace-flags -O[2-9] -O1		#325373
-	else
-		replace-flags -O[3-9] -O2
-	fi
-
-	local myconf
-
-	if use alsa && ! use sound; then
-		einfo "Although sound USE flag is disabled you chose to have alsa,"
-		einfo "so sound is switched on anyway."
-		myconf="${myconf} --with-sound"
-	else
-		myconf="${myconf} $(use_with sound)"
-	fi
-
-	if use X; then
-		myconf="${myconf} --with-x --without-ns"
-		myconf="${myconf} $(use_with gconf)"
-		myconf="${myconf} $(use_with gsettings)"
-		myconf="${myconf} $(use_with toolkit-scroll-bars)"
-		myconf="${myconf} $(use_with wide-int)"
-		myconf="${myconf} $(use_with gif) $(use_with jpeg)"
-		myconf="${myconf} $(use_with png) $(use_with svg rsvg)"
-		myconf="${myconf} $(use_with tiff) $(use_with xpm)"
-		myconf="${myconf} $(use_with imagemagick)"
-
-		if use xft; then
-			myconf="${myconf} --with-xft"
-			myconf="${myconf} $(use_with m17n-lib libotf)"
-			myconf="${myconf} $(use_with m17n-lib m17n-flt)"
-		else
-			myconf="${myconf} --without-xft"
-			myconf="${myconf} --without-libotf --without-m17n-flt"
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			myconf="${myconf} --with-x-toolkit=$(usev gtk3 || echo gtk)"
-			local f
-			for f in athena Xaw3d motif; do
-				use ${f} && ewarn "USE flag \"${f}\" ignored" \
-					"(superseded by \"gtk\")"
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-			use motif && ewarn "USE flag \"motif\" ignored" \
-				"(superseded by \"athena\" or \"Xaw3d\")"
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf="${myconf} --with-x-toolkit=motif"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf="${myconf} --with-x-toolkit=no"
-		fi
-
-		! use gtk && use gtk3 \
-			&& ewarn "USE flag \"gtk3\" has no effect if \"gtk\" is not set."
-	elif use aqua; then
-		einfo "Configuring to build with Cocoa support"
-		myconf="${myconf} --with-ns --disable-ns-self-contained"
-		myconf="${myconf} --without-x"
-	else
-		myconf="${myconf} --without-x --without-ns"
-	fi
-
-	if [[ ${PV##*.} = 9999 ]]; then
-		# These variables are not needed for building. We add them to
-		# configure options because they are stored in the Emacs binary
-		# and available in variable "system-configuration-options".
-		myconf="${myconf} EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
-	fi
-
-	# According to configure, this option is only used for GNU/Linux
-	# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
-	# out the location because $(get_libdir) does not necessarily return
-	# something that matches the host OS's libdir naming (e.g. RHEL).
-	local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
-	crtdir=${crtdir%/*}
-
-	econf \
-		--program-suffix=-${EMACS_SUFFIX} \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-crt-dir="${crtdir}" \
-		--with-gameuser="${GAMES_USER_DED:-games}" \
-		--without-compress-info \
-		--disable-maintainer-mode \
-		$(use_with hesiod) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with gpm) \
-		$(use_with dbus) \
-		$(use_with gnutls) \
-		$(use_with libxml2 xml2) \
-		$(use_with selinux) \
-		${myconf}
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	if [[ ${PV##*.} = 9999 ]]; then
-		emake CC="$(tc-getCC)" bootstrap
-		# cleanup, otherwise emacs will be dumped again in src_install
-		(cd src; emake versionclean)
-	fi
-	# set last component of emacs-version to (package revision + 1)
-	touch src/emacs-${FULL_VERSION}.${PR#r}
-	emake CC="$(tc-getCC)"
-}
-
-src_install () {
-	local i m
-
-	emake install DESTDIR="${D}"
-
-	rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
-		|| die "removing duplicate emacs executable failed"
-	mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
-		|| die "moving Emacs executable failed"
-
-	# move man pages to the correct place
-	for m in "${ED}"/usr/share/man/man1/* ; do
-		mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
-	done
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{applications,icons}
-	rm "${ED}"/var/lib/games/emacs/{snake,tetris}-scores
-	keepdir /var/lib/games/emacs
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	local c=";;"
-	if use source; then
-		insinto /usr/share/emacs/${FULL_VERSION}/src
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-		doins -r src/{m,s}
-		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
-		c=""
-	fi
-
-	sed 's/^X//' >"${T}/${SITEFILE}" <<-EOF
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	X  ${c}(setq find-function-C-source-directory
-	X  ${c}      "${EPREFIX}/usr/share/emacs/${FULL_VERSION}/src")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-		elog "Emacs${EMACS_SUFFIX#emacs}.app is in ${EPREFIX}/Applications/Gentoo."
-		elog "You may want to copy or symlink it into /Applications by yourself."
-	fi
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [[ -f ${ED}${infodir}/dir.orig ]]; then
-		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	else
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${ED}"${infodir}/dir{,.*}
-		for f in "${ED}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${ED}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	local f
-	for f in "${EROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
-		[[ -e ${f} ]] || touch "${f}"
-	done
-	chown "${GAMES_USER_DED:-games}" "${EROOT}"/var/lib/games/emacs
-
-	elisp-site-regen
-	eselect emacs update ifunset
-
-	if use X; then
-		elog "You need to install some fonts for Emacs."
-		elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
-		elog "machine would satisfy basic Emacs requirements under X11."
-		elog "See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml"
-		elog "for how to enable anti-aliased fonts."
-		elog
-	fi
-
-	elog "You can set the version to be started by /usr/bin/emacs through"
-	elog "the Emacs eselect module, which also redirects man and info pages."
-	elog "Therefore, several Emacs versions can be installed at the same time."
-	elog "\"man emacs.eselect\" for details."
-	elog
-	elog "If you upgrade from a previous major version of Emacs, then it is"
-	elog "strongly recommended that you use app-admin/emacs-updater to rebuild"
-	elog "all byte-compiled elisp files of the installed Emacs packages."
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
--- a/app-editors/emacs-vcs/emacs-vcs-24.0.95.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.95.ebuild
@ -1,369 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.95.ebuild,v 1.2 2012/05/03 18:33:00 jdhore Exp $
-
-EAPI=4
-
-inherit autotools elisp-common eutils flag-o-matic multilib
-
-if [[ ${PV##*.} = 9999 ]]; then
-	EBZR_PROJECT="emacs"
-	EBZR_BRANCH="trunk"
-	EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/"
-	# "Nosmart" is much faster for initial branching.
-	EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}"
-	inherit bzr
-	SRC_URI=""
-else
-	SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz
-		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.gz"
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	S="${WORKDIR}/emacs-${FULL_VERSION}"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
-SLOT="24"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="alsa aqua athena dbus gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
-REQUIRED_USE="aqua? ( !X )"
-
-RDEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-1.2
-	net-libs/liblockfile
-	hesiod? ( net-dns/hesiod )
-	kerberos? ( virtual/krb5 )
-	alsa? ( media-libs/alsa-lib )
-	gpm? ( sys-libs/gpm )
-	dbus? ( sys-apps/dbus )
-	gnutls? ( net-libs/gnutls )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	selinux? ( sys-libs/libselinux )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib )
-		jpeg? ( virtual/jpeg )
-		png? ( >=media-libs/libpng-1.4:0 )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk3? ( x11-libs/gtk+:3 )
-			!gtk3? ( x11-libs/gtk+:2 )
-		)
-		!gtk? (
-			Xaw3d? ( x11-libs/libXaw3d )
-			!Xaw3d? (
-				athena? ( x11-libs/libXaw )
-				!athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	alsa? ( virtual/pkgconfig )
-	dbus? ( virtual/pkgconfig )
-	gnutls? ( virtual/pkgconfig )
-	libxml2? ( virtual/pkgconfig )
-	X? ( virtual/pkgconfig )
-	gzip-el? ( app-arch/gzip )"
-
-RDEPEND="${RDEPEND}
-	>=app-emacs/emacs-common-gentoo-1.3[X?]"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT(emacs,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.in)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EBZR_BRANCH}"
-		einfo "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	epatch "${FILESDIR}"/emacs-24.0.92-ns-appdirs.patch
-
-	if ! use alsa; then
-		# ALSA is detected even if not requested by its USE flag.
-		# Suppress it by supplying pkg-config with a wrong library name.
-		sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-	if ! use gzip-el; then
-		# Emacs' build system automatically detects the gzip binary and
-		# compresses el files. We don't want that so confuse it with a
-		# wrong binary name
-		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	ALLOWED_FLAGS=""
-	strip-flags
-
-	if use sh; then
-		replace-flags -O[1-9] -O0		#262359
-	elif use ia64; then
-		replace-flags -O[2-9] -O1		#325373
-	else
-		replace-flags -O[3-9] -O2
-	fi
-
-	local myconf
-
-	if use alsa && ! use sound; then
-		einfo "Although sound USE flag is disabled you chose to have alsa,"
-		einfo "so sound is switched on anyway."
-		myconf="${myconf} --with-sound"
-	else
-		myconf="${myconf} $(use_with sound)"
-	fi
-
-	if use X; then
-		myconf="${myconf} --with-x --without-ns"
-		myconf="${myconf} $(use_with gconf)"
-		myconf="${myconf} $(use_with gsettings)"
-		myconf="${myconf} $(use_with toolkit-scroll-bars)"
-		myconf="${myconf} $(use_with wide-int)"
-		myconf="${myconf} $(use_with gif) $(use_with jpeg)"
-		myconf="${myconf} $(use_with png) $(use_with svg rsvg)"
-		myconf="${myconf} $(use_with tiff) $(use_with xpm)"
-		myconf="${myconf} $(use_with imagemagick)"
-
-		if use xft; then
-			myconf="${myconf} --with-xft"
-			myconf="${myconf} $(use_with m17n-lib libotf)"
-			myconf="${myconf} $(use_with m17n-lib m17n-flt)"
-		else
-			myconf="${myconf} --without-xft"
-			myconf="${myconf} --without-libotf --without-m17n-flt"
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			myconf="${myconf} --with-x-toolkit=$(usev gtk3 || echo gtk)"
-			local f
-			for f in athena Xaw3d motif; do
-				use ${f} && ewarn "USE flag \"${f}\" ignored" \
-					"(superseded by \"gtk\")"
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-			use motif && ewarn "USE flag \"motif\" ignored" \
-				"(superseded by \"athena\" or \"Xaw3d\")"
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf="${myconf} --with-x-toolkit=motif"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf="${myconf} --with-x-toolkit=no"
-		fi
-
-		! use gtk && use gtk3 \
-			&& ewarn "USE flag \"gtk3\" has no effect if \"gtk\" is not set."
-	elif use aqua; then
-		einfo "Configuring to build with Cocoa support"
-		myconf="${myconf} --with-ns --disable-ns-self-contained"
-		myconf="${myconf} --without-x"
-	else
-		myconf="${myconf} --without-x --without-ns"
-	fi
-
-	if [[ ${PV##*.} = 9999 ]]; then
-		# These variables are not needed for building. We add them to
-		# configure options because they are stored in the Emacs binary
-		# and available in variable "system-configuration-options".
-		myconf="${myconf} EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
-	fi
-
-	# According to configure, this option is only used for GNU/Linux
-	# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
-	# out the location because $(get_libdir) does not necessarily return
-	# something that matches the host OS's libdir naming (e.g. RHEL).
-	local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
-	crtdir=${crtdir%/*}
-
-	econf \
-		--program-suffix=-${EMACS_SUFFIX} \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-crt-dir="${crtdir}" \
-		--with-gameuser="${GAMES_USER_DED:-games}" \
-		--without-compress-info \
-		--disable-maintainer-mode \
-		$(use_with hesiod) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with gpm) \
-		$(use_with dbus) \
-		$(use_with gnutls) \
-		$(use_with libxml2 xml2) \
-		$(use_with selinux) \
-		${myconf}
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	if [[ ${PV##*.} = 9999 ]]; then
-		emake CC="$(tc-getCC)" bootstrap
-		# cleanup, otherwise emacs will be dumped again in src_install
-		(cd src; emake versionclean)
-	fi
-	# set last component of emacs-version to (package revision + 1)
-	touch src/emacs-${FULL_VERSION}.${PR#r}
-	emake CC="$(tc-getCC)"
-}
-
-src_install () {
-	local i m
-
-	emake install DESTDIR="${D}"
-
-	rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
-		|| die "removing duplicate emacs executable failed"
-	mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
-		|| die "moving Emacs executable failed"
-
-	# move man pages to the correct place
-	for m in "${ED}"/usr/share/man/man1/* ; do
-		mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
-	done
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{applications,icons}
-	rm "${ED}"/var/lib/games/emacs/{snake,tetris}-scores
-	keepdir /var/lib/games/emacs
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	local c=";;"
-	if use source; then
-		insinto /usr/share/emacs/${FULL_VERSION}/src
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-		doins -r src/{m,s}
-		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
-		c=""
-	fi
-
-	sed 's/^X//' >"${T}/${SITEFILE}" <<-EOF
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	X  ${c}(setq find-function-C-source-directory
-	X  ${c}      "${EPREFIX}/usr/share/emacs/${FULL_VERSION}/src")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-		elog "Emacs${EMACS_SUFFIX#emacs}.app is in ${EPREFIX}/Applications/Gentoo."
-		elog "You may want to copy or symlink it into /Applications by yourself."
-	fi
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [[ -f ${ED}${infodir}/dir.orig ]]; then
-		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	else
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${ED}"${infodir}/dir{,.*}
-		for f in "${ED}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${ED}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	local f
-	for f in "${EROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
-		[[ -e ${f} ]] || touch "${f}"
-	done
-	chown "${GAMES_USER_DED:-games}" "${EROOT}"/var/lib/games/emacs
-
-	elisp-site-regen
-	eselect emacs update ifunset
-
-	if use X; then
-		elog "You need to install some fonts for Emacs."
-		elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
-		elog "machine would satisfy basic Emacs requirements under X11."
-		elog "See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml"
-		elog "for how to enable anti-aliased fonts."
-		elog
-	fi
-
-	elog "You can set the version to be started by /usr/bin/emacs through"
-	elog "the Emacs eselect module, which also redirects man and info pages."
-	elog "Therefore, several Emacs versions can be installed at the same time."
-	elog "\"man emacs.eselect\" for details."
-	elog
-	elog "If you upgrade from a previous major version of Emacs, then it is"
-	elog "strongly recommended that you use app-admin/emacs-updater to rebuild"
-	elog "all byte-compiled elisp files of the installed Emacs packages."
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
--- a/app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild,v 1.2 2012/05/19 15:58:54 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild,v 1.3 2012/05/22 20:29:31 ulm Exp $

 EAPI=4

@ -106,6 +106,7 @@ src_prepare() {
 	fi

 	epatch "${FILESDIR}"/emacs-24.0.92-ns-appdirs.patch
+	epatch_user

 	if ! use alsa; then
 		# ALSA is detected even if not requested by its USE flag.
--- a/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild,v 1.4 2012/05/19 15:58:54 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild,v 1.5 2012/05/22 20:29:31 ulm Exp $

 EAPI=4

@ -104,6 +104,8 @@ src_prepare() {
 			|| die "Upstream version number changed to ${FULL_VERSION}"
 	fi

+	epatch_user
+
 	if ! use alsa; then
 		# ALSA is detected even if not requested by its USE flag.
 		# Suppress it by supplying pkg-config with a wrong library name.
--- a/app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild,v 1.4 2012/05/19 15:58:54 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild,v 1.6 2012/05/22 20:33:37 ulm Exp $

 EAPI=4

@ -104,6 +104,8 @@ src_prepare() {
 			|| die "Upstream version number changed to ${FULL_VERSION}"
 	fi

+	epatch_user
+
 	if ! use alsa; then
 		# ALSA is detected even if not requested by its USE flag.
 		# Suppress it by supplying pkg-config with a wrong library name.
@ -271,8 +273,8 @@ src_install () {
 		# This is not meant to install all the source -- just the
 		# C source you might find via find-function
 		doins src/*.{c,h,m}
-		doins -r src/{m,s}
-		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
+		doins -r src/s
+		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/s/README
 		c=""
 	fi

--- a/app-emacs/howm/ChangeLog
+++ b/app-emacs/howm/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for app-emacs/howm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/howm/ChangeLog,v 1.40 2012/05/21 10:10:49 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/howm/ChangeLog,v 1.41 2012/05/22 21:03:29 ranger Exp $
+
+  22 May 2012; Brent Baude <ranger@gentoo.org> howm-1.3.9.2.ebuild:
+  Marking howm-1.3.9.2 ppc for bug 415065

  21 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> howm-1.3.9.2.ebuild:
  x86 stable wrt bug #415065
--- a/app-emacs/howm/Manifest
+++ b/app-emacs/howm/Manifest
@ -1,17 +1,7 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX 50howm-gentoo.el 73 RMD160 20413488c902df03e021104f0a69cb9d5f219287 SHA1 fd6346b78c1e160d54699bbc60aaf328d27ab8e8 SHA256 57dd76427874d721e25b7107f09e3bb3982ca31a1103665777fc81ee5aa8de75
 DIST howm-1.3.9.1.tar.gz 455351 RMD160 c4c870b49458aa9944845763773e8dbdbadd4f3f SHA1 0b708d389e3c414e22abc18a030f0815b6b0220c SHA256 c4e5760bc226d7a523906cbe74f961659ccbf878eda2bf0e7d91fe7022e60e55
 DIST howm-1.3.9.2.tar.gz 462278 RMD160 2d842dfb9d2d4a2f5d2b349647e1ddc0fed31031 SHA1 0f85e998078a21d217afe304690a7a25c0d4d513 SHA256 baff5ce28580502a876600350b7eac5d5bf1cd32ba60c115cbb9edc2ac63d578
 EBUILD howm-1.3.9.1.ebuild 1040 RMD160 2e9a5f1b3e0672274d4acea7d99119b366159267 SHA1 c9f0080a102fd76ad84a490e700e5121d6f75da7 SHA256 963e9db8218508f80d7fa9334b3a4c2f1887636e414a65d74ecbf2dce4fc2b9e
-EBUILD howm-1.3.9.2.ebuild 1041 RMD160 4dcb80ef135b106ac8d353fcb1b2500df5c1a02c SHA1 dae0f44a03c62ec5ebd2614b1e3137f3347c73c6 SHA256 b0a82bc55e37079d4b89ff3a83bd52ad16508eb77a6bc0c29a1166d88acd811b
-MISC ChangeLog 4956 RMD160 13737a995dc190cc54dbdda485fe7db8d5dbb309 SHA1 c682626ba8d946f10ebd88c321c5650ca06896c7 SHA256 2e030600f9bc6a9563394a62d51e75bff32bd2e6e5c418cdaa62a0eabb90340e
+EBUILD howm-1.3.9.2.ebuild 1036 RMD160 23f0249dd1a4d247f3e94ac268c5788b24092e76 SHA1 260fb19614e21cced9fcfae9cb1f60dd21c13c86 SHA256 009b08c07852f7f0d4e97ff47389bae378db31c6380b04fcbd8b659cb86c297d
+MISC ChangeLog 5063 RMD160 f5b11611cdae8b9d0b53416fc6f86380ba20be32 SHA1 ca89ea8cd5d8b63a5d70233bde606cdd6143ad61 SHA256 b261e2ccba97f800e53d45a2753c585d43d693368fa9982789df320a2b7f1c3d
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREKAAYFAk+6FKkACgkQuUQtlDBCeQKQEQCeLMktDm6XOIFbqdj5SY4Bc0v3
-z3wAniVB/NeGuiZMSfZXn/MATMPg8DFb
-=LUVa
-----END PGP SIGNATURE-----
--- a/app-emacs/howm/howm-1.3.9.2.ebuild
+++ b/app-emacs/howm/howm-1.3.9.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/howm/howm-1.3.9.2.ebuild,v 1.3 2012/05/21 10:10:49 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/howm/howm-1.3.9.2.ebuild,v 1.4 2012/05/22 21:03:29 ranger Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="http://howm.sourceforge.jp/a/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""

 SITEFILE="50${PN}-gentoo.el"
--- a/app-emacs/riece/ChangeLog
+++ b/app-emacs/riece/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for app-emacs/riece
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/riece/ChangeLog,v 1.82 2012/05/21 10:11:34 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/riece/ChangeLog,v 1.83 2012/05/22 21:04:21 ranger Exp $
+
+  22 May 2012; Brent Baude <ranger@gentoo.org> riece-8.0.0.ebuild:
+  Marking riece-8.0.0 ppc for bug 415067

  21 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> riece-8.0.0.ebuild:
  x86 stable wrt bug #415067
--- a/app-emacs/riece/Manifest
+++ b/app-emacs/riece/Manifest
@ -1,17 +1,7 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX 50riece-gentoo.el 81 RMD160 837f5d9d71c69ddc6dab8e7b74bf5a5d0e07e988 SHA1 9aa944a6a9a4acf72fe8de073b0ba02c6775c3ba SHA256 6e929bd0a3e87bd77c5bf03ed656726f8929b92dba031b4e5b505688ed352d92
 DIST riece-6.1.0.tar.gz 419600 RMD160 a45e1fae8ec7339c62876c898763806ea97053fe SHA1 0f244cd4ca53a82032508c30d519ed5be83be56d SHA256 1d2ff64eefe4740ead60b4ff2487147caa0fd6f545a572fd988885be31591be4
 DIST riece-8.0.0.tar.gz 432370 RMD160 66fb0bac7fe4061501b0538eef5d5da482d79340 SHA1 051ed515b2174c0803085a4538f238a7c2248751 SHA256 e2da635832a07c8a44bdc4ff57e6f427d270fad9a5c71423b8de5811f21ef5a6
 EBUILD riece-6.1.0.ebuild 968 RMD160 53dcbb76c19cac70c6b269c6f198dd12c8a8babe SHA1 9ca1d6bd9558e2231f97d0f96d8f83f4aa8439dd SHA256 fd30815371f4642954a46253df44a07f73ba4b999c3d406886c9b4c56c3f3376
-EBUILD riece-8.0.0.ebuild 914 RMD160 0bd85a6a120bfa0e5e21c3f2c884de077f3fafa0 SHA1 8ee4b90aa5148d7366b303c6a7b17c528aa9f1e8 SHA256 0b173cd2d5a73fdf003b25007001403cc6b3527b5d6b42f1cd058a700b0d8d5b
-MISC ChangeLog 10012 RMD160 58e028fb78f9b2bb5560e6517e4a839ca9a19d91 SHA1 18020e08a367c5d52654815231a972de6c1c55b6 SHA256 0e02db3510407eb41e11786e3c8e279d301ae3189f0ef1b70e3299272226560c
+EBUILD riece-8.0.0.ebuild 909 RMD160 a894e1becc523ae211aa4a27194c192a9d397bef SHA1 beb088b86df44eff050c302cd788366e658346c5 SHA256 9c6f00df145e3109fcd0b1fe46eb63d454e91c0bf2fe2766f325ee4a9aa68927
+MISC ChangeLog 10117 RMD160 ad50aa838a533583709e7816a77edfc5fb6175a7 SHA1 398b5f23a11764b00bc3b02f7ffb87311f4fd4c3 SHA256 6f6813a6cd137b7f452933b0317087f02a6cd5beeb12717744c651beab45b329
 MISC metadata.xml 181 RMD160 d3afd6164ac6e4418ef21260fff8bd83d4068945 SHA1 771f78598d9a1d349b87ac64ec344e8c71a62fec SHA256 4c68988fa6b23ba6f5c6e27866f36c5118882d7cbe182b2f9649e8823e7c10c0
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREKAAYFAk+6FNUACgkQuUQtlDBCeQLsDQCdFNEJ75TNG7RPxbBJdzSfDDiz
-4m8AnRA/d0aXOfPaGtfiXZjgARS8y74j
-=f/Gb
-----END PGP SIGNATURE-----
--- a/app-emacs/riece/riece-8.0.0.ebuild
+++ b/app-emacs/riece/riece-8.0.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/riece/riece-8.0.0.ebuild,v 1.4 2012/05/21 10:11:34 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/riece/riece-8.0.0.ebuild,v 1.5 2012/05/22 21:04:21 ranger Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/riece/${P}.tar.gz"

 LICENSE="GPL-3 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ppc ppc64 x86"
 IUSE="linguas_ja"
 RESTRICT="test"

--- a/app-forensics/openscap/ChangeLog
+++ b/app-forensics/openscap/ChangeLog
@ -1,6 +1,13 @@
 # ChangeLog for app-forensics/openscap
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/ChangeLog,v 1.15 2011/12/28 14:01:19 swift Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/ChangeLog,v 1.16 2012/05/22 20:51:55 hwoarang Exp $
+
+*openscap-0.8.2 (22 May 2012)
+
+  22 May 2012; Markos Chandras <hwoarang@gentoo.org>
+  +files/test_probes_interface.patch, +files/test_probes_process.patch,
+  +openscap-0.8.2.ebuild, -openscap-0.7.3.ebuild, -openscap-0.7.4.ebuild:
+  Version bump. Remove old thanks to LABBE Corentin <corentin.labbe@geomatys.fr>

  28 Dec 2011; <swift@gentoo.org> openscap-0.8.0.ebuild, metadata.xml:
  Fix build failure with RPM probes (bug #396263) by Corentin Labbe
--- a/app-forensics/openscap/Manifest
+++ b/app-forensics/openscap/Manifest
@ -1,9 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX openscap-0.7.1-sql-fix.patch 1122 RMD160 0a98b86f864b3990c97769141a12f78557046883 SHA1 0058400cf127afd688d065c43b5ff22d6cf0f1c6 SHA256 3918480e8c038490101336bbf46d0db91323d5284e168a4f1e270866c263e3a2
-DIST openscap-0.7.3.tar.gz 4264040 RMD160 fd2ba5173a23a0df09f641e0630b874d4c5a13dc SHA1 184888158542125c5d9587f375805080a8dc63e4 SHA256 7364f98182891ef6a81674c766cbdc4c53cf86543da2245450f09e43f8987793
-DIST openscap-0.7.4.tar.gz 4379825 RMD160 b7fe0273a1a6eec8c1dd6f5ffa776ada36ac896a SHA1 9c9d2aa5adb4fb76b27e1de3f641ab98f94ce87d SHA256 a0fb267f02ea9426f4fe8289b85c1cb2ac0dac6e700eccde0eed3b14bdcf0038
+AUX test_probes_interface.patch 387 RMD160 39a9774aefff83c14c4ab2a68d7fa1a02a57f140 SHA1 e16f915682595b21e0edac2c02ab37275e29ca29 SHA256 b09eb7d712e1aef4d1cd7de59962824b01572e8cca9c41db5f3df6fa11cc5c4c
+AUX test_probes_process.patch 458 RMD160 61212bbd50306c7cdcb986ee786f0f00d11857e5 SHA1 1fead6859ded04f27abd07f7c999045be5606c74 SHA256 44b47dfce6b0ac96e29430ad3e43257e4797dc8937bb9b63ecc8e1c979c0ba59
 DIST openscap-0.8.0.tar.gz 4473555 RMD160 835506335d0e422783d5fbf71b3a43a407bfdba5 SHA1 826df8826e38e0eb3d5cbed57662577101897061 SHA256 9755ad0ff58354fc50436ee88d605cc7d5e7f06816ff8c972db1272c44d2bc33
-EBUILD openscap-0.7.3.ebuild 1747 RMD160 4bea04b6c700c84594fccfa89e68097b8037865a SHA1 8c4c88a16bcd6912183602dc0a830b9a7b4dda14 SHA256 c477d1381da5be52b9ac41ca44d58fd4c99e242e31de98091f30a47ea288a888
-EBUILD openscap-0.7.4.ebuild 1747 RMD160 c464d7db1152e71d261c132daabb9565b7528288 SHA1 322fd66a4cc67b6a7133fd9349850a036e264833 SHA256 93c8bd09f8a8bc0bf884da3f9a6a98d25d0e861a007b45937ad1ae7d5b8b9e03
+DIST openscap-0.8.2.tar.gz 4524453 RMD160 06f4a08c9145a09f35b7c82e855922f547a247cb SHA1 a0a6e2b805497cb8ae9879674dd591e8bec90fa9 SHA256 fe7d6b3f20c08feef5c70ff3a02b752b593a8d8a3b3d1302d8e31fe0c29cce11
 EBUILD openscap-0.8.0.ebuild 2482 RMD160 f5cfc2dbeedba684363c8f20e9483c1dbe90b625 SHA1 643c59e571efc6ccf069e79bdfaa472edc7233c0 SHA256 5de57427c774574ae719652f084ac072a6c4c0eb177025e8b56a7cd8540af9e5
-MISC ChangeLog 2444 RMD160 df4094ed6d6b1b09963d2bff2405fecb16c7164f SHA1 f73e92081f6e0935d585bba7ead782798851a61e SHA256 e9b11335ffbc45939d24ae60dbac8a4b2fafb9a98feba5973db4289b12a1ae0f
+EBUILD openscap-0.8.2.ebuild 3522 RMD160 e84b9941ef9d5eacdfcf391ecc80b9e0ae345105 SHA1 b3d552e8805a1f1b023bfee5029c98892f1fe436 SHA256 3cba73aa789f38ed97b700ed598172c06f2e771ce4c34d8846ff8d993dba0d2e
+MISC ChangeLog 2759 RMD160 58b4400a83accd450cb2d6f523c44229733a1020 SHA1 8a68705137c88f0bd4411b498b3077d4d06d7835 SHA256 e134dcf1f64516c56d1f71a3196fd2e45253556277ecccc007fbe3bcee37626f
 MISC metadata.xml 690 RMD160 70288627b4da157c34d478ef77a331037be21428 SHA1 c0950ee1c531d606fbfaabfb71d6c3dd71dc045b SHA256 c826790db1cf53df236c92afe8bfbf530a6352195aebe16036eaa58366abbeb5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCgAGBQJPu/xwAAoJEPqDWhW0r/LCSCEP/jJHVsikJ0FbUjYo2GHE+Lm5
+fm+XZZYvlUgFBqgb9p/dcuS2+erMW0Kg3hXcGAXMpz0uVDZtInCHO+2TMaltDZRw
+1rTP+tgq2to44rQXSNZ24nahpglvptmKtodwuRr+GRKYgDwDH1mk6sBvXT2T0035
+tl1MVm9BFYk3X//b+7z7y5w60xxsXCDVvifLBQ4YdS0qFOUbik4fhRdSYsraeat1
+qg5vL26RzqLYx7M5u9ZpELCaYRtbpg80lhOIrxOQCmQXuneYyJO5eqWJYAylYlrB
+y8sUQcPu29Y4r3zQ4LHrnW1spmj09ZMadbfYBzApM3Re1Ym1TT8JjYBUE1guj1yf
+LZlJU5ZCLcuEPcgLt6O81JCAVBlUZuf+ZPuG7FhSS6pUujNv4oZbHVddP7haXLxy
+6xK9VHaPyW2E/3OnoO2mrs23owO2SEmGe2gTpzpIJcBWAIdQkXeT+iaw1gXIXsYc
+R0A1jZLMEE/bT/3MmpFZY2ecICy2lk5+MzH/H4HW+jD/yTFBpK4CRw0L6/3YaOGv
+uQAwEjJGuGxIThpHGQ26yBCivUp0v081hlbOadGFT2Hwmd4V0fyvpHjcgEx7ptpb
+9Hl8/XzQauQ/ZlYSUqf4G40U+j3/5Gu8edDQ53mFzlWnZT8gfVl/PgevBh6bJbpr
+ItPVcDFhT9t1NFbUBKSk
+=1d8m
+-----END PGP SIGNATURE-----
--- a/app-forensics/openscap/files/test_probes_interface.patch
+++ b/app-forensics/openscap/files/test_probes_interface.patch
@ -0,0 +1,11 @@
+--- tests/probes/interface/test_probes_interface.sh.orig	2012-04-05 14:41:53.846540789 +0200
+++ tests/probes/interface/test_probes_interface.sh	2012-04-05 14:42:41.141285232 +0200
+@@ -22,6 +22,8 @@
+     local DF="test_probes_interface.xml"
+     local RF="results.xml"
+ 
+    require "ipcalc" || return 255
+
+     [ -f $RF ] && rm -f $RF
+ 
+     if [ ! -x test_probes_interface ]; then		
--- a/app-forensics/openscap/files/test_probes_process.patch
+++ b/app-forensics/openscap/files/test_probes_process.patch
@ -0,0 +1,10 @@
+--- tests/probes/process/test_probes_process.xml.sh.orig	2012-04-05 15:49:38.746901398 +0200
+++ tests/probes/process/test_probes_process.xml.sh	2012-04-05 15:50:02.330775903 +0200
+@@ -1,6 +1,6 @@
+ #!/usr/bin/env bash
+ 
+-TMP_P=(`LD_PRELOAD= ps -A -o pid -o ppid -o comm | awk '$1 != 2 && $2 != 2 {print $3}' | \
+TMP_P=(`LD_PRELOAD= ps -A -o pid -o ppid -o comm | grep -v '\[' | awk '$1 != 2 && $2 != 2 {print $3}' | \
+         sed -n '2,30p'`)
+ 
+ COUNTER=1
--- a/app-forensics/openscap/openscap-0.7.3.ebuild
+++ b/app-forensics/openscap/openscap-0.7.3.ebuild
@ -1,70 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.7.3.ebuild,v 1.4 2011/08/21 03:40:45 phajdan.jr Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-
-inherit eutils multilib python bash-completion
-
-DESCRIPTION="Framework which enables integration with the Security Content Automation Protocol (SCAP)"
-HOMEPAGE="http://www.open-scap.org/"
-SRC_URI="http://www.open-scap.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bash-completion doc nss perl python sql"
-RESTRICT="test"
-
-RDEPEND="!nss? ( dev-libs/libgcrypt )
-	nss? ( dev-libs/nss )
-	sql? ( dev-db/opendbx )
-	dev-libs/libpcre
-	dev-libs/libxml2
-	dev-libs/libxslt
-	net-misc/curl"
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_configure() {
-	local myconf
-	if use python || use perl ; then
-		myconf+=" --enable-bindings"
-	else
-		myconf+=" --disable-bindings"
-	fi
-	if use nss ; then
-		myconf+=" --with-crypto=nss3"
-	else
-		myconf+=" --with-crypto=gcrypt"
-	fi
-	econf ${myconf}
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	find "${D}" -name '*.la' -delete || die
-	sed -i 's/^Description/&:/' ${D}/usr/$(get_libdir)/pkgconfig/libopenscap.pc || die
-	#--enable-bindings enable all bindings, clean unwanted bindings
-	if use python && ! use perl ; then
-		rm -rf "${D}"/usr/$(get_libdir)/perl5 || die
-	fi
-	if ! use python && use perl ; then
-		rm -rf "${D}"/$(python_get_sitedir) || die
-	fi
-	if use doc ; then
-		dohtml -r docs/html/* || die
-		dodoc docs/examples/* || die
-	fi
-	if ! use bash-completion ; then
-		rm -rf "${D}"/etc/bash_completion.d || die
-	fi
-}
--- a/app-forensics/openscap/openscap-0.7.4.ebuild
+++ b/app-forensics/openscap/openscap-0.7.4.ebuild
@ -1,70 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.7.4.ebuild,v 1.1 2011/08/19 18:23:13 hwoarang Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-
-inherit eutils multilib python bash-completion
-
-DESCRIPTION="Framework which enables integration with the Security Content Automation Protocol (SCAP)"
-HOMEPAGE="http://www.open-scap.org/"
-SRC_URI="http://www.open-scap.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion doc nss perl python sql"
-RESTRICT="test"
-
-RDEPEND="!nss? ( dev-libs/libgcrypt )
-	nss? ( dev-libs/nss )
-	sql? ( dev-db/opendbx )
-	dev-libs/libpcre
-	dev-libs/libxml2
-	dev-libs/libxslt
-	net-misc/curl"
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_configure() {
-	local myconf
-	if use python || use perl ; then
-		myconf+=" --enable-bindings"
-	else
-		myconf+=" --disable-bindings"
-	fi
-	if use nss ; then
-		myconf+=" --with-crypto=nss3"
-	else
-		myconf+=" --with-crypto=gcrypt"
-	fi
-	econf ${myconf}
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	find "${D}" -name '*.la' -delete || die
-	sed -i 's/^Description/&:/' ${D}/usr/$(get_libdir)/pkgconfig/libopenscap.pc || die
-	#--enable-bindings enable all bindings, clean unwanted bindings
-	if use python && ! use perl ; then
-		rm -rf "${D}"/usr/$(get_libdir)/perl5 || die
-	fi
-	if ! use python && use perl ; then
-		rm -rf "${D}"/$(python_get_sitedir) || die
-	fi
-	if use doc ; then
-		dohtml -r docs/html/* || die
-		dodoc docs/examples/* || die
-	fi
-	if ! use bash-completion ; then
-		rm -rf "${D}"/etc/bash_completion.d || die
-	fi
-}
--- a/app-forensics/openscap/openscap-0.8.2.ebuild
+++ b/app-forensics/openscap/openscap-0.8.2.ebuild
@ -0,0 +1,104 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.8.2.ebuild,v 1.1 2012/05/22 20:51:55 hwoarang Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2"
+
+inherit eutils multilib python bash-completion-r1
+
+DESCRIPTION="Framework which enables integration with the Security Content Automation Protocol (SCAP)"
+HOMEPAGE="http://www.open-scap.org/"
+SRC_URI="https://fedorahosted.org/releases/o/p/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bash-completion doc nss perl python rpm selinux sql test"
+#RESTRICT="test"
+
+RDEPEND="!nss? ( dev-libs/libgcrypt )
+	nss? ( dev-libs/nss )
+	rpm? ( >=app-arch/rpm-4.9 )
+	sql? ( dev-db/opendbx )
+	dev-libs/libpcre
+	dev-libs/libxml2
+	dev-libs/libxslt
+	net-misc/curl"
+DEPEND="${RDEPEND}
+	perl? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+	test? (
+		app-arch/unzip
+		net-misc/ipcalc
+		sys-apps/grep )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	sed -i 's/uname -p/uname -m/' tests/probes/uname/test_probes_uname.xml.sh || die
+	sed -i 's,/etc/rc.d/init.d,/etc/init.d,' src/OVAL/probes/unix/runlevel.c || die
+	#problem sent upstream  https://fedorahosted.org/openscap/ticket/45
+	sed -i 's,unzip,\$1,' tests/test_common.sh || die
+	#problem sent upstream https://fedorahosted.org/openscap/ticket/46
+	epatch ${FILESDIR}/test_probes_interface.patch || die
+	# runlevel isnt supported on gentoo
+	sed -i 's,probecheck "runlevel,probecheck "runlevellllll,' tests/probes/runlevel/test_probes_runlevel.sh || die
+	#According to comment of theses tests, we must modify it. For the moment disable it
+	sed -i 's,.*linux-def_inetlisteningservers_test,#&,' tests/mitre/test_mitre.sh || die
+	sed -i 's,.*ind-def_environmentvariable_test,#&,' tests/mitre/test_mitre.sh || die
+	#This test fail when testing process with [] in names https://fedorahosted.org/openscap/ticket/47
+	epatch ${FILESDIR}/test_probes_process.patch || die
+
+	if ! use rpm ; then
+		sed -i 's,probe_rpminfo_req_deps_ok=yes,probe_rpminfo_req_deps_ok=no,' configure || die
+		sed -i 's,probe_rpminfo_opt_deps_ok=yes,probe_rpminfo_opt_deps_ok=no,' configure || die
+		sed -i 's,probe_rpmverify_req_deps_ok=yes,probe_rpmverify_req_deps_ok=no,' configure || die
+		sed -i 's,probe_rpmverify_opt_deps_ok=yes,probe_rpmverify_opt_deps_ok=no,' configure || die
+		sed -i 's,^probe_rpm.*_deps_missing=,&disabled by USE flag,' configure || die
+		sed -i 's,.*rpm.*,#&,' tests/mitre/test_mitre.sh || die
+	fi
+	if ! use selinux ; then
+		sed -i 's,.*selinux.*,#&,' tests/mitre/test_mitre.sh || die
+	fi
+}
+
+src_configure() {
+	local myconf
+	if use python || use perl ; then
+		myconf+=" --enable-bindings"
+	else
+		myconf+=" --disable-bindings"
+	fi
+	if use nss ; then
+		myconf+=" --with-crypto=nss3"
+	else
+		myconf+=" --with-crypto=gcrypt"
+	fi
+	econf ${myconf}
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	find "${D}" -name '*.la' -delete || die
+	sed -i 's/^Description/&:/' "${D}"/usr/$(get_libdir)/pkgconfig/libopenscap.pc || die
+	#--enable-bindings enable all bindings, clean unwanted bindings
+	if use python && ! use perl ; then
+		rm -rf "${D}"/usr/$(get_libdir)/perl5 || die
+	fi
+	if ! use python && use perl ; then
+		rm -rf "${D}"/$(python_get_sitedir) || die
+	fi
+	if use doc ; then
+		dohtml -r docs/html/* || die
+		dodoc docs/examples/* || die
+	fi
+	if use bash-completion ; then
+		dobashcomp "${D}"/etc/bash_completion.d/oscap
+	fi
+	rm -rf "${D}"/etc/bash_completion.d || die
+}
--- a/app-forensics/ovaldi/ChangeLog
+++ b/app-forensics/ovaldi/ChangeLog
@ -1,6 +1,17 @@
 # ChangeLog for app-forensics/ovaldi
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/ovaldi/ChangeLog,v 1.2 2011/08/24 13:43:02 hwoarang Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/ovaldi/ChangeLog,v 1.3 2012/05/22 20:54:50 hwoarang Exp $
+
+*ovaldi-5.10.1.2 (22 May 2012)
+
+  22 May 2012; Markos Chandras <hwoarang@gentoo.org>
+  +files/ovaldi-5.10.1.2-add-selinux-libs.patch,
+  +files/ovaldi-5.10.1.2-disable-ldap-probes.patch,
+  +files/ovaldi-5.10.1.2-disable-selinux-probes.patch,
+  +files/ovaldi-5.10.1.2-missing-memory-header.patch,
+  +files/ovaldi-5.10.1.2-strnicmp.patch, +files/ovaldi-5.10.1.2-xerces3.patch,
+  +ovaldi-5.10.1.2.ebuild:
+  Version bump thanks to LABBE Corentin <corentin.labbe@geomatys.fr>

  24 Aug 2011; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
  Assign package to proxy-maintainers team
--- a/app-forensics/ovaldi/Manifest
+++ b/app-forensics/ovaldi/Manifest
@ -1,29 +1,37 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

+AUX ovaldi-5.10.1.2-add-selinux-libs.patch 494 RMD160 2c9e67ee11cd3094d12788dd4a25e09370bb8e1b SHA1 9c3b0b85f1b8f2c9dceb44ad836c48e57d85f3b8 SHA256 7b2cc39e80170bb2418df7c98e3f46757f452f372f33b40adad8a3081a04bca8
+AUX ovaldi-5.10.1.2-disable-ldap-probes.patch 514 RMD160 d9f335c85bdba89272fdba201dad01db4f8b9b72 SHA1 cc1392b19ff925583705c8af9059d912784bb261 SHA256 fab78dc2e49a642337c85537199db797ebcc8d5dfe6bd2f977a7d3d43c2f646b
+AUX ovaldi-5.10.1.2-disable-selinux-probes.patch 3418 RMD160 98c21bcc8d0057b184c90d30a08d9d988401417f SHA1 d0f35753b2af88df54610234ce05c737b6739979 SHA256 0852abf008d39827dff195005df718233c122cfa86a47be27592ecbee1cb08fa
+AUX ovaldi-5.10.1.2-missing-memory-header.patch 703 RMD160 6688f6b8b8eba5c50055f73ec3744c12ac8db532 SHA1 329b149970902ed44ce1938414660971b91fca9f SHA256 145ba83c3000de0204d6b892702b490c1c592c0f47b4c8d20138a53623abfc1f
+AUX ovaldi-5.10.1.2-strnicmp.patch 292 RMD160 30058fc991df58e38be9b19855512602879d0136 SHA1 09f4ef19ba2dc009a45ff3b89e93dae6e9fd0cb6 SHA256 aa4a1f23df2fd4b8ed0456a23948cc597d0573eb1e9881f8a8f229b8778f6a54
+AUX ovaldi-5.10.1.2-xerces3.patch 13510 RMD160 c93dbde89c2d025f3b68a21446820b5c0a950bfb SHA1 ace15aef1a2456dd71f86dd44a3006f3541ff3e0 SHA256 7818b08cb2fe965b14a7732f26f36d4a2a67da70fdf050751b42834e95cac39e
 AUX ovaldi-5.9.1-disable-ldap-probes.patch 1237 RMD160 5c75a4eb790712f2a5e219035c3bd66b6437b7b4 SHA1 fe627c386fd1e9f299b7caa06b73fe3ac943cae6 SHA256 ca8846757488a75d434a4cc909a96de44cf4b8f6d8f7950c2938630668bbde6a
 AUX ovaldi-5.9.1-strnicmp.patch 292 RMD160 30058fc991df58e38be9b19855512602879d0136 SHA1 09f4ef19ba2dc009a45ff3b89e93dae6e9fd0cb6 SHA256 aa4a1f23df2fd4b8ed0456a23948cc597d0573eb1e9881f8a8f229b8778f6a54
 AUX ovaldi-5.9.1-xerces3.patch 12336 RMD160 501377cc5cbe1256a72bf2cd0be8a67943aca50e SHA1 024a2860faf0783c728d468fbe77dd6dc0da5a2f SHA256 70754174e4d390663b79b0dc070eba536d2868ce5b68aae1632e805a52b0e0f0
 AUX rpmdb.patch 2131 RMD160 eab0ea48e95ae7d278b80b555a73ca456ac07703 SHA1 ae06d023162d19019f27fdbbc9476fcf57d10cad SHA256 d40775d272b8aed6062b983640cf4c0a330a9d318012b922099eeb04d4c1d131
 AUX use_local_rpmdb.patch 429 RMD160 4a8f35be13522873bcfc5e03842964e84fc557b0 SHA1 70fe83d0f9f1c8716a2a8afec70da94c9183b2be SHA256 e7956ab2c1de68b0c5284641a36136643aa5a6e12cfd8b6042f0484c1cba63cd
+DIST ovaldi-5.10.1.2-src.tar.bz2 14859172 RMD160 e9d6688610b97b4c3a31c4fabf738002ab409e01 SHA1 1119d253cc5e80272ca5acd1e03c3ef5f95aaae8 SHA256 2d00a1bc730f6635beebd52611ee30c914169626ef5adf68ff313295c483d319
 DIST ovaldi-5.9.1-src.tar.bz2 14745625 RMD160 ea01a73e0592c007a4611afff1a995ab617ed19b SHA1 7a7667cc2044df49c8413fc01946e00f6ee4a3a5 SHA256 40161ac64fd221543a19f178de283919be2dd7f513a6fb354f1440fe1bfb98e1
+EBUILD ovaldi-5.10.1.2.ebuild 2414 RMD160 08e5ccbf3ed7452f51beea98f91d18c69f52ef6b SHA1 5a91c573ca1fda5df53a35e73c2cae21d06b7f11 SHA256 a4cd65663769d4e699df17cd7a1945a3db0ac0c1b603e6ee59843ebf4041df44
 EBUILD ovaldi-5.9.1.ebuild 1862 RMD160 1f8f898a1f9b8552fddc96636db57975577beeae SHA1 2d6d04095b3b7e6150c57d8c53eddd4410e26932 SHA256 d4c7a6cdfe1957bf958a2d553bfdde2a8dfc6dede51286170506c39259dd6632
-MISC ChangeLog 767 RMD160 2a86f2ca2487521a105fab6b56d6349086b3c280 SHA1 109f632dfe42601483d8d0f19123f88340d05b80 SHA256 90f374946e0ca21998b88d1b12fe89b098261c33e4f30616391b05b214dc6ab7
+MISC ChangeLog 1238 RMD160 3f27c0c40f31ad284c6bdc1ba945eb68de8d2ab6 SHA1 f3b0758091b06fb2f4e5740ba45dfaaa05e1f253 SHA256 cb8c5d1f55a316326f476a13e7e0769ba893007787c20f4c31c3277483d849bd
 MISC metadata.xml 565 RMD160 4b6ef0c87213699f88a7c3a0f1233b23079bacc0 SHA1 7960569fb509a8aeccd8632ef8b8160e8f3d6140 SHA256 635243ac3f5b09dc36bd19708ba4e43152189bf63f19579b2f4ea5937a8569e6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)

-iQIcBAEBCgAGBQJOVP+YAAoJEPqDWhW0r/LCFE8QAKMnHqXV5ARTsqCRdbjzslcm
-+toWyK++2Mpi4nEAok+zoEtccXYGgOq/tf8kgfHy/c3zK/EaPGRzEQ5WoFvuS+xB
-JOCpNxosHbDjMUo5xD6YzDZC/DStZL++9Uy29+W8Oh2/HnUMCSJHIEIfcDI0iPXR
-t9ggF1RCY/j/8Sc1tQOCQ2tH2XYi05BA/oc7NwwOPxAE8ZO4zHe5CLopr/nUWl/h
-OgknkCSzlNzVMvuJdup7MQ3QGUSnlGUGoKlNduHF/nWzQ6NDNtKxcp0Mtm+EHZ5C
-fHOxrX/LhagwSA17x3EJ9TLJGv6GZDnl7gnG0V8oerGIIUYUGeZppKEQHVZfRrjv
-r0mmP1hkvl3XCuDH9rUUH5bJsObiWVZw9VoGxfzBrh/uAPCTy3svZrc4mT9zKmUE
-AFVoIj9SxWb+9Pdi/pvirt5SmGtqEKIgO00bJi3puJALsrLUksEwpFZS3R0W50oE
-NaNZgyflWeIYO1po07+0r2nLS4Yp8PPtkmaM5dhBrBuwFXgdUAawgJHJrnxe6I8J
-jLPob9ZapR4Id4z39H6XbNkNmrw0bT3NAWXzlb+zmek+YQzJXlDjSM5QC+u0EHP0
-DoQLpW06MCett18OjjwA7tYRAmAqGE0b8tBhg3EFKoUVqutvj3l33QZMZ5upGmOT
-oDrEDlFhA5rb5fNe4ksF
-=LQAn
+iQIcBAEBCgAGBQJPu/0eAAoJEPqDWhW0r/LCHOAQAIPajW250I4kxdILdsd9G4hE
+2OXO/yW1aicEQ28S2ecry4mBxjkshskPe11hHGoEqjl2GFcNxa3y6gyb5eGMQ0Nu
+VlYK1IrDogg8J/YawZjW7u9Q4fQSzaN6ePOB3OgcWfXlm/Kb3TuaqyudNOwqIVAA
+VmzZ07wBi6XQrEppu/XiZhn59eaYJhNEtpqjhKJ/7kmnW04wdk3AHQvpr+J6UTqR
+KDTETJyGSWzPIaOZXE/4O7dYwCNej0VtS0OmBoEY8ZgN/u7kRyUEmlDUk3WHhCeo
+Rkyv7466N3omb+kVMbnsPynfWQOpbe5MoLJdw8LhVG8MvOUTRfZdsTN/twPwjVr2
+oz/rnzesq4O3iUnY0d+lStlhFZwQynJCYCugaUIx7uX33n9jTHrn9/NJgO4MQHlU
+So1k2sU6kgwDH2GOjhZ1vD3y2OpR+d4craa0aS1o+5cfXwOger6BjTvaEqLQJ/Jv
+zSEC5oqgmZjliTLJLhFEdOF+M2CF+fsWK0xpmLHK3OwFNVRcH1SpGUPVbXlZo5as
+MHDDgNhSMtGRN3XPQBbsboxjdfEuYAjlpYA+yr166CoiwCLxNtyu8oesu/sTD+v7
+9nb9Fj6lqh2RDnqd0+t3rRrIMv6HpZSSbvwdCD7YxXl4dORJy3TN3BNJnLucS/EF
+FjpXcsn5CFcc7cXUzvpv
+=5boT
 -----END PGP SIGNATURE-----
--- a/app-forensics/ovaldi/files/ovaldi-5.10.1.2-add-selinux-libs.patch
+++ b/app-forensics/ovaldi/files/ovaldi-5.10.1.2-add-selinux-libs.patch
@ -0,0 +1,11 @@
+--- project/linux/Makefile.orig	2012-01-02 12:08:20.400871287 +0100
+++ project/linux/Makefile	2012-01-02 12:08:48.966488826 +0100
+@@ -50,7 +50,7 @@
+ LIBDIR = -L/usr/local/lib -L/usr/lib
+ 
+ # What libraries do we need?
+-LIBS = -lxerces-c -lxalan-c -lpcre -lpopt -lgcrypt  -lblkid
+LIBS = -lxerces-c -lxalan-c -lpcre -lpopt -lgcrypt  -lblkid -lsepol -lselinux
+ 
+ # Determine what package management system is being used 
+ #PACKAGE_RPM  = $(shell /usr/bin/env rpm  --version 2>/dev/null)
--- a/app-forensics/ovaldi/files/ovaldi-5.10.1.2-disable-ldap-probes.patch
+++ b/app-forensics/ovaldi/files/ovaldi-5.10.1.2-disable-ldap-probes.patch
@ -0,0 +1,11 @@
+--- src/linux/ProbeFactory.cpp	2010-12-10 13:37:00.019140703 +0100
+++ src/linux/ProbeFactory.cpp	2010-08-27 21:23:41.000000000 +0200
+@@ -61,8 +61,6 @@
+ 		probe = XmlFileContentProbe::Instance();
+ 	} else if(objectName.compare("textfilecontent54_object") == 0) {
+ 		probe = TextFileContent54Probe::Instance();
+-	} else if(objectName.compare("ldap_object") == 0) {
+-		probe = LDAPProbe::Instance();
+ 
+ // here are the objects defined in the unix schema
+ 	} else if(objectName.compare("file_object") == 0) {
--- a/app-forensics/ovaldi/files/ovaldi-5.10.1.2-disable-selinux-probes.patch
+++ b/app-forensics/ovaldi/files/ovaldi-5.10.1.2-disable-selinux-probes.patch
@ -0,0 +1,94 @@
+--- ./src/linux/ProbeFactory.cpp.old	2011-08-18 14:45:11.314556346 +0200
+++ ./src/linux/ProbeFactory.cpp	2011-08-18 14:45:23.151011753 +0200
+@@ -101,10 +101,6 @@
+ #endif
+ 	} else if (objectName.compare("partition_object") == 0) {
+ 		probe = PartitionProbe::Instance();
+-	} else if (objectName.compare("selinuxsecuritycontext_object") == 0) {
+-		probe = SelinuxSecurityContextProbe::Instance();
+-	} else if (objectName.compare("selinuxboolean_object") == 0) {
+-		probe = SelinuxBooleanProbe::Instance();
+ 	} else if (objectName.compare("iflisteners_object") == 0) {
+ 		probe = IfListenersProbe::Instance();
+ 	} else {
+--- src/linux/ProbeFactory.h.old	2011-08-18 14:47:23.226501075 +0200
+++ src/linux/ProbeFactory.h	2011-08-18 14:47:34.183998019 +0200
+@@ -71,8 +71,6 @@
+ #include "InetdProbe.h"
+ 
+ #include "PartitionProbe.h"
+-#include "SelinuxSecurityContextProbe.h"
+-#include "SelinuxBooleanProbe.h"
+ #include "IfListenersProbe.h"
+ 
+ class AbsProbe;
+--- src/probes/unix/Process58Probe.cpp.old	2012-05-22 10:09:52.980828398 +0200
+++ src/probes/unix/Process58Probe.cpp	2012-05-22 10:11:06.266468168 +0200
+@@ -29,10 +29,10 @@
+ //****************************************************************************************//
+ 
+ #ifdef LINUX
+-#  include <selinux/selinux.h>
+-#  include <selinux/context.h>
+/*#  include <selinux/selinux.h>
+#  include <selinux/context.h>*/
+ #  include <sys/capability.h>
+-#  include <SecurityContextGuard.h>
+/*#  include <SecurityContextGuard.h>*/
+ #endif
+ 
+ #include <fstream>
+@@ -328,7 +328,7 @@
+ 	pid_t sessionId;
+ 	uid_t loginuid;
+ 	uint64_t effCap, *effCapp=&effCap;
+-	string selinuxDomainLabel;
+/*	string selinuxDomainLabel;*/
+ 
+ 	Process58Probe::ProcStatus statStatus, statusStatus, ttyStatus, loginuidStatus;
+ 
+@@ -423,10 +423,10 @@
+ 	}
+ 
+ 	// this one doesn't require reading anything in /proc
+-	if (!RetrieveSelinuxDomainLabel(pid, &selinuxDomainLabel, &errMsg)) {
+/*	if (!RetrieveSelinuxDomainLabel(pid, &selinuxDomainLabel, &errMsg)) {
+ 		item->AppendMessage(new OvalMessage(errMsg, OvalEnum::LEVEL_ERROR));
+ 		item->SetStatus(OvalEnum::STATUS_ERROR);
+-	}
+	}*/
+ 
+ 	// The Linux start time is represented as the number of jiffies (1/100 sec)
+ 	// that the application was started after the last system reboot.  To get an
+@@ -491,10 +491,10 @@
+ 		// aren't any.
+ 		item->AppendElement(new ItemEntity("posix_capability", "", OvalEnum::DATATYPE_STRING, false, OvalEnum::STATUS_ERROR));
+ 
+-	if (selinuxDomainLabel.empty())
+/*	if (selinuxDomainLabel.empty())*/
+ 		item->AppendElement(new ItemEntity("selinux_domain_label", "", OvalEnum::DATATYPE_STRING, false, OvalEnum::STATUS_ERROR));
+-	else
+-		item->AppendElement(new ItemEntity("selinux_domain_label", selinuxDomainLabel));
+/*	else
+		item->AppendElement(new ItemEntity("selinux_domain_label", selinuxDomainLabel));*/
+ 
+ 	if (statStatus == PROC_OK)
+ 		item->AppendElement(new ItemEntity("session_id", Common::ToString(sessionId), OvalEnum::DATATYPE_INTEGER));
+@@ -709,7 +709,7 @@
+ 											   capMap[capEnum]));
+ 	}
+ }
+-
+/*
+ bool Process58Probe::RetrieveSelinuxDomainLabel(pid_t pid, string *label, string *err) {
+ 	security_context_t sctx;
+ 	int ec = getpidcon(pid, &sctx);
+@@ -732,7 +732,7 @@
+ 	*label = tmp;
+ 	return true;
+ }
+-
+*/
+ #elif defined SUNOS
+ 
+ void Process58Probe::GetPSInfo(string command, string pidStr, ItemVector* items) {
--- a/app-forensics/ovaldi/files/ovaldi-5.10.1.2-missing-memory-header.patch
+++ b/app-forensics/ovaldi/files/ovaldi-5.10.1.2-missing-memory-header.patch
@ -0,0 +1,20 @@
+--- src/CountFunction.cpp.old	2012-01-02 11:37:27.113604532 +0100
+++ src/CountFunction.cpp	2012-01-02 11:37:39.624998573 +0100
+@@ -29,6 +29,7 @@
+ //****************************************************************************************//
+ 
+ #include <cstddef>
+#include <memory>
+ #include "CountFunction.h"
+ #include "ComponentFactory.h"
+ 
+--- src/UniqueFunction.cpp.orig	2012-01-02 11:39:58.564269070 +0100
+++ src/UniqueFunction.cpp	2012-01-02 11:40:12.057615550 +0100
+@@ -29,6 +29,7 @@
+ //****************************************************************************************//
+ 
+ #include <set>
+#include <memory>
+ #include "Common.h"
+ #include "ComponentFactory.h"
+ #include "UniqueFunction.h"
--- a/app-forensics/ovaldi/files/ovaldi-5.10.1.2-strnicmp.patch
+++ b/app-forensics/ovaldi/files/ovaldi-5.10.1.2-strnicmp.patch
@ -0,0 +1,11 @@
+--- src/Main.h.old	2010-10-22 14:59:13.000000000 +0200
+++ src/Main.h	2010-10-22 14:59:38.000000000 +0200
+@@ -38,7 +38,7 @@
+ #endif
+ 
+ #ifdef LINUX
+-#  define STRNICMP strnicmp
+#  define STRNICMP strncasecmp
+ #elif defined SUNOS
+ #  define STRNICMP strncasecmp
+ #elif defined DARWIN
--- a/app-forensics/ovaldi/files/ovaldi-5.10.1.2-xerces3.patch
+++ b/app-forensics/ovaldi/files/ovaldi-5.10.1.2-xerces3.patch
@ -0,0 +1,306 @@
+--- src/XmlProcessor.cpp.old	2011-08-18 14:51:20.311616357 +0200
+++ src/XmlProcessor.cpp	2011-08-18 14:51:47.214381144 +0200
+@@ -35,7 +35,6 @@
+ // for dom Writer
+ #include <xercesc/dom/DOMImplementation.hpp>
+ #include <xercesc/dom/DOMImplementationLS.hpp>
+-#include <xercesc/dom/DOMWriter.hpp>
+ #include <xercesc/framework/StdOutFormatTarget.hpp>
+ #include <xercesc/framework/LocalFileFormatTarget.hpp>
+ #include <xercesc/util/XMLUni.hpp>
+@@ -53,8 +52,17 @@
+ //****************************************************************************************//
+ //			DataDirResolver Class                                   					  //	
+ //****************************************************************************************//
+-
+#if XERCES_VERSION_MAJOR < 3
+ DOMInputSource* DataDirResolver::resolveEntity (const XMLCh *const /*publicId*/, const XMLCh *const systemId, const XMLCh *const /*baseURI*/) {
+#else
+InputSource* DataDirResolver::resolveEntity(const XMLCh* publicId, const XMLCh* systemId)
+{
+	return NULL;
+	//return DataDirResolver::resolveEntity (publicId, systemId, NULL);
+}
+
+DOMLSInput* DataDirResolver::resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId, const XMLCh *const baseURI) {
+#endif
+ 	string path = "";
+ 	size_t last;
+ 	string schemapath = Common::GetSchemaPath();
+@@ -104,13 +112,19 @@
+ 
+     try  {
+         XMLPlatformUtils::Initialize();
+#if XERCES_VERSION_MAJOR < 3
+#define SetParameter(parser,n,v) parser->setFeature(n,v)
+#else
+#define SetParameter(parser,n,v) parser->getDomConfig()->setParameter(n,v)
+#endif
+ 
+ 		parser = makeParser();
+ 		parserWithCallerAdoption = makeParser();
+ 		// add one extra feature on this parser to prevent it from
+ 		// taking ownership of its documents.
+-		parserWithCallerAdoption->setFeature(XMLUni::fgXercesUserAdoptsDOMDocument, true);
+		SetParameter(parserWithCallerAdoption, XMLUni::fgXercesUserAdoptsDOMDocument, true);
+ 
+#undef SetParameter
+     } catch (const XMLException& toCatch) {
+         string errMsg = "Error:  An error occured durring initialization of the xml utilities:\n";
+         errMsg.append(XmlCommon::ToString(toCatch.getMessage()));
+@@ -137,32 +151,55 @@
+ 
+ }
+ 
+#if XERCES_VERSION_MAJOR < 3
+ DOMBuilder *XmlProcessor::makeParser() {
+#else
+DOMLSParser *XmlProcessor::makeParser() {
+#endif
+     // Instantiate the DOM parser.
+ 	static const XMLCh gLS[] = { chLatin_L, chLatin_S, chNull };
+ 	DOMImplementation *impl = DOMImplementationRegistry::getDOMImplementation(gLS);
+ 
+#if XERCES_VERSION_MAJOR < 3
+ 	DOMBuilder *parser = ((DOMImplementationLS*)impl)->createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
+#else
+	DOMLSParser *parser = ((DOMImplementationLS*)impl)->createLSParser(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
+#endif
+ 
+ 	///////////////////////////////////////////////////////
+ 	//	Set features on the builder
+ 	///////////////////////////////////////////////////////
+ 
+-	parser->setFeature(XMLUni::fgDOMComments, false); // Discard Comment nodes in the document. 
+-	parser->setFeature(XMLUni::fgDOMDatatypeNormalization, true); // Let the validation process do its datatype normalization that is defined in the used schema language.  
+-	parser->setFeature(XMLUni::fgDOMNamespaces, true); //  Perform Namespace processing
+-	parser->setFeature(XMLUni::fgDOMValidation, true); // Report all validation errors.  
+-	parser->setFeature(XMLUni::fgXercesSchema, true); //  Enable the parser's schema support.
+-	parser->setFeature(XMLUni::fgXercesSchemaFullChecking, true); //  Enable full schema constraint checking, including checking which may be time-consuming or memory intensive. Currently, particle unique attribution constraint checking and particle derivation restriction checking are controlled by this option.  
+-	parser->setFeature(XMLUni::fgXercesValidationErrorAsFatal, true); //  The parser will treat validation error as fatal and will exit  
+-	parser->setFeature(XMLUni::fgXercesDOMHasPSVIInfo, true); // Enable storing of PSVI information in element and attribute nodes.
+#if XERCES_VERSION_MAJOR < 3
+#define SetParameter(parser,n,v) parser->setFeature(n,v)
+#else
+#define SetParameter(parser,n,v) parser->getDomConfig()->setParameter(n,v)
+#endif
+
+	SetParameter(parser, XMLUni::fgDOMComments, false); // Discard Comment nodes in the document. 
+	SetParameter(parser, XMLUni::fgDOMDatatypeNormalization, true); // Let the validation process do its datatype normalization that is defined in the used schema language.  
+	SetParameter(parser, XMLUni::fgDOMNamespaces, true); //  Perform Namespace processing
+#if XERCES_VERSION_MAJOR < 3
+	SetParameter(parser, XMLUni::fgDOMValidation, true); // Report all validation errors.   
+#else
+	SetParameter(parser, XMLUni::fgDOMValidate, true); // Report all validation errors.   
+#endif
+	SetParameter(parser, XMLUni::fgXercesSchema, true); //  Enable the parser's schema support.
+	SetParameter(parser, XMLUni::fgXercesSchemaFullChecking, true); //  Enable full schema constraint checking, including checking which may be time-consuming or memory intensive. Currently, particle unique attribution constraint checking and particle derivation restriction checking are controlled by this option.  
+	SetParameter(parser, XMLUni::fgXercesValidationErrorAsFatal, true); //  The parser will treat validation error as fatal and will exit  
+	SetParameter(parser, XMLUni::fgXercesDOMHasPSVIInfo, true); // Enable storing of PSVI information in element and attribute nodes.
+#undef SetParameter
+ 
+ 	///////////////////////////////////////////////////////
+ //****************************************************************************************//
+ //			The following code was added to handle air-gap operation					  //	
+ //****************************************************************************************//
+ 	/* Look for XML schemas in local directory instead of Internet */
+#if XERCES_VERSION_MAJOR < 3
+ 	parser->setEntityResolver (&resolver);
+#else
+	parser->getDomConfig()->setParameter(XMLUni::fgXercesEntityResolver, &resolver);
+#endif
+ //****************************************************************************************//
+ //			End of air-gap code															  //	
+ //****************************************************************************************//
+@@ -170,7 +207,11 @@
+ 	///////////////////////////////////////////////////////
+ 	//	Add an Error Handler
+ 	///////////////////////////////////////////////////////
+#if XERCES_VERSION_MAJOR < 3
+ 	parser->setErrorHandler(&errHandler);
+#else
+	parser->getDomConfig()->setParameter(XMLUni::fgDOMErrorHandler, &errHandler);
+#endif
+ 
+ 	return parser;
+ }
+@@ -250,24 +291,26 @@
+ 		XMLCh tempStr[100];
+ 		XMLString::transcode("LS", tempStr, 99);
+ 		DOMImplementation *impl = DOMImplementationRegistry::getDOMImplementation(tempStr);
+#if XERCES_VERSION_MAJOR < 3
+ 		DOMWriter *theSerializer = ((DOMImplementationLS*)impl)->createDOMWriter();
+#else
+		DOMLSSerializer *theSerializer = ((DOMImplementationLS*)impl)->createLSSerializer();
+#endif
+
+#if XERCES_VERSION_MAJOR < 3
+#define SetParameter(serializer,n,v) if (serializer->canSetFeature(n,v)) serializer->setFeature(n,v)
+#else
+#define SetParameter(serializer,n,v) if (serializer->getDomConfig()->canSetParameter(n,v)) serializer->getDomConfig()->setParameter(n,v)
+#endif
+ 
+ 		// set feature if the serializer supports the feature/mode
+-		if (theSerializer->canSetFeature(XMLUni::fgDOMWRTSplitCdataSections, true))
+-			theSerializer->setFeature(XMLUni::fgDOMWRTSplitCdataSections, true);
+-
+-		if (theSerializer->canSetFeature(XMLUni::fgDOMWRTDiscardDefaultContent, true))
+-			theSerializer->setFeature(XMLUni::fgDOMWRTDiscardDefaultContent, true);
+-
+-		if (theSerializer->canSetFeature(XMLUni::fgDOMWRTFormatPrettyPrint, true))
+-			theSerializer->setFeature(XMLUni::fgDOMWRTFormatPrettyPrint, true);
+-
+-		if (theSerializer->canSetFeature(XMLUni::fgDOMWRTBOM, false))
+-			theSerializer->setFeature(XMLUni::fgDOMWRTBOM, false);
+-
+-		//if (theSerializer->canSetFeature(XMLUni::fgDOMWRTDiscardDefaultContent, true))
+-		//	theSerializer->setFeature(XMLUni::fgDOMWRTBOM, true);
+		SetParameter(theSerializer, XMLUni::fgDOMWRTSplitCdataSections, true);
+		SetParameter(theSerializer, XMLUni::fgDOMWRTDiscardDefaultContent, true);
+		SetParameter(theSerializer, XMLUni::fgDOMWRTFormatPrettyPrint, true);
+		SetParameter(theSerializer, XMLUni::fgDOMWRTBOM, false);
+		//SetParameter(theSerializer, XMLUni::fgDOMWRTBOM, true);
+ 
+#undef SetParameter
+ 		//
+ 		// Plug in a format target to receive the resultant
+ 		// XML stream from the serializer.
+@@ -284,7 +327,13 @@
+ 		//
+ 		// do the serialization through DOMWriter::writeNode();
+ 		//
+#if XERCES_VERSION_MAJOR < 3
+ 		theSerializer->writeNode(myFormTarget, *doc);
+#else
+		DOMLSOutput *output = ((DOMImplementationLS*)impl)->createLSOutput();
+		output->setByteStream(myFormTarget);
+		theSerializer->write(doc, output);
+#endif
+ 
+ 		theSerializer->release();
+ 		delete myFormTarget;
+--- src/XmlProcessor.h.old	2011-08-18 14:35:41.608703233 +0200
+++ src/XmlProcessor.h	2011-08-18 14:39:21.835597094 +0200
+@@ -38,14 +38,17 @@
+ #include <string>
+ 
+ //	required xerces	includes
+-#include <xercesc/dom/DOMBuilder.hpp>
+ #include <xercesc/dom/DOMDocument.hpp>
+ #include <xercesc/dom/DOMErrorHandler.hpp>
+ #include <xercesc/dom/DOMError.hpp>
+ 
+ // for entity resolver
+-#include <xercesc/dom/DOMEntityResolver.hpp>
+-#include <xercesc/dom/DOMInputSource.hpp>
+
+#include <xercesc/dom/DOMImplementationRegistry.hpp>
+#include <xercesc/dom/DOMLSParser.hpp>
+#include <xercesc/sax/EntityResolver.hpp>
+#include <xercesc/sax/InputSource.hpp>
+#include <xercesc/sax2/SAX2XMLReader.hpp>
+ 
+ #include "Exception.h"
+ 
+@@ -53,12 +56,14 @@
+ 	This class extends the default DOMEntityResolver and implments the resolve entity method 
+ 	to support 
+ */
+-class DataDirResolver : public xercesc::DOMEntityResolver {
+class DataDirResolver : public xercesc::EntityResolver {
+ public:
+ 	/**
+      *     
+ 	*/
+-	xercesc::DOMInputSource *resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId, const XMLCh *const baseURI);
+//	xercesc::DOMInputSource *resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId, const XMLCh *const baseURI);
+	xercesc::InputSource *resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId);
+	xercesc::DOMLSInput *resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId, const XMLCh *const baseURI);
+ };
+ 
+ /**
+@@ -135,7 +140,7 @@
+ 	/**
+ 	 * Has the common code for creating an XML parser.
+ 	 */
+-	xercesc::DOMBuilder *makeParser();
+	xercesc::DOMLSParser *makeParser();
+ 
+ 	static XmlProcessor* instance;
+ 
+@@ -144,7 +149,7 @@
+ 	 * owns the documents it builds.  Users must manually destroy
+ 	 * those documents.
+ 	 */
+-	xercesc::DOMBuilder *parserWithCallerAdoption;
+	xercesc::DOMLSParser *parserWithCallerAdoption;
+ 
+ 	/**
+ 	 * This parser doesn't have user-adoption switched on, so it
+@@ -156,7 +161,7 @@
+ 	 * appear to ever be switched off.  So to make sure this isn't
+ 	 * leaking memory, I have created separate parsers.
+ 	 */
+-	xercesc::DOMBuilder *parser;
+	xercesc::DOMLSParser *parser;
+ 
+ 	/** The entity resolver for both parsers. */
+ 	DataDirResolver resolver;
+--- src/probes/independent/XmlFileContentProbe.cpp.old	2010-10-22 14:49:22.000000000 +0200
+++ src/probes/independent/XmlFileContentProbe.cpp	2010-10-22 14:51:39.000000000 +0200
+@@ -419,12 +419,24 @@
+     return new DummyEntityResolver::DoNothingBinInputStream();
+ }
+ 
+#if XERCES_VERSION_MAJOR < 3
+ unsigned int DummyEntityResolver::DoNothingBinInputStream::curPos() const
+#else
+const XMLCh* DummyEntityResolver::DoNothingBinInputStream::getContentType() const
+{
+    return NULL;
+}
+XMLFilePos DummyEntityResolver::DoNothingBinInputStream::curPos() const
+#endif
+ {
+     return 0;
+ }
+ 
+#if XERCES_VERSION_MAJOR < 3
+ unsigned int DummyEntityResolver::DoNothingBinInputStream::readBytes(XMLByte *const /*toFill*/, const unsigned int /*maxToRead*/)
+#else
+XMLSize_t DummyEntityResolver::DoNothingBinInputStream::readBytes(XMLByte *const toFill, XMLSize_t maxToRead)
+#endif
+ {
+     return 0;
+ }
+--- src/probes/independent/XmlFileContentProbe.h.old	2010-10-22 14:55:47.000000000 +0200
+++ src/probes/independent/XmlFileContentProbe.h	2010-10-22 14:57:00.000000000 +0200
+@@ -134,8 +134,14 @@
+     class DoNothingBinInputStream : public BinInputStream
+     {
+     public:
+#if XERCES_VERSION_MAJOR < 3
+         virtual unsigned int curPos() const;
+         virtual unsigned int readBytes(XMLByte *const toFill, const unsigned int maxToRead);
+#else
+	virtual XMLFilePos curPos() const;
+	virtual const XMLCh* getContentType() const;
+	virtual XMLSize_t readBytes(XMLByte *const toFill, XMLSize_t maxToRead);
+#endif
+     };
+ };
+ 
+--- src/XmlCommon.cpp.old
+++ src/XmlCommon.cpp
+@@ -546,7 +546,11 @@ void XmlCommon::AddSchemaLocation(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *do
+ string XmlCommon::GetNamespace(DOMElement *element) {
+ 
+ 	string xmlns = "";
+#if XERCES_VERSION_MAJOR < 3
+ 	xmlns = XmlCommon::ToString(element->getTypeInfo()->getNamespace());
+#else
+	xmlns = XmlCommon::ToString(element->getSchemaTypeInfo()->getTypeNamespace());
+#endif
+ 	if (xmlns.compare("") == 0) {
+ 		xmlns = "";
+ 	}
--- a/app-forensics/ovaldi/ovaldi-5.10.1.2.ebuild
+++ b/app-forensics/ovaldi/ovaldi-5.10.1.2.ebuild
@ -0,0 +1,78 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/ovaldi/ovaldi-5.10.1.2.ebuild,v 1.1 2012/05/22 20:54:50 hwoarang Exp $
+
+EAPI=3
+
+inherit eutils
+
+DESCRIPTION="Free implementation of OVAL"
+HOMEPAGE="http://oval.mitre.org/language/interpreter.html"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap rpm selinux"
+
+DEPEND="rpm? ( app-arch/rpm )
+	dev-libs/libgcrypt
+	dev-libs/libpcre
+	dev-libs/xalan-c
+	dev-libs/xerces-c
+	ldap? ( net-nds/openldap )
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}-src"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-xerces3.patch
+	epatch "${FILESDIR}"/${P}-strnicmp.patch
+	epatch "${FILESDIR}"/${P}-missing-memory-header.patch
+	if ! use ldap ; then
+		einfo "Disabling LDAP probes"
+		epatch "${FILESDIR}"/${P}-disable-ldap-probes.patch
+		sed -i 's/-lldap//' project/linux/Makefile || die
+		sed -i 's/.*LDAPProbe.h.*//' src/linux/ProbeFactory.h || die
+		rm src/probes/independent/LDAPProbe.{cpp,h} || die
+	fi
+
+	# rpm probes support is build dependant only on the presence of the rpm binary
+	if use rpm ; then
+		#Same problems as bug 274679, so i do a local copy of the header and patch it
+		cp /usr/include/rpm/rpmdb.h src/probes/linux/ || die
+		epatch "${FILESDIR}"/use_local_rpmdb.patch
+		epatch "${FILESDIR}"/rpmdb.patch
+	else
+		einfo "Disabling rpm probes"
+		sed -i 's/^PACKAGE_RPM/#PACKAGE_RPM/' project/linux/Makefile || die
+	fi
+	# same thing for dpkg, but package dpkg is not sufficient, needs app-arch/apt-pkg that is not on tree
+	einfo "Disabling dpkg probes"
+	sed -i 's/^PACKAGE_DPKG/#PACKAGE_DPKG/' project/linux/Makefile || die
+
+	#Disabling SELinux support
+	if ! use selinux ; then
+		rm src/probes/linux/SelinuxSecurityContextProbe.cpp || die
+		rm src/probes/linux/SelinuxBooleanProbe.cpp || die
+		rm src/probes/linux/SelinuxBooleanProbe.h || die
+		epatch "${FILESDIR}"/${P}-disable-selinux-probes.patch
+	else
+		epatch "${FILESDIR}"/${P}-add-selinux-libs.patch
+	fi
+}
+
+src_compile () {
+	emake -C project/linux || die
+}
+
+src_install () {
+	# no make install in Makefile
+	dosbin project/linux/Release/ovaldi project/linux/ovaldi.sh || die
+	dodir /var/log/${PN} || die
+	insinto /usr/share/${PN}
+	doins xml/* || die
+	dodoc docs/{README.txt,version.txt} || die
+	doman docs/ovaldi.1 || die
+}
--- a/app-forensics/yasat/ChangeLog
+++ b/app-forensics/yasat/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for app-forensics/yasat
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/yasat/ChangeLog,v 1.7 2012/03/01 22:13:27 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/yasat/ChangeLog,v 1.8 2012/05/22 20:59:30 hwoarang Exp $
+
+*yasat-526 (22 May 2012)
+
+  22 May 2012; Markos Chandras <hwoarang@gentoo.org> +yasat-526.ebuild,
+  -yasat-400.ebuild, -yasat-421.ebuild:
+  Version bump. Remove old thanks to LABBE Corentin <corentin.labbe@geomatys.fr>

  01 Mar 2012; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
  add proxy-maintainers as herd
--- a/app-forensics/yasat/Manifest
+++ b/app-forensics/yasat/Manifest
@ -1,28 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-DIST yasat-400.tar.gz 89667 RMD160 c361ca444529b633ee567bff12883a22b6b057eb SHA1 539821ba26f7feac83da7187b334070434c21b08 SHA256 89d3b5b68f0c872e0817d77b01736279f606d31a64c2674af319c866b2d3e6b8
-DIST yasat-421.tar.gz 112834 RMD160 e6efcbeccd7b610814dbf1a01bb605f4a15aa304 SHA1 75f8fcbe205c2e3a2ae970b5df67451f2770e14d SHA256 3db884855051c8ff1489c3a21dee65495e4dd298ae2e9dde9a8e09ab6bf3e166
 DIST yasat-456.tar.gz 116257 RMD160 4f108007370df58f52da5f17ca033ce7fe0a74bc SHA1 c49b6f31baf69a5f2a95e3dc76c02e371c3d1f55 SHA256 bc6c598693b9bbebd30d3d4dcf54d94b5e519af524296bffa7c6965f1f843c68
-EBUILD yasat-400.ebuild 561 RMD160 f096b2e43526da083710d83215f3cad917267e78 SHA1 c1b06aa6f10fa5a77ec7ab9a95f8016a96b8ee61 SHA256 eab0ca0091d1262178faa49832b403fa18b929492bc6ef494c9b25aaba9e2c89
-EBUILD yasat-421.ebuild 561 RMD160 27764b6b9f5ce5afcc587557285daac16f58013c SHA1 85084ffa9875d3923484af55a8c6492d47a60b62 SHA256 265f640dc5d74b751fb4927f7e575427938a3074d37b59cebfb4e3011444c624
+DIST yasat-526.tar.gz 123976 RMD160 d76118c23ed64a51287a1268f8754364a0979a94 SHA1 15081946fa2481f24e15cd760b1329297f7a0c9d SHA256 a4ff957d59923c7c87fbcde27c894d731a3685b8534be17867d9cdc41974e600
 EBUILD yasat-456.ebuild 561 RMD160 53a33cee7f2f334f78f2115ea6dbb78760ee1952 SHA1 f68926eab6c319c44ccae1357e71de80dc7e5dda SHA256 b13deb4b9e8c699cb7354347ef32153b0e9c074bc55632f8e175b9061f53bf57
-MISC ChangeLog 1462 RMD160 0268ccf75583c1ba531f61150797fd2d8764d3e4 SHA1 b0b02f1e6f5c25e34448938f7ce2dbe92f7535e3 SHA256 049a760555f6f1cf697347d6f950f179f20e64f7a2145367c526e300e5845c4e
+EBUILD yasat-526.ebuild 587 RMD160 8468525283164c7ef61cef6236c7d1573eb4a656 SHA1 afa0519f88743abb795efc8f01b443ba1e44740b SHA256 8e48800bfdd283e1ede7a040abb7cf6ee037f5b7f7210fb6ffa9dda0f39babfe
+MISC ChangeLog 1682 RMD160 4f0914888830c1da1a3637f68929e8918ef9f710 SHA1 15479cb46bb703e3c34349a67926ca543eb9ac5e SHA256 3d18ecd1d1775e603574e0b7a0ed3e13e51a12e5252085a55332d85bcd3038b4
 MISC metadata.xml 506 RMD160 9723e436c6988331e57769b55127e35bdd28ec2b SHA1 b36e85d48afd11af045c8982ea1a0a3680d07e25 SHA256 493a2d62a9e6bcdbb025215977edf3774be7791f52be8c5e88176569a987085d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)

-iQIcBAEBCgAGBQJPT/SMAAoJEPqDWhW0r/LCYK8QAIffpgWcbbZBUlcTlawn3ALT
-xb4VEY1Dc0bOURyrhRV/XHqbOzJskPAdQS95amvkx0OpJZcdKnXGHwem/OLm8W5t
-UxoB+4ClLuC07WAs/zvN+A1PbvV7Ungip5uLOWMu+QHOURRbCoRARr+MPIfg6JSz
-4RCdo5OwAP6fJWIcqj8FSQAuZb2bDwKc6/8NG2uONJ/zlXI958/O3lxQi52bLuK0
-mUJ1ipcr893P77FqXMXUuRGCOHjTVy4jO2X0+qy9nT7YZbzo48HTghd4VIZA/QU2
-wIw8wSBkC1ldMC+jD9JMWOzpVeCaAlakBH73MZclWZ/zY1ZthFVCfPvdqYyPQ711
-OkMfi3w64a+bSu608zTAZ9Ndg1Z0CTf7xct2aNR0YmKoS/uTdPzoUOeph26KBsq+
-uXAmNNAFwSbofFrH9ILfTi6m90oWN3WPOq3Mzmjh7QF5fFrbDdmigj7mdxtsfw6/
-ZYY3G6ZCMNRtYoKmmITU96BlvGu+uHiueZJYBGPHnE94ak5vX9ft5n7qPs+mCdK1
-u1ye7Iu9OIY44gtSQlxns2lmF2GRlbOV1Mijz8P31yF2hReNIHOv9mcfqszXZxka
-7a1WpJxwblsxgqtp3iUxHeG/SmiXM/gTSCUny2YQfuxNfA8T9e/wQXM9nDmALigv
-ZCWLcAWmtT/XQy4ZLdcL
-=NFzi
+iQIcBAEBCgAGBQJPu/43AAoJEPqDWhW0r/LC960P/RsnSs62QSfM0bW3wFQO0ZEl
+eDWKrNYsywKPT/PlXweppEzJNAH2sJSdkg55YjZzqhRknsuuympItYevFN11Colt
+x4aiyF3ExJRQ6EPOA9bhS15BUsDzTSppIGDVWNlTJDMj0T7RKfb8Hm6dVsFPzdI3
+MviqNcLJ+CkPFYl4gOQ1TKWuF8CDSdzojz2xl5/n5MUPHMPq+qclTA4HTu+gX54H
+anUHzBKrJdKTa6LWWr+4wwt3bJv24MKQ1KQFisEnWavEXLaqcCklHu7mJyLFBR8l
+AGh+2pIe+4McvDTBPLBvyr3CmCKWjHQQyNa5rjNTvJ6XJfxIjAWIvlfDGvMB0xtB
+4sn0/YeBhirtkCy+nBVt7GI8N5Q9EZYMyup2dZDYKFX0ctWOlTqkjjuM4ibAc9h5
+dOLFKMenUK1WvzjAUIxT1AEHFVgcjYKL9PkZ89S+ipP8j9QqCSdBxFxCfPGz6b/
+1INvJxw+zt/fOodQoNxeFk27Gbdz/HLXTczAKnSCI4SNYEhoog8Waotc+nWC5HOm
+zrLpHbRsJkPzsGpbvDN9lENjoBFT3P/cO7zLZbnLJ/kAGA/7K9oNnUlQH0zoEZl2
+Eu4dzdYUlNNqckbyZh2qLzcioWVP4qr6XgCh6P9Uh/D3K3xo0lUpPEQLSLV6u79Q
+CMY7h2ZekGD+FmOsmRUi
+=d9/7
 -----END PGP SIGNATURE-----
--- a/app-forensics/yasat/yasat-421.ebuild
+++ b/app-forensics/yasat/yasat-421.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/yasat/yasat-421.ebuild,v 1.1 2011/06/16 08:57:28 hwoarang Exp $
-
-DESCRIPTION="Security and system auditing tool"
-HOMEPAGE="http://yasat.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	emake install DESTDIR="${D}" PREFIX="/usr" SYSCONFDIR="/etc" || die
-	dodoc README CHANGELOG || die
-}
--- a/app-forensics/yasat/yasat-526.ebuild
+++ b/app-forensics/yasat/yasat-526.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/yasat/yasat-400.ebuild,v 1.1 2011/03/24 01:02:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/yasat/yasat-526.ebuild,v 1.1 2012/05/22 20:59:30 hwoarang Exp $

 DESCRIPTION="Security and system auditing tool"
 HOMEPAGE="http://yasat.sourceforge.net"
@ -16,4 +16,5 @@ S=${WORKDIR}/${PN}
 src_install() {
 	emake install DESTDIR="${D}" PREFIX="/usr" SYSCONFDIR="/etc" || die
 	dodoc README CHANGELOG || die
+	doman man/yasat.8 || die
 }
--- a/app-misc/acdctl/ChangeLog
+++ b/app-misc/acdctl/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for app-misc/acdctl
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/acdctl/ChangeLog,v 1.5 2009/06/28 18:03:43 patrick Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/acdctl/ChangeLog,v 1.6 2012/05/22 16:27:12 ssuominen Exp $
+
+  22 May 2012; Samuli Suominen <ssuominen@gentoo.org> acdctl-1.1.ebuild:
+  Use virtual/libusb instead of dev-libs/libusb.

  28 Jun 2009; Patrick Lauer <patrick@gentoo.org> acdctl-1.1.ebuild:
  EAPI2ification, nailing libusb dep to slot 0, fixes #270155
--- a/app-misc/acdctl/Manifest
+++ b/app-misc/acdctl/Manifest
@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1

 DIST acdctl-1.1.tar.bz2 10827 RMD160 1b0f735583d1be57d44744a7f9ab763ba1612c25 SHA1 1721953cb53d4de003657c42f28fe654a76e2b5b SHA256 d6c6d83672682d5d803431010bce3112becf5c6a42e1918da3f814b1e3af4f43
-EBUILD acdctl-1.1.ebuild 528 RMD160 0f8588df7ff33f02add10b018c6077be921bf495 SHA1 1b803da649671cbc067e9538df91d30634bf3b8b SHA256 494bdef113a050a4e8f7798ee3d47fcec23ff636a748983cb063fcbecf38294b
-MISC ChangeLog 753 RMD160 d3dfc5bb720aee16f57a9ea8f0e6036c38da5207 SHA1 a956ed029497b2970a1ee39e5558ad10295c3f63 SHA256 ceb26ace3c78345efafd2dcf5c7306025ff194e59ba8983bd0b0d4bac700f542
+EBUILD acdctl-1.1.ebuild 550 RMD160 5cce351a14e2993fd3ce9d2b112102e0fc63da52 SHA1 4fa4c1af79e9815437ef6fa992e004e3c2c71c3d SHA256 ebd66d3f60ce670d104ef6a12daa68f5cabf9c1e829f7bc866af39d9cb239bd4
+MISC ChangeLog 878 RMD160 e600516675bb7c6c500b6ae6b88700945364c6f9 SHA1 fb3e0995f5396b13c033543d9071c4cb273394f9 SHA256 5638c77dc7eb05a013fd32b2860ca693b9b0cec1ca4a56b5f321829439d95d52
 MISC metadata.xml 474 RMD160 dc8cf5c3dd9fec99a8a7d426fd2c33cd6dfec14f SHA1 c7dfb3c22c0784ccad6f688287937e9cfb7e8547 SHA256 57481f2edcc0584c64f00789d74592c5b9be49c78013598e329ce5b83e7dbfbb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)

-iJwEAQEIAAYFAk58/5gACgkQfXuS5UK5QB3AxAP/a9WoV+VPybCnHdAsML6fSkZe
-Ah5b4Yf+DW9GcloMyNySVyuGrOXPKAxcJvSbQTuA4AwDB6p5unTpDLDh8NFdh/Kq
-A1QBh99stCTrhTzdpkqFcY8ODRMwyIqCeP3ReSazxpNhB2bwaXEo+I1jUvj9d9Ke
-axjeW1QHovkS17/YucU=
-=i1yv
+iQEcBAEBAgAGBQJPu72mAAoJEEdUh39IaPFN69UH/iE4/xRfnBPrfy/CfYtZyyu4
+dNY69KUZHhSVODYGYQsumv47rr8vM7bKcqMAZOT3NsiQB9i+MxEQrDtF+LYMJ3W0
+NqEde8jY2YBpWHgdaFgHsHd78ebxYGK4JnqV2DDYbCXo87hW33PJuUBPw0imCROC
+kd1Nj3N7vPYFz9b8mwGlJVXAcmG0/mv8Nh026lwTek6/4OkH0ncFLUayLUQT85yQ
+aYYjdp5FkU49+V03BTC8uAeiHjlhlR+QApqC7dAPvDT4Yv8Mu+fSdVtHyK51s1mu
+IEwp6ww4QEwkptkqHH0ee9hCX2WFcM8CyEOPdHwnAmux1VoVFhr4f3D2cBD7KOA=
+=2rJV
 -----END PGP SIGNATURE-----
--- a/app-misc/acdctl/acdctl-1.1.ebuild
+++ b/app-misc/acdctl/acdctl-1.1.ebuild
@ -1,17 +1,20 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/acdctl/acdctl-1.1.ebuild,v 1.5 2009/06/28 18:03:43 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/acdctl/acdctl-1.1.ebuild,v 1.6 2012/05/22 16:27:12 ssuominen Exp $

-EAPI="2"
+EAPI=4

 DESCRIPTION="Apple Cinema Display Control"
 HOMEPAGE="http://www.technocage.com/~caskey/acdctl/"
 SRC_URI="http://www.technocage.com/~caskey/acdctl/download/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="ppc"
 IUSE=""
-DEPEND="dev-libs/libusb:0"
+
+RDEPEND="virtual/libusb:0"
+DEPEND="${RDEPEND}"

 src_install() {
 	dobin acdctl
--- a/app-misc/livecd-tools/ChangeLog
+++ b/app-misc/livecd-tools/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for app-misc/livecd-tools
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/livecd-tools/ChangeLog,v 1.122 2011/10/26 22:47:17 williamh Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/livecd-tools/ChangeLog,v 1.123 2012/05/22 22:31:54 williamh Exp $
+
+  22 May 2012; William Hubbs <williamh@gentoo.org> livecd-tools-2.0.2.ebuild,
+  livecd-tools-9999.ebuild:
+  add dependency on net-dialup/mingetty

 *livecd-tools-2.0.2 (26 Oct 2011)

--- a/app-misc/livecd-tools/Manifest
+++ b/app-misc/livecd-tools/Manifest
@ -10,15 +10,15 @@ DIST livecd-tools-2.0.tar.bz2 11996 RMD160 90a7fdcee3608f6638ed5720a07895f75717f
 EBUILD livecd-tools-1.0.40.ebuild 1564 RMD160 934f28f7c1a18afe7d2996a2edc87d617f941853 SHA1 6f29be4c4f4fcc171854746794e857d85e1552d8 SHA256 0bbbca6d5028e520f34534d56d01be37c23f09a3f587e731bbc6822ca636011c
 EBUILD livecd-tools-1.0.42.ebuild 1642 RMD160 37231180e93318980b5ad87c5edf83e722b3c22c SHA1 869664b84fdb965bc535998663add94888b0fd11 SHA256 0bdff51600574df5d2d62231df257286d65ee17d789eb62060ddad4905fa1122
 EBUILD livecd-tools-2.0.1.ebuild 1144 RMD160 adb07232d975752500925bb99524944ef08d0620 SHA1 64c5334bd44a728363b36e384ca1c96ee190aa3e SHA256 e49adb20d525a5162fca4932178a5cc64464c27421f0918ff5576f11d731acdf
-EBUILD livecd-tools-2.0.2.ebuild 1139 RMD160 a34fbef18e3e8e6f68b4cfeff929e91a807b8769 SHA1 6f1ad282a4b6a1fc90840518d7436de7456691d0 SHA256 358010f5025acfaf003c4fe94ba3b5bf5c8f60da59a93a51a056a5420f602d3e
+EBUILD livecd-tools-2.0.2.ebuild 1160 RMD160 a28ea6929131f0f89d8d289b5b6a7baef7b17a49 SHA1 f80c9a9856e47ffefb2249fac0fbe6dc8225e1fa SHA256 8e8c3d8e3d8fcc8f2cb96bb14e247153c8db7ed0eb625efc5707085448bbdf5b
 EBUILD livecd-tools-2.0.ebuild 947 RMD160 a45e6d6a6f5d328a5e95044c9e3d39be3cf5db4e SHA1 19be44731f15bf2daf2dd56601ea5a79c28ea79f SHA256 9ef6ac38296b98abdb3d27f2e67637ddf50bc5ba6a65ccafcefe45b79bcb31ec
-EBUILD livecd-tools-9999.ebuild 1138 RMD160 f336c79fd4b6add719563cad00e30f6a71c7aa40 SHA1 56e5c1bdcf65da437784b1492803b8b12f095b1a SHA256 72017195e602fd9e23b2dacf38ddcb016e9a028c8a15c364ce00807c9df21be3
-MISC ChangeLog 23273 RMD160 1952cdb49fa43be6e845c3aa070210effe7d6531 SHA1 af52e5ff1d192c540760d2cb7427bc5ed7351924 SHA256 753bfd34cffe2b7d586c38872bc2afbdef336d3c86e327d968cfed6a4c67f1a3
+EBUILD livecd-tools-9999.ebuild 1160 RMD160 fc47502aa895397e7d6ec7171ff5f5ca57050d7b SHA1 66e910a20f4b874879b3956463fab1c89446aaa2 SHA256 f4c59f6bf2ece548fae60665bf4b3f15cff90cc8e453cabada173e40268c64ae
+MISC ChangeLog 23420 RMD160 ce67319d40d494adeca50256ce7963137771eb78 SHA1 0334d2c6107341e3a2f2da0fbb79ebedf9379b72 SHA256 32947fa3fc0cdeeeb3a22e02bfdf4d14ff5a180bb1050cbfff9aa74a8b2db182
 MISC metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 SHA1 1e72098aafb1fa729eba6fc8357c7e732eb79dee SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)

-iEYEARECAAYFAk6ojgIACgkQblQW9DDEZTjptwCgqkuC1A+Mr3Mj1ZtbW3SYXhGO
-J4MAniXibfRetSFOkK55mgr98B7beWmz
-=CEi6
+iEYEARECAAYFAk+8E+wACgkQblQW9DDEZTjbqACcDLcLNyK+NpgGQ1XBm/YrVAJw
+hCgAn35o5o6n0Prnk2fv+hUfP1Ri82Gy
+=Zg41
 -----END PGP SIGNATURE-----
--- a/app-misc/livecd-tools/livecd-tools-2.0.2.ebuild
+++ b/app-misc/livecd-tools/livecd-tools-2.0.2.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/livecd-tools/livecd-tools-2.0.2.ebuild,v 1.1 2011/10/26 22:47:17 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/livecd-tools/livecd-tools-2.0.2.ebuild,v 1.2 2012/05/22 22:31:54 williamh Exp $

 EAPI=4

@ -21,6 +21,7 @@ LICENSE="GPL-2"
 IUSE=""

 RDEPEND="dev-util/dialog
+	net-dialup/mingetty
 	>=sys-apps/baselayout-2
 	>=sys-apps/openrc-0.8.2-r1
 	sys-apps/pciutils
--- a/app-misc/livecd-tools/livecd-tools-9999.ebuild
+++ b/app-misc/livecd-tools/livecd-tools-9999.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/livecd-tools/livecd-tools-9999.ebuild,v 1.9 2011/10/25 03:05:17 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/livecd-tools/livecd-tools-9999.ebuild,v 1.10 2012/05/22 22:31:54 williamh Exp $

 EAPI=4

@ -21,6 +21,7 @@ LICENSE="GPL-2"
 IUSE=""

 RDEPEND="dev-util/dialog
+	net-dialup/mingetty
 	>=sys-apps/baselayout-2
 	>=sys-apps/openrc-0.8.2-r1
 	sys-apps/pciutils
--- a/app-mobilephone/bitpim/ChangeLog
+++ b/app-mobilephone/bitpim/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for app-mobilephone/bitpim
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/ChangeLog,v 1.33 2011/04/03 21:25:36 scarabeus Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/ChangeLog,v 1.34 2012/05/22 16:33:29 ssuominen Exp $
+
+  22 May 2012; Samuli Suominen <ssuominen@gentoo.org> bitpim-1.0.6-r1.ebuild:
+  Use virtual/libusb instead of dev-libs/libusb.

  03 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> bitpim-1.0.6-r1.ebuild:
  Use virtual/ffmpeg instead of media-video/ffmpeg.
--- a/app-mobilephone/bitpim/Manifest
+++ b/app-mobilephone/bitpim/Manifest
@ -6,13 +6,17 @@ AUX bitpim-1.0.6-gcc43.patch 836 RMD160 aaac3af0d3bebeab2d062a2cab18585f3607caf3
 AUX bitpim-1.0.6-gentoo.patch 3342 RMD160 c819de9c04f0e450e761145278db66f2ce4621de SHA1 ebc1e1ee0be32333edb4cabfd671de69420562b2 SHA256 4b0e0d59da000a0450a1e7fc0124e8cdf58f1b7caebc193c0a4dbc3719ba55e3
 AUX maketarball 916 RMD160 9b8c3bbf63f14d8270c70ca72a61ebe7f82519d8 SHA1 7e17e9dc31281a227967816bf986e744164ac1c5 SHA256 74e267ea8ca9d5375f52b5c47515a46bfea43d04ec309f4c4ff794c7cc20c800
 DIST bitpim-1.0.6.tar.bz2 4595216 RMD160 8b532bc412a6953196ea184f8a55911747b33943 SHA1 6975f456f80e5b4ff3173cf1893ef9f9af71b280 SHA256 9a46b965e505d5a25bb613cef887bf23871f7b1c20493786cd0b880e3ef6855d
-EBUILD bitpim-1.0.6-r1.ebuild 3554 RMD160 91f5910a88bf8f69fcd55946ab8e26c144916d3d SHA1 846b28b21e757b54ec43669a95dbd65b2fec854f SHA256 9ddd42137d09d790da653f2e0a08fd0f13c520164070c69c89f5f68ddb47b26a
-MISC ChangeLog 6820 RMD160 c491285897ebc18afe8158f196ba4776bb2240c4 SHA1 9d7965f0ccf91e5c71b4437d68d1ea8d5ad95a9c SHA256 855160a2bdbeed7bebdae0967240081316b62e08a97f2a0c55a91d5c015ba1c9
+EBUILD bitpim-1.0.6-r1.ebuild 3553 RMD160 e10c33224bdf8caa54c436fb1f4934f6096b4dda SHA1 574aab907de0bc5e6199f269d0d6dddf6fffe580 SHA256 069b8b28dcf627e350e0114ab04daa1d85f056ebf3d448b08ceba9910faa1f23
+MISC ChangeLog 6948 RMD160 34fe898f23b9f309f60043bce353e947379bbc3e SHA1 13daa556f202f3b282be32d6c5e184c1f779496a SHA256 90ec3997d2cfb7976f7d6203b35e8eb09cbe8616ca6d8821934bccde2fc139c9
 MISC metadata.xml 493 RMD160 758546fe05ba3b5b9baa62ab57daa9f91e186c4e SHA1 cb5fd4b63457236da8393aed4c04f390b5058bcc SHA256 916482535ef05b666d05b74cdec20cbeb764688ee0d31abd4b40ecc06bd530a2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)

-iEYEARECAAYFAk2Y5IUACgkQHB6c3gNBRYcLfgCeJfnwT26/z8GC44kJQdHR8Bot
-n3AAnjRXQnVibzN6MumameQ3/CXfr5gP
-=crin
+iQEcBAEBAgAGBQJPu78fAAoJEEdUh39IaPFNRZ4IAKJYmlKB56Vcpn8Jogyt+FTM
+uPjprXr+edygesL1AjIr97fwKKclk453gC6slrkfIoDgmdC7+5+/7tuj5T+qZLPD
+7dFHW8FZ8BavlKjHC67dAkWr+9yPKAcfOxmtbkIMdrpUajgIAkgUBvvJKKPEw8Aq
+efXxdg3qI6pdzp36nI0Wq1n8TzQpdt7ZuxCrrR8mKXAk+rOzbbJ6LVtxiCgrBfNE
+M4KxXvyXNOoPo4OA2jSJwPQNooEPHG9Im8yTn7L3Kvm5sFPNYxDj1Bk0u90RLXju
+Qk0hTAX4N39EmEY5VK/iWSYc1cimGOq6sVGjGafvAl2Erl0bYW3zkEvz1qjF8a0=
+=wVNI
 -----END PGP SIGNATURE-----
--- a/app-mobilephone/bitpim/bitpim-1.0.6-r1.ebuild
+++ b/app-mobilephone/bitpim/bitpim-1.0.6-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/bitpim-1.0.6-r1.ebuild,v 1.6 2011/04/03 21:25:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/bitpim-1.0.6-r1.ebuild,v 1.7 2012/05/22 16:33:29 ssuominen Exp $

 EAPI="3"
 PYTHON_DEPEND="2:2.5"
@ -26,7 +26,7 @@ COMMON_DEPEND="dev-python/apsw
 		>=dev-python/paramiko-1.7.1
 		dev-python/pycrypto
 	)
-	usb? ( dev-libs/libusb:0 )"
+	usb? ( virtual/libusb:0 )"
 DEPEND="${COMMON_DEPEND}
 	usb? ( dev-lang/swig )"
 RDEPEND="${COMMON_DEPEND}
--- a/app-mobilephone/gammu/ChangeLog
+++ b/app-mobilephone/gammu/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for app-mobilephone/gammu
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.91 2011/08/13 07:15:53 xarthisius Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.92 2012/05/22 16:06:13 ssuominen Exp $
+
+  22 May 2012; Samuli Suominen <ssuominen@gentoo.org> gammu-1.28.0.ebuild,
+  gammu-1.29.0.ebuild, gammu-1.30.0.ebuild:
+  Use virtual/libusb instead of dev-libs/libusb.

  13 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> gammu-1.25.0-r1.ebuild,
  gammu-1.28.0.ebuild, gammu-1.29.0.ebuild, gammu-1.30.0.ebuild:
--- a/app-mobilephone/gammu/Manifest
+++ b/app-mobilephone/gammu/Manifest
@ -8,17 +8,19 @@ DIST gammu-1.28.0.tar.bz2 2391956 RMD160 0e8b60b1cd0d201db776f6eca70071bf2847c09
 DIST gammu-1.29.0.tar.bz2 5982258 RMD160 b5c0cb59639723e841a48dc4a15ac4e313056d6b SHA1 24808550b3a0eed1d0eee71f5975ae4d6577a540 SHA256 0f7c3122e5f5e246b3ce7fb128b42c1d679ebb3f11f805ea17f1ba86400e1bbf
 DIST gammu-1.30.0.tar.bz2 6230340 RMD160 a7ff4d23cca98bd598f0a69bbf3d16d5a2f3ecbc SHA1 b16e55f8a26dff4b0ce3150525fd45ea7bc8c37c SHA256 5918fe10502aef36ab474b4ae44545cd0a7433499b5e29b703ffecb99a7496ae
 EBUILD gammu-1.25.0-r1.ebuild 2615 RMD160 8e8974e9d17efb0d6d19f08ea83cdda20d081bbd SHA1 2fd3213288215a299c874528bf90a51711bf4c4d SHA256 4f4f697aba531a7263c1cad39d61228659ae67f8226be4038671fc175b3e7fdf
-EBUILD gammu-1.28.0.ebuild 2752 RMD160 cba0cabee37ac3a6bdf6b2b24b06852cc623ad03 SHA1 4a4df8027830ee00e5819cab90e76c8a5e17644b SHA256 0bee7799aa7eab0f447496dca5fcd9a8485f1bdf28756c9fb851025b3ac777aa
-EBUILD gammu-1.29.0.ebuild 2754 RMD160 854a0c8d24ecd0fcba71fbb9706742a16535c6c3 SHA1 5563171a7b9ec44878114841ce30aec0520ae806 SHA256 913128b2f8076456c13c4638dde6a1be2c4adafd73a0985aa78576a8aa68c7d4
-EBUILD gammu-1.30.0.ebuild 2867 RMD160 a57394cdce784e3de2b9bf5751ba63c63f5b5e4b SHA1 3981cdc1c1c932d179a6d02faeb9d7b623bfe4ee SHA256 ed01be0921b0183fb4435b23b984e4578961e46e37ba6eb2211656f5a66513fc
-MISC ChangeLog 17346 RMD160 a05fbc73ee06b0093b7c4522c0941637bc404038 SHA1 df6446d1b892f1855b4edeb1af44401f8cd3933c SHA256 940ece42e8c906e010b0a7e7b4e3f91c8e20d2f88717479ad583cbb1624e0067
+EBUILD gammu-1.28.0.ebuild 2750 RMD160 a9a3fd2ac6380e009b442e251de3b41dc0e7edc1 SHA1 845ee529547963fb0ce723e620da54a3ce2eb26d SHA256 f7665dc26e511b087efc82986dc75bb664249d86998533b8bf396d38ba8e5120
+EBUILD gammu-1.29.0.ebuild 2752 RMD160 d2904be0ab77dd9e781e90f36eeb339b0607a544 SHA1 152a5f0a45c19664950508b73d54939cc9c39918 SHA256 921fca4c1e85df9ee8e37a0ac13f220cf051520619ae305bdf76f4786f93a10a
+EBUILD gammu-1.30.0.ebuild 2865 RMD160 84138b5972a20b8dc6732ae853fcd74ad54fb56e SHA1 2b79dc99a2344b447a28a54db17cf3ed5498a08f SHA256 32b2313e77d307b4e9576dbac061a14f84c0f127b5dcabb9162fcdea96569d89
+MISC ChangeLog 17514 RMD160 9ec62e79f80731cf314f471b55c6e43ae6185414 SHA1 f73b20f7b3492a704160eee42564373a2b541cf3 SHA256 41aa3ee667b062a96286b4e8c5f631e7d3f61ce9b0c33bd60699151f9daf6cc1
 MISC metadata.xml 230 RMD160 fb7510521b9f8a7be49091f43fb88774fc570c41 SHA1 dae0f2c2dac2e91328c7f40c52c510558ca1ff03 SHA256 b3d8f975317deaaee62c569e9d903ec66989f74df6835aad11938471f239382f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)

-iJwEAQECAAYFAk5GJLAACgkQIiMqcbOVdxTemAQAhzjLVdQFfmw4I8CSHlSF7PKP
-GD7evizHdQO+Xl7l6yIR5HDbAsB/8d0VHea+LtcV7VhGuzM00z/b2Vyr1dvRwHhh
-H5qTWTyLnkBtADNJTjkXrfBdZsm9MTk1Fccx2jPWkn63wY7VmIwORcmUL4Y+0nlw
-tFisteCxsKsU0QQ1GWQ=
-=Iyxt
+iQEcBAEBAgAGBQJPu7i7AAoJEEdUh39IaPFNALIH/jsBdJVhqLeo0R61QyuCKThi
+dJbdqyvb9zjf121YEKfn6dwP479p3p+GpxpJLdwbGJYfpV4EDVZnYNPV1I9/G0gL
+JRHq+yGE+o8LLIEqfzbM86pt1ZG6GCGxkVARyhGjVJXwytfPXan5O1nxZuu0tGtw
+RqRvfZlwZGK8wJB0KRhxSzewZ4ayrFBU0JbwTPu/6BKXDmR2DMblYQNBmeDMZVZT
+QLuXegVBmSmaD6aD4KCCivmXvXAzV9aYqwF7cHJ+WGQhVe8662rs34Qm7g+QhzcQ
+zyp8e4w8Hng5gbWbGemHKqC/DBKGPkM7LRn1uPIouo495Wn9fGxyJFEucZm7ewY=
+=VD+v
 -----END PGP SIGNATURE-----
--- a/app-mobilephone/gammu/gammu-1.28.0.ebuild
+++ b/app-mobilephone/gammu/gammu-1.28.0.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.28.0.ebuild,v 1.5 2011/08/13 07:15:53 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.28.0.ebuild,v 1.6 2012/05/22 16:06:13 ssuominen Exp $

 EAPI="3"

@ -19,7 +19,7 @@ IUSE="curl debug bluetooth irda mysql postgres dbi nls python usb"

 RDEPEND="bluetooth? ( net-wireless/bluez )
 	curl? ( net-misc/curl )
-	usb? ( dev-libs/libusb:1 )
+	usb? ( virtual/libusb:1 )
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql-server )
 	dbi? ( >=dev-db/libdbi-0.8.3 )
--- a/app-mobilephone/gammu/gammu-1.29.0.ebuild
+++ b/app-mobilephone/gammu/gammu-1.29.0.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.29.0.ebuild,v 1.2 2011/08/13 07:15:53 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.29.0.ebuild,v 1.3 2012/05/22 16:06:13 ssuominen Exp $

 EAPI="3"

@ -19,7 +19,7 @@ IUSE="curl debug bluetooth irda mysql postgres dbi nls python usb"

 RDEPEND="bluetooth? ( net-wireless/bluez )
 	curl? ( net-misc/curl )
-	usb? ( dev-libs/libusb:1 )
+	usb? ( virtual/libusb:1 )
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql-server )
 	dbi? ( >=dev-db/libdbi-0.8.3 )
--- a/app-mobilephone/gammu/gammu-1.30.0.ebuild
+++ b/app-mobilephone/gammu/gammu-1.30.0.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.30.0.ebuild,v 1.2 2011/08/13 07:15:53 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.30.0.ebuild,v 1.3 2012/05/22 16:06:13 ssuominen Exp $

 EAPI="3"

@ -19,7 +19,7 @@ IUSE="bash-completion curl debug bluetooth irda mysql postgres dbi nls python us

 RDEPEND="bluetooth? ( net-wireless/bluez )
 	curl? ( net-misc/curl )
-	usb? ( dev-libs/libusb:1 )
+	usb? ( virtual/libusb:1 )
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql-server )
 	dbi? ( >=dev-db/libdbi-0.8.3 )
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.315 2012/05/13 21:36:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.316 2012/05/23 00:22:24 dilfridge Exp $
+
+*libreoffice-3.5.4.2 (23 May 2012)
+
+  23 May 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +libreoffice-3.5.4.2.ebuild:
+  Version bump

  13 May 2012; Andreas K. Huettel <dilfridge@gentoo.org>
  libreoffice-3.5.9999.ebuild, libreoffice-9999-r2.ebuild:
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@ -20,31 +20,35 @@ DIST ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip 2732347 RMD160 28bdf
 DIST ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz 12735186 RMD160 a2776747753219a110e8d5b39939d0914cfec37d SHA1 908c4053f8f4e6214426a41b1e4134e7bc86098e SHA256 dc6445d2c0445e5536010b80bd811adda6741ed82b288fe831d5be9902457941
 DIST libreoffice-binfilter-3.5.2.2.tar.xz 5979532 RMD160 104eb7ef0c53700b664d7cae871d96ac9cd2a286 SHA1 feeaa103adf07f9eb5578f4073a8a464b2abadfd SHA256 aadccf388989331d0738059e6fd0c70b9fb48bb6ca622a243365d8253b1a4b30
 DIST libreoffice-binfilter-3.5.3.2.tar.xz 5979484 RMD160 48a65d7d3b5f7de01ee4e2d74a1ba2a3ec29805a SHA1 b499371af021ee59622d179c3a32dc736611653d SHA256 332344f8b8241e30ef31fc2f4ed24b2b1b2d252a7eae64cd9709fd1a7c7da847
+DIST libreoffice-binfilter-3.5.4.2.tar.xz 5978820 RMD160 272f7467b82eb99ca3a81fdea5692ae6da59aedf SHA1 89a156c9603aac1f70dc1b4108fa3cb335ffe1fa SHA256 7c1a471358c4028ef8aa542c50ce0852ba2960be9dfb2ebbf0103ad59389d07a
 DIST libreoffice-branding-gentoo-0.4.tar.xz 130792 RMD160 39c693e84e13d7199f9505b5616cffd5b7072d3b SHA1 e12d41b67b75f3507b86d12b3c182195269d6210 SHA256 9a870560cd470234039ab136c1bb023a0da3fa8d0ffa4f6770b830fec707fc9a
 DIST libreoffice-branding-gentoo-0.5.tar.xz 150616 RMD160 e8d475d184fdfd75f348772edac6a6eb76613341 SHA1 83da8ba0db288a827e805780e01edeccd2f51ccc SHA256 91beaf63fca297914cb4390b760ffef52b03450ecb52affab0f124a2dbd63a63
 DIST libreoffice-core-3.5.2.2.tar.xz 103296172 RMD160 8e1b87e2ea35683ee31e0a2b209d85f14ba85753 SHA1 ab0cfa84a11ec4d18afe7095235a4b4c904e9649 SHA256 df681145f7f1dda30e3f82d4924722957662d744df0e7b6fa024b2bd53fb3dc6
 DIST libreoffice-core-3.5.3.2.tar.xz 103327220 RMD160 cb084b763e6a8136ab23f368b7fc44a911ee2744 SHA1 33bdaec948367c5b06c2b6a7c39ceaa865abe28d SHA256 182a1dadbf4ed7dc758466aa4f1c2ee79dbc57d65ba94872fa6aaeef3f3847ad
+DIST libreoffice-core-3.5.4.2.tar.xz 103422460 RMD160 e118cfa44ba198fa3d3fe8fc21bd1e3940270868 SHA1 a01d77612c9678d52a75fb160590bb76d670d7f6 SHA256 3eeb89d05fa423c446767defd54ff89456b2ead8fc4628c3403043d4c1845faa
 DIST libreoffice-help-3.5.3.2.tar.xz 1857688 RMD160 e836522c25b19a03af5645baeb8e5349a9d74e46 SHA1 305c5fa9213f90c9f87d67e5e7d4b8faac49ee1a SHA256 cf6e6d9610aa594597fb079cac5091b0f4ab4a063c5f4a82021b0b4a6fa539ae
+DIST libreoffice-help-3.5.4.2.tar.xz 1857756 RMD160 ce00c1893e0315fa7cee156707553fdcebb552d2 SHA1 0d417affc2b91ef345cb010f3a2d11a6417b7f44 SHA256 61e93d4ad9c1ad1308fe85f8416bf9dfafd875ba9cdb2050890b7b0e1abf4869
 EBUILD libreoffice-3.5.2.2.ebuild 14796 RMD160 50e705b52d06cbe7e2aa820fbafd8cbe56997d7a SHA1 c0130bdd1cd67d9d60a285ff2842581952d6eb24 SHA256 69394c1cf5045771069a2cd2fcbb0b2e64127b57ae637447364f53947db5033f
 EBUILD libreoffice-3.5.3.2.ebuild 15391 RMD160 ab20a10477855e6f862dbb81ec27c01a7c8f69e5 SHA1 1feb39d7eb3c4de770abc2969e30524972d82bbd SHA256 a2c0135be6478664ff1cdc1df4ae30056aa65e19bfcc562ccbfded04135e756c
+EBUILD libreoffice-3.5.4.2.ebuild 15585 RMD160 22055c455c0a2da2f177d1fff0cad13f2a719905 SHA1 c26a1d0f78ea1f57a8f9c5c25c8e5832e2f5dbf2 SHA256 9ceaae1f93448b4eaa517251a9bf76bba0992069be9fb22eeb8ebbb883386ea9
 EBUILD libreoffice-3.5.9999.ebuild 15587 RMD160 5f60c8faec05a38919236961202036eb07dabe6b SHA1 a007c70ca151828a3428c6a8a9390cc96ba00d11 SHA256 3528c75f55d64489f62ab3443bbe7ff45f96ce30d455c999ba7f4f53c881780e
 EBUILD libreoffice-9999-r2.ebuild 17294 RMD160 fe0b75a13f195585fb066e1d5c54a75e6317fd59 SHA1 60c1cfed32b19cc412e33cc8c0618c40030bacd8 SHA256 40ef16e03e1c1e45a3ec16129e4588988480da1cb0869e35c9268e2ef1b1ca21
-MISC ChangeLog 58225 RMD160 c213e179933242da9afeb1d1e4ee3d1958f6ff07 SHA1 19f2c9776c3627fcc153a04cfa96076d13dbc565 SHA256 989fd166b27bf30b07b4e458c3ace21efbef65ef9e3c880472c5d8985f9293da
+MISC ChangeLog 58365 RMD160 939215b402d262170b9e6bbc44de9d049f6086b8 SHA1 df0734bdd9150251f466e39f7fbc010bd7de838b SHA256 4befd71fc2bbfed81f373147196dc90cbacd55718c9764a9f40dbfc5abd41742
 MISC metadata.xml 1534 RMD160 24433486738eb58853e959332201611cf24fd5c6 SHA1 05d71c3efc820312fcf61f0fee4cb8d6e91a7c52 SHA256 2f095ea98ee3715366a47bfb72683434384d06526cb66a3db8b071fed537b401
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)

-iQIcBAEBCgAGBQJPsClpAAoJENwGBM22xffe12gP/2XLsZjHYeK5ytq5ey/aaPOM
-rbxBQtqGIDE9SBf8niQSNQqvFqgYqc3aGkRT0bmEX3zRsfLVf8Lgk/7/mHdFRXYy
-oHSTiJSloEo/B0GGZg6hXfGF4k9ZJJ2jp7EPPZ9gwpM4j57vG6yrkHFr7KnNNa1t
-12PkXI/NPudmogBOXF/POjo8eJYEb4+7Rh0JgMRHwVnnxgDoSqxW/sN46+AXsCYl
-IciYQXqOZpT2E+pw3e2O0huFIbhxLR/ndSP32B+nxnsLtYiFA22sMlzprJOsD9U8
-O/WJGwQxiUvSIyUZs0oE6aRInSWN6JRv2BJ3rb7Of5DKss8KhE/nly/4iVJOWEu9
-IBlgNi2ZwFuoLl7lXS5Zx8CZfyGR28tT8pVum8K1mvcpwbRdIUH9v/GRv9YSCN/4
-E9FN2KyWgy5oKN+zhXrb7i79ybI7KCZ/xeQxQUswq72nTV6CqGb6iw2eVBVZ2xdA
-qUgLYrli9B72ybFK+kXb18/7VFUvJului2q/sg849cLfIWPK43GC7R8uhtu8Q9Pc
-7atVyU992LQUTRIHgDNe1JOaKdX9ZjcMkGlPc7cay8niUr5Dos3TzWkoL0DDIXRL
-LHbfYdSU7ibhqA0tCKZwq/xIHciT1HcvZT1R0mQXjWJAdjyLSlEbg9EWF2Ds+qWR
-ym0QjTqA26G3D7VmC4Jh
-=22Fo
+iQIcBAEBCgAGBQJPvC3sAAoJENwGBM22xffeTPkP/2RLkslDfCzlKIP27DDQsO2P
+7GwAGrelkFB9vaQNU+Mud1JsQiu7FDvyYSQt3hW0de9Pc3xEEclZdoxriPCusO+t
+rNU00dkOfXfYaHrTfqohwfo8D9bjUjLxME5rUi7VgcylTdPg9a84GF3b56guXczm
+RP3Y7IgSTI3bNdElkmANTth9hj3xPlYEBpLBuHhqh0PGTqRHu+6bGrRREoOY0emN
+n27gHQEvFShfTQwz7hdITq8JHrRgxOjjn6hj9fV2Q8Bf+45RRSpisKppusBNoG9S
+F+Ph5c4l6FW5za/E5tCWGWrbV3KLscjm/PJndxngQY+insUz+SHVNSBJuG5lMVs+
+3H5JO3NZ6bu02KL+RwFOnRnwNwyFF/nVU7HF32Zd/kM4XymGLyMgsbD8RfETtezW
+oBVryX3ms8prEG1WqLBI52sQnE68Z4Ho+GIpMF6mqIFR00yMU0HbNIqfVvqa4AJj
+v0t79nQq6LaIBkcXu6aPDsKozaeuSWfn63paUjHC4OKUUug3qXX7NttQ8orc5Aa0
+iJKuc/NZduOMshaC6OsQ9Ws08v4rLtxucO5BuIUQcjT31Rljt2YrBUpdqFmOqwTK
+6XpFyTl7L1kjNoO83nz6M1jBfvC1CvEUvTQIsbu2whKxn4iIADYuJgOOQqD3UbT3
+9MXwh5UxI0pHMkgSxQEj
+=8hh4
 -----END PGP SIGNATURE-----
--- a/app-office/libreoffice/libreoffice-3.5.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.4.2.ebuild
@ -0,0 +1,548 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.4.2.ebuild,v 1.1 2012/05/23 00:22:24 dilfridge Exp $
+
+EAPI=4
+
+KDE_REQUIRED="optional"
+QT_MINIMAL="4.7.4"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+	http://dev-builds.libreoffice.org/pre-releases/src
+	http://download.documentfoundation.org/libreoffice/src
+	http://download.documentfoundation.org/libreoffice/old/src
+"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.5.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
+inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="LibreOffice, a full office productivity suite."
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+MODULES="core binfilter help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		for mod in ${MODULES}; do
+			if [[ ${mod} == binfilter ]]; then
+				SRC_URI+=" binfilter? ( ${i}/${PN}-${mod}-${PV}.tar.xz )"
+			else
+				SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+			fi
+		done
+		unset mod
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz"
+ADDONS_SRC+=" xmlsec? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz )"
+ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ADDONS_SRC+=" java? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ADDONS_SRC+=" java? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ADDONS_SRC+=" java? ( ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip )"
+ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+SRC_URI+=" ${ADDONS_SRC}"
+
+unset ADDONS_URI
+unset EXT_URI
+unset ADDONS_SRC
+
+IUSE="binfilter binfilterdebug +branding +cups dbus eds gnome +graphite gstreamer +gtk
+jemalloc kde mysql nlpsolver +nsplugin odk opengl pdfimport postgres svg test
+vba +webdav +xmlsec"
+LICENSE="LGPL-3"
+SLOT="0"
+[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+NSS_DEPEND="
+	>=dev-libs/nspr-4.8.8
+	>=dev-libs/nss-3.12.9
+"
+
+COMMON_DEPEND="
+	app-arch/zip
+	app-arch/unzip
+	>=app-text/hunspell-1.3.2-r3
+	app-text/mythes
+	>=app-text/libexttextcat-3.2
+	app-text/libwpd:0.9[tools]
+	app-text/libwpg:0.2
+	>=app-text/libwps-0.2.2
+	dev-cpp/libcmis
+	dev-db/unixODBC
+	dev-libs/expat
+	>=dev-libs/glib-2.28
+	>=dev-libs/hyphen-2.7.1
+	>=dev-libs/icu-4.8.1.1
+	>=dev-lang/perl-5.0
+	>=dev-libs/openssl-1.0.0d
+	>=dev-libs/redland-1.0.14[ssl]
+	>=media-libs/fontconfig-2.8.0
+	media-libs/freetype:2
+	>=media-libs/libpng-1.4
+	media-libs/libvisio
+	>=net-misc/curl-7.21.4
+	sci-mathematics/lpsolve
+	>=sys-libs/db-4.8
+	virtual/jpeg
+	>=x11-libs/cairo-1.10.0[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	dbus? ( >=dev-libs/dbus-glib-0.92 )
+	eds? ( gnome-extra/evolution-data-server )
+	gnome? (
+		gnome-base/gconf:2
+		gnome-base/orbit
+	)
+	gtk? ( >=x11-libs/gtk+-2.24:2 )
+	graphite? ( media-gfx/graphite2 )
+	gstreamer? (
+		>=media-libs/gstreamer-0.10
+		>=media-libs/gst-plugins-base-0.10
+	)
+	java? (
+		>=dev-java/bsh-2.0_beta4
+		dev-java/lucene:2.9
+		dev-java/lucene-analyzers:2.3
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+	opengl? ( virtual/opengl )
+	pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] )
+	postgres? ( >=dev-db/postgresql-base-8.4.0 )
+	svg? ( gnome-base/librsvg )
+	webdav? ( net-libs/neon )
+	xmlsec? ( ${NSS_DEPEND} )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	!app-office/openoffice-bin
+	!app-office/openoffice
+	media-fonts/libertine-ttf
+	media-fonts/liberation-fonts
+	media-fonts/urw-fonts
+	cups? ( net-print/cups )
+	java? ( >=virtual/jre-1.6 )
+"
+
+PDEPEND="
+	>=app-office/libreoffice-l10n-3.5.0
+"
+
+# FIXME: cppunit should be moved to test conditional
+#	 after everything upstream is under gbuild
+#	 as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.46
+	>=dev-libs/libxml2-2.7.8
+	dev-libs/libxslt
+	dev-perl/Archive-Zip
+	dev-util/cppunit
+	>=dev-util/gperf-3
+	dev-util/intltool
+	dev-util/mdds
+	virtual/pkgconfig
+	media-libs/sampleicc
+	net-misc/npapi-sdk
+	net-print/cups
+	>=sys-apps/findutils-4.4.2
+	sys-devel/bison
+	sys-apps/coreutils
+	sys-devel/flex
+	sys-devel/gettext
+	>=sys-devel/make-3.82
+	sys-libs/zlib
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-proto/randrproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	java? (
+		=virtual/jdk-1.6*
+		>=dev-java/ant-core-1.7
+		test? ( dev-java/junit:4 )
+	)
+"
+
+PATCHES=(
+	# this can't be upstreamed :(
+	"${FILESDIR}/${PN}-system-pyuno.patch"
+	"${FILESDIR}/${PN}-3.5-propagate-gb_FULLDEPS.patch"
+	"${FILESDIR}/${PN}-3.5-doublebuild.patch"
+)
+
+REQUIRED_USE="
+	nsplugin? ( gtk )
+	gnome? ( gtk )
+	eds? ( gnome )
+	nlpsolver? ( java )
+"
+
+S="${WORKDIR}/${PN}-core-${PV}"
+
+RESTRICT="test"
+
+pkg_pretend() {
+	local pgslot
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		CHECKREQS_MEMORY="512M"
+		CHECKREQS_DISK_BUILD="6G"
+		check-reqs_pkg_pretend
+
+		if [[ $(gcc-major-version) -lt 4 ]]; then
+			eerror "Compilation with gcc older than 4.0 is not supported"
+			die "Too old gcc found."
+		fi
+	fi
+
+	# ensure pg version
+	if use postgres; then
+		 pgslot=$(postgresql-config show)
+		 if [[ ${pgslot//.} < 90 ]] ; then
+		 	eerror "PostgreSQL slot must be set to 9.0 or higher."
+			eerror "    postgresql-config set 9.0"
+			die "PostgreSQL slot is not set to 9.0 or higher."
+		 fi
+	fi
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	kde4-base_pkg_setup
+
+	python_set_active_version 2
+	python_pkg_setup
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		CHECKREQS_MEMORY="512M"
+		CHECKREQS_DISK_BUILD="6G"
+		check-reqs_pkg_pretend
+	fi
+}
+
+src_unpack() {
+	local mod dest tmplfile tmplname mypv
+
+	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+	if use branding; then
+		unpack "${BRANDING}"
+	fi
+
+	if [[ ${PV} != *9999* ]]; then
+		for mod in ${MODULES}; do
+			if [[ ${mod} == binfilter ]] && ! use binfilter; then
+				continue
+			fi
+			unpack "${PN}-${mod}-${PV}.tar.xz"
+			if [[ ${mod} != core ]]; then
+				mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
+				rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
+			fi
+		done
+	else
+		for mod in ${MODULES}; do
+			if [[ ${mod} == binfilter ]] && ! use binfilter; then
+				continue
+			fi
+			mypv=${PV/.9999}
+			[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
+			EGIT_PROJECT="${PN}/${mod}"
+			EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
+			EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
+			EGIT_NOUNPACK="true"
+			git-2_src_unpack
+			if [[ ${mod} != core ]]; then
+				mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
+				rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
+			fi
+		done
+		unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
+	fi
+}
+
+src_prepare() {
+	# optimization flags
+	export ARCH_FLAGS="${CXXFLAGS}"
+	export LINKFLAGSOPTIMIZE="${LDFLAGS}"
+
+	# patchset
+	if [[ -n ${PATCHSET} ]]; then
+		EPATCH_FORCE="yes" \
+		EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+		EPATCH_SUFFIX="patch" \
+		epatch
+	fi
+
+	base_src_prepare
+
+	# please no debug in binfilter, it blows up things insanely
+	if use binfilter && ! use binfilterdebug ; then
+		for name in $(find "${S}/binfilter" -name makefile.mk) ; do
+			sed -i -e '1i\CFLAGS+= -g0' $name || die
+		done
+	fi
+
+	eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+	# system pyuno mess
+	sed \
+		-e "s:%eprefix%:${EPREFIX}:g" \
+		-e "s:%libdir%:$(get_libdir):g" \
+		-i pyuno/source/module/uno.py \
+		-i scripting/source/pyprov/officehelper.py || die
+
+}
+
+src_configure() {
+	local java_opts
+	local internal_libs
+	local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
+
+	# recheck that there is some value in jobs
+	[[ -z ${jbs} ]] && jbs="1"
+
+	# sane: just sane.h header that is used for scan in writer, not
+	#	linked or anything else, worthless to depend on
+	# vigra: just uses templates from there
+	#	 it is serious pain in the ass for packaging
+	#	 should be replaced by boost::gil if someone interested
+	internal_libs+="
+		--without-system-sane
+		--without-system-vigra
+	"
+
+	if use java; then
+		# hsqldb: system one is too new
+		# saxon: system one does not work properly
+		java_opts="
+			--without-system-hsqldb
+			--without-system-saxon
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-java-target-version=$(java-pkg_get-target)
+			--with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
+			--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)
+			--with-lucene-core-jar=$(java-pkg_getjar lucene-2.9 lucene-core.jar)
+			--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)
+		"
+		if use test; then
+			java_opts+=" --with-junit=$(java-pkg_getjar junit-4 junit.jar)"
+		else
+			java_opts+=" --without-junit"
+		fi
+	fi
+
+	if use branding; then
+		internal_libs+="
+			--with-about-bitmap="${WORKDIR}/branding-about.png"
+			--with-intro-bitmap="${WORKDIR}/branding-intro.png"
+		"
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --disable-gnome-vfs: old gnome virtual fs support
+	# --disable-kdeab: kde3 adressbook
+	# --disable-kde: kde3 support
+	# --disable-ldap: ldap requires internal mozilla stuff, same like mozab
+	# --disable-mozilla: disable mozilla build that is used for adresbook, not
+	#   affecting the nsplugin that is always ON
+	# --disable-pch: precompiled headers cause build crashes
+	# --disable-rpath: relative runtime path is not desired
+	# --disable-static-gtk: ensure that gtk is linked dynamically
+	# --disable-ugly: disable ugly pieces of code
+	# --disable-zenity: disable build icon
+	# --enable-extension-integration: enable any extension integration support
+	# --with-{max-jobs,num-cpus}: ensuring parallel building
+	# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --without-stlport: disable deprecated extensions framework
+	# --disable-ext-report-builder: too much java packages pulled in
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+		--with-system-headers \
+		--with-system-libs \
+		--with-system-jars \
+		--with-system-dicts \
+		--enable-cairo-canvas \
+		--enable-largefile \
+		--enable-python=system \
+		--enable-randr \
+		--enable-randr-link \
+		--enable-release-build \
+		--enable-unix-qstart-libpng \
+		--enable-mergelibs \
+		--disable-ccache \
+		--disable-crashdump \
+		--disable-dependency-tracking \
+		--disable-epm \
+		--disable-fetch-external \
+		--disable-gnome-vfs \
+		--disable-ext-report-builder \
+		--disable-kdeab \
+		--disable-kde \
+		--disable-ldap \
+		--disable-mozilla \
+		--disable-online-update \
+		--disable-pch \
+		--disable-rpath \
+		--disable-systray \
+		--disable-static-gtk \
+		--disable-strip-solver \
+		--disable-ugly \
+		--disable-zenity \
+		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+		--with-build-version="Gentoo official package" \
+		--enable-extension-integration \
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-tar="${DISTDIR}" \
+		--with-lang="" \
+		--with-max-jobs=${jbs} \
+		--with-num-cpus=2 \
+		--with-unix-wrapper=libreoffice \
+		--with-vendor="Gentoo Foundation" \
+		--with-x \
+		--without-afms \
+		--without-fonts \
+		--without-myspell-dicts \
+		--without-stlport \
+		--without-system-mozilla \
+		--without-help \
+		--with-helppack-integration \
+		--without-sun-templates \
+		$(use_enable binfilter) \
+		$(use_enable dbus) \
+		$(use_enable eds evolution2) \
+		$(use_enable gnome gconf) \
+		$(use_enable gnome gio) \
+		$(use_enable gnome lockdown) \
+		$(use_enable graphite) \
+		$(use_enable gstreamer) \
+		$(use_enable gtk) \
+		--disable-gtk3 \
+		$(use_enable java ext-scripting-beanshell) \
+		$(use_enable kde kde4) \
+		$(use_enable mysql ext-mysql-connector) \
+		$(use_enable nlpsolver ext-nlpsolver) \
+		$(use_enable nsplugin) \
+		$(use_enable odk) \
+		$(use_enable opengl) \
+		$(use_enable pdfimport ext-pdfimport) \
+		$(use_enable postgres postgresql-sdbc) \
+		$(use_enable svg librsvg system) \
+		$(use_enable test linkoo) \
+		$(use_enable vba) \
+		$(use_enable vba activex-component) \
+		$(use_enable webdav neon) \
+		$(use_enable xmlsec) \
+		$(use_with java) \
+		$(use_with mysql system-mysql-cppconn) \
+		${internal_libs} \
+		${java_opts}
+}
+
+src_compile() {
+	# hack for offlinehelp, this needs fixing upstream at some point
+	# it is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	(
+		 source "${S}/Env.Host.sh" 2&> /dev/null
+
+		 local path="${SOLARVER}/${INPATH}/res/img"
+		 mkdir -p "${path}" || die
+
+		 echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=default_images/res/helpimg > \"${path}/helpimg.ilst\""
+		 perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+			  -dir=default_images/res/helpimg \
+			  > "${path}/helpimg.ilst"
+		 [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
+	)
+
+	# not a proper make script
+	make build || die
+}
+
+src_test() {
+	make check || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+	# Fix bash completion placement
+	newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+	rm -rf "${ED}"/etc/
+
+	# symlink the nsplugin to system location
+	if use nsplugin; then
+		inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
+	fi
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+	fi
+
+	# Hack for offlinehelp, this needs fixing upstream at some point.
+	# It is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	insinto /usr/$(get_libdir)/libreoffice/help
+	doins xmlhelp/util/*.xsl
+}
+
+pkg_preinst() {
+	# Cache updates - all handled by kde eclass for all environments
+	kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+
+	use cups || \
+		ewarn 'You will need net-print/cups to be able to print and export to PDF with libreoffice.'
+
+	use java || \
+		ewarn 'If you plan to use lbase aplication you should enable java or you will get various crashes.'
+}
+
+pkg_postrm() {
+	kde4-base_pkg_postrm
+}
--- a/app-pda/barry/ChangeLog
+++ b/app-pda/barry/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for app-pda/barry
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/ChangeLog,v 1.21 2012/05/03 20:20:57 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/ChangeLog,v 1.22 2012/05/22 16:39:13 ssuominen Exp $
+
+  22 May 2012; Samuli Suominen <ssuominen@gentoo.org> barry-0.16.ebuild,
+  barry-0.17.1.ebuild:
+  Use virtual/libusb instead of dev-libs/libusb.

  03 May 2012; Jeff Horelick <jdhore@gentoo.org> barry-0.16.ebuild,
  barry-0.17.1.ebuild:
--- a/app-pda/barry/Manifest
+++ b/app-pda/barry/Manifest
@ -1,9 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 10-blackberry.rules 1983 RMD160 bea10908beef0558402b8a8888ebc0ea4e561562 SHA1 c94747478a616c67cd115662c7a5bb4ad6220611 SHA256 26d15257fc5f48089a1b8559e7ac93101bdbc4434e409214c67dda130f05159a
 AUX barry-0.16-gcc45.patch 310 RMD160 42a67dc4baba475a1ef0352d2efc842d21cfaf7a SHA1 3247f8f102e8e5a72be89206df0891b641ebaa1a SHA256 f341443d2de4a229eeed8409ccd7e52d3ce8cb3dc3ab5607f69657a3472785f6
 AUX blacklist-berry_charge.conf 65 RMD160 5fbc61819a71cb266a93053c99d32ea2424c5683 SHA1 5320c555ecd5b844bb4db5a238538abc472b2516 SHA256 26003dcfdf7da0a677cbc72e01615fc694ccd2e884269da9a22d722f7549386e
 DIST barry-0.16.tar.bz2 4981342 RMD160 407d1ae1d4c42a589093bd2cc4ad791f230ab23c SHA1 011b1f42c3832f30942744dc8f577dc0eaf2189c SHA256 60f0055399a6d97445e069b804bcc8a1c60f5fc999fcec385dcd4484990ec220
 DIST barry-0.17.1.tar.bz2 7618810 RMD160 444ac06937bde1b913b6a3132dce25caebc066c1 SHA1 99fbf38a124d0836ca386f21c8604ae8fb6a740b SHA256 8bff44bc0ff88aee6bb55d50c5dc84949c92f01841304833da4a50ab171e34ae
-EBUILD barry-0.16.ebuild 2343 RMD160 17b2a40cedd73da2f9d945cce25e4b30b7ac81f1 SHA1 ab1b83dcfdb692233e60fe2b166591af5d052312 SHA256 45b642a10a73da66dfc9a3641b22a0e08065f7e5d7107ea293bc3274e4179f68
-EBUILD barry-0.17.1.ebuild 2582 RMD160 c158099f8c334d5009ad5540af466171198e8fb6 SHA1 57571627fe8db11909a742d97a65186070da387f SHA256 58d1710c00df171e83e805ce59285e94ad4b67d03aef81f726ada9455c69b76a
-MISC ChangeLog 3795 RMD160 79b9183ed73894425bea77730903242e4903b01f SHA1 d7ca6fb7fc2a04fdc1c0b0615d84198761a77c08 SHA256 d88e26d33d0ecc7ab028ba4d58ef78272ba4257e74be76826629ada849b20f33
+EBUILD barry-0.16.ebuild 2345 RMD160 8b017887d541ffb9eb910c419e37893815f49433 SHA1 0cee080b0acc94edba7a8a952997182cea5bfc29 SHA256 4d0f7b198d93a7b97439ba7c982c76bc57243ad8b22ddb8927280ebd9735e633
+EBUILD barry-0.17.1.ebuild 2584 RMD160 f1c14bbe8fb23182ba6886ebb53b141ad62847c6 SHA1 d9500148b644a1613b341775b83e1940c5257cd8 SHA256 c19bb93b9efeeb52c36507b03634867258ea63bc60524b2724bd2a1df3fa9477
+MISC ChangeLog 3944 RMD160 43838d5d33c84ebc902b7e3bb20e00b3b468ca17 SHA1 cb5878517847fffd207f02aa6fc4426132c3c31d SHA256 0f3895cafa43bab4fa0ec8e48f1bb9f541120814d0ec0b70f1067915c25ee76b
 MISC metadata.xml 612 RMD160 595ca42f506b2cd4210929dbfe814719b0cb60e0 SHA1 3980d439b80c0fc90a34e1a829f48e6965bca8e5 SHA256 d2bbc5b8ee764c1bc941bc5375bc3d868ef3d697e86acf6e1ed3b9addeaffcf4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPu8B3AAoJEEdUh39IaPFNxYYH/0lygrwcl0+PoJ5qmMs2Jp6p
+l3pqNXMzQi4OYq/AJYHP5P5ltm+YBHOceWri7XJZMelDZUHoOOEIoWXjHybuYU0E
+HZSQU3XOk+vYKwrHD1lVQ5kg88fbjqmU05sJ2YaN8KoCagVkMrvS/iPwX3dzSRU
+0riNgmTTujGtm3StBE4QfZWNk1yLEZuU8wmtBpAZf4kGjadlYyFfNyrB/aK+Xt3/
+ACNy/lKH376hQiJssNmqubp1VAxLFXKVgDB0WWpHAzQ6cvv5hVSoRVNKK10ZaSBq
+J72z956VXiEX4Crj2iBlqEJhf19vPjRKG+ICjiX5YK+g42c/kLwNiRlFpMB/ddg=
+=pvG7
+-----END PGP SIGNATURE-----
--- a/app-pda/barry/barry-0.16.ebuild
+++ b/app-pda/barry/barry-0.16.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.16.ebuild,v 1.12 2012/05/03 20:20:56 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.16.ebuild,v 1.13 2012/05/22 16:39:13 ssuominen Exp $

 EAPI="3"

@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="boost doc gui"

-RDEPEND="dev-libs/libusb:0
+RDEPEND="virtual/libusb:0
 	dev-libs/openssl
 	sys-libs/zlib
 	boost?	( >=dev-libs/boost-1.33 )
--- a/app-pda/barry/barry-0.17.1.ebuild
+++ b/app-pda/barry/barry-0.17.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.17.1.ebuild,v 1.2 2012/05/03 20:20:56 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.17.1.ebuild,v 1.3 2012/05/22 16:39:13 ssuominen Exp $

 EAPI="4"

@ -17,7 +17,7 @@ IUSE="boost doc gui opensync nls static-libs"

 RDEPEND="
 	dev-libs/glib:2
-	dev-libs/libusb:0
+	virtual/libusb:0
 	dev-libs/openssl
 	sys-libs/zlib
 	>=dev-cpp/libxmlpp-2.6
--- a/app-portage/layman/ChangeLog
+++ b/app-portage/layman/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for app-portage/layman
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.153 2012/05/21 06:45:35 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.154 2012/05/22 21:02:36 ranger Exp $
+
+  22 May 2012; Brent Baude <ranger@gentoo.org> layman-1.4.2-r3.ebuild:
+  Marking layman-1.4.2-r3 ppc for bug 416623

  21 May 2012; Jeff Horelick <jdhore@gentoo.org> layman-1.4.2-r3.ebuild:
  marked x86 per bug 416623
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@ -4,8 +4,8 @@ DIST layman-1.4.1.tar.gz 59960 RMD160 01cf082089c346696df52960412ed26ce06afe4a S
 DIST layman-1.4.2.tar.gz 60655 RMD160 e8144dcbd9800164aeae96c485ff58b389845dfe SHA1 d66cb7c8054dbacd3a269edf987604d07520fb46 SHA256 a10418aa33f4f849c190b5c15b37abac81058858be3cb107d084057cef56ccfd
 DIST layman-2.0.0_rc3.tar.gz 74440 RMD160 14251717649b62bf2a722d5b97ffb0f1348ac9c1 SHA1 5598bd7cb4c506246c1a8c9a6d56df8613abcddf SHA256 fcbf59924f2fa62ef16ace2b4d66f9677c57396209b9c41a3548486f8d7453ab
 EBUILD layman-1.4.1.ebuild 2233 RMD160 5c38f8fecfad398ae7b3831e1e65eda3666706c9 SHA1 cbfdfcc947a1fff5437977260c480f8997629700 SHA256 11af1ea4a40b58a71308beba17bfc8895253aa94bf12777e64e3042d5e07b671
-EBUILD layman-1.4.2-r3.ebuild 2416 RMD160 6824d59c4acd62aa0551b5a1d9cb1f7fb47ae787 SHA1 19cb3c50f615299649aac6a7431ba6e8672dba01 SHA256 c12cea4aff6daaa693e2c2119a9277c0fa1032907805057642c9358cacbfd44a
+EBUILD layman-1.4.2-r3.ebuild 2415 RMD160 86ab957b4403c264c7cc2e92e174e221442ff608 SHA1 784d2ca0f7fe9fe9b1ace4e3477412ff2979ed9a SHA256 8d7551f9b80e59064486981dd33bf4d6894bd1bd33bdc1c3c717711b9be3bf4d
 EBUILD layman-2.0.0_rc3.ebuild 2808 RMD160 b9b753ede66b5bfbc1f1f7125687f88578ebfb3c SHA1 73f3fc4384bfe11c0127580725e80a83971ea2f2 SHA256 3bbd04b443b30225c00c257f1eeb62491773a3eb6390e90de9a3db8635a6f87a
 EBUILD layman-9999.ebuild 2775 RMD160 a6f6443e1ec8657b3a4bb8a812d2f88d04c47f83 SHA1 2c9f7c3592abb248abe976a708f261b9d3770006 SHA256 4e45660ae32587da712f4eb6bf6a387b1fdd6fe2223acc1bff376222227a25c8
-MISC ChangeLog 23064 RMD160 3b9c57dbefc3965a2dd0488b7ab630df891c3cca SHA1 60bf7eae8dbc91b05c86a9b4606b6acdd09be38a SHA256 499085192306e4c345a0a6a503824a4be71a7e9a862bdc6c47bbc75dbfb2a579
+MISC ChangeLog 23181 RMD160 242e3a051f65496bea2af7336a25fb543386c4c9 SHA1 6909ec26500ab88b55345ec98d25305e169f95df SHA256 6871efba6983d5c3b666f484b9b7fb7bfb7d9125b8f5ef3cb3b047e136488ea9
 MISC metadata.xml 581 RMD160 fe94f4ffa8a1ca0f36532c32c7396fe14b2f13fb SHA1 94ec4707e70384213ecdbdce51177b1059575d47 SHA256 0e51649ba2f7d1b06e85a0be179fff1db94477ae1d79684de9ae7f220599ec68
--- a/app-portage/layman/layman-1.4.2-r3.ebuild
+++ b/app-portage/layman/layman-1.4.2-r3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.4.2-r3.ebuild,v 1.3 2012/05/21 06:45:35 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.4.2-r3.ebuild,v 1.4 2012/05/22 21:02:36 ranger Exp $

 EAPI="2"
 PYTHON_DEPEND="2:2.5"
@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="bazaar cvs darcs git mercurial subversion test"

 COMMON_DEPS="dev-lang/python"
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@ -1,6 +1,15 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.311 2012/05/03 15:57:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.312 2012/05/23 01:13:17 zmedico Exp $
+
+  23 May 2012; Zac Medico <zmedico@gentoo.org> bash-4.1_p10.ebuild,
+  bash-4.1_p11.ebuild, bash-4.1_p7.ebuild, bash-4.1_p9.ebuild,
+  bash-4.2_p10.ebuild, bash-4.2_p20.ebuild, bash-4.2_p24-r1.ebuild,
+  bash-4.2_p24.ebuild, bash-4.2_p28.ebuild, bash-4.2_p8-r1.ebuild:
+  Adjust the portage blocker from bug #297933 to play nicely with
+  portage-2.1.6.7_p1 (which has a backported fix for this bug). This should not
+  hurt people upgrading from later portage-2.1.6.x or 2.1.7.x releases, since
+  the message about BASHOPTS being readonly is only cosmetic.

 *bash-4.2_p28 (03 May 2012)

--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@ -190,32 +190,22 @@ DIST readline51-001 2042 RMD160 93dd36106f68682c4dc73a9b1ecf62bf7943fae4 SHA1 2d
 EBUILD bash-3.1_p17.ebuild 4642 RMD160 c3b239d492a873c3727f743d3cd6011439863de6 SHA1 8c93c595193c4ef909c008b0aff39459184f802c SHA256 e8178f2c3a8505e11390721a552c28173adca3250c8195f4ad63a05a794f02a6
 EBUILD bash-3.2_p51.ebuild 5862 RMD160 c87e550711c01672fd2f99da2d1ae38ccad33008 SHA1 b4a0219bab848ea9090134f862257370b97650fe SHA256 2ded1efa635872ac5f01e27b390bd2d67b4e4867d52680074214ae8c3cac04ae
 EBUILD bash-4.0_p38.ebuild 5622 RMD160 9fa8130450ef281166bffd4e9fa788504a9010ad SHA1 8d94b50015898c29ecee539bb515b4d7a0d36b00 SHA256 6d42122cfb32ad9e6c4c1c66c17390fbae56bf268888ef318ba125616598f6fa
-EBUILD bash-4.1_p10.ebuild 5660 RMD160 9c0a3d574b1dbf873e26ea223c73c70abc042473 SHA1 a77efc85dd7fe68b3fd28df1da6761855f8ca7e9 SHA256 839f462bcfea9413484add206a3eb69b6b4a2c63782ecaf7e8b1eed8a34c5733
-EBUILD bash-4.1_p11.ebuild 5660 RMD160 307a3558a0b42808eacdd776841833cc40606d3d SHA1 ee713343156ba0e3789dd45a29903667febd4c22 SHA256 954e2b6d897a4e54fb2bde0c62da5af886c076aea6890fbfe6b8a9053f532ccc
-EBUILD bash-4.1_p7.ebuild 5647 RMD160 d304c9b6eeb384f9baa4a84e262f4725a2fad7b0 SHA1 7bbd8c7145bd494ff86fde53b9ba63a9aa1dd3de SHA256 f5d0f3136170e346cd97f30cc735f1e007183c5ae73bedb12b596c5b26323feb
-EBUILD bash-4.1_p9.ebuild 5647 RMD160 a4735eb85dacda84c5e616c40b18d3bd6090c2b8 SHA1 fb124d72adcab6e86240cfc991c18eb0681333a1 SHA256 9dfe8f46a4e24aa1a994e886fae5a80228449b0471e0856368e521ad2fd36588
-EBUILD bash-4.2_p10.ebuild 5604 RMD160 82d81068ca21f03dfa36e3f8e4b1506e91ef4a4d SHA1 65ae606556415c0cd82d1a8373aeb8574447650a SHA256 f0359ff78cd7c8b62e6e613779d83da25c158d430f2c54dee9c3d5fc2e1baf40
-EBUILD bash-4.2_p20.ebuild 5965 RMD160 5bf3f3fa892d5490c8dec13518ebaa9d573b2d89 SHA1 e2fd1482e2c21be4f57ca78cd761b684cc5a88b3 SHA256 3c9e66d81250a771e0334626cb760da2b4c980f5338dfec24bc27f378009d0f9
-EBUILD bash-4.2_p24-r1.ebuild 6233 RMD160 ce672ded63c0e5425b9b27dcca63eb0e3457d0cc SHA1 35b76dccc7ce6f8f41c9d01e12d63f502d8b801a SHA256 43f04b00dc64076bc51c26f0c8042b8a3929f118f08a796d6c38a16fb8f49275
-EBUILD bash-4.2_p24.ebuild 6152 RMD160 d2be7aa161ce2aa2ae8e291374576faa71be0690 SHA1 e7dcab1502f6ad69738129a913b5e7649512baa9 SHA256 166ea998731dc9e06d4f56358b7cd3d0c5dc8a6e596c2efead28c9c5abbb6dec
-EBUILD bash-4.2_p28.ebuild 6164 RMD160 f0d6479150079c1b896d646dab4f3d83d7770ede SHA1 39073758a479466be232e3de28efed4263a85a3e SHA256 60f0fb6072f8bfe680ed385c9e137eea0a89181b8920e802d19d1a2072783030
-EBUILD bash-4.2_p8-r1.ebuild 5546 RMD160 d60f2c28b28dcb55b063f16b8ee5400b88e0f6d6 SHA1 096e27b3ead5a1ec0756f88471db3084bee98f01 SHA256 466fd15f97af04edd495bf0452c8bebb0725288c2503362ff3d0088e849ca105
-MISC ChangeLog 47791 RMD160 dc6746b6e895ba351d435e7e49cf72a94e7f8ddb SHA1 8fb16c017671475ce791af884280a7ea14a14bec SHA256 045e0087709dff2be6024b9d4715868daec70293511543841268924080d43a1c
+EBUILD bash-4.1_p10.ebuild 5665 RMD160 c4a76614413f3917b718fca72dd0226cc58fa975 SHA1 6c7bee254cc9f4ea9cb7a7738b61623849e2b4f9 SHA256 c175e20f8201235cfa9895570dfb77918f7bf1ed37c2117f227eebdc140bf8f8
+EBUILD bash-4.1_p11.ebuild 5665 RMD160 9570a3a56d9587463938ae0132873b3b033d7e18 SHA1 e808db6c3c3ba5fac2aada66deecb7aef0ec3398 SHA256 8cd977c9f5b67ab5b2f64c6c4f18a8e6e1e0995a36409f6748415070ccfc4f36
+EBUILD bash-4.1_p7.ebuild 5653 RMD160 d86251150862a871bb11f5ef60ddf39dd3da2b4c SHA1 ccfda62f042b4f46b1b47933f7d6cfa5c4aa94b4 SHA256 2ed8301f9592b8acdd63816a477d2ac88843fbe4373b41f7720083bd8ea0d8fd
+EBUILD bash-4.1_p9.ebuild 5652 RMD160 0d9a54c8609d31012aa602ed61c12b71ee55a529 SHA1 f591913680853f0f6e999e90f6433ef9ceda2ace SHA256 2f9fdde7f8d8a7704c44233f5eb91a7745369c3bbbcc76cdb0872693a53a14de
+EBUILD bash-4.2_p10.ebuild 5607 RMD160 6a79ac577be49ff841806c12f2a76ea1eff3edf6 SHA1 d90cc052e815f4ee9aebaee27db2e8862f39de49 SHA256 14603925df60ca652df67a64d9c5862c346114f2d03833c8113d09915ffc4b0f
+EBUILD bash-4.2_p20.ebuild 5968 RMD160 1b385f24c5269b83269ebb380602c0dacb737eff SHA1 cc781f09f5a778b979269f6c45dd54aafab9c38b SHA256 bbc1c843ea9ea9c511c6c34eacd8ac28ad8ecd50e68503f70c55cf7e2406edef
+EBUILD bash-4.2_p24-r1.ebuild 6234 RMD160 a522ca323169621af8c88aebeae13a297f4d190f SHA1 0b0e337cb7ff643a80771419f3c04ac4c19f499c SHA256 fa229ba1ee9d97d82ef3c220123f3e858770b6d7dbfdf7cd1da214b280d25424
+EBUILD bash-4.2_p24.ebuild 6155 RMD160 f96e99e13eb95f66de5fe2402de761ccb92f48f0 SHA1 3951ab55deb27a55162971911b631331b331a554 SHA256 02d1f7d7e6e78219dba763c661a50b90c731b7e8f88aa9df66479fa678bb4b17
+EBUILD bash-4.2_p28.ebuild 6167 RMD160 4d1f9c36093bcccd7956fc048a3a9bae5d76346e SHA1 97c9ec08d88bb0c8ea53a0e9ddc23696000b39a1 SHA256 9ce516ae7fbe2315e35b071c91e9a72ab43f5c1a50d90697aa673b306bcf9598
+EBUILD bash-4.2_p8-r1.ebuild 5549 RMD160 61d5b34e0125eeb9ef17cbdb552ceae0e3754c41 SHA1 91c1346e5c9f0d0f07323b7c0ea38b9534911a94 SHA256 4ca7fc7ee535d0a034468acbe321ec37435a7790c0757b69f4a8e34fbdc0f178
+MISC ChangeLog 48345 RMD160 2b9d7e31d421719030fd386dff288f151810b5f4 SHA1 a7a4fa989c5ee06c421229fdfba350076f137f0c SHA256 e9c78c2b9d279fbab27d5440c17b0b8347b72246a796f1ebdca0d0865f0cc25a
 MISC metadata.xml 568 RMD160 c778ff1669af3c368238bcf481b344b741f0d6e1 SHA1 8d74d1c518351ad8085c9c26a5f2554d8c768b20 SHA256 48d380acb97dda0a7f4bd918b208d11367a8367d289b0a2d78ef08ef9a4e2562
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iQIcBAEBAgAGBQJPoqsQAAoJELEHsLL7fEFWVxIP/2EKHjTNI39QsI+ly/Mv9bO+
-+YVbBcK+U80ijY5b+BzdX5fEonA2pf7W9ap4VAWI9e5EN8CiNsLb5koAujKMwFGq
-V4NLPU9GTjUmq3ZluxWFZZ90p3weeXo1IuedqUqusyAtpaZiE1b4qZTs3xuc/5/f
-zPxs1Znkxh7fzBm9oSSQGfYUl75vAp6h38qRiXREmgDK7Uz+cjj44tobdfo/JpV3
-/K5pHQiQp0DLk7sdj9YzIBvwIgOvqvC7imYwh9HVdzRoPS7Tew1BtRDBLmFXZESM
-Xq1x4WrZKGUN6YzeWHv+SbGZP6nvIwDCBJOvilI4hJtUwpzeUvZ8bdJ0Lba3tG+l
-EhNmab9xt7WNxyCxk677/xYMoOMGuJ+GaGURv2jWyAz6MIbzpYcjxElJ0zFgD1TU
-qsjguHoKvn46PuNegTkob18UVaXeGCPWggpK8EWWleomiOEyxGrV1PbUkOhfCD/i
-N3Nlr7SQQBFiWeAcvnTB3zLIp9FWe0ot65s3JtNs4R+Chqxq+fqufR0rxU4GnV/z
-F0EvVreNFyopiE9KMZjS05KCrFN1dqeKFc+9hb6lSTxEnFJfw+6ZD9pZkIcpGIgx
-Mx2GRB6RIOIikt5WBy+/Dcbs8Y2OFiK1u/3IYg4g1hIkeNBylrwnVZB/grkrVgqE
-2ms4T0PctXU1pDoNdHkX
-=kkNd
+iEYEARECAAYFAk+8ObUACgkQ/ejvha5XGaMeewCggs1PzZcgq0hboksUMefjtXgF
+xx4An0njzLHOjdeBXA3LteX3hIP4BdOM
+=nes6
 -----END PGP SIGNATURE-----
--- a/app-shells/bash/bash-4.1_p10.ebuild
+++ b/app-shells/bash/bash-4.1_p10.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p10.ebuild,v 1.2 2011/05/16 10:36:26 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p10.ebuild,v 1.3 2012/05/23 01:13:17 zmedico Exp $

 EAPI="1"

@ -43,7 +43,7 @@ IUSE="afs bashlogger examples mem-scramble +net nls plugins vanilla"
 DEPEND=">=sys-libs/ncurses-5.2-r2
 	nls? ( virtual/libintl )"
 RDEPEND="${DEPEND}
-	!<sys-apps/portage-2.1.7.16
+	!<sys-apps/portage-2.1.6.7_p1
 	!<sys-apps/paludis-0.26.0_alpha5"

 S=${WORKDIR}/${MY_P}
--- a/app-shells/bash/bash-4.1_p11.ebuild
+++ b/app-shells/bash/bash-4.1_p11.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p11.ebuild,v 1.2 2011/05/16 10:36:26 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p11.ebuild,v 1.3 2012/05/23 01:13:17 zmedico Exp $

 EAPI="1"

@ -43,7 +43,7 @@ IUSE="afs bashlogger examples mem-scramble +net nls plugins vanilla"
 DEPEND=">=sys-libs/ncurses-5.2-r2
 	nls? ( virtual/libintl )"
 RDEPEND="${DEPEND}
-	!<sys-apps/portage-2.1.7.16
+	!<sys-apps/portage-2.1.6.7_p1
 	!<sys-apps/paludis-0.26.0_alpha5"

 S=${WORKDIR}/${MY_P}
--- a/app-shells/bash/bash-4.1_p7.ebuild
+++ b/app-shells/bash/bash-4.1_p7.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p7.ebuild,v 1.9 2011/05/16 10:36:26 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p7.ebuild,v 1.10 2012/05/23 01:13:17 zmedico Exp $

 EAPI="1"

@ -43,7 +43,7 @@ IUSE="afs bashlogger examples mem-scramble +net nls plugins vanilla"
 DEPEND=">=sys-libs/ncurses-5.2-r2
 	nls? ( virtual/libintl )"
 RDEPEND="${DEPEND}
-	!<sys-apps/portage-2.1.7.16
+	!<sys-apps/portage-2.1.6.7_p1
 	!<sys-apps/paludis-0.26.0_alpha5"

 S=${WORKDIR}/${MY_P}
--- a/app-shells/bash/bash-4.1_p9.ebuild
+++ b/app-shells/bash/bash-4.1_p9.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p9.ebuild,v 1.8 2011/05/16 10:36:26 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p9.ebuild,v 1.9 2012/05/23 01:13:17 zmedico Exp $

 EAPI="1"

@ -43,7 +43,7 @@ IUSE="afs bashlogger examples mem-scramble +net nls plugins vanilla"
 DEPEND=">=sys-libs/ncurses-5.2-r2
 	nls? ( virtual/libintl )"
 RDEPEND="${DEPEND}
-	!<sys-apps/portage-2.1.7.16
+	!<sys-apps/portage-2.1.6.7_p1
 	!<sys-apps/paludis-0.26.0_alpha5"

 S=${WORKDIR}/${MY_P}
--- a/app-shells/bash/bash-4.2_p10.ebuild
+++ b/app-shells/bash/bash-4.2_p10.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p10.ebuild,v 1.5 2011/10/07 20:01:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p10.ebuild,v 1.6 2012/05/23 01:13:17 zmedico Exp $

 EAPI="1"

@ -43,7 +43,7 @@ IUSE="afs bashlogger examples mem-scramble +net nls plugins vanilla"
 DEPEND=">=sys-libs/ncurses-5.2-r2
 	nls? ( virtual/libintl )"
 RDEPEND="${DEPEND}
-	!<sys-apps/portage-2.1.7.16
+	!<sys-apps/portage-2.1.6.7_p1
 	!<sys-apps/paludis-0.26.0_alpha5"
 # we only need yacc when the .y files get patched (bash42-005)
 DEPEND+=" virtual/yacc"
--- a/app-shells/bash/bash-4.2_p20.ebuild
+++ b/app-shells/bash/bash-4.2_p20.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p20.ebuild,v 1.12 2012/03/28 18:13:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p20.ebuild,v 1.13 2012/05/23 01:13:17 zmedico Exp $

 EAPI="1"

@ -41,7 +41,7 @@ DEPEND=">=sys-libs/ncurses-5.2-r2
 	>=sys-libs/readline-6.2
 	nls? ( virtual/libintl )"
 RDEPEND="${DEPEND}
-	!<sys-apps/portage-2.1.7.16
+	!<sys-apps/portage-2.1.6.7_p1
 	!<sys-apps/paludis-0.26.0_alpha5"
 # we only need yacc when the .y files get patched (bash42-005)
 DEPEND+=" virtual/yacc"
--- a/app-shells/bash/bash-4.2_p24-r1.ebuild
+++ b/app-shells/bash/bash-4.2_p24-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p24-r1.ebuild,v 1.2 2012/04/26 13:22:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p24-r1.ebuild,v 1.3 2012/05/23 01:13:17 zmedico Exp $

 EAPI="1"

@ -41,7 +41,7 @@ DEPEND=">=sys-libs/ncurses-5.2-r2
 	readline? ( >=sys-libs/readline-6.2 )
 	nls? ( virtual/libintl )"
 RDEPEND="${DEPEND}
-	!<sys-apps/portage-2.1.7.16
+	!<sys-apps/portage-2.1.6.7_p1
 	!<sys-apps/paludis-0.26.0_alpha5"
 # we only need yacc when the .y files get patched (bash42-005)
 DEPEND+=" virtual/yacc"
--- a/app-shells/bash/bash-4.2_p24.ebuild
+++ b/app-shells/bash/bash-4.2_p24.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p24.ebuild,v 1.6 2012/04/03 18:22:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p24.ebuild,v 1.7 2012/05/23 01:13:17 zmedico Exp $

 EAPI="1"

@ -41,7 +41,7 @@ DEPEND=">=sys-libs/ncurses-5.2-r2
 	readline? ( >=sys-libs/readline-6.2 )
 	nls? ( virtual/libintl )"
 RDEPEND="${DEPEND}
-	!<sys-apps/portage-2.1.7.16
+	!<sys-apps/portage-2.1.6.7_p1
 	!<sys-apps/paludis-0.26.0_alpha5"
 # we only need yacc when the .y files get patched (bash42-005)
 DEPEND+=" virtual/yacc"
--- a/app-shells/bash/bash-4.2_p28.ebuild
+++ b/app-shells/bash/bash-4.2_p28.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p28.ebuild,v 1.1 2012/05/03 15:57:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p28.ebuild,v 1.2 2012/05/23 01:13:17 zmedico Exp $

 EAPI="1"

@ -41,7 +41,7 @@ DEPEND=">=sys-libs/ncurses-5.2-r2
 	readline? ( >=sys-libs/readline-6.2 )
 	nls? ( virtual/libintl )"
 RDEPEND="${DEPEND}
-	!<sys-apps/portage-2.1.7.16
+	!<sys-apps/portage-2.1.6.7_p1
 	!<sys-apps/paludis-0.26.0_alpha5"
 # we only need yacc when the .y files get patched (bash42-005)
 DEPEND+=" virtual/yacc"
--- a/app-shells/bash/bash-4.2_p8-r1.ebuild
+++ b/app-shells/bash/bash-4.2_p8-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p8-r1.ebuild,v 1.3 2011/08/11 02:23:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p8-r1.ebuild,v 1.4 2012/05/23 01:13:17 zmedico Exp $

 EAPI="1"

@ -43,7 +43,7 @@ IUSE="afs bashlogger examples mem-scramble +net nls plugins vanilla"
 DEPEND=">=sys-libs/ncurses-5.2-r2
 	nls? ( virtual/libintl )"
 RDEPEND="${DEPEND}
-	!<sys-apps/portage-2.1.7.16
+	!<sys-apps/portage-2.1.6.7_p1
 	!<sys-apps/paludis-0.26.0_alpha5"
 # we only need yacc when the .y files get patched (bash42-005)
 DEPEND+=" virtual/yacc"
--- a/app-shells/dash/ChangeLog
+++ b/app-shells/dash/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for app-shells/dash
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/ChangeLog,v 1.93 2012/05/21 20:20:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/ChangeLog,v 1.94 2012/05/22 20:52:21 ranger Exp $
+
+  22 May 2012; Brent Baude <ranger@gentoo.org> dash-0.5.7.1.ebuild:
+  Marking dash-0.5.7.1 ppc for bug 416929

  21 May 2012; Agostino Sarubbo <ago@gentoo.org> dash-0.5.7.1.ebuild:
  Stable for amd64, wrt bug #416929
--- a/Show more
+++ b/Show more