Sync with portage [Tue Sep 18 10:16:14 MSK 2012].

2012-09-18 10:16:19 +04:00 · 2012-09-18 10:16:19 +04:00 · fc1ff8a5e5
commit fc1ff8a5e5
parent 28f0bb60b7
410 changed files with 1504 additions and 3488 deletions
--- a/app-admin/eselect-mesa/eselect-mesa-0.0.10.ebuild
+++ b/app-admin/eselect-mesa/eselect-mesa-0.0.10.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-admin/eselect-mesa/eselect-mesa-0.0.10.ebuild,v 1.11 2012/05/10 17:54:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-mesa/eselect-mesa-0.0.10.ebuild,v 1.12 2012/09/17 19:16:43 grobian Exp $

 EAPI=3

@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"

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

 DEPEND=""
--- a/app-admin/eselect-postgresql/eselect-postgresql-1.0.10.ebuild
+++ b/app-admin/eselect-postgresql/eselect-postgresql-1.0.10.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-admin/eselect-postgresql/eselect-postgresql-1.0.10.ebuild,v 1.8 2012/05/12 18:14:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-postgresql/eselect-postgresql-1.0.10.ebuild,v 1.9 2012/09/17 19:19:07 grobian Exp $

 EAPI="4"

@ -9,7 +9,7 @@ HOMEPAGE="http://www.gentoo.org/"
 SRC_URI="http://dev.gentoo.org/~titanofold/${P}.tbz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ppc-macos x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 IUSE=""

 RDEPEND="app-admin/eselect
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@ -1,3 +1,3 @@
 DIST sudo-1.8.5p2.tar.gz 1746344 SHA256 c32ae2bc3faf83444c82ca75ccb10ad3684d8222e3535f164c4a4db7cdddf8cf SHA512 616967eea79f91cda2b0cd1d13ed453d20142521ecfca289432bdf5708ac0549c7873fd80170cc0481390e82f1e60fb0bffcfc7c6b70d5d721aa98d23361c5cb WHIRLPOOL ac0d2c040935c54947571a0d4671be70aaaf7a6f69cb097acd321718656d4c569b0db4191eaf943c6b642a1d641263429287241a236a0f2a0c9edf973710bf8b
 DIST sudo-1.8.5p3.tar.gz 1746553 SHA256 00bbf27d53e8a74ef3e76b531c2b8a8d6dccab58e0d040c2a3a08171543bb1a7 SHA512 d326be88f5631872039b0a8377753b3eea12cca63b3ab57aecbb35f9abbcebca8b7d73bb31da4a5b4a03bfef15c51f4f9212a349b3551202fdf0d26993e2bd46 WHIRLPOOL 0ac3f034785d1edddbbda34d8d51dc2cd967c0d4e94fbb44c88b69eecbbcb654d417e89f9f21850ba566feee333d2fad8218673983153b19b432885faaf33e87
-DIST sudo-1.8.6p1.tar.gz 1855230 SHA256 70d6a3ceb6168c879a80a5fa03cdd06178b95d0ecb6bf87aa0bc7c159da944cc SHA512 9a0c530af240f07417a6fc745248c08942826c2efb0ac271ec38535d5c741a01459ed514256d781912a599f507deb63561222bf3079f7d7f743248cb878e69ee WHIRLPOOL c39025f1813293b17cabaef934b6399ab5f9bc19917f0c37654346b300efc9022ed21683f07a115cc0ddc12d0006e28101268e3aec81413625831c6b91c385d5
+DIST sudo-1.8.6p2.tar.gz 1855389 SHA256 d342ba710cc326bfa2065ed8ebe262a72b54a497a686aa4cbbbd0ae3028dcf4b SHA512 43759069f0e4a39c5cb5e1ea88ee0f57a9a418c2792093ff0a05420fc4d4a09477f0df5d1f5da71dc67644f7391bcb74faa367ec12a7717050bc3f368f6fa0d5 WHIRLPOOL 669440a17502e76f7b1ee20dd80ded6f3a564a1d1c5827d01d60513befec3a13bcc547c230bf3d1f606a93fa2a9090c34af550ae47c0b1bf3d5125c235c76289
--- a/app-admin/sudo/sudo-1.8.6_p2.ebuild
+++ b/app-admin/sudo/sudo-1.8.6_p2.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-admin/sudo/sudo-1.8.6_p1.ebuild,v 1.1 2012/09/13 13:50:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.6_p2.ebuild,v 1.1 2012/09/17 15:26:13 flameeyes Exp $

 EAPI=4

--- a/app-crypt/aespipe/metadata.xml
+++ b/app-crypt/aespipe/metadata.xml
@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
-	<maintainer>
-		<email>crypto@gentoo.org</email>
-	</maintainer>
+<herd>crypto</herd>
 </pkgmetadata>
--- a/app-crypt/asedriveiiie-serial/metadata.xml
+++ b/app-crypt/asedriveiiie-serial/metadata.xml
@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
-	<maintainer>
-		<email>crypto@gentoo.org</email>
-	</maintainer>
+<herd>crypto</herd>
 </pkgmetadata>
--- a/app-crypt/asedriveiiie-usb/metadata.xml
+++ b/app-crypt/asedriveiiie-usb/metadata.xml
@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
-	<maintainer>
-		<email>crypto@gentoo.org</email>
-	</maintainer>
+<herd>crypto</herd>
 </pkgmetadata>
--- a/app-crypt/bestcrypt/Manifest
+++ b/app-crypt/bestcrypt/Manifest
@ -1,4 +1 @@
-DIST BestCrypt-1.6-16.tar.gz 213202 SHA256 4e0dd8e9cf0c5b69e32d2222ed64ad45a2a8bd6198de61c50d13371df363198c SHA512 fcc507f0dfb00b781925b345fdd638730d7deda17b67a134eb2794cbd0e5476f961e1a367f77ee33eb020ab8d22332d9d0d83d673d8c06443241a8df3981e69a WHIRLPOOL b81dc4ebeb6a19fa4efb3b79279777ef59bef916146d771cd25e6a02a4d00c86870f63031d481f2dc3875130cac3ba5396cc4db0e2390146d08eabcc97432955
 DIST BestCrypt-1.7-0.tar.gz 250694 SHA256 663bb1929cf88d6b241c496fc0663cbec69ab4ee4e2b6a90220031bc86fdbd88 SHA512 b685bd447ce561220eadb2977b2b8846a6e99354df63d59def5dafe61972554ef6d11726be99be8622ca8147ebb7cb9f99c61d645defdfc9bedd5089db1e5556 WHIRLPOOL 3860f72222180763f5898749d164821287e14cfc8619e759cce151594879b2b429e392bbc4ce90d66c288084d2f483d2bb647051b9e56bd4b5e969f924d0cee2
-DIST bcrypt-rc6-serpent-c.diff.gz 6034 SHA256 6161a5bb5711307351eab95e53174bb7f181f870a4755e59ea1ad3eff9427bf5 SHA512 79133063b5072c3fa14cc46f8f8d049d7bb2f8e4690b43254608a3316bdf70e9afb41ef29b8d2d478c237cc5c68cdd38fb663ef39537b3d06a06582afcde1494 WHIRLPOOL 2059c329f69ef6ade5c9cf912cc4a22c309242d4990591e59f9bda0b4443943417a993f15882557e99d6461ab7d2b89ae4318400b5e4b6b5b26126d961d51996
-DIST bcrypt-rc6-serpent.diff.gz 5718 SHA256 1407b27e6a8390f62b66985d25f91ca1b68ff89ca5d9c211f0e83868214bdde8 SHA512 cc30c2514d890b549563ef8bec798bdc0b6e02cb406f6997757b3d28c63146a1b4debba79e7efb66576ef92c3ac3961244eaffad622dfa35a5a50aacccaf3d98 WHIRLPOOL d935e28cd440acbe606189a9c3fe36acf4283d0e5f079af3b7c8afc713210044a1b6e7432e8a9eb9bdbf942e5224cf3f614f8b897628e3eacbbefa8de53810b9
--- a/app-crypt/bestcrypt/bestcrypt-1.6_p16.ebuild
+++ b/app-crypt/bestcrypt/bestcrypt-1.6_p16.ebuild
@ -1,100 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.6_p16.ebuild,v 1.2 2008/05/01 15:12:34 maekke Exp $
-
-inherit flag-o-matic eutils linux-mod toolchain-funcs multilib
-
-MY_PN="bcrypt"
-MY_PV="${PV/_p/-}"
-DESCRIPTION="commercially licensed transparent filesystem encryption"
-HOMEPAGE="http://www.jetico.com/"
-SRC_URI="http://www.jetico.com/linux/BestCrypt-${MY_PV}.tar.gz
-	!x86? ( mirror://gentoo/bcrypt-rc6-serpent-c.diff.gz )
-	x86? ( http://www.carceri.dk/files/bcrypt-rc6-serpent.diff.gz )"
-
-LICENSE="bestcrypt"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 x86"
-
-DEPEND="virtual/linux-sources"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	MODULE_NAMES="bc(block:"${S}/mod")
-		bc_3des(block:"${S}/mod":mod/3des)
-		bc_bf128(block:"${S}/mod":mod/bf128)
-		bc_bf448(block:"${S}/mod":mod/bf448)
-		bc_blowfish(block:"${S}/mod":mod/blowfish)
-		bc_cast(block:"${S}/mod":mod/cast)
-		bc_des(block:"${S}/mod":mod/des)
-		bc_gost(block:"${S}/mod":mod/gost)
-		bc_idea(block:"${S}/mod":mod/idea)
-		bc_rc6(block:"${S}/mod":mod/rc6)
-		bc_rijn(block:"${S}/mod":mod/rijn)
-		bc_serpent(block:"${S}/mod":mod/serpent)
-		bc_twofish(block:"${S}/mod":mod/twofish)"
-	BUILD_TARGETS="all"
-	BUILD_PARAMS=" \
-		CPP=\"$(tc-getCXX)\" \
-		KERNEL_DIR=\"${KV_DIR}\" \
-		VER=${KV_MAJOR}.${KV_MINOR} \
-		KEXT=${KV_OBJ}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if use x86;	then
-		epatch "${WORKDIR}/bcrypt-rc6-serpent.diff"
-	else
-		epatch "${WORKDIR}/bcrypt-rc6-serpent-c.diff"
-	fi
-}
-
-src_compile() {
-	linux-mod_src_compile
-
-	filter-flags -fforce-addr
-
-	emake -C kgsha CPP="$(tc-getCXX)" EXTRA_CXXFLAGS="${CXXFLAGS}" || die "library compile failed"
-	emake -C kgsha256 CPP="$(tc-getCXX)"  EXTRA_CXXFLAGS="${CXXFLAGS}" || die "library compile failed"
-	emake -C src CC="$(tc-getCC)"  EXTRA_CFLAGS="${CFLAGS} -I../kgsha256" || die "bctool compile failed"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dobin bin/bctool
-	dolib.so lib/libkgsha{,256}.so
-	insinto /usr/bin
-	doman man/bctool.8
-	for link in bcumount bcformat bcfsck bcnew bcpasswd bcinfo \
-			bclink bcunlink bcmake_hidden bcreencrypt; do
-		dosym bctool "/usr/bin/${link}"
-	done
-
-	insinto /etc
-	newins etc/bc.conf bc.conf
-	newinitd "${FILESDIR}"/bcrypt3 bcrypt
-	dodoc README HIDDEN_PART
-}
-
-pkg_postinst() {
-	elog "If you are using the serpent or rc6 encryption modules and have any problems,"
-	elog "please submit bugs to http://bugs.gentoo.org because these modules are not part"
-	elog "of the standard distribution of BestCrypt for Linux released by Jetico."
-	elog "For more information on these additional modules:"
-	elog "visit http://www.carceri.dk/index.php?redirect=other_bestcrypt"
-
-	ewarn
-	ewarn "The BestCrypt drivers are not free - Please purchace a license from "
-	ewarn "http://www.jetico.com/"
-	ewarn
-
-	linux-mod_pkg_postinst
-}
--- a/app-crypt/bestcrypt/metadata.xml
+++ b/app-crypt/bestcrypt/metadata.xml
@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
-	<maintainer>
-		<email>crypto@gentoo.org</email>
-	</maintainer>
+<herd>crypto</herd>
 </pkgmetadata>
--- a/app-crypt/coolkey/metadata.xml
+++ b/app-crypt/coolkey/metadata.xml
@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
-	<maintainer>
-		<email>crypto@gentoo.org</email>
-	</maintainer>
+<herd>crypto</herd>
 </pkgmetadata>
--- a/app-crypt/gpa/metadata.xml
+++ b/app-crypt/gpa/metadata.xml
@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
-	<maintainer>
-		<email>crypto@gentoo.org</email>
-	</maintainer>
+<herd>crypto</herd>
 </pkgmetadata>
--- a/app-crypt/tinyca/metadata.xml
+++ b/app-crypt/tinyca/metadata.xml
@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
-	<maintainer>
-		<email>crypto@gentoo.org</email>
-	</maintainer>
+<herd>crypto</herd>
 </pkgmetadata>
--- a/app-crypt/xca/metadata.xml
+++ b/app-crypt/xca/metadata.xml
@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
-	<maintainer>
-		<email>crypto@gentoo.org</email>
-	</maintainer>
+<herd>crypto</herd>
 </pkgmetadata>
--- a/app-doc/halibut/metadata.xml
+++ b/app-doc/halibut/metadata.xml
@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sgml</herd>
-  <maintainer>
-    <email>sgml@gentoo.org</email>
-    <description>Feel free to take the maintainership of it.</description>
-  </maintainer>
+<herd>sgml</herd>
 </pkgmetadata>
--- a/app-editors/amyedit/amyedit-1.0-r2.ebuild
+++ b/app-editors/amyedit/amyedit-1.0-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-editors/amyedit/amyedit-1.0-r2.ebuild,v 1.5 2012/09/17 11:56:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/amyedit/amyedit-1.0-r2.ebuild,v 1.6 2012/09/18 00:02:28 blueness Exp $

 EAPI=3

@ -11,7 +11,7 @@ HOMEPAGE="http://amyedit.sf.net"
 SRC_URI="mirror://sourceforge/amyedit/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 RDEPEND=">=dev-cpp/gtkmm-2.6:2.4
 	>=dev-cpp/glibmm-2.14:2
--- a/app-editors/ee/ee-1.5.2.ebuild
+++ b/app-editors/ee/ee-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-editors/ee/ee-1.5.2.ebuild,v 1.5 2012/09/17 11:46:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ee/ee-1.5.2.ebuild,v 1.6 2012/09/17 21:05:38 blueness Exp $

 EAPI="4"

@ -12,7 +12,7 @@ SRC_URI="http://mahon.cwx.net/sources/${P}.src.tgz"

 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""

 RDEPEND="!app-editors/ersatz-emacs"
--- a/app-emulation/virt-viewer/Manifest
+++ b/app-emulation/virt-viewer/Manifest
@ -1,3 +1,4 @@
 DIST virt-viewer-0.4.2.tar.gz 442244 SHA256 32057e115ee53d9894af05ac4659893dc7e6ff9efba8d74999147b1bfda1439c SHA512 e583ee1beacff124d5fe85671716cbd68704aa1bc3ab44105ec890fdc764cd50b644728aff04299a90357cb5fcff859820434728662dde033238c8be0c8e229d WHIRLPOOL 2797b183fa06896a8f9b51dee719ac5920315c3c5b78a0ac852a8ebd514c5f8166fcae42c8c44a858eb05bf6ff0d1e8dbfabfc2266a2edaa657f331f552aa969
 DIST virt-viewer-0.5.2.tar.gz 583436 SHA256 e7f09b5de988fd3c81568d05d2b5db97c620b547ec8f92eab8e6a88604a18009 SHA512 bde9a101e3978defac75646184b708aefc94fbaa5a620211313e4f6c93fd73d30fa2ac225760f82cc632eeaad3c3de710c4cf3965d16fe1fdfb4794faef53ae3 WHIRLPOOL e58fdf300f65b7b4fdd3a33e32f29753c22a5255af5af9f7a9ac5eb814c4885fd358df3f7266c0667b2c6c9f740d6657ad8bf5f35392b97537786a57dc77e24c
 DIST virt-viewer-0.5.3.tar.gz 638327 SHA256 944a53ab4079940d502e4e8572177fdf73357342f723e36538932556b6c2d996 SHA512 dcb047c6d38636963381fc1c10c343b3d5ae13666bdca2edcb1362421dcda204ddbfee30ca2a1bc8f82e461d2a74be7aa85a980d7476c85c6dcff6b740c1da80 WHIRLPOOL 2b3f61e2e4608a7a86107652dc6773a05ec195b29fb7bbe6ca182d0828df8e45c46f375088b542a3717fd4b31043517cdaf0cdb919d2d9bfb950b56c7bc544a8
+DIST virt-viewer-0.5.4.tar.gz 619744 SHA256 8e8ca29ac9f0ef8dc49e28fa465814e13c67f37a5fab5ceea163f9ada3735f5b SHA512 3a4b241a9e3fb47db24e2bf0acaba2f4b2e0bde5d0becdefa8b3c653abcd69683f26203e255241f17c53b7119ad87b5158877795a9dd215f467d98cfce267d5c WHIRLPOOL e0b44e859d8d5ece7e7d2523693d973daa86ffe93a07bd43e51bcdc79ab33b64756ade4d70440efa27e5b34a6932be04840c54fc1fb31f759c299f29e26f0ce2
--- a/app-emulation/virt-viewer/virt-viewer-0.5.4.ebuild
+++ b/app-emulation/virt-viewer/virt-viewer-0.5.4.ebuild
@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.5.4.ebuild,v 1.1 2012/09/18 01:37:28 cardoe Exp $
+
+EAPI=4
+inherit eutils gnome2 toolchain-funcs
+
+DESCRIPTION="Graphical console client for connecting to virtual machines"
+HOMEPAGE="http://virt-manager.org/"
+SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk3 nsplugin sasl +spice +vnc"
+
+RDEPEND=">=app-emulation/libvirt-0.9.7
+	>=dev-libs/libxml2-2.6
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? (
+		>=x11-libs/gtk+-2.18:2
+		>=gnome-base/libglade-2.6
+		)
+	nsplugin? (
+		>=dev-libs/nspr-4
+		>=x11-libs/gtk+-2.18:2
+		>=gnome-base/libglade-2.6
+		)
+	spice? ( >=net-misc/spice-gtk-0.12[sasl?,gtk3=] )
+	vnc? ( >=net-libs/gtk-vnc-0.4.3 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nsplugin? ( >=net-misc/npapi-sdk-0.27 )"
+
+REQUIRED_USE="|| ( spice vnc )
+	nsplugin? ( !gtk3 )
+	gtk3? ( !nsplugin )"
+
+pkg_setup() {
+	G2CONF="$(use_enable nsplugin plugin) $(use_with spice spice-gtk)"
+	G2CONF="${G2CONF} $(use_with vnc gtk-vnc)"
+	use gtk3 && G2CONF="${G2CONF} --with-gtk=3.0"
+	use gtk3 || G2CONF="${G2CONF} --with-gtk=2.0"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.5.x-npapi-sdk.patch
+}
+
+src_configure() {
+	if use nsplugin; then
+		export MOZILLA_PLUGIN_CFLAGS="$($(tc-getPKG_CONFIG) --cflags npapi-sdk nspr)"
+		export MOZILLA_PLUGIN_LIBS="$($(tc-getPKG_CONFIG) --libs npapi-sdk nspr)"
+	fi
+
+	gnome2_src_configure
+}
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.22.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.1.22.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-emulation/virtualbox-additions/virtualbox-additions-4.1.22.ebuild,v 1.2 2012/09/16 23:34:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.1.22.ebuild,v 1.3 2012/09/17 20:13:38 nativemad Exp $

 EAPI=2

@ -15,7 +15,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"

 LICENSE="PUEL"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="mirror"

--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.22.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.22.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-emulation/virtualbox-bin/virtualbox-bin-4.1.22.ebuild,v 1.2 2012/09/16 23:35:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.22.ebuild,v 1.3 2012/09/17 20:12:44 nativemad Exp $

 EAPI=2

@ -21,7 +21,7 @@ SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_amd64.

 LICENSE="GPL-2 PUEL"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+additions +chm headless python sdk vboxwebsrv rdesktop-vrdp"
 RESTRICT="mirror"

--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.22.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.22.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-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.22.ebuild,v 1.2 2012/09/16 23:35:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.22.ebuild,v 1.3 2012/09/17 20:11:41 nativemad Exp $

 EAPI=2

@ -16,7 +16,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.vbox-extpack ->

 LICENSE="PUEL"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="mirror strip"

--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.22.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.22.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-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.22.ebuild,v 1.2 2012/09/16 23:36:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.22.ebuild,v 1.3 2012/09/17 20:10:44 nativemad Exp $

 EAPI=2

@ -13,7 +13,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X"

 RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.22.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.22.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-emulation/virtualbox-modules/virtualbox-modules-4.1.22.ebuild,v 1.2 2012/09/16 23:36:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.22.ebuild,v 1.3 2012/09/17 20:09:47 nativemad Exp $

 # XXX: the tarball here is just the kernel modules split out of the binary
 #      package that comes from virtualbox-bin
@ -16,7 +16,7 @@ SRC_URI="http://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="pax_kernel"

 RDEPEND="!=app-emulation/virtualbox-9999"
--- a/app-emulation/virtualbox/virtualbox-4.1.22.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.22.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-emulation/virtualbox/virtualbox-4.1.22.ebuild,v 1.3 2012/09/16 23:34:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.22.ebuild,v 1.4 2012/09/17 20:17:37 nativemad Exp $

 EAPI=4

@ -21,7 +21,7 @@ HOMEPAGE="http://www.virtualbox.org/"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"

 RDEPEND="!app-emulation/virtualbox-bin
--- a/app-misc/matew/metadata.xml
+++ b/app-misc/matew/metadata.xml
@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>web-apps</herd>
-<maintainer>
-  <email>web-apps@gentoo.org</email>
-  <name>Gentoo Web Application Packages Maintainers</name>
-</maintainer>
 </pkgmetadata>
--- a/app-misc/screenfetch/Manifest
+++ b/app-misc/screenfetch/Manifest
@ -1,2 +1,3 @@
 DIST screenfetch-2.4.7.zip 33869 SHA256 e852b6d2adb28a8b172e1bee3d4c4df2a539dcdd73a2e47a1b4ab08d2d6e8a02 SHA512 d75cf42ab1b2d004d681e839a46e1758005fcd2d0aff27d38fd9ae3475b00e4567eb0b5e13699741af7aca8b94481f7143163c0e5717c81ad79c060c705044fe WHIRLPOOL 74684b853054092d996b4c663d5c1bdc33dab7043ab883ed469b5f7745e65fce6163f6fb9f6fbec120138a6baac77eaab7c95b329f928f10b7645d9aaab2deb7
 DIST screenfetch-2.5.0.zip 35891 SHA256 c6a7f12dbce4b5dd9d4acdb963c8582513c46730492f673837f3ace43da5c80a SHA512 9166728efa9317d8794a345dd76a5fe9f0e9286be4b3c629a1e39aec7036d946116d711ab5e3e1f816e5e7f84e8d9707963055d26d3c10e881313d61611732fb WHIRLPOOL d74de210a7b84b3a6c83f3a34b2060167e868524859209ce739d5f407f972d1b03b7c664b9614ac32bdb64c77d366df2b64cc9cb1025c078e9be01eafd6c681c
+DIST screenfetch-2.5.3.zip 38191 SHA256 57e313aed760e2591fb84867c77a8cb51b7575d86434cf66bc6395f481e5c1fe SHA512 4a1c70f443220974c6c35a816f41d64f936eb771332482c63e9ac2df8a7a851f4f140a44dec37a774a66d1830b68bfa8ac95b407cf8b019a50f94d051e92df4c WHIRLPOOL 91c06ed5e05a80b00914783604721b85005ee5540a1c38f1478b46cb9c4821425ea8ce6535948a002e4a9b42617bc02b8ca0952096beb54bb26b961c58b3f403
--- a/app-misc/screenfetch/screenfetch-2.5.3.ebuild
+++ b/app-misc/screenfetch/screenfetch-2.5.3.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screenfetch/screenfetch-2.5.3.ebuild,v 1.1 2012/09/17 20:17:33 hwoarang Exp $
+
+EAPI=4
+
+MY_PN="${PN/f/F}"
+DESCRIPTION="A Bash Screenshot Information Tool"
+HOMEPAGE="https://github.com/KittyKatt/screenFetch"
+SRC_URI="http://github.com/KittyKatt/${MY_PN}/zipball/v${PV} -> ${P}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND="media-gfx/scrot
+	x11-apps/xdpyinfo"
+
+GIT_HASH="9d5d97e"
+S="${WORKDIR}"/KittyKatt-${MY_PN}-${GIT_HASH}
+
+src_install() {
+	dobin ${PN}-dev
+	# also known as screenfetch
+	dosym ${PN}-dev /usr/bin/${PN}
+	dodoc CHANGELOG README.mkdn TODO
+}
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@ -1,3 +1,4 @@
 DIST eix-0.23.10.tar.xz 438336 SHA256 6525b65de08dc3c5946f008b57c8027e5725d2bbc0bf5b980afda65ea207b356 SHA512 ab84fdbf1ec671c02c5d5ef9e4d70f9d76035fe7e537a4afa78231321a1f3721561eec9b32d96153b045ea59917a214dbad79933b930c46b9ac1843acbe3c4fd WHIRLPOOL 13e009d6c2114e8d8e0dbb1151f96a7cd0fab40e1a59ce46cb03fbd68602129fd151917f2abe2d860082b8e9cb852136bca6c04709be8546251df9414c030f0d
 DIST eix-0.25.5.tar.xz 487608 SHA256 bc0ff803063e7a20ad6cd24763808f5a2b95600bf2b6525fff402e4e430606c6 SHA512 3a7898c5f320bfd52e606eb732701301c96bd63fb143c4a195343efdf4abb354fd6b20cdfa6d0a72fcb39b60bfe6f7a4fe7135c908b5464952f01f965820a7a0 WHIRLPOOL dd9d5a996506b2575754969117fce09539ecba41e925f17c330aa5ff22dd6e12d1908104000d9ce109151d8caf214c9eec46b85292456d7526ecbc4d98b91db4
 DIST eix-0.26.4.tar.xz 501832 SHA256 90b0b3afad22775efef697bf58d15b45502648c9c24674ed60a363bfe9baf043 SHA512 2ced51521f9a5f1b1838b387b4aef875ce1391cdf30618c373878d79bb5e859a6199afa87d3807a0f80cfe3dc5ebfc2dc339a3fff4384f562a1fe4f0935fca9e WHIRLPOOL 3a53f225e6ed652c2b69a5c2b22899d0db1f0f47d8d8ddf4199d165babc004155286ad57ac60ac0d7b11b76752387fe0dd124d3c580c92f2d1b9bcfa97a365e4
+DIST eix-0.27.0.tar.xz 506088 SHA256 309a09e9922d7454bd469907b2c935b185488a7712903b9e4177ed3f63fcbadc SHA512 bde9a2864a07dbb101c867feedf14422576c26d43fc97d13305cdc6c6c7a45caf19fe33669b48e4472f3d97e671ddb038c21e2e828dc9b30131d8b560015e3f7 WHIRLPOOL f8d3cd6e4056e6f8645f4fc22c89e25c21fe3cbe43fa80a76c2681c9b93f70bf314d29b1cb6d5047feb141edcab1dc56981c04a22dc49b697380447ce83f3c5c
--- a/app-portage/eix/eix-0.27.0.ebuild
+++ b/app-portage/eix/eix-0.27.0.ebuild
@ -0,0 +1,68 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.27.0.ebuild,v 1.1 2012/09/17 16:08:04 darkside Exp $
+
+EAPI=4
+
+PLOCALES="de ru"
+inherit bash-completion-r1 eutils multilib l10n
+
+DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
+HOMEPAGE="http://eix.berlios.de"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="clang debug +dep doc nls optimization security strong-optimization sqlite tools zsh-completion"
+
+RDEPEND="app-shells/push
+	sqlite? ( >=dev-db/sqlite-3 )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	clang? ( sys-devel/clang )
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	if has_version "<${CATEGORY}/${PN}-0.25.3"; then
+	    local eixcache="${EROOT}"/var/cache/${PN}
+	    [[ -f ${eixcache} ]] && rm -f "${eixcache}"
+	fi
+}
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	econf $(use_with sqlite) $(use_with doc extra-doc) \
+		$(use_with zsh-completion) \
+		$(use_enable nls) $(use_enable tools separate-tools) \
+		$(use_enable security) $(use_enable optimization) \
+		$(use_enable strong-optimization) $(use_enable debug debugging) \
+		$(use_with prefix always-accept-keywords) \
+		$(use_with dep dep-default) \
+		$(use_with clang nongnu-cxx clang++) \
+		--with-ebuild-sh-default="/usr/$(get_libdir)/portage/bin/ebuild.sh" \
+		--with-portage-rootpath="${ROOTPATH}" \
+		--with-eprefix-default="${EPREFIX}" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	keepdir "/var/cache/${PN}"
+	fowners portage:portage "/var/cache/${PN}"
+	fperms 775 "/var/cache/${PN}"
+}
+
+pkg_postinst() {
+	# fowners in src_install doesn't work for owner/group portage:
+	# merging changes this owner/group back to root.
+	use prefix || chown portage:portage "${EROOT}var/cache/${PN}"
+	local obs="${EROOT}var/cache/eix.previous"
+	! test -f "${obs}" || ewarn "Found obsolete ${obs}, please remove it"
+}
--- a/app-text/highlight/highlight-3.9.ebuild
+++ b/app-text/highlight/highlight-3.9.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-text/highlight/highlight-3.9.ebuild,v 1.1 2012/05/02 01:17:15 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.9.ebuild,v 1.2 2012/09/17 14:59:29 aballier Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples qt4"

 DEPEND="dev-lang/lua
--- a/app-text/htp/metadata.xml
+++ b/app-text/htp/metadata.xml
@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>web-apps</herd>
-<maintainer>
-  <email>web-apps@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
--- a/app-text/lv/lv-4.51-r3.ebuild
+++ b/app-text/lv/lv-4.51-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-text/lv/lv-4.51-r3.ebuild,v 1.6 2012/03/06 21:43:00 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/lv/lv-4.51-r3.ebuild,v 1.7 2012/09/18 03:12:31 ottxor Exp $

 EAPI="4"

@ -14,7 +14,7 @@ SRC_URI="http://www.ff.iij4u.or.jp/~nrt/freeware/${MY_P}.tar.gz"

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

 RDEPEND="sys-libs/ncurses
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@ -1,3 +1,4 @@
 DIST poppler-0.18.4.tar.gz 1992993 SHA256 33421148cdc8e043da291dece2cce1cea6220d49a50c00c56d56d6435501d42e SHA512 dc7a8f059b6d0b1a73160a40226efc7b9d058806cc62c7b59e868453fef679dd92095629d26462f3697e96e6b16f95ce5425b7b96985f04b4d2db83e432e5216 WHIRLPOOL af4b8889aa0005dff5d4dae0414e2c1468e9a5bf58365425dae5cc96ae6afa8c2943cfc632a23781ac558df54e71f55d3195e8219f1410f026aebaf7cb62ba23
 DIST poppler-0.20.2.tar.gz 2146312 SHA256 2debc5034e0e85402957d84fb2674737658a3dbe8a3c631e1792e3f8c88ce369 SHA512 7a9a9e94298be025d8ee2dcba2be61c9d6bf167cee238a2599e211999ce0dcb59b5ef3418c5f3a6ddc8f1600e7ef2954c53f4a4149742a8a87879b1c58e77bed WHIRLPOOL 3c614eec3e054439a0733d00904fb27788c09ad41735397a5283ca74be0ec80b4f5ea77cf02a1a6706a2d0adf7cef2835eefe0e84f976aefcc8bbedd2e7e0430
 DIST poppler-0.20.3.tar.gz 2144857 SHA256 2ffef576f6de800285e0164f244bb0ca4f02d57f36540d4449a69e8fb8b72923 SHA512 a55bffdfe01196e93edcfd8a6b9ab832b998ec9e16975a8c92055a73fa283abae4c58f60270b5f8152e741d96c55ae6ef489bb688a278caa112068eb66e3adbd WHIRLPOOL 264c97160969fd8968669d4f475c24bb76136c2eae3bed1f2079fe2cfba12326327efba42092f304b2239e9069f87137988c45a604241f1d2e95a2479528ba7e
+DIST poppler-0.20.4.tar.gz 2154257 SHA256 bdb9b2579bc43f034a69612fc1eebead0c468767c949c6c6548ee71b71abd72a SHA512 3e0603cae90667fec11cbd4e2778d779d56a7b38f621c47cabba8be31fb1cdac8dcbf936295560528098838aa0db516baaeb4234dd585947413816db344bb778 WHIRLPOOL 8c56d7da64f9e86290142efd6364b458f449ff9f306b170348c4d5965100c17470ae4069bcea1033d65f62870aaf144fc7fb2b53d3044f1bc0b0c483f0deffa4
--- a/app-text/poppler/poppler-0.20.4.ebuild
+++ b/app-text/poppler/poppler-0.20.4.ebuild
@ -0,0 +1,101 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.20.4.ebuild,v 1.1 2012/09/17 14:24:37 johu Exp $
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="http://poppler.freedesktop.org/"
+SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="cairo cjk curl cxx debug doc +introspection jpeg jpeg2k +lcms png qt4 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=media-libs/fontconfig-2.6.0
+	>=media-libs/freetype-2.3.9
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		>=x11-libs/cairo-1.10.0
+		introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/openjpeg )
+	lcms? ( media-libs/lcms:2 )
+	png? ( >=media-libs/libpng-1.4:0 )
+	qt4? (
+		x11-libs/qt-core:4
+		x11-libs/qt-gui:4
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	!dev-libs/poppler
+	!dev-libs/poppler-glib
+	!dev-libs/poppler-qt3
+	!dev-libs/poppler-qt4
+	!app-text/poppler-utils
+	cjk? ( >=app-text/poppler-data-0.4.4 )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.20.1-lcms-automagic.patch"
+)
+
+DOCS=(AUTHORS ChangeLog NEWS README README-XPDF TODO)
+
+src_configure() {
+	mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT4_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_XPDF_HEADERS=ON
+		$(cmake-utils_use_enable curl LIBCURL)
+		$(cmake-utils_use_enable cxx CPP)
+		$(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
+		$(cmake-utils_use_enable utils)
+		$(cmake-utils_use_with cairo)
+		$(cmake-utils_use_with introspection GObjectIntrospection)
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with png)
+		$(cmake-utils_use_with qt4)
+		$(cmake-utils_use_with tiff)
+	)
+	if use lcms; then
+		mycmakeargs+=(-DENABLE_CMS=lcms2)
+	else
+		mycmakeargs+=(-DENABLE_CMS=)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use cairo && use doc; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/* || die 'failed to install API documentation'
+	fi
+}
+
+pkg_postinst() {
+	ewarn "After upgrading app-text/poppler you may need to reinstall packages"
+	ewarn "linking to it. If you're not a portage-2.2_rc user, you're advised"
+	ewarn "to run revdep-rebuild"
+}
--- a/app-text/xdvipdfmx/xdvipdfmx-0.7.8_p20120701.ebuild
+++ b/app-text/xdvipdfmx/xdvipdfmx-0.7.8_p20120701.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-text/xdvipdfmx/xdvipdfmx-0.7.8_p20120701.ebuild,v 1.1 2012/07/26 12:14:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvipdfmx/xdvipdfmx-0.7.8_p20120701.ebuild,v 1.2 2012/09/17 14:22:05 ottxor Exp $

 EAPI="4"

@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd  ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="doc"

 RDEPEND="!<app-text/texlive-core-2010
@ -30,6 +30,9 @@ RDEPEND="${RDEPEND}
 S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}

 src_configure() {
+	# don't do OSX stuff as it breaks on using long gone freetype funcs
+	export kpse_cv_have_ApplicationServices=no
+
 	econf \
 		--with-system-kpathsea \
 		--with-system-zlib \
--- a/app-vim/neocomplcache/Manifest
+++ b/app-vim/neocomplcache/Manifest
@ -1,2 +1,2 @@
-DIST neocomplcache-6.0.tar.bz2 98280 SHA256 8ae531567aba1a44457c42dc8a71e161d52a6ea65fb2beeb2876f52158e9f668 SHA512 7e12d6d2a0bbd1ad9989592ac392152053ef42d840d0f421f10203486bb3151f1509dd68b8c996ce42e91d9c7f456bbb23acf270980f6622e3df6c7dd6abc35d WHIRLPOOL 8b3252dc7ebd9ec3de0e8f6254a22c3a38b6b61b6f322c7fc36be151efe5057fa6281cc64b7517e5f8de5856fbdb23e78e67067bc93fd719a4ef3b54e86ee2ce
 DIST neocomplcache-6.1.tar.gz 135387 SHA256 d575cdadbf1b53f055e30cf46cd8118301eaca82c0c0709a63f3064c15ac94e1 SHA512 2e225590505067756d0ea873d083393aac3fbbe06ab4739b4152c841f9568ccab44af2c74859d7f5906deac57d245ea4eb66f7f7fb2efe8558c10b824363f94d WHIRLPOOL 26a485903a88801756899beca9cf8be4f87822d5dadef0c2e3ce6ac9fec9103229eb729e71295b9cd45f69fe0c65746657fa0d08ba3c3a2dedb80207984c3f87
+DIST neocomplcache-7.1.tar.bz2 73724 SHA256 82286c44115e3181749259402876e17f742a40d3f1cd47f0f1cce6d2c1432cbb SHA512 1ed17243722055a08bfda6b3e5524870d55377dd5998cbc5677f673974eebf5ee4019975e6b66c12c8ce5ff804d5c1512e69b7f53f56c1bb6f87638025a3210b WHIRLPOOL fc9345818579a300be55333a14e9003300050075d929e95aba7503980524fa9c77f7e4f7c946a456cfd9bd012f4dc8ce5d647d40f479980384eb09a84212ecc0
--- a/app-vim/neocomplcache/neocomplcache-7.1.ebuild
+++ b/app-vim/neocomplcache/neocomplcache-7.1.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-vim/neocomplcache/neocomplcache-6.0.ebuild,v 1.1 2011/05/22 02:29:39 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/neocomplcache/neocomplcache-7.1.ebuild,v 1.1 2012/09/18 04:02:54 radhermit Exp $

 EAPI=4

--- a/app-vim/vim-r/Manifest
+++ b/app-vim/vim-r/Manifest
@ -1,3 +1 @@
-DIST vim-r-110805.tar.gz 128963 SHA256 afec779e21358ffc21062a68ed11c4c74466a73360603dc3f47ae2b190839bd3 SHA512 bc30ddaa96d310d9ecab84f41aaf9247cedb3253bc3c3cb0c829a57e6d86245c6d69a592d2527d2cd211b848da77c70892782d14efd050c36272caa1096654c0 WHIRLPOOL 1cd92fa07f370c8bdd7bbcc6c1046323b42baa9fcc49be24767bc8a50dce11c6b6e77487941ae5637ebd4251d8812869d9db429f1d26a7e58bcaee6feaddc2f9
-DIST vim-r-111014.tar.gz 132346 SHA256 2733fb7355da61d273481cb928ebab72ae9d89c616df379204c7a04aad50525e SHA512 4d9a7d7256a6edc0cc16e8cc5e93c6c6cfbfa6165339c005ddaa7d8cd666a2b7c8930085c633ac6c781fdc34a7d2b584d7545edf8bea98892f4ba16d31d9fe4d WHIRLPOOL 21b4ab9f784c1d050baa24987db5313311967b9c32a018edbdaf4d38a756ef37fbe0569f27912c89b78ac266248e0c63ac244c0f1f7582de4a647a08f141bbfb
-DIST vim-r-111114.tar.gz 132667 SHA256 292d9d6b10c9d93e7d9c120dd1ad7ae98ee640fa3698687b94098363c9a2e335 SHA512 dfc409c5c3d34f7a47facbc3687e53b94ade48616b0e5d8cec6d2d98ba0982d9421433c73a6cc539af5e2e082fc098ff115d42bb00c29cc66d62afdc22b21712 WHIRLPOOL 2441da6435a80b70615d40135c0b2638fe51a6d604012084e6c911a806f8d8dd0f0e3fe174b5a9e9a5c9ebb62982cf83cec2c4c3d44173335f62772be1b20d5c
+DIST vim-r-0.9.7.tar.bz2 116621 SHA256 6ef80b5c8308c65cdbf1df08d81b440cef4649ed205e48601c12cd9999960f01 SHA512 44f382e009ab02c892803fc05021c04b21eabe85b9228d9cac3972bc1c84ef513733937fe81dce2524f4d612d8098685201f14d4de6935ea5fecb316b4d3c9a1 WHIRLPOOL f196d7bc8454e56dca476ca279bd2b181871190fb78f0a98e1abb2ee196ddc733faf102f21dd58f5525c0e6ce9b0efc71747af735bad5c9299612a4f44103298
--- a/app-vim/vim-r/vim-r-110805.ebuild
+++ b/app-vim/vim-r/vim-r-110805.ebuild
@ -1,16 +1,14 @@
-# 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-vim/vim-r/vim-r-110805.ebuild,v 1.1 2011/08/07 21:42:54 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/vim-r/vim-r-0.9.7.ebuild,v 1.1 2012/09/18 03:45:24 radhermit Exp $

 EAPI="4"
 VIM_PLUGIN_VIM_VERSION="7.3"

 inherit vim-plugin

-MY_PN="Vim-R-plugin"
 DESCRIPTION="vim plugin: integrate vim with R"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2628"
-SRC_URI="https://github.com/vim-scripts/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
 LICENSE="public-domain"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
@ -19,12 +17,3 @@ RDEPEND="dev-lang/R
 	|| ( app-vim/conque app-vim/screen )"

 VIM_PLUGIN_HELPFILES="r-plugin.txt"
-
-src_unpack() {
-	unpack ${A}
-	mv *-${MY_PN}-* "${S}"
-}
-
-src_prepare() {
-	rm README
-}
--- a/app-vim/vim-r/vim-r-111014.ebuild
+++ b/app-vim/vim-r/vim-r-111014.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/vim-r/vim-r-111014.ebuild,v 1.1 2011/11/01 19:51:23 radhermit Exp $
-
-EAPI="4"
-VIM_PLUGIN_VIM_VERSION="7.3"
-
-inherit vim-plugin
-
-MY_PN="Vim-R-plugin"
-DESCRIPTION="vim plugin: integrate vim with R"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2628"
-SRC_URI="https://github.com/vim-scripts/${MY_PN}/tarball/${PV}@1 -> ${P}.tar.gz"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/R
-	|| ( app-vim/conque app-vim/screen )"
-
-VIM_PLUGIN_HELPFILES="r-plugin.txt"
-
-src_unpack() {
-	unpack ${A}
-	mv *-${MY_PN}-* "${S}"
-}
-
-src_prepare() {
-	rm README || die
-}
--- a/app-vim/vim-r/vim-r-111114.ebuild
+++ b/app-vim/vim-r/vim-r-111114.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/vim-r/vim-r-111114.ebuild,v 1.1 2011/11/17 16:36:24 radhermit Exp $
-
-EAPI="4"
-VIM_PLUGIN_VIM_VERSION="7.3"
-
-inherit vim-plugin
-
-MY_PN="Vim-R-plugin"
-DESCRIPTION="vim plugin: integrate vim with R"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2628"
-SRC_URI="https://github.com/vim-scripts/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/R
-	|| ( app-vim/conque app-vim/screen )"
-
-VIM_PLUGIN_HELPFILES="r-plugin.txt"
-
-src_unpack() {
-	unpack ${A}
-	mv *-${MY_PN}-* "${S}"
-}
-
-src_prepare() {
-	rm README || die
-}
--- a/dev-db/xbsql/xbsql-0.11-r2.ebuild
+++ b/dev-db/xbsql/xbsql-0.11-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/dev-db/xbsql/xbsql-0.11-r2.ebuild,v 1.2 2012/09/16 23:09:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xbsql/xbsql-0.11-r2.ebuild,v 1.3 2012/09/17 20:20:01 blueness Exp $

 EAPI=4

@ -14,7 +14,7 @@ SRC_URI="http://www.rekallrevealed.org/packages/${P}.tgz"

 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
 IUSE="doc static-libs"

 RDEPEND="
--- a/dev-lang/mono/mono-2.10.9-r2.ebuild
+++ b/dev-lang/mono/mono-2.10.9-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/dev-lang/mono/mono-2.10.9-r2.ebuild,v 1.2 2012/09/16 10:43:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.10.9-r2.ebuild,v 1.3 2012/09/17 20:01:40 nativemad Exp $

 EAPI="4"

@ -11,7 +11,7 @@ HOMEPAGE="http://www.mono-project.com/Main_Page"

 LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"

 IUSE="minimal pax_kernel xen"

--- a/dev-libs/cryptlib/metadata.xml
+++ b/dev-libs/cryptlib/metadata.xml
@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>crypto</herd>
-<maintainer><email>crypto@gentoo.org</email></maintainer>
 </pkgmetadata>
--- a/dev-libs/libestr/Manifest
+++ b/dev-libs/libestr/Manifest
@ -1,2 +1,3 @@
 DIST libestr-0.1.2.tar.gz 315615 SHA256 0e8b95374fa271dc2afdfadfc9afc0f5826252a1b698ddea1474d5600a7c66ca SHA512 dd423f534d4aad72819d6ed27b0b29a66afd3955acfda4051a389398e58cb2b6f25d47b79729df19e86fdf3cbd2a6e4814e670e4d8d27eaa07f6c40bd01e5667 WHIRLPOOL 7718e33ed6b9cea413146a0c34e4860610169df1a67a08a2efec1f356bfc740aed2d670247694acb8e7db540d080357f7ab0db0cc8a1924da7e8e4488d4fdd99
 DIST libestr-0.1.3.tar.gz 329298 SHA256 25a4a97942818ceacd8b47370d74a8e09dad2dfeb3c4534e76523e5408973919 SHA512 586130d90dbc0bda032a3b81e6a560fa8f4cf7670b86ec3ad3b196252d5309cabfdd1f5c5cf7f3a7cde273a631bd11afabccf2fd766ecf2656e7e68fa96c6d76 WHIRLPOOL a1b78cdc5c4588041faf36bbc6cf487b3bb22e069e2e9e1f0e8eb3f0e1c6cd6a26d09261653237b834459f8fa8046e7f63dae686e25983ef9896be374d911a10
+DIST libestr-0.1.4.tar.gz 329510 SHA256 e30b05bc3091e2c35464d7ac736b2d4e5c054cc883e244c920b571e533de85e3 SHA512 b6aad598f5679badd9e26feb4a59c7163d4202dd65440726de73a4f4d27151d8256f7b34e50cc82d436f9324d2a40bd5f1a521358e2858bb0826c84c08f57592 WHIRLPOOL 197de707e7f4029cac372d5e7689e5f2e9b5476adf66bafacce5430d2e63e3c1ae5b8ba852d3b1946f58035acae7e669706f6632322fd55ca42c484f1a3a9bb7
--- a/dev-libs/libestr/libestr-0.1.4.ebuild
+++ b/dev-libs/libestr/libestr-0.1.4.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libestr/libestr-0.1.4.ebuild,v 1.1 2012/09/17 20:15:33 hwoarang Exp $
+
+EAPI=4
+
+DESCRIPTION="Library for some string essentials"
+HOMEPAGE="http://libestr.adiscon.com/"
+SRC_URI="http://libestr.adiscon.com/files/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
+IUSE="debug static-libs"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_configure()	{
+	econf $(use_enable debug) $(use_enable static-libs static)
+}
+
+src_install()	{
+	emake install DESTDIR="${D}"
+	find "${D}" -name "*.la" -delete || die
+}
--- a/dev-libs/libxml2/libxml2-2.8.0-r2.ebuild
+++ b/dev-libs/libxml2/libxml2-2.8.0-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/dev-libs/libxml2/libxml2-2.8.0-r2.ebuild,v 1.5 2012/09/15 18:04:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.8.0-r2.ebuild,v 1.7 2012/09/18 01:31:33 blueness Exp $

 EAPI="4"
 PYTHON_DEPEND="python? 2"
@ -16,7 +16,7 @@ HOMEPAGE="http://www.xmlsoft.org/"

 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples icu ipv6 lzma python readline static-libs test"

 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
--- a/dev-libs/pth/metadata.xml
+++ b/dev-libs/pth/metadata.xml
@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
-	<maintainer>
-		<email>crypto@gentoo.org</email>
-	</maintainer>
+<herd>crypto</herd>
 </pkgmetadata>
--- a/dev-perl/Devel-GlobalDestruction/Devel-GlobalDestruction-0.90.0.ebuild
+++ b/dev-perl/Devel-GlobalDestruction/Devel-GlobalDestruction-0.90.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/dev-perl/Devel-GlobalDestruction/Devel-GlobalDestruction-0.90.0.ebuild,v 1.2 2012/09/01 11:32:38 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Devel-GlobalDestruction/Devel-GlobalDestruction-0.90.0.ebuild,v 1.3 2012/09/17 16:43:15 grobian Exp $

 EAPI=4

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Expose PL_dirty, the flag which marks global destruction"

 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-aix"
+KEYWORDS="~amd64 ~x86 ~ppc-aix ~x86-solaris"
 IUSE=""

 RDEPEND=">=dev-perl/Sub-Exporter-Progressive-0.1.2"
--- a/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.6.ebuild
+++ b/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.6.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/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.6.ebuild,v 1.1 2012/08/30 17:27:38 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.6.ebuild,v 1.2 2012/09/17 16:46:11 grobian Exp $

 EAPI=4

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Only use Sub::Exporter if you need it"

 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~x86-solaris"
 IUSE=""

 RDEPEND="
--- a/dev-php/YAML/YAML-1.0.6.ebuild
+++ b/dev-php/YAML/YAML-1.0.6.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/dev-php/YAML/YAML-1.0.6.ebuild,v 1.2 2012/09/14 22:28:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/YAML/YAML-1.0.6.ebuild,v 1.3 2012/09/17 21:39:51 johu Exp $

 EAPI=4

@ -15,7 +15,7 @@ SRC_URI="http://pear.symfony-project.com//get/YAML-1.0.6.tgz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""

 DEPEND=">=dev-lang/php-5.2.4
--- a/dev-php/pecl-crack/pecl-crack-0.4-r3.ebuild
+++ b/dev-php/pecl-crack/pecl-crack-0.4-r3.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-crack/pecl-crack-0.4-r3.ebuild,v 1.1 2012/09/17 20:40:54 hanno Exp $
+
+EAPI="4"
+
+PHP_EXT_NAME="crack"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS="EXPERIMENTAL"
+
+USE_PHP="php5-3 php5-4"
+
+inherit php-ext-pecl-r2
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="PHP interface to the cracklib libraries."
+LICENSE="PHP-3 CRACKLIB"
+SLOT="0"
+IUSE=""
+
+src_prepare() {
+	local slot
+	for slot in $(php_get_slots) ; do
+		cd "${WORKDIR}/${slot}"
+		epatch "${FILESDIR}/fix-php-5-4-support.patch"
+		# Patch for http://pecl.php.net/bugs/bug.php?id=5765
+		epatch "${FILESDIR}/fix-pecl-bug-5765.patch"
+	done
+	php-ext-source-r2_src_prepare
+}
--- a/dev-python/ecdsa/ecdsa-0.8.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.8.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/dev-python/ecdsa/ecdsa-0.8.ebuild,v 1.1 2012/09/16 20:05:55 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ecdsa/ecdsa-0.8.ebuild,v 1.2 2012/09/18 04:28:48 mr_bones_ Exp $

 EAPI="4"
 PYTHON_DEPEND="2"
@ -16,7 +16,7 @@ SRC_URI="https://github.com/warner/python-${PN}/tarball/python-${P} -> ${P}.tar.
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="test"

 DEPEND="test? ( dev-libs/openssl:0 )"

--- a/dev-python/pymtp/pymtp-0.0.4-r1.ebuild
+++ b/dev-python/pymtp/pymtp-0.0.4-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/dev-python/pymtp/pymtp-0.0.4-r1.ebuild,v 1.4 2012/09/12 12:20:16 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pymtp/pymtp-0.0.4-r1.ebuild,v 1.5 2012/09/17 20:26:11 blueness Exp $

 EAPI=4

@ -20,7 +20,7 @@ SRC_URI="${DEB_URI}/${PN}_${PV}.orig.tar.gz

 LICENSE=GPL-3
 SLOT=0
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""

 RDEPEND=">=media-libs/libmtp-1.1.0"
--- a/dev-ruby/coffee-script-source/coffee-script-source-1.3.3.ebuild
+++ b/dev-ruby/coffee-script-source/coffee-script-source-1.3.3.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/dev-ruby/coffee-script-source/coffee-script-source-1.3.3.ebuild,v 1.1 2012/06/19 04:44:26 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/coffee-script-source/coffee-script-source-1.3.3.ebuild,v 1.2 2012/09/17 19:21:10 grobian Exp $

 EAPI=4
 USE_RUBY="ruby18 ruby19 ree18 jruby"
@ -15,6 +15,6 @@ HOMEPAGE="https://github.com/rails/coffee-rails"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~x64-macos ~x86-solaris"

 IUSE=""
--- a/dev-ruby/fast_xs/fast_xs-0.8.0.ebuild
+++ b/dev-ruby/fast_xs/fast_xs-0.8.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/dev-ruby/fast_xs/fast_xs-0.8.0.ebuild,v 1.8 2012/08/15 09:19:20 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fast_xs/fast_xs-0.8.0.ebuild,v 1.9 2012/09/17 19:22:54 grobian Exp $

 EAPI=4

@ -18,7 +18,7 @@ HOMEPAGE="http://fast-xs.rubyforge.org/"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~hppa ~ppc64 x86 ~x86-fbsd ~x86-solaris"
 IUSE=""

 ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.3.2 )"
--- a/dev-ruby/journey/journey-1.0.4.ebuild
+++ b/dev-ruby/journey/journey-1.0.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/dev-ruby/journey/journey-1.0.4.ebuild,v 1.1 2012/06/19 04:45:33 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/journey/journey-1.0.4.ebuild,v 1.2 2012/09/17 16:41:25 grobian Exp $

 EAPI=4
 USE_RUBY="ruby18 ruby19 ree18"
@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/rails/journey"

 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~x64-macos ~x86-solaris"
 IUSE=""

 ruby_add_bdepend "doc? ( dev-ruby/hoe )"
--- a/dev-ruby/log4r/log4r-1.1.10.ebuild
+++ b/dev-ruby/log4r/log4r-1.1.10.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/dev-ruby/log4r/log4r-1.1.10.ebuild,v 1.4 2012/08/25 12:53:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/log4r/log4r-1.1.10.ebuild,v 1.5 2012/09/17 16:14:09 johu Exp $

 EAPI="2"
 USE_RUBY="ruby18 ruby19"
@ -21,7 +21,7 @@ IUSE=""

 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"

 all_ruby_install() {
 	all_fakegem_install
--- a/dev-ruby/mime-types/mime-types-1.19.ebuild
+++ b/dev-ruby/mime-types/mime-types-1.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/dev-ruby/mime-types/mime-types-1.19.ebuild,v 1.3 2012/09/06 15:58:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mime-types/mime-types-1.19.ebuild,v 1.4 2012/09/17 20:42:08 johu Exp $

 EAPI=4

@ -17,7 +17,7 @@ HOMEPAGE="http://rubyforge.org/projects/mime-types"

 LICENSE="Ruby Artistic GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 ruby_add_bdepend "doc? ( dev-ruby/hoe dev-ruby/rubyforge )
--- a/dev-ruby/pg/pg-0.14.0.ebuild
+++ b/dev-ruby/pg/pg-0.14.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/dev-ruby/pg/pg-0.14.0.ebuild,v 1.4 2012/09/15 15:10:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/pg/pg-0.14.0.ebuild,v 1.5 2012/09/17 15:54:37 johu Exp $

 EAPI=4
 USE_RUBY="ruby18 ree18 ruby19"
@ -18,7 +18,7 @@ HOMEPAGE="http://bitbucket.org/ged/ruby-pg/"

 LICENSE="|| ( GPL-2 Ruby )"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 RDEPEND="${RDEPEND}
--- a/dev-ruby/sass-rails/sass-rails-3.1.5.ebuild
+++ b/dev-ruby/sass-rails/sass-rails-3.1.5.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/dev-ruby/sass-rails/sass-rails-3.1.5.ebuild,v 1.5 2012/05/17 10:58:30 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sass-rails/sass-rails-3.1.5.ebuild,v 1.6 2012/09/17 19:24:21 grobian Exp $

 EAPI=4
 USE_RUBY="ruby18 ruby19 ree18"
@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rails/sass-rails"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~x64-macos ~x86-solaris"

 IUSE=""

--- a/dev-ruby/sass-rails/sass-rails-3.2.5.ebuild
+++ b/dev-ruby/sass-rails/sass-rails-3.2.5.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/dev-ruby/sass-rails/sass-rails-3.2.5.ebuild,v 1.2 2012/05/17 10:58:30 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sass-rails/sass-rails-3.2.5.ebuild,v 1.3 2012/09/17 19:24:21 grobian Exp $

 EAPI=4
 USE_RUBY="ruby18 ruby19 ree18"
@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rails/sass-rails"

 LICENSE="MIT"
 SLOT="3.2"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~x64-macos ~x86-solaris"

 IUSE=""

--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@ -1 +1,2 @@
 DIST mdds_0.6.0.tar.bz2 123325 SHA256 846200f5c8ddf34f86747fd4dc5feb5fea90e753639a7d5dbd3ccdce4467a67b SHA512 288054875e86d5715395d8884bff7a76fc1b091af1ba4fd00f7bd6f3b79f158297d8ececd5bf406c61ab372f8a128713379f89fc801a807dc369645ef3eca572 WHIRLPOOL 44842f8bc191d6d460848723daccb2dc5dd2faa66ef1fcf45769dc44ecd0220f5fcc926f745d27bfcb25abbe15a4bc4821988192aef9f29d1f2f7641821fc5c4
+DIST mdds_0.6.1.tar.bz2 128115 SHA256 4381b38db6ee807090c6f352d62575ea8ce9768701ad95f01afbcda497e69960 SHA512 9b53ddfe5330f276a3e3d9febf6e6749957915f2997cd81059f060221f2dcb6ba53576f9b3b01d10289143e98a0f80bcee29654bebc3c96ddf9b0a32c411dfd2 WHIRLPOOL 51b60a028b1f75f9167903aa0395876e7a8c7c96d21d619aca280ac485197b387dca55f55c61c98f7203b16ad1989c6d2c4eab8f8eb113cbec8af929ddafbb63
--- a/dev-util/mdds/mdds-0.6.1.ebuild
+++ b/dev-util/mdds/mdds-0.6.1.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mdds/mdds-0.6.1.ebuild,v 1.1 2012/09/17 17:30:23 scarabeus Exp $
+
+EAPI=4
+
+inherit base
+
+DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
+HOMEPAGE="http://code.google.com/p/multidimalgorithm/"
+SRC_URI="http://multidimalgorithm.googlecode.com/files/${P/-/_}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-libs/boost"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P/-/_}
+
+src_configure() {
+	econf \
+		--with-hash-container=boost \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+}
+
+src_compile() { :; }
--- a/eclass/vdr-plugin-2.eclass
+++ b/eclass/vdr-plugin-2.eclass
@ -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/eclass/vdr-plugin-2.eclass,v 1.9 2012/08/05 19:26:36 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.10 2012/09/17 19:32:49 hd_brummy Exp $

 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
@ -262,7 +262,7 @@ linguas_support() {

 	for f in ${makefile_dir[*]}; do

-		PLUGIN_LINGUAS=$( ls ${f}/po --ignore="*.pot" | tr \\\012 ' ' | tr -d [:upper:] | tr -d [:punct:] |sed -e "s:po::g" )
+		PLUGIN_LINGUAS=$( ls ${f}/po --ignore="*.pot" | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
 		einfo "LINGUAS=\"${PLUGIN_LINGUAS}\""

 		sed -i ${f}/Makefile \
--- a/eclass/vim.eclass
+++ b/eclass/vim.eclass
@ -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/eclass/vim.eclass,v 1.203 2012/09/11 16:40:05 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.204 2012/09/18 01:26:55 radhermit Exp $

 # Authors:
 # 	Jim Ramsay <lack@gentoo.org>
@ -245,7 +245,7 @@ vim_pkg_setup() {
 			# python.eclass only defines python_pkg_setup for EAPIs that support
 			# USE dependencies
 			python_pkg_setup
-		elif ! built_with_use =dev-lang/python-2* threads; then
+		elif ! has_version "=dev-lang/python-2*[threads]"; then
 			die "You must build dev-lang/python with USE=threads"
 		fi
 	fi
--- a/games-strategy/megaglest/megaglest-3.6.0.3.ebuild
+++ b/games-strategy/megaglest/megaglest-3.6.0.3.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/games-strategy/megaglest/megaglest-3.6.0.3.ebuild,v 1.5 2012/09/08 21:49:44 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/megaglest-3.6.0.3.ebuild,v 1.6 2012/09/17 22:30:05 hasufell Exp $

 EAPI=4
 VIRTUALX_REQUIRED="manual"
@ -13,13 +13,14 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug +editor freetype +ftgl sse sse2 sse3 static +streflop +tools +unicode wxuniversal +model-viewer"
+IUSE="debug +editor sse sse2 sse3 static +streflop +tools +unicode wxuniversal +model-viewer"

 RDEPEND="
 	>=dev-lang/lua-5.1
 	dev-libs/icu
 	dev-libs/libxml2
 	media-libs/fontconfig
+	media-libs/freetype
 	media-libs/libsdl[X,audio,joystick,opengl,video]
 	media-libs/libvorbis
 	media-libs/openal
@ -31,17 +32,16 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXext
 	editor? ( x11-libs/wxGTK:2.8[X,opengl] )
-	freetype? ( media-libs/freetype )
 	model-viewer? ( x11-libs/wxGTK:2.8[X] )
 	!static? (
-		dev-libs/xerces-c
+		dev-libs/xerces-c[icu]
+		media-libs/ftgl
 		media-libs/glew
 		media-libs/libogg
 		media-libs/libpng:0
 		net-libs/miniupnpc
 		net-misc/curl
 		virtual/jpeg
-		ftgl? ( media-libs/ftgl )
 	)"
 DEPEND="${RDEPEND}
 	sys-apps/help2man
@ -49,14 +49,14 @@ DEPEND="${RDEPEND}
 	editor? ( ${VIRTUALX_DEPEND} )
 	model-viewer? ( ${VIRTUALX_DEPEND} )
 	static? (
-		dev-libs/xerces-c[static-libs]
+		dev-libs/xerces-c[icu,static-libs]
+		media-libs/ftgl[static-libs]
 		media-libs/glew[static-libs]
 		media-libs/libogg[static-libs]
 		media-libs/libpng:0[static-libs]
 		net-libs/miniupnpc[static-libs]
 		net-misc/curl[static-libs]
 		virtual/jpeg[static-libs]
-		ftgl? ( media-libs/ftgl[static-libs] )
 	)"
 PDEPEND="~games-strategy/${PN}-data-${PV}"

@ -98,8 +98,7 @@ src_configure() {
 		-DMEGAGLEST_DATA_INSTALL_PATH="${GAMES_DATADIR}/${PN}"
 		# icons are used at runtime, wrong default location share/pixmaps
 		-DMEGAGLEST_ICON_INSTALL_PATH="${GAMES_DATADIR}/${PN}"
-		$(cmake-utils_use_use freetype FREETYPEGL)
-		$(cmake-utils_use_use ftgl FTGL)
+		-DUSE_FTGL=ON
 		$(cmake-utils_use_want static STATIC_LIBS)
 		$(cmake-utils_use_want streflop STREFLOP)
 		-DWANT_SVN_STAMP=off
--- a/games-strategy/megaglest/metadata.xml
+++ b/games-strategy/megaglest/metadata.xml
@ -13,8 +13,6 @@
 	</upstream>
 	<use>
 		<flag name='editor'>Build map editor</flag>
-		<flag name='freetype'>Use Freetype-GL for on-screen fonts</flag>
-		<flag name='ftgl'>Use FTGL for on-screen fonts</flag>
 		<flag name='streflop'>Use the library streflop. Out of synchs may
 			occur if not enabled.</flag>
 		<flag name='tools'>Build model import/export tools</flag>
--- a/kde-base/kaddressbook/kaddressbook-4.4.11.1-r1.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-4.4.11.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/kde-base/kaddressbook/kaddressbook-4.4.11.1-r1.ebuild,v 1.2 2012/09/07 23:58:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.4.11.1-r1.ebuild,v 1.3 2012/09/17 18:40:45 johu Exp $

 EAPI=4

@ -9,7 +9,7 @@ KDE_HANDBOOK=optional
 inherit kde4-meta

 DESCRIPTION="The KDE Address Book"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

 DEPEND="
--- a/kde-base/kalarm/kalarm-4.4.11.1-r2.ebuild
+++ b/kde-base/kalarm/kalarm-4.4.11.1-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/kde-base/kalarm/kalarm-4.4.11.1-r2.ebuild,v 1.2 2012/09/07 23:59:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-4.4.11.1-r2.ebuild,v 1.3 2012/09/17 18:41:45 johu Exp $

 EAPI=4

@ -9,7 +9,7 @@ KDE_HANDBOOK=optional
 inherit kde4-meta

 DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

 RDEPEND="
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r1.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.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/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r1.ebuild,v 1.2 2012/09/07 23:59:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r1.ebuild,v 1.3 2012/09/17 18:44:08 johu Exp $

 EAPI=4

@ -13,7 +13,7 @@ else
 fi

 DESCRIPTION="KDE PIM runtime plugin collection"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

 RESTRICT="test"
--- a/kde-base/kmail/kmail-4.4.11.1-r1.ebuild
+++ b/kde-base/kmail/kmail-4.4.11.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/kde-base/kmail/kmail-4.4.11.1-r1.ebuild,v 1.2 2012/09/08 00:00:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.4.11.1-r1.ebuild,v 1.3 2012/09/17 18:39:49 johu Exp $

 EAPI=4

@ -10,7 +10,7 @@ VIRTUALX_REQUIRED=test
 inherit flag-o-matic kde4-meta

 DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE."
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

 DEPEND="
--- a/kde-base/kontact/kontact-4.4.11.1-r1.ebuild
+++ b/kde-base/kontact/kontact-4.4.11.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/kde-base/kontact/kontact-4.4.11.1-r1.ebuild,v 1.2 2012/09/08 00:00:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-4.4.11.1-r1.ebuild,v 1.3 2012/09/17 18:44:53 johu Exp $

 EAPI=4

@ -9,7 +9,7 @@ KDE_HANDBOOK=optional
 inherit kde4-meta

 DESCRIPTION="KDE personal information manager"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

 DEPEND="
--- a/kde-base/libkdepim/libkdepim-4.4.11.1-r1.ebuild
+++ b/kde-base/libkdepim/libkdepim-4.4.11.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/kde-base/libkdepim/libkdepim-4.4.11.1-r1.ebuild,v 1.2 2012/09/08 00:00:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/libkdepim-4.4.11.1-r1.ebuild,v 1.3 2012/09/17 18:43:08 johu Exp $

 EAPI=4

@ -8,7 +8,7 @@ KMNAME="kdepim"
 inherit kde4-meta

 DESCRIPTION="Common library for KDE PIM apps"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

 DEPEND="
--- a/kde-base/libkleo/libkleo-4.4.11.1-r1.ebuild
+++ b/kde-base/libkleo/libkleo-4.4.11.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/kde-base/libkleo/libkleo-4.4.11.1-r1.ebuild,v 1.2 2012/09/08 00:01:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkleo/libkleo-4.4.11.1-r1.ebuild,v 1.3 2012/09/17 18:42:26 johu Exp $

 EAPI=4

@ -8,7 +8,7 @@ KMNAME="kdepim"
 inherit kde4-meta

 DESCRIPTION="KDE library for encryption handling."
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

 DEPEND="
--- a/kde-misc/polkit-kde-kcmodules/Manifest
+++ b/kde-misc/polkit-kde-kcmodules/Manifest
@ -1 +1,2 @@
+DIST polkit-kde-kcmodules-0.98_pre20120917.tar.xz 31480 SHA256 c3731a2909688c95a482fc32c1eed115edc2fcc5526195f8d09505cc661de430 SHA512 ad2637d0716f80c3be48b74d9ea0baaddec8dda8e35fe704aa0b175dfd4e5cc33d830057cbfc8898423403b0e94d09347cd71ef6f7bc3fea5a4309b393b64f51 WHIRLPOOL da31bf28c3e209880cc0752687200d6bb5a8ce6e21f4daac8f0b4b24ea2d04eec13d59065378e484ec85d64a71af0d4f010deaa7bad56ca1e00f8a391a8257f1
 DIST polkit-kde-kcmodules-1-0.98_pre20101127.tar.bz2 25790 SHA256 0634bd83b7f4e415c2cb9bce8bffb860a7eb8abb6c6d9b2dc3230ce501da5e3e
--- a/kde-misc/polkit-kde-kcmodules/polkit-kde-kcmodules-0.98_pre20120917.ebuild
+++ b/kde-misc/polkit-kde-kcmodules/polkit-kde-kcmodules-0.98_pre20120917.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/polkit-kde-kcmodules/polkit-kde-kcmodules-0.98_pre20120917.ebuild,v 1.1 2012/09/17 13:36:18 johu Exp $
+
+EAPI=4
+
+inherit kde4-base
+
+DESCRIPTION="PolKit agent module for KDE."
+HOMEPAGE="http://www.kde.org"
+SRC_URI="http://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+SLOT="4"
+IUSE="debug"
+
+DEPEND="
+	>=sys-auth/polkit-kde-agent-0.99
+	>=sys-auth/polkit-qt-0.103
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
--- a/licenses/FDL-1.1+
+++ b/licenses/FDL-1.1+
@ -0,0 +1,2 @@
+GNU Free Documentation License, version 1.1 or any later version.
+See FDL-1.1, FDL-1.2, or FDL-1.3 for the full text of these licenses.
--- a/licenses/FDL-1.2+
+++ b/licenses/FDL-1.2+
@ -0,0 +1,2 @@
+GNU Free Documentation License, version 1.2 or any later version.
+See FDL-1.2 or FDL-1.3 for the full text of these licenses.
--- a/licenses/FDL-1.3+
+++ b/licenses/FDL-1.3+
@ -0,0 +1,2 @@
+GNU Free Documentation License, version 1.3 or any later version.
+See FDL-1.3 for the full text of this license.
--- a/licenses/GPL-1+
+++ b/licenses/GPL-1+
@ -0,0 +1,2 @@
+GNU General Public License, version 1 or any later version.
+See GPL-1, GPL-2, or GPL-3 for the full text of these licenses.
--- a/licenses/GPL-2+
+++ b/licenses/GPL-2+
@ -0,0 +1,2 @@
+GNU General Public License, version 2 or any later version.
+See GPL-2 or GPL-3 for the full text of these licenses.
--- a/licenses/GPL-3+
+++ b/licenses/GPL-3+
@ -0,0 +1,2 @@
+GNU General Public License, version 3 or any later version.
+See GPL-3 for the full text of this license.
--- a/licenses/LGPL-2+
+++ b/licenses/LGPL-2+
@ -0,0 +1,2 @@
+GNU Library General Public License, version 2 or any later version.
+See LGPL-2, LGPL-2.1, or LGPL-3 for the full text of these licenses.
--- a/licenses/LGPL-2.1+
+++ b/licenses/LGPL-2.1+
@ -0,0 +1,2 @@
+GNU Library General Public License, version 2.1 or any later version.
+See LGPL-2.1 or LGPL-3 for the full text of these licenses.
--- a/licenses/LGPL-3+
+++ b/licenses/LGPL-3+
@ -0,0 +1,2 @@
+GNU Library General Public License, version 3 or any later version.
+See LGPL-3 for the full text of this license.
--- a/mail-client/roundcube/roundcube-0.8.1.ebuild
+++ b/mail-client/roundcube/roundcube-0.8.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/mail-client/roundcube/roundcube-0.8.1.ebuild,v 1.2 2012/09/15 15:06:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/roundcube-0.8.1.ebuild,v 1.3 2012/09/18 04:50:15 nativemad Exp $

 EAPI="4"

@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
 # roundcube is GPL-licensed, the rest of the licenses here are
 # for bundled PEAR components, googiespell and utf8.class.php
 LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="ldap +mysql postgres ssl spell"

 RDEPEND="virtual/httpd-php
--- a/mail-mta/nullmailer/nullmailer-1.11.ebuild
+++ b/mail-mta/nullmailer/nullmailer-1.11.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/mail-mta/nullmailer/nullmailer-1.11.ebuild,v 1.3 2012/09/09 18:58:09 rajiv Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.11.ebuild,v 1.4 2012/09/17 15:33:01 johu Exp $

 EAPI=4
 WANT_AUTOMAKE="1.10.3"
@ -20,7 +20,7 @@ HOMEPAGE="http://untroubled.org/nullmailer/"

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

 IUSE="ssl"

--- a/media-fonts/paratype/Manifest
+++ b/media-fonts/paratype/Manifest
@ -1,3 +1,3 @@
-DIST paratype-mono-1.zip 178983 RMD160 b371c31e8320735664b8e117208cac06a6260ef6 SHA1 5cf07f7b10222a3044a8c3297996c1174fd9f79c SHA256 1903ef8bca290f936bf218e258ac031575ab7da3e5fe4a2fd04eaa86a5599022
-DIST paratype-sans-1.zip 1600360 RMD160 5672db272cf38d2878fbfbea110298d5277b212a SHA1 fb81801bcf51a8f587b044f3a1a2c8f938823dd2 SHA256 7105b5e7d9965b5b2fa189b5a84c66a8252b3432c0293f1350c15ad159447ee1
-DIST paratype-serif-1.zip 1029464 RMD160 065d616cbd4ca36c1b2099359e77109b577eb438 SHA1 b85de704e22b341e9f0dd7ef7478fedec371823b SHA256 1bf55f3cf143a5e22501de18e597677ed81aaad9c12019146a9e3735e06543a5
+DIST paratype-mono-1.zip 178983 SHA256 1903ef8bca290f936bf218e258ac031575ab7da3e5fe4a2fd04eaa86a5599022
+DIST paratype-sans-1.zip 1600360 SHA256 7105b5e7d9965b5b2fa189b5a84c66a8252b3432c0293f1350c15ad159447ee1
+DIST paratype-serif-1.zip 1029464 SHA256 1bf55f3cf143a5e22501de18e597677ed81aaad9c12019146a9e3735e06543a5
--- a/media-fonts/paratype/metadata.xml
+++ b/media-fonts/paratype/metadata.xml
@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
-	<maintainer>
-		<email>fonts@gentoo.org</email>
-	</maintainer>
+<herd>fonts</herd>
 </pkgmetadata>
--- a/media-fonts/sil-ezra/Manifest
+++ b/media-fonts/sil-ezra/Manifest
@ -1 +1 @@
-DIST EzraSIL251.zip 634131 RMD160 a4c557347456329caaa95756489a18797cc764d9 SHA1 97472305eea615f415c7805ba32da01a6d706283 SHA256 fd2894531aab32ff7d6845e3d0b4c0401c91f64ba637d13624dfc17a3e815831
+DIST EzraSIL251.zip 634131 SHA256 fd2894531aab32ff7d6845e3d0b4c0401c91f64ba637d13624dfc17a3e815831
--- a/media-fonts/sil-ezra/metadata.xml
+++ b/media-fonts/sil-ezra/metadata.xml
@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
-	<maintainer>
-		<email>fonts@gentoo.org</email>
-	</maintainer>
+<herd>fonts</herd>
 </pkgmetadata>
--- a/media-gfx/optipng/Manifest
+++ b/media-gfx/optipng/Manifest
@ -1,3 +1,4 @@
-DIST optipng-0.7.1.tar.gz 1608280 RMD160 67e413c1ddffcd480043c362fc4f185a7f3f3ddb SHA1 f71ae8c83ffb610c774f454c0f4e47cc7385a545 SHA256 6d28cd194729f6c806df24cb604355f27c4badd4457fffcbeeca23d9b6106b76
-DIST optipng-0.7.2.tar.gz 1613776 RMD160 7b578c8339cae5d5f5d687965aa33022c6dc5910 SHA1 06c294ca6fd767ff59f5ef9afdb32ae390b40989 SHA256 5bfd5cfd4880e325011e5b09ff915fe64ce791c5aa8103068831dd8e52d521a1
-DIST optipng-0.7.tar.gz 1607303 RMD160 5a4ef72c786ac28a44d6f0e5335c65484767c461 SHA1 68122f8cdd279312a4d4cde53a48286ded680f06 SHA256 bc069bb69bbac8ac4eac86cf9d54b5f5138f48c29c4196cec587b6589c628e7b
+DIST optipng-0.7.1.tar.gz 1608280 SHA256 6d28cd194729f6c806df24cb604355f27c4badd4457fffcbeeca23d9b6106b76
+DIST optipng-0.7.2.tar.gz 1613776 SHA256 5bfd5cfd4880e325011e5b09ff915fe64ce791c5aa8103068831dd8e52d521a1
+DIST optipng-0.7.3.tar.gz 1613868 SHA256 e07079fbf4cd7f11e756ca042f5285dd7a1f1784bb398fe6bbb63e5324368491 SHA512 2e15f88e9c1d1ed447c9236485bf6a0560678e11ea51e53a967b66ad6205f2cd000d0dccdeb2dd8f4ee3496891da112b37451ddeef80f31700542a69b9749eb4 WHIRLPOOL 87e397962019885ac1e4f9a36f1a707c325b4e8030add9f56bbf11841c2a5eab95ec472737a954bf96fbd8be0e06b08911f8786416758efd02ce3c4479c0fd83
+DIST optipng-0.7.tar.gz 1607303 SHA256 bc069bb69bbac8ac4eac86cf9d54b5f5138f48c29c4196cec587b6589c628e7b
--- a/media-gfx/optipng/optipng-0.7.3.ebuild
+++ b/media-gfx/optipng/optipng-0.7.3.ebuild
@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.7.3.ebuild,v 1.2 2012/09/18 04:45:38 nativemad Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Compress PNG files without affecting image quality"
+HOMEPAGE="http://optipng.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="sys-libs/zlib
+	media-libs/libpng:0"
+DEPEND="${RDEPEND}
+	sys-apps/findutils"
+
+src_prepare() {
+	rm -R src/{libpng,zlib} || die
+	find . -type d -name build -exec rm -R {} + || die
+
+	# next release is almost a complete rewrite, so plug this compilation
+	# problem in anticipation of the much (c)leaner(?) rewrite
+	sed -i \
+		-e 's/^#ifdef AT_FDCWD/#if defined(AT_FDCWD) \&\& !(defined (__SVR4) \&\& defined (__sun))/' \
+		src/optipng/osys.c || die
+}
+
+src_configure() {
+	./configure \
+		-with-system-libpng \
+		-with-system-zlib \
+		|| die "configure failed"
+}
+
+src_compile() {
+	emake \
+		-C src/optipng \
+		CC="$(tc-getCC)" \
+		GENTOO_CFLAGS="${CFLAGS}" \
+		GENTOO_LDFLAGS="${LDFLAGS}" \
+		|| die "emake failed"
+}
+
+src_install() {
+	dodoc README.txt doc/*.txt || die
+	dohtml doc/*.html || die
+	doman src/optipng/man/optipng.1 || die
+
+	dobin src/optipng/optipng || die "dobin failed"
+}
--- a/media-libs/jasper/jasper-1.900.1-r5.ebuild
+++ b/media-libs/jasper/jasper-1.900.1-r5.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/media-libs/jasper/jasper-1.900.1-r5.ebuild,v 1.3 2012/09/14 18:35:11 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jasper/jasper-1.900.1-r5.ebuild,v 1.4 2012/09/17 15:42:25 jer Exp $

 EAPI=3

@ -13,7 +13,7 @@ SRC_URI="http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-${PV}.zip

 LICENSE="JasPer2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="jpeg opengl static-libs"

 RDEPEND="jpeg? ( virtual/jpeg )
--- a/media-sound/tap-reverbed/Manifest
+++ b/media-sound/tap-reverbed/Manifest
@ -1 +1 @@
-DIST tap-reverbed-r0.tar.gz 90703 RMD160 c76df991102a59847ae53a0a5d10013d6c48a22a SHA1 80cce2b280338b83fa4dc14c92c5808673848f2e SHA256 95593f47e5fc00178dc03fa8f83bef3d14a30ebe4b3bdb53ebeacf4e709b17e8
+DIST tap-reverbed-r0.tar.gz 90703 SHA256 95593f47e5fc00178dc03fa8f83bef3d14a30ebe4b3bdb53ebeacf4e709b17e8
--- a/media-sound/tap-reverbed/metadata.xml
+++ b/media-sound/tap-reverbed/metadata.xml
@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>proaudio</herd>
-<maintainer>
-  <email>proaudio@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>
--- a/media-video/vdr/vdr-1.6.0_p2-r11.ebuild
+++ b/media-video/vdr/vdr-1.6.0_p2-r11.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/media-video/vdr/vdr-1.6.0_p2-r10.ebuild,v 1.5 2012/06/22 15:53:36 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r11.ebuild,v 1.2 2012/09/17 19:41:44 hd_brummy Exp $

 EAPI="4"

@ -40,7 +40,7 @@ SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
 	ftp://ftp.tvdr.de/vdr/Developer/${MY_P}-2.diff
 	http://www.zulu-entertainment.de/files/patches/${EXT_P}.tar.bz2"

-KEYWORDS="~arm amd64 ~ppc x86"
+KEYWORDS="~arm ~amd64 ~ppc ~x86"
 SLOT="0"
 LICENSE="GPL-2"

@ -174,12 +174,8 @@ EOT
 	eend 0
 }

-lang_linguas() {
-	LING1=$( cat /etc/make.conf | grep LINGUAS | sed -e "s:LINGUAS=::" -e "s:\"::g" )
-}
-
 lang_po() {
-	LING2=$( ls ${S}/po | tr \\\012 ' ' | sed -e "s:_::g" -e "s:[A-Z]::g" -e "s:.po::g" )
+	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ')
 }

 src_prepare() {
@ -315,19 +311,11 @@ src_prepare() {
 	einfo "\n \t VDR supports now the LINGUAS values"

 	lang_po
-	lang_linguas

-	einfo "\t Please set one of this values in /etc/make.conf"
-	einfo "\t LINGUAS=\"${LING2}\"\n"
+	einfo "\t Please set one of this values in /etc/make.conf or /etc/portage/make.conf"
+	einfo "\t LINGUAS=\"${LING_PO}\"\n"

-	if [[ -z ${LINGUAS} ]]; then
-		eerror "\n \t No values in LINGUAS="
-		eerror "\t you will get only english text on OSD \n"
-	else
-		einfo "\t Language for ${LING1} will installed \n"
-	fi
-
-	strip-linguas ${LING2} en
+	strip-linguas ${LING_PO} en
 }

 src_install() {
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Mon, 17 Sep 2012 13:36:58 +0000
+Tue, 18 Sep 2012 05:06:58 +0000
--- a/Show more
+++ b/Show more