Sync with portage [Sat Jul 14 14:53:30 MSK 2012].

12 years ago · 41612fd05d
parent 279de2ecf4
commit 41612fd05d
544 changed files with 7872 additions and 2662 deletions
--- a/app-admin/conky/conky-1.9.0.ebuild
+++ b/app-admin/conky/conky-1.9.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-admin/conky/conky-1.9.0.ebuild,v 1.1 2012/05/05 15:20:09 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0.ebuild,v 1.2 2012/07/13 16:54:53 billie Exp $

 EAPI=4

@ -59,7 +59,8 @@ DEPEND="
 	"

 src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.8.1-utf8-scroll.patch"
+	epatch "${FILESDIR}/${PN}-1.8.1-utf8-scroll.patch" \
+		"${FILESDIR}/${P}-ncurses.patch"
 }

 src_configure() {
--- a/app-admin/conky/files/conky-1.9.0-ncurses.patch
+++ b/app-admin/conky/files/conky-1.9.0-ncurses.patch
@ -0,0 +1,31 @@
+From fd9462da5ed12369fc6a72e42ebc45c6707403fb Mon Sep 17 00:00:00 2001
+From: Pavel Labath <pavelo@centrum.sk>
+Date: Fri, 13 Jul 2012 13:41:09 +0200
+Subject: [PATCH] Fix "conky failes to build with --disable-ncurses" (sf.net #3541329)
+
+---
+ src/conky.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/conky.c b/src/conky.c
+index c5b4bed..17fe1a7 100644
+--- a/src/conky.c
+++ b/src/conky.c
+@@ -885,12 +885,12 @@ void generate_text_internal(char *p, int p_max_size,
+ 			OBJ(cpu) {
+ 				if (cur->cpu_usage) {
+ 					if (obj->data.i > info.cpu_count) {
+-						static bool warned = false;
+						static int warned = 0;
+ 						if(!warned) {
+ 							NORM_ERR("obj->data.i %i info.cpu_count %i",
+ 									obj->data.i, info.cpu_count);
+ 							NORM_ERR("attempting to use more CPUs than you have!");
+-							warned = true;
+							warned = 1;
+ 						}
+ 					} else  {
+ 						percent_print(p, p_max_size,
+-- 
+1.7.0.4
+
--- a/app-editors/jedit/jedit-4.5.2.ebuild
+++ b/app-editors/jedit/jedit-4.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/jedit/jedit-4.5.2.ebuild,v 1.1 2012/07/11 21:59:59 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.5.2.ebuild,v 1.2 2012/07/13 12:10:13 caster Exp $

 EAPI=4

@ -19,17 +19,17 @@ SLOT="0"
 IUSE=""

 RDEPEND="
-	>=virtual/jre-1.5"
+	>=virtual/jre-1.6"
 # Fails to build docs with jdk7 #411371
 DEPEND="
-	>=virtual/jdk-1.5
+	>=virtual/jdk-1.6
 	doc? (
 		virtual/jdk:1.6
 		=app-text/docbook-xml-dtd-4.3*
 		>=app-text/docbook-xsl-stylesheets-1.65.1
 		dev-libs/libxslt
 	)
-	dev-java/bsh"
+	dev-java/bsh[bsf]"

 S="${WORKDIR}/jEdit"

--- a/app-editors/zile/Manifest
+++ b/app-editors/zile/Manifest
@ -1,3 +1,4 @@
 DIST zile-2.3.24.tar.gz 953962 SHA256 218bb2af414c6a168101656631a5b2da92f20a965895e1006658cc658b0b7e89 SHA512 8361f42436ae9ca150f09d830096b7a3fb0089d58bffe5ad7538b5ec5cd4e0e50085213e938db1a95e2922db845d1d2f36841a65fe1b9b72f60cd930dd8f09b9 WHIRLPOOL 37aae22305abdc2c2b86c8f6b43dcb7621464213ac375ec2fde767d99f79ddba08216c392c5500a71175f30762fe57e786f94305ff03947e413d5291cfafa934
 DIST zile-2.4.6.tar.gz 1257698 SHA256 d8a8e6b4624084902a9a6b91cbd6c64a970c0d5bbef79acb6bacb7abf05c607d SHA512 89e6948ee136c09029419ea87b5d9e62f6b30851bdee190775bb70880aa4dd5fec117e1bc2b0fc4dfd5f64fc201a5ce8d8718035ad47c7a8b00b040a9e53e467 WHIRLPOOL a36f60c6f5f7508e9da8677c992e8ccd2074ee8f6cae519075b26c4a1e7609b43a69e5fd8c0bef0bbfc224545e40cc7cbbae56b1bd317ac64177cbe846cbb9a2
 DIST zile-2.4.7.tar.gz 1254385 SHA256 8cf532fe48b5ca09e2cf67abf7abe33642eb7af4e7cd8bd1eb90137d96c467aa SHA512 eba58cd1c5eee6e4cf7e17aa56fc3682ac14d68eab6e72591fe0a1dd582b1d217717f6b31206fb70fbda8628251e5daded95c1bb688bcff6eb8dc6984ecd75d6 WHIRLPOOL fac86881b596ce753f3e073e630e57d52346bdaee1a2a27fec36053860944dc8b95e91d8a2c6f4afb809244bbfb7cdec60820aaad4fdbe59bdac4341874c9f1c
+DIST zile-2.4.8.tar.gz 1184855 SHA256 b793f4e064e3cdcac2f72a42b168c5cc0da6f7d078b8aac458b7d3cbacf7bc49 SHA512 53740400cf80ccd2106919688cfb7d60e6779e7666f555ea7ef3e4fe07620c13aafaa86a5ac766a288493012a46e5dff0b7640847a6b24206eb913668d34b491 WHIRLPOOL dd3d5ff7bcba89faf6c2545cc833d0e6592e87de0956063f479b92055dd1aca05252579fb140a02e8df4d88e00261bc0b88f6285eea5eae096660cd01c132afc
--- a/app-editors/zile/zile-2.3.24-r1.ebuild
+++ b/app-editors/zile/zile-2.3.24-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-editors/zile/zile-2.3.24-r1.ebuild,v 1.6 2012/04/01 15:34:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/zile/zile-2.3.24-r1.ebuild,v 1.7 2012/07/13 12:13:10 ulm Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/zile/${P}.tar.gz"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ppc sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test valgrind"

 RDEPEND="sys-libs/ncurses"
--- a/app-editors/zile/zile-2.4.8.ebuild
+++ b/app-editors/zile/zile-2.4.8.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/zile/zile-2.4.8.ebuild,v 1.1 2012/07/13 12:13:10 ulm Exp $
+
+EAPI=4
+
+DESCRIPTION="Zile is a small Emacs clone"
+HOMEPAGE="http://www.gnu.org/software/zile/"
+SRC_URI="mirror://gnu/zile/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="acl test"
+
+RDEPEND="dev-libs/boehm-gc
+	sys-libs/ncurses
+	acl? ( virtual/acl )"
+
+DEPEND="${RDEPEND}
+	test? ( dev-lang/perl )"
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--disable-silent-rules \
+		$(use_enable acl)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# AUTHORS, FAQ, and NEWS are installed by the build system
+	dodoc README THANKS
+
+	# Zile should never install charset.alias (even on non-glibc arches)
+	rm -f "${ED}"/usr/lib/charset.alias
+}
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@ -1,3 +1,2 @@
-DIST jre-6u29-linux-i586.bin 21632980 RMD160 ce7ba2ec99643b6d47f6b634d7e9fa5877513b4a SHA1 6de26b992a9920117d2f156ff5bbddf2d5b28f77 SHA256 13bd1ce27709be7d05c07221185d4f572242b14a80cea67b557e761f5ba7e440
-DIST jre-6u31-linux-i586.bin 21699103 RMD160 45252ef657d84abeaa1f22d8e3cfc7906a726645 SHA1 7fff7f6f99282ea3adc718c1f449df9107a8ad0c SHA256 c7c6882b8018e95ded4d145ae28692e2a0a4c13e66c5310d8f5c42b90b5b4dd0
-DIST jre-6u33-linux-i586.bin 21693745 RMD160 c395a2a780a3714673e4acd4a835e1ece1abd9bb SHA1 0eb29f15703fdcb567d64e15ed41a31a5a6ab66f SHA256 6e406b3552f276238141e40c65f83928df0bf93af5f11c74ac6970cde6758f0e
+DIST jre-6u31-linux-i586.bin 21699103 SHA256 c7c6882b8018e95ded4d145ae28692e2a0a4c13e66c5310d8f5c42b90b5b4dd0 SHA512 55b360877c21499d9031193c50d74d055ab581a83d21f12aed186184fa1bf697fbf71275cdcd0947259d987da223a11e0e2b06dc184d92bd098811852342f19b WHIRLPOOL b936620fb4d55fa697a16c10d4156693f9cb6b7db865a891d18a11f9f93af1fea547ca6febca6da462a59fba2670c4e5a6fd9fac2913b250cd2fc39c0792d4ce
+DIST jre-6u33-linux-i586.bin 21693738 SHA256 a824c38cb57110642678f21739fe995e84c876dfcbc3d64f3091ef08adacad4a SHA512 71e92b9c650234a3c0069f7c23146e78043fbac4f9e75cb37f0401b5a2d43bf5d64471f14890bd2d7680d5fa7b2a38b443321815c207e1df378ac688827226bb WHIRLPOOL 5a001c0358edb77f169972f269a68809301f777b80f85634d2c8a214ac451ab52c65fa42900e1969c2092ac37e194c0a6eaf31458d150e2a62c9e17b3c6484c1
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.29.ebuild
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.29.ebuild
@ -1,109 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.29.ebuild,v 1.4 2011/11/05 21:34:26 caster Exp $
-
-EAPI="4"
-
-inherit java-vm-2 eutils pax-utils prefix versionator
-
-MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
-S_PV="$(replace_version_separator 3 '_')"
-
-X86_AT="jre-${MY_PV}-linux-i586.bin"
-
-# check the URIs when bumping, no idea about their stability yet
-JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre-${MY_PV}-download-513650.html"
-
-DESCRIPTION="Oracle's Java SE Runtime Environment (32bit)"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-SRC_URI="${X86_AT}"
-
-LICENSE="Oracle-BCLA-JavaSE"
-KEYWORDS="-* amd64"
-SLOT="1.6"
-IUSE="X alsa nsplugin"
-
-RESTRICT="fetch strip"
-QA_TEXTRELS="
-	opt/${P}/lib/i386/client/libjvm.so
-	opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/server/libjvm.so"
-
-JAVA_VM_NO_GENERATION1=true
-
-RDEPEND="alsa? ( app-emulation/emul-linux-x86-soundlibs )
-	X? ( app-emulation/emul-linux-x86-xlibs )"
-
-S="${WORKDIR}/jre${S_PV}"
-
-pkg_nofetch() {
-	einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package has become fetch restricted again."
-
-	einfo "Please download ${X86_AT} from:"
-	einfo "${JRE_URI}"
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_unpack() {
-	sh "${DISTDIR}"/${A} -noregister || die "Failed to unpack"
-}
-
-src_compile() {
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler. This needs to be done before CDS - #215225
-	pax-mark m $(list-paxables "${S}"/bin/*)
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	"${S}"/bin/java -client -Xshare:dump || die
-	"${S}"/bin/java -server -Xshare:dump || die
-}
-
-src_install() {
-	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
-	# writable executable segments
-	rm -vf lib/i386/libjavaplugin_oji.so \
-		lib/i386/libjavaplugin_nscp*.so
-	rm -vrf plugin/i386
-	# Without nsplugin flag, also remove the new plugin
-	arch=i386;
-	if ! use nsplugin; then
-		rm -vf lib/${arch}/libnpjp2.so \
-			lib/${arch}/libjavaplugin_jni.so
-	fi
-
-	dodir /opt/${P}
-	cp -pPR bin lib man "${ED}"/opt/${P} || die
-
-	# Remove empty dirs we might have copied
-	rmdir -v $(find "${D}" -type d -empty) || die
-
-	dodoc COPYRIGHT README
-
-	if use nsplugin; then
-		install_mozilla_plugin /opt/${P}/lib/${arch}/libnpjp2.so
-	fi
-
-	# FIXME figure out how to handle the control pannel conflict with
-	# sun-jdk
-
-	# Install desktop file for the Java Control Panel. Using VMHANDLE as file
-	# name to prevent file collision with jdk and or other slots.
-# 	[[ -f "${ED}"/opt/${P}/lib/desktop/applications/sun_java.desktop ]] || die
-# 	sed -e "s/\(Name=\)Java/\1 Java Control Panel for Oracle JRE ${SLOT} (sun-jre-bin)/" \
-# 		-e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \
-# 		-e "s#Icon=.*#Icon=/opt/${P}/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png#" \
-# 		"${ED}"/opt/${P}/lib/desktop/applications/sun_java.desktop > \
-# 		"${T}"/${VMHANDLE}.desktop
-#
-# 	domenu "${T}"/${VMHANDLE}.desktop
-
-	# bug #56444
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
-	eprefixify "${T}"/fontconfig.properties
-	insinto /opt/${P}/lib/
-	doins "${T}"/fontconfig.properties
-
-	set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
-	java-vm_revdep-mask
-}
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.33-r1.ebuild
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.33-r1.ebuild
@ -0,0 +1,162 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.33-r1.ebuild,v 1.1 2012/07/13 15:57:29 sera Exp $
+
+EAPI="4"
+
+inherit java-vm-2 eutils prefix versionator
+
+# This URIs need to be updated when bumping!
+JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre6-downloads-1637595.html"
+
+MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
+S_PV="$(replace_version_separator 3 '_')"
+
+X86_AT="jre-${MY_PV}-linux-i586.bin"
+
+DESCRIPTION="Oracle's Java SE Runtime Environment (32bit)"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+SRC_URI="${X86_AT}"
+
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="1.6"
+KEYWORDS="-* ~amd64"
+IUSE="X alsa nsplugin"
+
+RESTRICT="fetch strip"
+QA_TEXTRELS="
+	opt/${P}/lib/i386/client/libjvm.so
+	opt/${P}/lib/i386/motif21/libmawt.so
+	opt/${P}/lib/i386/server/libjvm.so"
+
+RDEPEND="alsa? ( app-emulation/emul-linux-x86-soundlibs )
+	X? ( app-emulation/emul-linux-x86-xlibs )"
+
+S="${WORKDIR}/jre${S_PV}"
+
+pkg_nofetch() {
+	einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package has become fetch restricted again."
+	einfo ""
+	einfo "Please download ${X86_AT} from:"
+	einfo "${JRE_URI}"
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_unpack() {
+	sh "${DISTDIR}"/${A} -noregister || die "Failed to unpack"
+}
+
+src_compile() {
+	# This needs to be done before CDS - #215225
+	java-vm_set-pax-markings "${S}"
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	bin/java -client -Xshare:dump || die
+	bin/java -server -Xshare:dump || die
+}
+
+src_install() {
+	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
+	# writable executable segments
+	rm -vf lib/i386/libjavaplugin_oji.so \
+		lib/i386/libjavaplugin_nscp*.so
+	rm -vrf plugin/i386
+	# Without nsplugin flag, also remove the new plugin
+	arch=i386;
+	if ! use nsplugin; then
+		rm -vf lib/${arch}/libnpjp2.so \
+			lib/${arch}/libjavaplugin_jni.so
+	fi
+
+	dodir /opt/${P}
+	cp -pPR bin lib man "${ED}"/opt/${P} || die
+
+	# Remove empty dirs we might have copied
+	find "${D}" -type d -empty -exec rmdir {} + || die
+
+	dodoc COPYRIGHT README
+
+	if use nsplugin; then
+		install_mozilla_plugin /opt/${P}/lib/${arch}/libnpjp2.so
+	fi
+
+	# Install desktop file for the Java Control Panel.
+	# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
+	# make_desktop_entry can't be used as ${P} would end up in filename.
+	newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
+		sun-jcontrol-${PN}-${SLOT}.png || die
+	sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT} (${PN})#" \
+		-e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \
+		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}.png#" \
+		lib/desktop/applications/sun_java.desktop > \
+		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
+	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
+
+	# bug #56444
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
+	eprefixify "${T}"/fontconfig.properties
+	insinto /opt/${P}/lib/
+	doins "${T}"/fontconfig.properties
+
+	set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
+	java-vm_revdep-mask
+}
+
+QA_FLAGS_IGNORED="
+	/opt/${P}/bin/java
+	/opt/${P}/bin/java_vm
+	/opt/${P}/bin/javaws
+	/opt/${P}/bin/keytool
+	/opt/${P}/bin/orbd
+	/opt/${P}/bin/pack200
+	/opt/${P}/bin/policytool
+	/opt/${P}/bin/rmid
+	/opt/${P}/bin/rmiregistry
+	/opt/${P}/bin/servertool
+	/opt/${P}/bin/tnameserv
+	/opt/${P}/bin/unpack200
+	/opt/${P}/lib/i386/client/libjvm.so
+	/opt/${P}/lib/i386/headless/libmawt.so
+	/opt/${P}/lib/i386/jli/libjli.so
+	/opt/${P}/lib/i386/libawt.so
+	/opt/${P}/lib/i386/libcmm.so
+	/opt/${P}/lib/i386/libdcpr.so
+	/opt/${P}/lib/i386/libdeploy.so
+	/opt/${P}/lib/i386/libdt_socket.so
+	/opt/${P}/lib/i386/libfontmanager.so
+	/opt/${P}/lib/i386/libhprof.so
+	/opt/${P}/lib/i386/libinstrument.so
+	/opt/${P}/lib/i386/libioser12.so
+	/opt/${P}/lib/i386/libj2gss.so
+	/opt/${P}/lib/i386/libj2pcsc.so
+	/opt/${P}/lib/i386/libj2pkcs11.so
+	/opt/${P}/lib/i386/libjaas_unix.so
+	/opt/${P}/lib/i386/libjava_crw_demo.so
+	/opt/${P}/lib/i386/libjavaplugin_jni.so
+	/opt/${P}/lib/i386/libjava.so
+	/opt/${P}/lib/i386/libjawt.so
+	/opt/${P}/lib/i386/libJdbcOdbc.so
+	/opt/${P}/lib/i386/libjdwp.so
+	/opt/${P}/lib/i386/libjpeg.so
+	/opt/${P}/lib/i386/libjsig.so
+	/opt/${P}/lib/i386/libjsoundalsa.so
+	/opt/${P}/lib/i386/libjsound.so
+	/opt/${P}/lib/i386/libmanagement.so
+	/opt/${P}/lib/i386/libmlib_image.so
+	/opt/${P}/lib/i386/libnative_chmod_g.so
+	/opt/${P}/lib/i386/libnative_chmod.so
+	/opt/${P}/lib/i386/libnet.so
+	/opt/${P}/lib/i386/libnio.so
+	/opt/${P}/lib/i386/libnpjp2.so
+	/opt/${P}/lib/i386/libnpt.so
+	/opt/${P}/lib/i386/librmi.so
+	/opt/${P}/lib/i386/libsplashscreen.so
+	/opt/${P}/lib/i386/libunpack.so
+	/opt/${P}/lib/i386/libverify.so
+	/opt/${P}/lib/i386/libzip.so
+	/opt/${P}/lib/i386/motif21/libmawt.so
+	/opt/${P}/lib/i386/native_threads/libhpi.so
+	/opt/${P}/lib/i386/server/libjvm.so
+	/opt/${P}/lib/i386/xawt/libmawt.so
+	/opt/${P}/lib/jexec"
--- a/app-i18n/kcc/kcc-1.0.ebuild
+++ b/app-i18n/kcc/kcc-1.0.ebuild
@ -1,8 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/kcc/kcc-1.0.ebuild,v 1.14 2006/11/26 17:24:44 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/kcc/kcc-1.0.ebuild,v 1.15 2012/07/14 06:11:14 hattya Exp $

-inherit toolchain-funcs eutils
+EAPI="4"
+
+inherit eutils toolchain-funcs

 DESCRIPTION="A Kanji code converter"
 HOMEPAGE="http://www2s.biglobe.ne.jp/~Nori/ruby/"
@ -15,21 +17,17 @@ IUSE=""

 S="${WORKDIR}/${PN}"

-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}/${PN}-gcc3-gentoo.diff"
 }

 src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}"
 }

 src_install() {
-	dobin kcc || die
-
+	dobin kcc
 	dodoc README
-	insinto /usr/share/man/ja/man1
-	newins kcc.jman kcc.1 || die
+	cp -f kcc.jman kcc.1 || die
+	doman -i18n=ja kcc.1
 }
--- a/app-i18n/kcc/metadata.xml
+++ b/app-i18n/kcc/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+  <herd>cjk</herd>
 </pkgmetadata>
--- a/app-i18n/qkc/metadata.xml
+++ b/app-i18n/qkc/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+  <herd>cjk</herd>
 </pkgmetadata>
--- a/app-i18n/qkc/qkc-1.00.ebuild
+++ b/app-i18n/qkc/qkc-1.00.ebuild
@ -1,29 +1,35 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/qkc/qkc-1.00.ebuild,v 1.13 2007/05/16 15:19:13 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/qkc/qkc-1.00.ebuild,v 1.14 2012/07/14 05:56:39 hattya Exp $
+
+EAPI="4"

 inherit toolchain-funcs

 MY_P="${PN}c${PV/./}"
+
 DESCRIPTION="Quick KANJI code Converter"
 HOMEPAGE="http://hp.vector.co.jp/authors/VA000501/"
 SRC_URI="http://hp.vector.co.jp/authors/VA000501/${MY_P}.zip"

 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="x86 alpha ppc sparc amd64 ppc64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""

 DEPEND="app-arch/unzip"
+S="${WORKDIR}"

-S=${WORKDIR}
+src_prepare() {
+	sed -i "/^LFLAGS/s:$: \${LDFLAGS}:" Makefile
+}

 src_compile() {
-	make CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }

 src_install() {
-	dobin qkc || die
+	dobin qkc
 	dodoc qkc.doc
 	doman -i18n=ja qkc.1
 }
--- a/app-i18n/xsim/files/xsim-0.3.9.4-db3.patch
+++ b/app-i18n/xsim/files/xsim-0.3.9.4-db3.patch
@ -1,37 +0,0 @@
--- xsim-0.3.9.4/configure	2002-10-24 19:53:57.000000000 +0100
-+++ xsim-0.3.9.4a/configure	2003-05-24 22:32:41.000000000 +0100
-@@ -5223,21 +5223,20 @@
-   fi
- 
-   for bdb_dir in $bdb_library_dirs; do
-    if test -r "$bdb_dir/libdb_cxx.so"; then
-      bdblibs="$bdb_dir"
-      bdblib="db_cxx"
-      break
-    fi
-    if test -r "$bdb_dir/libdb4_cxx.so"; then
-      bdblibs="$bdb_dir"
-      bdblib="db4_cxx"
-      break
-    fi
-    if test -r "$bdb_dir/libdb3_cxx.so"; then
-      bdblibs="$bdb_dir"
-      bdblib="db3_cxx"
-      break
-+    if test "$bdb_version" = ">=3.2"; then
-+      if test -r "$bdb_dir/libdb_cxx-3.so"; then
-+        bdblibs="$bdb_dir"
-+        bdblib="db_cxx-3"
-+        break
-+      fi
-     fi
-+    if test "$bdb_version" = ">=4.1"; then
-+       if test -r "$bdb_dir/libdb_cxx-4.1.so"; then
-+         bdblibs="$bdb_dir"
-+         bdblib="db_cxx-4.1"
-+         break
-+       fi
-+    fi    
-   done
- fi
- 
--- a/app-i18n/xsim/metadata.xml
+++ b/app-i18n/xsim/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+  <herd>cjk</herd>
 </pkgmetadata>
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@ -1,3 +1,3 @@
 DIST calibre-0.8.52.tar.xz 24690364 SHA256 29eebc8c82dd2cacc70e3fb5bc309020348028752a23765d8956769b79deaf2a SHA512 9fb6bb085b8f42a0ad3f63141ce2de63cc7e7c0d5ed914904ddd05fac3713c4c47f093e4579ceab7080627585167e7312039cbc8bc2a1e969937553e123d072a WHIRLPOOL 569be4afc50c78bb4bb35f5d61201760c8ea5fa25d6bcafb343dd6cdfc4a5fc2ff4175549438a9473302331c982f4cfc1d0a916ff2ac3593072f4154142966e2
-DIST calibre-0.8.58.tar.xz 24990000 SHA256 f0b9ca637793c9817e2051d4bd6eacd5388a030b11c1470ca5b5b929d4115149 SHA512 6e9b6ef2ddfda17b4ba8627055ae625022fa0ca6d907f050b186364b092189029654c146526875476c9e55063ccb9b66d89c590771cd45b4b844014d01c55765 WHIRLPOOL 37e3c8a975d110222192cdb8b6f7ea576537362dc2875549928ddd99dc99773aa50a413dfa4e9954998b9d3170c2e9680af8a9a229f4c9b96b594d2de8ae5335
 DIST calibre-0.8.59.tar.xz 25001852 SHA256 cdab81f39cf558bf09b16eb3327b33e7edb958395f9180172e08f9879deeb7af SHA512 8f59b9eb68bde65efa2ec7f9045e7ca12a21db603dda4ddc7f5dc01ab7ec0e213d2137bcc9c899e31c895edb793603fa920a00747ad20a811cf0bfd43438045e WHIRLPOOL 2ed37c682752b281286f37a310019cad354030189b9f35349c2f7d4d35cf32235e5ebd4fcf70663705c845ea906844ea205b5de88244453c7ec3a18a92a9355a
+DIST calibre-0.8.60.tar.xz 25020596 SHA256 5f5a80ca2f6e9523f3911067090f7d1d9befc62ee90095e6188302c387646df1 SHA512 78267f30a1aa89edba17a5b27868b151b0b853f173b9ff01d5e0e8d78d20cae623120eac5418a3733bb768c9e6e835a3467f96a3d42e4b44e62bc188b7bfcf03 WHIRLPOOL 5001a766a6ebd7fdfcb3983049214a922d08b32498133ad4540efc1276d63e3853405eedf5b4f2e7075814f720c6a724742015792ec6497bbcee277b271632de
--- a/app-text/calibre/calibre-0.8.60.ebuild
+++ b/app-text/calibre/calibre-0.8.60.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/calibre/calibre-0.8.58.ebuild,v 1.1 2012/06/29 20:17:28 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.60.ebuild,v 1.1 2012/07/14 02:31:36 zmedico Exp $

 EAPI=4
 PYTHON_DEPEND=2:2.7
@ -63,12 +63,13 @@ src_prepare() {

 	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
 	# calls xdg-* (bug #258938).
-	sed -e "s:'xdg-desktop-menu', 'install':\\0, '--mode', 'user':" \
-		-e "s:check_call(\\['xdg-desktop-menu', 'forceupdate'\\]):#\\0:" \
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
 		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
 		-e "s|PreserveMIMEDefaults():||" \
-		-e "s:xdg-icon-resource install:\\0 --mode user:" \
-		-e "s:xdg-mime install:\\0 --mode user:" \
+		-e "s|xdg-icon-resource install|\\0 --mode user|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|xdg-mime install|\\0 --mode user|" \
 		-i src/calibre/linux.py || die "sed failed to patch linux.py"

 	# Disable unnecessary privilege dropping for bug #287067.
--- a/app-text/namazu/Manifest
+++ b/app-text/namazu/Manifest
@ -1,3 +1 @@
-DIST namazu-2.0.19.tar.gz 1392466 SHA256 b0fd725e87f61d99312d631db50f13738cf49afc9ade7c1881ce3f71b32a0d1b SHA512 fa3984721ffd159fea8ff5f8c8ddd2905e4afb16797f0ae82b1938ba90a317e983d6f7979d32470dc1bde9aa50affa847e3f8c003b311950f822490c34b33a62 WHIRLPOOL eb88a4f75d4400981f19d6afbee780e9f9667845910f7cfda888e24fd9be0f5419f265518ba5f634545233199f39973016b28a9309de297a5f13789cfdb66179
-DIST namazu-2.0.20.tar.gz 1393165 SHA256 cddbbce979484235976115b05535048f41145bd2ed5de9f84108fdca0d1dfcb3 SHA512 51ff3f8d3e70727ecb4bade7243a124ec630a5bf0c33b46854cbdcc0f6b82807fc1c79888d15b7d291c2c49fa11bca392cc967a590f755d5c0e5ac98f1eb3808 WHIRLPOOL 849422fa4eb999a872d0a53cb942ace7e4e7aec830617184786312cf17c2579e2e98a119f315035704db8444114cf88d752f42a4b4f5a4c5b98848f773675583
 DIST namazu-2.0.21.tar.gz 1394048 SHA256 5c18afb679db07084a05aca8dffcfb5329173d99db8d07ff6d90b57c333c71f7 SHA512 c0ce1b8c8b8ce30ee7d28cfed790a9c8585d1b468eefe2ba4ac70976e09329ae04a3a3bbf0b86b9673cfdf206f2b103896daca2f053062f451884fa659b31ea6 WHIRLPOOL 61794e4c1644303c90c074c4f383a74dd8db0550c8108120bc1ee9dd47d9b1e3aeef6484008c6ee729eb7711c4da57bb0d50f16ab0353886296e70d4f9daa9db
--- a/app-text/namazu/metadata.xml
+++ b/app-text/namazu/metadata.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
-<maintainer>
-  <email>hattya@gentoo.org</email>
-</maintainer>
+  <herd>cjk</herd>
+  <maintainer>
+    <email>hattya@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>
--- a/app-text/namazu/namazu-2.0.19-r1.ebuild
+++ b/app-text/namazu/namazu-2.0.19-r1.ebuild
@ -1,83 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/namazu/namazu-2.0.19-r1.ebuild,v 1.2 2012/06/09 19:00:57 armin76 Exp $
-
-inherit eutils elisp-common
-
-IUSE="emacs nls tk linguas_ja"
-
-DESCRIPTION="Namazu is a full-text search engine"
-HOMEPAGE="http://www.namazu.org/"
-SRC_URI="http://www.namazu.org/stable/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-
-RDEPEND=">=dev-perl/File-MMagic-1.20
-	emacs? ( virtual/emacs )
-	linguas_ja? (
-		app-i18n/nkf
-		|| (
-			dev-perl/Text-Kakasi
-			app-i18n/kakasi
-			app-text/chasen
-			app-text/mecab
-		)
-	)
-	nls? ( virtual/libintl )
-	tk? (
-		dev-lang/tk
-		www-client/lynx
-	)"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-src_compile() {
-	local myconf
-
-	use tk && myconf="--with-namazu=/usr/bin/namazu
-					--with-mknmz=/usr/bin/mknmz
-					--with-indexdir=/var/lib/namazu/index"
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable tk tknamazu) \
-		${myconf} || die
-	emake || die
-
-	if use emacs; then
-		cd lisp
-		elisp-compile gnus-nmz-1.el namazu.el || die
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS CREDITS ChangeLog* HACKING* NEWS README* THANKS TODO etc/*.png
-	dohtml -r doc/*
-
-	if use emacs; then
-		elisp-install ${PN} lisp/gnus-nmz-1.el* lisp/namazu.el* || die
-		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el || die
-
-		docinto lisp
-		dodoc lisp/ChangeLog*
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
--- a/app-text/namazu/namazu-2.0.19.ebuild
+++ b/app-text/namazu/namazu-2.0.19.ebuild
@ -1,78 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/namazu/namazu-2.0.19.ebuild,v 1.2 2012/06/09 19:00:57 armin76 Exp $
-
-inherit eutils elisp-common
-
-IUSE="emacs nls tk linguas_ja"
-
-DESCRIPTION="Namazu is a full-text search engine"
-HOMEPAGE="http://www.namazu.org/"
-SRC_URI="http://www.namazu.org/stable/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-
-DEPEND=">=dev-perl/File-MMagic-1.20
-	emacs? ( virtual/emacs )
-	linguas_ja? (
-		app-i18n/nkf
-		|| (
-			dev-perl/Text-Kakasi
-			app-i18n/kakasi
-			app-text/chasen
-			app-text/mecab
-		)
-	)
-	nls? ( sys-devel/gettext )
-	tk? (
-		dev-lang/tk
-		www-client/lynx
-	)"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-src_compile() {
-	local myconf
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable tk tknamazu) \
-		${myconf} || die
-	emake || die
-
-	if use emacs; then
-		cd lisp
-		elisp-compile gnus-nmz-1.el namazu.el || die
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-
-#	rm -rf "${D}"/usr/share/namazu/{doc,etc}
-
-	dodoc AUTHORS CREDITS ChangeLog* HACKING* NEWS README* THANKS TODO etc/*.png
-	dohtml -r doc/*
-
-	if use emacs; then
-		elisp-install ${PN} lisp/gnus-nmz-1.el* lisp/namazu.el* || die
-		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el || die
-
-		docinto lisp
-		dodoc lisp/ChangeLog*
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
--- a/app-text/namazu/namazu-2.0.20.ebuild
+++ b/app-text/namazu/namazu-2.0.20.ebuild
@ -1,83 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/namazu/namazu-2.0.20.ebuild,v 1.3 2012/06/09 19:00:57 armin76 Exp $
-
-inherit eutils elisp-common
-
-IUSE="emacs nls tk linguas_ja"
-
-DESCRIPTION="Namazu is a full-text search engine"
-HOMEPAGE="http://www.namazu.org/"
-SRC_URI="http://www.namazu.org/stable/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-
-RDEPEND=">=dev-perl/File-MMagic-1.20
-	emacs? ( virtual/emacs )
-	linguas_ja? (
-		app-i18n/nkf
-		|| (
-			dev-perl/Text-Kakasi
-			app-i18n/kakasi
-			app-text/chasen
-			app-text/mecab
-		)
-	)
-	nls? ( virtual/libintl )
-	tk? (
-		dev-lang/tk
-		www-client/lynx
-	)"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-2.0.19-gentoo.patch"
-}
-
-src_compile() {
-	local myconf
-
-	use tk && myconf="--with-namazu=/usr/bin/namazu
-					--with-mknmz=/usr/bin/mknmz
-					--with-indexdir=/var/lib/namazu/index"
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable tk tknamazu) \
-		${myconf} || die
-	emake || die
-
-	if use emacs; then
-		cd lisp
-		elisp-compile gnus-nmz-1.el namazu.el || die
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS CREDITS ChangeLog* HACKING* NEWS README* THANKS TODO etc/*.png
-	dohtml -r doc/*
-
-	if use emacs; then
-		elisp-install ${PN} lisp/gnus-nmz-1.el* lisp/namazu.el* || die
-		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el || die
-
-		docinto lisp
-		dodoc lisp/ChangeLog*
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
--- a/app-text/zemberek-server/zemberek-server-0.7.1.ebuild
+++ b/app-text/zemberek-server/zemberek-server-0.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-text/zemberek-server/zemberek-server-0.7.1.ebuild,v 1.8 2011/03/25 19:29:05 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zemberek-server/zemberek-server-0.7.1.ebuild,v 1.9 2012/07/13 14:10:14 sera Exp $

 EAPI=2
 inherit eutils java-pkg-2 java-ant-2
@ -9,7 +9,7 @@ DESCRIPTION="A Turkish spell checker server based on Zemberek NLP library"
 HOMEPAGE="http://code.google.com/p/zemberek/"
 SRC_URI="http://zemberek.googlecode.com/files/${PN}-nolibs-${PV}.tar.gz"

-LICENSE="MPL-1.1"
+LICENSE="MPL-1.1 GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 S="${WORKDIR}"
--- a/dev-cpp/glog/Manifest
+++ b/dev-cpp/glog/Manifest
@ -1 +1,2 @@
-DIST glog-0.3.1-1.tar.gz 491798 SHA256 0a5ce945aaa5c64cb3889bf4844a0459263c06a77ad549042230dfea316787cb SHA512 9bf48fe53e45a7af24ea6cfe27f6a4b592efe9911e2c9764c364d551ad9a7ab4eae2ace64873ec9bd2202323032ffbdbbda5ea9e7514aa0e324e30048c238e96 WHIRLPOOL 21593af929da3db01527c6e9111b75a7318be2c14abebbfb1e09f0a6ac12442e522cb510a776ef95136168baa1400e759bb69f7670192301ed1044db00eac385
+DIST glog-0.3.1-1.tar.gz 491798 RMD160 dcbb4a7ba28afb4126e1b9791dda2a784a3bda68 SHA1 14e3f6d6f2ecceac1ee6a66a1d28ddbc32a2b4ab SHA256 0a5ce945aaa5c64cb3889bf4844a0459263c06a77ad549042230dfea316787cb
+DIST glog-0.3.2.tar.gz 478666 RMD160 2dfe7b93d7130a82d64000bce4cd6261f41f916e SHA1 94e641e50afd03c574af6a55084e94a347c911d7 SHA256 5e47f9437e97cb1621930dea3c557a2801ddac3b5db1a9fd0c3cde399f2c9ccd
--- a/dev-cpp/glog/glog-0.3.2.ebuild
+++ b/dev-cpp/glog/glog-0.3.2.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glog/glog-0.3.2.ebuild,v 1.1 2012/07/13 11:57:20 dev-zero Exp $
+
+EAPI="4"
+inherit eutils
+
+DESCRIPTION="Google's C++ logging library"
+HOMEPAGE="http://code.google.com/p/google-glog/"
+SRC_URI="http://google-glog.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gflags static-libs unwind test"
+
+RDEPEND="gflags? ( dev-cpp/gflags )
+	unwind? ( sys-libs/libunwind )"
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gmock
+		dev-cpp/gtest
+	)"
+
+src_configure() {
+	export ac_cv_lib_gflags_main=$(usex gflags)
+	export ac_cv_lib_unwind_backtrace=$(usex unwind)
+	use test || export ac_cv_prog_GTEST_CONFIG=no
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/usr/share/doc"
+	dodoc AUTHORS ChangeLog NEWS README*
+	dohtml doc/*
+
+	use static-libs || rm "${D}"/usr/lib*/*.la
+}
--- a/dev-cpp/glog/metadata.xml
+++ b/dev-cpp/glog/metadata.xml
@ -4,8 +4,10 @@
 	<maintainer>
 		<email>vapier@gentoo.org</email>
 	</maintainer>
+	<herd>cpp</herd>
 	<use>
-		<flag name="gflags">Use gflags module for flag parsing</flag>
+		<flag name="gflags">Use <pkg>dev-cpp/gflags</pkg> for flag parsing</flag>
+		<flag name="unwind">Use <pkg>sys-libs/libunwind</pkg> for stack unwinding instead of glibc/gcc (may be more reliable on x86_64)</flag>
 	</use>
 	<upstream>
 		<remote-id type="google-code">google-glog</remote-id>
--- a/dev-cpp/libassa/Manifest
+++ b/dev-cpp/libassa/Manifest
@ -1,2 +1 @@
-DIST libassa-3.5.0.tar.gz 586237 SHA256 72a627c74e82ff679cb16ebe3a625b9032d8d1feed4c1da63ebb5106a80b1314 SHA512 5b1ab4f6d2424d446cf12b9f30397f6cdebe2154b15e5766c33f8e4e4582ec6660af04b3d7456a706143bcbcc1be6042d262e9982bfce7c87ce8d1a7972f22f1 WHIRLPOOL 8441cad6b1b6581b04dc5e2e61da29a096360cd2ea3830dcbcd691f88a6f1956e57f3b90798f699927569ecc5aa11c37995b79388f44d7c24e5b1f0123b45c63
 DIST libassa-3.5.1.tar.gz 641255 SHA256 c1245a98373f37c0e286b327e2d750fd20278c71f47f2018053b4d799d33172c SHA512 ad00cb1de21bece699e49d31247201f62604f8d7d1e8f385f7b0eb20bf2bb953bfc741363a5009f64f0f262100cc09f136a49a0dab6ea330424dee1965a3c2c7 WHIRLPOOL e1272e069f1deda79c7fb2d2b198c66c152b159198aa53ba21ebd723b4f7e5146d9ca58cdc4140c948184995add9f5b72a62467046ff65df17330a7c4ef46bf7
--- a/dev-cpp/libassa/files/libassa-3.5.0-dont-run-ldconfig.patch
+++ b/dev-cpp/libassa/files/libassa-3.5.0-dont-run-ldconfig.patch
@ -1,21 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 508d13e..2cd704e 100644
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -40,16 +40,3 @@ MAINTAINERCLEANFILES = \
- 	*.log core FILE *~ Makefile.in configure config.h.in \
- 	config.status aclocal.m4 config.guess config.sub \
- 	depcomp install-sh mkinstalldirs missing
-
-
-# Run ldconfig after installing the library:
-#
-#   '-ldconfig' expands into 'PATH="$PATH:/sbin" ldconfig -n /usr/local/bin'
-#
-# Somehow, this doen't work.
-#
-install-exec-hook:
-	-ldconfig
-
-uninstall-hook:
-	-ldconfig
--- a/dev-cpp/libassa/files/libassa-3.5.0-gcc44.patch
+++ b/dev-cpp/libassa/files/libassa-3.5.0-gcc44.patch
@ -1,28 +0,0 @@
-For va_list in gcc 4.4+ and glibc system stdarg.h is always required. For gcc 4.4+ including stdio.h
-is required because of headers clean up.
-
-Patch by Samuli Suominen <ssuominen@gentoo.org>
-
-diff -ur libassa-3.5.0.orig/assa/Logger_Impl.cpp libassa-3.5.0/assa/Logger_Impl.cpp
--- libassa-3.5.0.orig/assa/Logger_Impl.cpp	2006-07-20 05:30:54.000000000 +0300
-+++ libassa-3.5.0/assa/Logger_Impl.cpp	2009-09-04 13:26:26.000000000 +0300
-@@ -14,6 +14,7 @@
- 
- #include <iostream>
- #include <iomanip>
-+#include <stdio.h>				// vsnprintf(3)
- #include <string.h>				// strerror(3)
- 
- #include "assa/TimeVal.h"
-diff -ur libassa-3.5.0.orig/assa/Logger_Impl.h libassa-3.5.0/assa/Logger_Impl.h
--- libassa-3.5.0.orig/assa/Logger_Impl.h	2006-07-20 05:30:54.000000000 +0300
-+++ libassa-3.5.0/assa/Logger_Impl.h	2009-09-04 13:29:45.000000000 +0300
-@@ -21,7 +21,7 @@
- #include <sys/varargs.h>		// va_list
- #endif
- 
-#if defined (__CYGWIN32__) || defined (__NetBSD__) || defined (WIN32)
-+#if defined (__CYGWIN32__) || defined (__NetBSD__) || defined (WIN32) || defined (__GLIBC__)
- # include <stdarg.h>
- #endif
- 
--- a/dev-cpp/libassa/files/libassa-3.5.0-ldflags.patch
+++ b/dev-cpp/libassa/files/libassa-3.5.0-ldflags.patch
@ -1,13 +0,0 @@
-diff --git a/utils/Makefile.am b/utils/Makefile.am
-index 3d95d22..82c2345 100644
--- a/utils/Makefile.am
-+++ b/utils/Makefile.am
-@@ -15,7 +15,7 @@ noinst_PROGRAMS = bytereader
- ASSADIR = ${top_srcdir}/assa
- INCLUDES = -I$(top_srcdir)
- 
-LDFLAGS = -static
-+LDFLAGS += -static
- LDADD = $(top_builddir)/assa/libassa-@ASSA_RELEASE@.la @WIN32_EXTRA_LIBADD@
- 
- bytereader_SOURCES   = bytereader.cpp
--- a/dev-cpp/libassa/files/libassa-3.5.0-link-dynamically.patch
+++ b/dev-cpp/libassa/files/libassa-3.5.0-link-dynamically.patch
@ -1,15 +0,0 @@
-diff --git a/utils/Makefile.am b/utils/Makefile.am
-index 82c2345..6550015 100644
--- a/utils/Makefile.am
-+++ b/utils/Makefile.am
-@@ -15,8 +15,8 @@ noinst_PROGRAMS = bytereader
- ASSADIR = ${top_srcdir}/assa
- INCLUDES = -I$(top_srcdir)
- 
-LDFLAGS += -static
-LDADD = $(top_builddir)/assa/libassa-@ASSA_RELEASE@.la @WIN32_EXTRA_LIBADD@
-+LDFLAGS += -L$(top_builddir)/assa/.libs
-+LIBS = -lassa-3.5
- 
- bytereader_SOURCES   = bytereader.cpp
- 
--- a/dev-cpp/libassa/files/libassa-3.5.1-gcc47.patch
+++ b/dev-cpp/libassa/files/libassa-3.5.1-gcc47.patch
@ -0,0 +1,12 @@
+diff --git a/assa/CommonUtils.h b/assa/CommonUtils.h
+index 2db38d2..4db27f6 100644
+--- a/assa/CommonUtils.h
+++ b/assa/CommonUtils.h
+@@ -16,6 +16,7 @@
+ 
+ #include <sstream>
+ 
+#include <unistd.h>
+ #include <string> 
+ #include <vector>
+ using std::vector;
--- a/dev-cpp/libassa/libassa-3.5.0.ebuild
+++ b/dev-cpp/libassa/libassa-3.5.0.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libassa/libassa-3.5.0.ebuild,v 1.10 2011/07/19 20:33:31 angelos Exp $
-
-EAPI=3
-inherit autotools eutils
-
-DESCRIPTION="A networking library based on Adaptive Communication Patterns"
-HOMEPAGE="http://libassa.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc static-libs"
-
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-dont-run-ldconfig.patch \
-		"${FILESDIR}"/${P}-fix-tests.patch \
-		"${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-link-dynamically.patch
-	AT_M4DIR="${S}/macros"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable doc doxygen)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
-	find "${ED}" -name "*.la" -exec rm -rf {} + || die "failed to delete .la files"
-}
--- a/dev-cpp/libassa/libassa-3.5.1-r1.ebuild
+++ b/dev-cpp/libassa/libassa-3.5.1-r1.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libassa/libassa-3.5.1-r1.ebuild,v 1.1 2012/07/13 11:08:03 angelos Exp $
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="A networking library based on Adaptive Communication Patterns"
+HOMEPAGE="http://libassa.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="net-libs/libtirpc"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.5.0-fix-tests.patch \
+		"${FILESDIR}"/${P}-gcc47.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable doc doxygen)
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -exec rm -rf {} + || die "failed to delete .la files"
+}
--- a/dev-db/hsqldb/hsqldb-1.8.1.2-r1.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.8.1.2-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-db/hsqldb/hsqldb-1.8.1.2-r1.ebuild,v 1.8 2012/06/04 06:32:37 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.8.1.2-r1.ebuild,v 1.9 2012/07/13 14:19:56 sera Exp $

 EAPI=1
 JAVA_PKG_IUSE="doc source test"
@ -13,7 +13,7 @@ DESCRIPTION="The leading SQL relational database engine written in Java."
 HOMEPAGE="http://hsqldb.org"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"

-LICENSE="BSD"
+LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-solaris"
 IUSE=""
--- a/dev-db/hsqldb/hsqldb-1.8.1.3.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.8.1.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-db/hsqldb/hsqldb-1.8.1.3.ebuild,v 1.4 2012/06/04 06:32:37 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.8.1.3.ebuild,v 1.5 2012/07/13 14:19:56 sera Exp $

 EAPI=1
 JAVA_PKG_IUSE="doc source test"
@ -13,7 +13,7 @@ DESCRIPTION="The leading SQL relational database engine written in Java."
 HOMEPAGE="http://hsqldb.org"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"

-LICENSE="BSD"
+LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-solaris"
 IUSE=""
--- a/dev-db/virtuoso-odbc/Manifest
+++ b/dev-db/virtuoso-odbc/Manifest
@ -1,2 +1,4 @@
 DIST VOS-genpatches-6.1.4.tar.bz2 1224 SHA256 005d960017363d7f0c9807da6f706ec991e48d2c479f92798ee7df9003b7848a SHA512 f99429da6fd4c92252d183b6d1b8caae4910ac93d775c120d67c12925a0eb6ef2ce13a77b27944a2203047965431682a392a2731fc1690cb3f223a65823471c5 WHIRLPOOL 985ad05b55c7ebd1859e1233cb0546247b2ceca0f85b0ffc9212cc8393fbdd4c94af05b521beae08f3c11a838f64bc5b802c5f46dade8568de651929595cdf21
+DIST VOS-genpatches-6.1.5.tar.bz2 1224 SHA256 005d960017363d7f0c9807da6f706ec991e48d2c479f92798ee7df9003b7848a SHA512 f99429da6fd4c92252d183b6d1b8caae4910ac93d775c120d67c12925a0eb6ef2ce13a77b27944a2203047965431682a392a2731fc1690cb3f223a65823471c5 WHIRLPOOL 985ad05b55c7ebd1859e1233cb0546247b2ceca0f85b0ffc9212cc8393fbdd4c94af05b521beae08f3c11a838f64bc5b802c5f46dade8568de651929595cdf21
 DIST virtuoso-opensource-6.1.4.tar.gz 100595847 SHA256 153f92211a23e05dcf4bde4c94d2963d06321d00f213c50025d740b96140154e SHA512 4da7c152706723581486a1d70b2c6b9a1a6fc7280aa25a1d0184acea40c59de073e7473d2f9ac4cb75add3b90c4bc26bdf80695beb61f178e52b461215cf8e75 WHIRLPOOL 19e39c997fd415ebab1cf2a956a997d31d33565c84c99bbdc8d90acb7791f719832ba6c9c2f9d8033c9d4ed2ac212437614ede171c95c982a0b825e168bf17d2
+DIST virtuoso-opensource-6.1.5.tar.gz 112834237 SHA256 fa0af9ee0d16bd80ca1ac30202d6fd67311843269bea70a92eca87e2cce94a09 SHA512 957fa2bdd570e47999887475bcea3c97940d3ae986500c098e14582469dcce6ee6d8031f5fd9e6f4ca1e9b32e28a6015d1a3247144a2b28ae3845336248e32c5 WHIRLPOOL 3d7f8bce88a81dba3b0c305074e47067a5d076f42c7d7f38712642d362bb74884556184d5f82231543c30dcd1f4019bdbb816dc4560541a55a9c382cacdd865f
--- a/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.5.ebuild
+++ b/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.5.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.5.ebuild,v 1.1 2012/07/13 22:20:20 creffett Exp $
+
+EAPI=4
+
+inherit virtuoso
+
+DESCRIPTION="ODBC driver for OpenLink Virtuoso Open-Source Edition"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/openssl-0.9.7i:0
+"
+DEPEND="${RDEPEND}"
+
+VOS_EXTRACT="
+	libsrc/Dk
+	libsrc/Thread
+	libsrc/odbcsdk
+	libsrc/util
+	binsrc/driver
+"
+
+src_configure() {
+	myconf+="
+		--disable-static
+		--without-iodbc
+	"
+
+	virtuoso_src_configure
+}
+
+src_install() {
+	virtuoso_src_install
+
+	# Remove libtool files
+	find "${ED}" -name '*.la' -delete
+}
--- a/dev-db/virtuoso-server/Manifest
+++ b/dev-db/virtuoso-server/Manifest
@ -1,2 +1,4 @@
 DIST VOS-genpatches-6.1.4.tar.bz2 1224 SHA256 005d960017363d7f0c9807da6f706ec991e48d2c479f92798ee7df9003b7848a SHA512 f99429da6fd4c92252d183b6d1b8caae4910ac93d775c120d67c12925a0eb6ef2ce13a77b27944a2203047965431682a392a2731fc1690cb3f223a65823471c5 WHIRLPOOL 985ad05b55c7ebd1859e1233cb0546247b2ceca0f85b0ffc9212cc8393fbdd4c94af05b521beae08f3c11a838f64bc5b802c5f46dade8568de651929595cdf21
+DIST VOS-genpatches-6.1.5.tar.bz2 1224 SHA256 005d960017363d7f0c9807da6f706ec991e48d2c479f92798ee7df9003b7848a SHA512 f99429da6fd4c92252d183b6d1b8caae4910ac93d775c120d67c12925a0eb6ef2ce13a77b27944a2203047965431682a392a2731fc1690cb3f223a65823471c5 WHIRLPOOL 985ad05b55c7ebd1859e1233cb0546247b2ceca0f85b0ffc9212cc8393fbdd4c94af05b521beae08f3c11a838f64bc5b802c5f46dade8568de651929595cdf21
 DIST virtuoso-opensource-6.1.4.tar.gz 100595847 SHA256 153f92211a23e05dcf4bde4c94d2963d06321d00f213c50025d740b96140154e SHA512 4da7c152706723581486a1d70b2c6b9a1a6fc7280aa25a1d0184acea40c59de073e7473d2f9ac4cb75add3b90c4bc26bdf80695beb61f178e52b461215cf8e75 WHIRLPOOL 19e39c997fd415ebab1cf2a956a997d31d33565c84c99bbdc8d90acb7791f719832ba6c9c2f9d8033c9d4ed2ac212437614ede171c95c982a0b825e168bf17d2
+DIST virtuoso-opensource-6.1.5.tar.gz 112834237 SHA256 fa0af9ee0d16bd80ca1ac30202d6fd67311843269bea70a92eca87e2cce94a09 SHA512 957fa2bdd570e47999887475bcea3c97940d3ae986500c098e14582469dcce6ee6d8031f5fd9e6f4ca1e9b32e28a6015d1a3247144a2b28ae3845336248e32c5 WHIRLPOOL 3d7f8bce88a81dba3b0c305074e47067a5d076f42c7d7f38712642d362bb74884556184d5f82231543c30dcd1f4019bdbb816dc4560541a55a9c382cacdd865f
--- a/dev-db/virtuoso-server/virtuoso-server-6.1.5.ebuild
+++ b/dev-db/virtuoso-server/virtuoso-server-6.1.5.ebuild
@ -0,0 +1,86 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/virtuoso-server-6.1.5.ebuild,v 1.1 2012/07/13 22:25:39 creffett Exp $
+
+EAPI=4
+
+inherit virtuoso
+
+DESCRIPTION="Server binaries for Virtuoso, high-performance object-relational SQL database"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="kerberos ldap readline"
+
+# Bug 305077
+RESTRICT="test"
+
+# zeroconf support looks like broken - disabling - last checked around 5.0.12
+# mono support fetches mono source and compiles it manually - disabling for now
+# mono? ( dev-lang/mono )
+COMMON_DEPEND="
+	dev-libs/libxml2:2
+	>=dev-libs/openssl-0.9.7i:0
+	>=sys-libs/zlib-1.2.5.1-r2:0[minizip]
+	kerberos? ( app-crypt/mit-krb5 )
+	ldap? ( net-nds/openldap )
+	readline? ( sys-libs/readline:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	sys-apps/gawk
+	>=sys-devel/bison-2.3
+	>=sys-devel/flex-2.5.33
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	~dev-db/virtuoso-odbc-${PV}:${SLOT}
+"
+
+VOS_EXTRACT="
+	libsrc/Dk
+	libsrc/Thread
+	libsrc/Tidy
+	libsrc/Wi
+	libsrc/Xml.new
+	libsrc/langfunc
+	libsrc/odbcsdk
+	libsrc/plugin
+	libsrc/util
+	binsrc/virtuoso
+	binsrc/tests
+"
+
+DOCS=(AUTHORS ChangeLog CREDITS INSTALL NEWS README)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.1.4-unbundle-minizip.patch"
+	"${FILESDIR}/${PN}-6.1.4-strncat-overflow.patch"
+
+)
+
+src_prepare() {
+	sed -e '/^lib_LTLIBRARIES\s*=.*/s/lib_/noinst_/' -i binsrc/virtuoso/Makefile.am \
+		|| die "failed to disable installation of static lib"
+
+	virtuoso_src_prepare
+}
+
+src_configure() {
+	myconf+="
+		$(use_enable kerberos krb)
+		$(use_enable ldap openldap)
+		$(use_with readline)
+		--disable-static
+		--disable-hslookup
+		--disable-rendezvous
+		--without-iodbc
+		--program-transform-name="s/isql/isql-v/"
+	"
+
+	virtuoso_src_configure
+}
+
+src_install() {
+	virtuoso_src_install
+
+	keepdir /var/lib/virtuoso/db
+}
--- a/dev-haskell/frown/Manifest
+++ b/dev-haskell/frown/Manifest
@ -1 +1 @@
-DIST frown-0.6.1.tar.gz 1291807 SHA256 bfb5a7a84527624a605342cf739ebbef078a25721ca5af4fb7998590d76a9c05 SHA512 015f65afabde7061318bbd66c79ad064a44774afd9bcf161c842984128679f24c1e91e7de067a14833bd4b69d51906d825e453a02b9c0dd38b13b2a7432a9693 WHIRLPOOL fde918658a1664222b4b37953efabcdbf074c9280c898a39ca1ed0a08b740e2304760a2f08d6c1953f35cfb00a2cbb76690731c4e1a11ac591be93ac620658eb
+DIST frown-0.6.1.tar.gz 1291807 RMD160 7835af5095bc16c7ff459259fa91d1c08c35ca85 SHA1 251d299382f3fd2d1b2a5fda398497d19739a825 SHA256 bfb5a7a84527624a605342cf739ebbef078a25721ca5af4fb7998590d76a9c05
--- a/dev-haskell/frown/files/frown-0.6.1-ghc74.patch
+++ b/dev-haskell/frown/files/frown-0.6.1-ghc74.patch
@ -0,0 +1,396 @@
+diff --git a/Base.lhs b/Base.lhs
+index bbd9df5..c26e048 100644
+--- a/Base.lhs
+++ b/Base.lhs
+@@ -36,9 +36,9 @@
+ > where
+ >
+ > import Prettier
+-> import Monad                  (  MonadPlus(..)  )
+-> import IO
+-> import System
+> import Control.Monad                  (  MonadPlus(..)  )
+> import System.IO
+> import System.Exit
+ 
+ %-------------------------------------------------------------------------------
+ \subsection{List utilities}
+diff --git a/Case.lhs b/Case.lhs
+index 6558614..cbe87c0 100644
+--- a/Case.lhs
+++ b/Case.lhs
+@@ -45,10 +45,10 @@
+ > import MergeSort
+ > import Base
+ > import Options
+-> import Maybe
+-> import IO
+-> import Monad
+-> import List                   (  partition  )
+> import Data.Maybe
+> import System.IO
+> import Control.Monad
+> import Data.List                   (  partition  )
+ > import Prelude                hiding (  lookup  )
+ 
+ %-------------------------------=  --------------------------------------------
+@@ -347,4 +347,4 @@ More lookahead.
+ > actions'                      :: Symbol -> Past -> Past
+ > actions' x (Node es ts)       =  Node [ a{ future = f } | a <- es
+ >                                                         , Just f <- [lookup (future a) x] ]
+->                                       [ (e, actions' x t) | (e, t) <- ts ]
+\ No newline at end of file
+>                                       [ (e, actions' x t) | (e, t) <- ts ]
+diff --git a/Compact.lhs b/Compact.lhs
+index f878a06..6886a6a 100644
+--- a/Compact.lhs
+++ b/Compact.lhs
+@@ -49,9 +49,9 @@
+ > import Base
+ > import Generate
+ > import MergeSort
+-> import Char
+-> import IO
+-> import Maybe
+> import Data.Char
+> import System.IO
+> import Data.Maybe
+ > import Prelude                hiding (  lookup  )
+ 
+ %-------------------------------=  --------------------------------------------
+@@ -444,4 +444,4 @@ Names.
+ 
+ >     wrap s                    =  prefix opts ++ s ++ suffix opts
+ >     wrap_var s                =  var (wrap s)
+->     wrap_con s                =  con (wrap s)
+\ No newline at end of file
+>     wrap_con s                =  con (wrap s)
+diff --git a/Convert.lhs b/Convert.lhs
+index 6b7d836..01d2c32 100644
+--- a/Convert.lhs
+++ b/Convert.lhs
+@@ -42,13 +42,13 @@
+ > import OrdUniqListSet         (  Set, MinView(Empty, Min)  ) -- for nhc98
+ > import Atom                   hiding (  string  )
+ > import Haskell                hiding (  Empty, Decl, guard  )
+-> import Maybe
+-> import List
+> import Data.Maybe
+> import Data.List
+ > import Base
+ > import Prettier               hiding (  concat, intersperse  )
+ > import qualified Prettier as PP
+-> import Monad
+-> import IO                     hiding (  isEOF  )
+> import Control.Monad
+> import System.IO                     hiding (  isEOF  )
+ > import Options
+ 
+ > newEOF                        :: Ident
+@@ -361,4 +361,4 @@ Instance of a rule scheme.
+ >           | terminal w        =  w
+ >           | otherwise         =  case lookup w bindings of
+ >                                      Just w' -> w' { attributes = attributes w }
+->                                      Nothing -> updateArgs w (map substitute (arguments w))
+\ No newline at end of file
+>                                      Nothing -> updateArgs w (map substitute (arguments w))
+diff --git a/GParser2.hs b/GParser2.hs
+index 9d04100..0cb4c21 100644
+--- a/GParser2.hs
+++ b/GParser2.hs
+@@ -47,9 +47,9 @@
+   import qualified Base
+   import Prettier               (  Pretty  )
+   import Options
+-  import Char
+-  import List
+-  import IO
+  import Data.Char              hiding (  isSymbol  )
+  import Data.List
+  import System.IO
+ 
+ 
+ 
+@@ -2258,4 +2258,4 @@
+       where verb                =  verbose opts
+  
+   run                           :: (Monad m) => Lex m Answer -> (String -> m Answer)
+-  run parser inp                =  unLex parser (\a _ _ _ _ -> return a) False inp 1 (take 1 (lines inp))
+\ No newline at end of file
+  run parser inp                =  unLex parser (\a _ _ _ _ -> return a) False inp 1 (take 1 (lines inp))
+diff --git a/GVStack.lhs b/GVStack.lhs
+index f5968ad..acb5d96 100644
+--- a/GVStack.lhs
+++ b/GVStack.lhs
+@@ -45,10 +45,10 @@
+ > import Options
+ > import Base
+ > import Generate
+-> import IO
+-> import Monad
+-> import Char
+-> import List                   (  maximumBy  )
+> import System.IO
+> import Control.Monad
+> import Data.Char
+> import Data.List                   (  maximumBy  )
+ > import Prelude                hiding (  lookup  )
+ 
+ %-------------------------------=  --------------------------------------------
+diff --git a/Generate.lhs b/Generate.lhs
+index 74d7335..3b7284f 100644
+--- a/Generate.lhs
+++ b/Generate.lhs
+@@ -43,7 +43,7 @@
+ > import OrdUniqListSet         (  Set  )
+ > import Base
+ > --import Char                   (  toLower, toUpper  )
+-> import List                   (  intersperse  )
+> import Data.List                   (  intersperse  )
+ 
+ Symbols.
+ 
+diff --git a/Haskell.lhs b/Haskell.lhs
+index aba2831..74f7bec 100644
+--- a/Haskell.lhs
+++ b/Haskell.lhs
+@@ -35,7 +35,7 @@
+ > import Atom                   hiding (  string  )
+ > import qualified Atom
+ > import Prettier
+-> import Char
+> import Data.Char
+ > import Prelude                hiding (  concat  )
+ 
+ %-------------------------------=  --------------------------------------------
+diff --git a/LR0.lhs b/LR0.lhs
+index 0a16123..60bb002 100644
+--- a/LR0.lhs
+++ b/LR0.lhs
+@@ -45,7 +45,7 @@
+ > import Base                   hiding (  list  )
+ > import qualified Base
+ > import Prelude                hiding (  null  )
+-> import IO
+> import System.IO
+ > import Options
+ 
+ %-------------------------------=  --------------------------------------------
+@@ -269,4 +269,4 @@ State |0| is the error or trap state and the goto state for start
+ productions such as |Start# : Start, EOF;|.
+ 
+ > errorState                    :: State
+-> errorState                    =  State 0 (Set.empty :\/ Set.empty)
+\ No newline at end of file
+> errorState                    =  State 0 (Set.empty :\/ Set.empty)
+diff --git a/Lexer2.lhs b/Lexer2.lhs
+index af55186..3bb1e33 100644
+--- a/Lexer2.lhs
+++ b/Lexer2.lhs
+@@ -35,9 +35,9 @@
+ > module Lexer2
+ > where
+ > import Prelude
+-> import Char
+-> import IO
+-> import Monad
+> import Data.Char
+> import System.IO
+> import Control.Monad
+ > import Base
+ > import Options
+ 
+@@ -156,4 +156,4 @@
+ 
+ > isSymbol, isIdChar	        :: Char -> Bool
+ > isSymbol c			=  c `elem` "!@#$%&*+./<=>?\\^|:-~"
+-> isIdChar c			=  isAlphaNum c || c `elem` "_'"
+\ No newline at end of file
+> isIdChar c			=  isAlphaNum c || c `elem` "_'"
+diff --git a/Lib/OrdUniqListFM.lhs b/Lib/OrdUniqListFM.lhs
+index 1419028..4e2eea5 100644
+--- a/Lib/OrdUniqListFM.lhs
+++ b/Lib/OrdUniqListFM.lhs
+@@ -64,8 +64,8 @@
+ > import qualified OrdUniqList as OUL
+ > import MergeSort		(  mergeSort  )
+ > import Prettier               hiding (  empty  )
+-> import qualified List
+-> import Maybe                  (  fromMaybe  )
+> import qualified Data.List as List
+> import Data.Maybe                  (  fromMaybe  )
+ 
+ > infixl 9  !
+ > infixl 9  //
+@@ -292,4 +292,4 @@ The list argument of |fromList_C| need not be functional.
+ @prefixLookup@ returns the list of all completions of the given list.
+ 
+  prefixLookup			:: Ord a => FM [a] b -> [a] -> [([a], b)]
+- prefixLookup (FM f) s		=  [ b | Assoc b@(a, _)<-f, s `isPrefixOf` a ]
+\ No newline at end of file
+ prefixLookup (FM f) s		=  [ b | Assoc b@(a, _)<-f, s `isPrefixOf` a ]
+diff --git a/Lib/OrdUniqListSet.lhs b/Lib/OrdUniqListSet.lhs
+index 66eba10..ddb8629 100644
+--- a/Lib/OrdUniqListSet.lhs
+++ b/Lib/OrdUniqListSet.lhs
+@@ -59,8 +59,8 @@
+ > import qualified Prelude
+ > import qualified OrdUniqList as OUL
+ > import Prettier               hiding (  empty  )
+-> import qualified List
+-> import Monad
+> import qualified Data.List as List
+> import Control.Monad
+ 
+ %-------------------------------------------------------------------------------
+ \subsection{Type definitions and instance declarations}
+diff --git a/Lookahead.lhs b/Lookahead.lhs
+index ba23a5d..5c0fb31 100644
+--- a/Lookahead.lhs
+++ b/Lookahead.lhs
+@@ -42,9 +42,9 @@
+ > import qualified Prettier as PP
+ > import Base
+ > import Options
+-> import IO
+-> import Maybe
+-> import Monad                  (  when  )
+> import System.IO
+> import Data.Maybe
+> import Control.Monad                  (  when  )
+ 
+ %-------------------------------=  --------------------------------------------
+ \section{Grouping of actions}
+diff --git a/Main.lhs b/Main.lhs
+index b9b2a2e..98af968 100644
+--- a/Main.lhs
+++ b/Main.lhs
+@@ -53,11 +53,12 @@ Compile me with
+ > import Prettier               hiding (  string, concat  )
+ > import qualified Prettier as PP
+ > import qualified SearchTree as ST
+-> import Monad                  (  when  )
+-> import Directory
+-> import IO
+-> import System
+> import Control.Monad                  (  when  )
+> import System.Directory
+ > import System.Console.GetOpt
+> import System.Exit
+> import System.Environment
+> import System.IO
+ 
+ %-------------------------------=  --------------------------------------------
+ \section{The main program}
+@@ -689,4 +690,4 @@ o  Introduce abbreviations for patterns (as in Happy):
+                                  | let add op = ADDOP (op :: Addop)
+                                  | let id  s  = IDENT (s :: String);
+ 
+-   |add op| serves as an abbreviation for |ADDOP op|.
+\ No newline at end of file
+   |add op| serves as an abbreviation for |ADDOP op|.
+diff --git a/Options.lhs b/Options.lhs
+index a0e559f..ece780d 100644
+--- a/Options.lhs
+++ b/Options.lhs
+@@ -33,8 +33,8 @@
+ > where
+ > import Base
+ > import System.Console.GetOpt
+-> import Char
+-> import IO
+> import Data.Char
+> import System.IO
+ 
+ %-------------------------------=  --------------------------------------------
+ \section{Command line options}
+@@ -149,4 +149,4 @@
+ >   | otherwise                 =  Signature False
+ 
+ > (<<)                          :: String -> String -> Bool
+-> s << t                        =  map toLower s `isPrefix` map toLower t
+\ No newline at end of file
+> s << t                        =  map toLower s `isPrefix` map toLower t
+diff --git a/SearchTree.lhs b/SearchTree.lhs
+index 85755d4..d1c58ba 100644
+--- a/SearchTree.lhs
+++ b/SearchTree.lhs
+@@ -32,7 +32,7 @@
+ >                               ,  length, lookup, unsafeLookup  )
+ > where
+ > import MergeSort		(  mergeSortBy  )
+-> import Maybe                  (  fromMaybe  )
+> import Data.Maybe                  (  fromMaybe  )
+ > import Prelude                hiding (  length, lookup  )
+ > import qualified Prelude
+ 
+@@ -99,4 +99,4 @@ Lookup.
+ 
+ 
+ > unsafeLookup                  :: (Ord a, Show a) => FM a v -> a -> v
+-> unsafeLookup fm a             =  fromMaybe (error ("unsafeLookup: key not found: " ++ show a)) (lookup fm a)
+\ No newline at end of file
+> unsafeLookup fm a             =  fromMaybe (error ("unsafeLookup: key not found: " ++ show a)) (lookup fm a)
+diff --git a/Stackless.lhs b/Stackless.lhs
+index 106b8f3..2fb1a97 100644
+--- a/Stackless.lhs
+++ b/Stackless.lhs
+@@ -47,10 +47,10 @@
+ > import Base
+ > import Generate
+ > import MergeSort
+-> import Char
+-> import Maybe
+-> import IO
+-> import Monad
+> import Data.Char
+> import Data.Maybe
+> import System.IO
+> import Control.Monad
+ > import Prelude                hiding (  lookup  )
+ 
+ Characteristics.
+@@ -311,4 +311,4 @@ Names.
+ 
+ >     wrap s                    =  prefix opts ++ s ++ suffix opts
+ >     wrap_var s                =  var (wrap s)
+->     wrap_con s                =  con (wrap s)
+\ No newline at end of file
+>     wrap_con s                =  con (wrap s)
+diff --git a/Standard.lhs b/Standard.lhs
+index 18bce59..9fb5305 100644
+--- a/Standard.lhs
+++ b/Standard.lhs
+@@ -47,9 +47,9 @@
+ > import Options
+ > import Base
+ > import Generate
+-> import Char
+-> import IO
+-> import Maybe
+> import Data.Char
+> import System.IO
+> import Data.Maybe
+ > import Prelude                hiding (  lookup  )
+ 
+ Characteristics.
+@@ -293,4 +293,4 @@ Names.
+ 
+ >     wrap s                    =  prefix opts ++ s ++ suffix opts
+ >     wrap_var s                =  var (wrap s)
+->     wrap_con s                =  con (wrap s)
+\ No newline at end of file
+>     wrap_con s                =  con (wrap s)
+diff --git a/frown.cabal b/frown.cabal
+index 19448ed..5a44fdf 100644
+--- a/frown.cabal
+++ b/frown.cabal
+@@ -2,7 +2,7 @@ Name:			Frown
+ Version:		0.6
+ License:		GPL
+ Author:			Ralf Hinze
+-Build-Depends:		base, haskell98
+Build-Depends:		base, directory
+ Synopsis:		A parser generator for Haskell
+ 
+ Executable:		frown
--- a/dev-haskell/frown/frown-0.6.1-r1.ebuild
+++ b/dev-haskell/frown/frown-0.6.1-r1.ebuild
@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/frown/frown-0.6.1-r1.ebuild,v 1.12 2007/12/13 18:01:45 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/frown/frown-0.6.1-r1.ebuild,v 1.13 2012/07/13 20:42:04 qnikst Exp $
+
+EAPI="4"

 CABAL_FEATURES="bin"
 inherit haskell-cabal
@ -18,10 +20,10 @@ RDEPEND=""

 S="${WORKDIR}/Frown-${PV}"

-src_unpack() {
-	unpack ${A}
+src_prepare() {
 	# enabling optimisation is strongly recommended
 	echo "ghc-options: -O" >> "${S}/frown.cabal"
+	epatch "${FILESDIR}/${P}-ghc74.patch"
 }

 src_install() {
--- a/dev-java/commons-jelly/commons-jelly-1.0-r5.ebuild
+++ b/dev-java/commons-jelly/commons-jelly-1.0-r5.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/commons-jelly-1.0-r5.ebuild,v 1.1 2012/07/13 13:47:12 sera Exp $
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_P="${P}-src"
+DESCRIPTION="A Java and XML based scripting and processing engine"
+HOMEPAGE="http://commons.apache.org/jelly/"
+SRC_URI="mirror://apache/jakarta/commons/jelly/source/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/commons-beanutils:1.7
+	dev-java/commons-cli:1
+	dev-java/commons-collections:0
+	dev-java/commons-discovery:0
+	dev-java/commons-jexl:1.0
+	dev-java/commons-lang:0
+	dev-java/commons-logging:0
+	dev-java/dom4j:1
+	dev-java/jakarta-jstl:0
+	dev-java/jaxen:1.1
+	dev-java/junit:0
+	java-virtuals/servlet-api:2.5"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.4"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.4
+	test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${MY_P}
+
+java_prepare() {
+	# disables dependency fetching, and remove tests as a dependency of jar
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_EXTRA_ARGS="-Dlibdir=."
+EANT_GENTOO_CLASSPATH="
+	commons-beanutils-1.7,commons-cli-1,commons-collections,commons-discovery
+	commons-jexl-1.0,commons-lang,commons-logging,dom4j-1,jakarta-jstl
+	jaxen-1.1,junit,servlet-api-2.5"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar ${PN}.jar
+
+	dodoc NOTICE.txt README.txt RELEASE-NOTES.txt || die
+
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@ -1,33 +1,33 @@
-DIST jdk-6u31-linux-i586.bin 85292206 SHA256 60fdd4083373db919334500b8050b326d45d78703aa2d403eda48cfa5621702b
-DIST jdk-6u31-linux-ia64.bin 71220085 SHA256 53ed873098c0dcdf94e3d74ff074005ae1d8aa94c2b75c530df6272a76a3adc9
-DIST jdk-6u31-linux-x64.bin 85581913 SHA256 0219d4feeedb186e5081ab092dfcda20c290fde5463f9a707e12fd63897fd342
-DIST jdk-6u31-solaris-i586.sh 85175121 SHA256 997f9934dd1b32b206c1798824a4bd9e0606bb51f149264bf28d46853f3fe069
-DIST jdk-6u31-solaris-sparc.sh 90382665 SHA256 98994aee1009f6fc3364c904bb478816be6454c9296ba4f9f95f350b5871df4a
-DIST jdk-6u31-solaris-sparcv9.sh 12835228 SHA256 67c0ba60eb37cbe8fabf4f1eb64117d82d32772fcce19b77039b8fcf9176df59
-DIST jdk-6u31-solaris-x64.sh 8911566 SHA256 fbedc2e46f9e2260d876107cb6bbac08378e824f07c34966ab5a14e11f44e9ed
-DIST jdk-6u32-linux-i586-demos.tar.gz 12074528 SHA256 aa62b23fd886b22a4af51ade8eb42f97f2f143b96a1b2418413764e95e298328
-DIST jdk-6u32-linux-i586.bin 71746385 SHA256 ab840c7de8f452b09d53ebe9477ffdb4622fa8cabbf962474d1914fde9a20f19
-DIST jdk-6u32-linux-x64-demos.tar.gz 12134648 SHA256 99257a5984094f8ae0592cd06e380dd7aefc410f46013bc23b9bc3156d4c8d1e
-DIST jdk-6u32-linux-x64.bin 72033964 SHA256 269d05b8d88e583e4e66141514d8294e636f537f55eb50962233c9e33d8f8f49
-DIST jdk-6u32-solaris-i586-demos.tar.Z 17934628 SHA256 c9423970f73cf2b3115e16234d1848d92519809c0cea9a873f6f91c6fc7bccc5
-DIST jdk-6u32-solaris-i586.sh 71653841 SHA256 0634b567bfe8ffe1576492ecb08c28174354dae91bcf5bd2c1484e1a34ee94e7
-DIST jdk-6u32-solaris-sparc-demos.tar.Z 17943477 SHA256 25d435521bf481ed770f6b07b2320669b1964967afb6770048ff2598db817da1
-DIST jdk-6u32-solaris-sparc.sh 76857741 SHA256 8a4d5ad0310aca103c5e649958f7d8291f974c7c0bd9c77fb7b8020c162fad29
-DIST jdk-6u32-solaris-sparcv9-demos.tar.Z 67919 SHA256 05a887127d38732b3ba5e7d1096455e685f7add7f7cb24d96f9dadff3d2bde78
-DIST jdk-6u32-solaris-sparcv9.sh 12774004 SHA256 23a049e3c716309b5c1aa6bc1e96b6503f501a47250a7d1c45a02cbbc80b9fab
-DIST jdk-6u32-solaris-x64-demos.tar.Z 72693 SHA256 b139ac8b8a03d6e7652b11643883ce69fe365c61d3e9fa3c06d4ca9a003aa35b
-DIST jdk-6u32-solaris-x64.sh 8846042 SHA256 10f13c08e0571472dc0fb99ec10314c0083ae675ce6bc041c7a5a653d63522f0
-DIST jdk-6u33-linux-i586-demos.tar.gz 12074428 SHA256 5b3b4e8f005c6d1339fe4f692080246ba2a4ff90a89dd985679ad5b364bd48bc SHA512 c5bd3e3f4d657174c5743988a5b6e49bcf256990d9a77376bcde6e21eb2247d3748f5c6aeb203a5af22818e5db8e7706315d2e6a1d877cdcd9b22da5cc286353 WHIRLPOOL 484eb86a0034582bf3f7315fbb393af8fd9d0dea16848c6387fb22b3c9edea39268e7f5b2eaa18d22f91f6935b7bd28ea41e8e1448390a688865a306d65568f9
-DIST jdk-6u33-linux-i586.bin 71748499 SHA256 2acb931d0cb455dbae3f6b11d394dd7e5758e6499abc1a7c50909e72cfb67fa7 SHA512 e0ebf4c9b3e774e1f66cdef956c9fdcce6d8e2061cd9dcbe242a5e6f44cd266870c405ce6821075c97cd0fb8a23069f042bdfc465077c7334c6a578ea0f477e3 WHIRLPOOL 6c356ec2f06637a04a8ab22489ee50c159bd783b0d3651f00aab35450fe336caf574749f29716d41ec97f1f0da3f65112ac5c6d5ef4dbc0000ef19cf20403f5e
-DIST jdk-6u33-linux-ia64-demos.tar.gz 6858807 SHA256 8e51d3f9be6c0b9921f9534bc20fe25b023281fce8d2ecd9310c12bb3e72e55c
-DIST jdk-6u33-linux-ia64.bin 63591748 SHA256 020a5ca1c666e7a57c6ab5bad4d1f42657a9b2d7478665f8933aa5b1f0e0c4f7
-DIST jdk-6u33-linux-x64-demos.tar.gz 12134002 SHA256 056a59c944d1e1e1eb7b0be90e48d591cd4d2ddf165e376519dccdbd70547a3a
-DIST jdk-6u33-linux-x64.bin 72029591 SHA256 978daf43e7fc302220174a16aecaf54d5e9b72f1cd1681f36ab14a2b4bad5fd4
-DIST jdk-6u33-solaris-i586-demos.tar.Z 17950479 SHA256 4d77b49413054a9ed1755bfb229ab50b21301d9fc50f0a30dcddf5b6fcf0c420
-DIST jdk-6u33-solaris-i586.sh 71648957 SHA256 9b7a0f2ff0b269086c51d316b36cb85b106bf1f259c56defe58ce9fbf327826c
-DIST jdk-6u33-solaris-sparc-demos.tar.Z 17943081 SHA256 92e39fc49ace8d4b9f7babfad33e3a4f1cabc79145ff01964007a5d69823cb63
-DIST jdk-6u33-solaris-sparc.sh 76857363 SHA256 c76e8e40d34e4d4aed00ca1ee202c89e3545782f1785956ebaf22a12ad768622
-DIST jdk-6u33-solaris-sparcv9-demos.tar.Z 66663 SHA256 4f5f702c16cdfb35be00fed90a8d93299b7e10bc125c0f4b74fa47ee71ddb98f
-DIST jdk-6u33-solaris-sparcv9.sh 12775348 SHA256 fa42d6974d88c0c69fa827c1106c577f95687f19004bcca541db32ae19f9d1c5
-DIST jdk-6u33-solaris-x64-demos.tar.Z 71875 SHA256 6712cbf1d8067e32bd430c74bbbb958ce91d21fc16d7147ec890a967b932c357
-DIST jdk-6u33-solaris-x64.sh 8847662 SHA256 07e23931631c68120dd3c17d857982a1547937cc096f5f9d372029442ad5656c
+DIST jdk-6u31-linux-i586.bin 85292206 SHA256 60fdd4083373db919334500b8050b326d45d78703aa2d403eda48cfa5621702b SHA512 9cdd9c7dbdffafb4a77c39aabf4a128b4eaa68c317b4c55199b361ff4e4a01af7289a3a7a1339796a561faac644d86321afd7c1a58d5318a0e1e01e04d11f899 WHIRLPOOL 9d1044fa004a220fa140756f89da18b3803d4fe9c3b760eb22408d0f3e5ac54288529f1ae82e5378584c43bcb1c258a45d5dfdfc575128a68c90f67657114d62
+DIST jdk-6u31-linux-ia64.bin 71220085 SHA256 53ed873098c0dcdf94e3d74ff074005ae1d8aa94c2b75c530df6272a76a3adc9 SHA512 0fe949fb8ffa9f71ae771360d7a6d43deee3cc70047f0b076815f21a250db285f01b0069a9e55f117292369b93353b9851258138d4233eb726e0aa422ee814b3 WHIRLPOOL 43b176644ffc3ce45bfb607e766b2be0a07d78808547cd5c02257f48399753f101340ad56b824aac0ffe16ad259b68b978815b78ac1e527b9f13fbad6bfa8ce0
+DIST jdk-6u31-linux-x64.bin 85581913 SHA256 0219d4feeedb186e5081ab092dfcda20c290fde5463f9a707e12fd63897fd342 SHA512 a21bd9454a1928c0ba34603c481d8a9b5ed26cf1cd0e8ea07e180ff1bfa92d86afc2d7e59caab1f72110872d24e04b94113fcaf8afef62a9e7d7498dc557e472 WHIRLPOOL e51290d682836c75686f56d154bffa8beb0c462377f78fb33bed8229c73dbc93648effc3d9fbdefb6cd262145ca616c4858f0a759e872b9f003a48244c260ddb
+DIST jdk-6u31-solaris-i586.sh 85175121 SHA256 997f9934dd1b32b206c1798824a4bd9e0606bb51f149264bf28d46853f3fe069 SHA512 7767596037fa9803a3d3ba33b946746bd54da16079a0785e9e1fa5a21bd2b0a860fdf8ea0b68b471a5f66e5ba5942296e184837d69460218e546a1ee6c73d3e8 WHIRLPOOL 33b493ba9e0830df06ec5569e10a7aaf05903efc6405f4881094f088a72c39b05e2e8eef3f834ad0f914569a35d8f0e0d8f747101af5e5ffde9d8733c41834ca
+DIST jdk-6u31-solaris-sparc.sh 90382665 SHA256 98994aee1009f6fc3364c904bb478816be6454c9296ba4f9f95f350b5871df4a SHA512 d0926ac82b5d4879855f62a8bf412711c9f8f4a1eda5d31fd7bfff058409a28c3e0859c661aafdade9cca2971c4b357e92e27a457a85231a22f69ec6da45cc9c WHIRLPOOL 684d6ea8f054dc7520de9dae4894aea066058763920c2bf6e655cf6a1076bede1908691e5410753478cc1418dbe0963ad8df956cf2d0c2490f34a2a024a76e28
+DIST jdk-6u31-solaris-sparcv9.sh 12835228 SHA256 67c0ba60eb37cbe8fabf4f1eb64117d82d32772fcce19b77039b8fcf9176df59 SHA512 1ddf867527f47b6a54a32d5d6dc01b05f2cde4df87edebb31c6119616c87307a536cf81be21ff6a4f97b76cd5f2a01bec93780f4906986c06d2db5da3ffb1c2d WHIRLPOOL 19c4079121e4f22be12ecceae6e6732934c69ab320786128192188f53b1df8410c893387dff5bdfccdd836fe95df23324c68d9c0f53907d390c40f071deea7f6
+DIST jdk-6u31-solaris-x64.sh 8911566 SHA256 fbedc2e46f9e2260d876107cb6bbac08378e824f07c34966ab5a14e11f44e9ed SHA512 07922968831f2dc1ece4b1f4414654e5afed7dc8d6f9c96e71888d55a1d91c7808a2aea4849cd4679f1780c54c4ead3414140278774a36a59f7a24d22d9180a0 WHIRLPOOL 1330e558f0c5b69d34969874b5b013e4c124bb4581c5527a16c34d310340b0b3dc66c5edce18b69fb8242a87c0bb0dabc0ff3cec0cd5e48d326865de84d2185a
+DIST jdk-6u32-linux-i586-demos.tar.gz 12074528 SHA256 aa62b23fd886b22a4af51ade8eb42f97f2f143b96a1b2418413764e95e298328 SHA512 4c96f7103cddab227a6db768deea321e9ed88f737674fac285163b6d75ecdcd36aed54fe848b3cf56c932283ffc0bdc7472a1888a012d1ca3c3dbbc68a63eaa2 WHIRLPOOL d62e14c72cbd2af556dd0ec100a2d909744ed1afc88d5bb3a5451c137a2bcfa603ded0a6af19adb1566efff886f0d22358bdc2e54cccef0ad43e2497a5d79950
+DIST jdk-6u32-linux-i586.bin 71746385 SHA256 ab840c7de8f452b09d53ebe9477ffdb4622fa8cabbf962474d1914fde9a20f19 SHA512 eaf3ff0f38a553de2ecccfc4c4a37102069c9165065fe02a696e6c3a42c913d65d753b34307f999e7a92d8f1187d5ca966ffec711aaf4953dd8cf910a2509969 WHIRLPOOL 209bba587e9442328ce601e13573f7ff7c3e9788f63c43298aebf6bf5e1eea3d6bcd4bf4df750079c9ad6e97e0237ef68314db2806ce19cf77ad7bdf96c8e9cf
+DIST jdk-6u32-linux-x64-demos.tar.gz 12134648 SHA256 99257a5984094f8ae0592cd06e380dd7aefc410f46013bc23b9bc3156d4c8d1e SHA512 e4a08bea6796e1e7561171b2c7e7c6ef7f23a5ffb7fa7e61683844133fddc9e88a18ef55f3f3e48ca4b07cf71d4bb11195d0becc900ec89ebcf9695bd4b41ea6 WHIRLPOOL be0e3c5105719f59b6ccf384f2759b1cbb83abe279902a35f019827615ff0339de9144d4c60f5c00eb55a156eca532ef62984a0d75c4f4dc6d05444e82934aa0
+DIST jdk-6u32-linux-x64.bin 72033964 SHA256 269d05b8d88e583e4e66141514d8294e636f537f55eb50962233c9e33d8f8f49 SHA512 77f497cf72e340787eb50309f873d96f8392138444a4f8ee50130708bc2f8009b2b1d375653591204f39937c9b1e7a782acaf8ec2157ae5962a0711a87b5aacb WHIRLPOOL 545046103a48f49a2c6688cfa0972cab5546084bda404d33cb258f4ec99e055755c57e7b9794c212176531121bc08a4ff563a820ccd014557ea0edaa2725a3bf
+DIST jdk-6u32-solaris-i586-demos.tar.Z 17934628 SHA256 c9423970f73cf2b3115e16234d1848d92519809c0cea9a873f6f91c6fc7bccc5 SHA512 e368953f3971118d1bf5d4a0485879400908f4efc2f1fad756a05d3cf6c6963555e75808725e7eed409cb5b3ebd6c227bcd3da5d82854b682ef673b105d6fc12 WHIRLPOOL de797d9d0f8339bd9ca1fb77f81af170f3b4c7a1dab058e89168ed8917e42ff19fb293b27b40f0f963e02ae5ee76883f15933d5b22e9b21b4f23e09fdce9ef18
+DIST jdk-6u32-solaris-i586.sh 71653841 SHA256 0634b567bfe8ffe1576492ecb08c28174354dae91bcf5bd2c1484e1a34ee94e7 SHA512 0071bf352f6c1e248c6f897b9fee6f4d14d84b9528de7db9c0bbcf8eb4c354d0c44fbb765500953d6da5d3e465fbd515a44c2acad0ac2891f9cc0bce75c6f189 WHIRLPOOL db11d23d592121a738446c34e1a8cf2ca815280783f0a5f4daee00765da2bb5d958014963a891c41b4fb618f653e3c08e5bee63f260c86e0d8ceefbc29e37555
+DIST jdk-6u32-solaris-sparc-demos.tar.Z 17943477 SHA256 25d435521bf481ed770f6b07b2320669b1964967afb6770048ff2598db817da1 SHA512 e2894f5cd0b166dbc001468bdfef4e513973054b11a6f4dab01e7ce60ff1fe1a43e71e34f73fbcd3ff6edbbc5e3f2e564d794f69cc08d7e0d0c673c72d3f787a WHIRLPOOL aba944379f8c79d55e69441714da948f950f19f9b6e630863a517a3a49db8216a45b762b2047439a23f4296a256890fbf738b4b85b685a9eb82b3a5470987a94
+DIST jdk-6u32-solaris-sparc.sh 76857741 SHA256 8a4d5ad0310aca103c5e649958f7d8291f974c7c0bd9c77fb7b8020c162fad29 SHA512 ba958e5a7051a1c2418e2c78535be91a2d84ba9e9994e58b62eddbcbb9a73bc80212717a237122d45796269483f8c9bfcd5ed5b13faf21969f9f1501e20d56f8 WHIRLPOOL 0e91c9c5d13515f046b6e046dc573fbb7c6a13535740dbaf0361ae6db1726092b268033bfc753d14014518bba0e85033b4325541cc62cb767ee5b1fdd4870daa
+DIST jdk-6u32-solaris-sparcv9-demos.tar.Z 67919 SHA256 05a887127d38732b3ba5e7d1096455e685f7add7f7cb24d96f9dadff3d2bde78 SHA512 33bf312adf2002812cd503fd9ee773c878c63d01afdd071f489735015e8ba1f0c35b13bbfa4bc009dd6471ef3dcc359f8260a1cc4ec10a553ee9fb7e2a0a27b4 WHIRLPOOL 15e5842e0b477e34013325b98d209f4e47c0a742e8eda1ec3b5a3e2b5aaa9fc2b147176e64fb32d7a8a69bf0a71e8e76e9b6c977c6da9d09189e022d611c2ccc
+DIST jdk-6u32-solaris-sparcv9.sh 12774004 SHA256 23a049e3c716309b5c1aa6bc1e96b6503f501a47250a7d1c45a02cbbc80b9fab SHA512 ddc646deb3cd50a4a21e07ac5d0f669567945ef17e92126c7ea3bc7c477d8436ce1100cff68789882e4d69792bdd803d0b0a46762ea744859d7ebce2126babcc WHIRLPOOL 6f7459e5eacad19c6829d82e897144e8896f528382c07d62363638cec2972fba39277e94beb5aafd2d979e9548ba84f5b1ff16d7b931f784596ef3f2f7fe346a
+DIST jdk-6u32-solaris-x64-demos.tar.Z 72693 SHA256 b139ac8b8a03d6e7652b11643883ce69fe365c61d3e9fa3c06d4ca9a003aa35b SHA512 39403a2825218ac5a01f4d3ad47bb5fc95b3bbaf2d99f356f720e00460e61ca3a66e0b61e2c4e3ff92f061d35789f9b75e72d177f57a0b0d59e1d35b6011c3d2 WHIRLPOOL 3efcbf73d0dada0e9a0cbc323f38c45d058f6cf96466f9234b47b4f78293d068c0ba33c063b6ef3c4180947ef0f2835dc7f8ae95b37a07b08e295357c297857b
+DIST jdk-6u32-solaris-x64.sh 8846042 SHA256 10f13c08e0571472dc0fb99ec10314c0083ae675ce6bc041c7a5a653d63522f0 SHA512 b6b7b22a57fe18ed3e401df08b0cc7a754f101ccf1357df50c84912e8e0bae372655e5cd7259a21ac73ec3778d453626bd38797764a16d0922f41844f24ae1f9 WHIRLPOOL cf3ebbd94fd7d8d38c145a1766f5faeb3d8506e9b828c8c41ec1b66655b57fca275a7826dbd4bd430f1b7fd25428cff632ab6d442bfcebfc6883bce079da53ef
+DIST jdk-6u33-linux-i586-demos.tar.gz 12074593 SHA256 22265cb94b4f8cc549d333911a61015e6ea0366a7486bc0be3d3c5302b00d514 SHA512 9006b24f32e21d4c25ec845135f7647eaccc3b045f62781de26855460486742c98d226f3b1e16cd7c205cf9af5b0c84bb513d89484fdf86655183af1771373aa WHIRLPOOL 4f17cee1cb799a1cb89b05d28e7dead09771bff0edb28d5feee93c02e702beda9603702dbc0cea9a63c81b68e05e33f2098c4f4723d103458fb04ca6fc536dfa
+DIST jdk-6u33-linux-i586.bin 71748681 SHA256 bfb8f04ea18eb39a0e476b400a506d2614a3ce258d09a87d25e401e0f9b4d940 SHA512 62120cedf9ae87a3ae3c2538fc4797cd5b4ca831218932e7b580ca1f2d3a25baa429273861179cc156926dd19df0760716b7027a0a56860d7ae3858d9aee88eb WHIRLPOOL 1fcf117146891adbd2adc664d198aa4791ae754e445ee0c2a9ad946b5848183fc5408fafc832b305970238d0ef8f895b81c05ce07ea9457ac65c2e113c4cebb6
+DIST jdk-6u33-linux-ia64-demos.tar.gz 6858807 SHA256 8e51d3f9be6c0b9921f9534bc20fe25b023281fce8d2ecd9310c12bb3e72e55c SHA512 81b4253280f29fcac87851955226d441f1c0cdb8a296b04e168e83550c9cfe24ab7968f1b8f27872c650317c6fe0b1889a4bcac7e25af74f7c3d03e02e6ec96c WHIRLPOOL 3c51125186dc783cb10da6eaf27ae395e3a446dddbe3ba65371bf219dbf4f5dcefdf75801fb6c29bc3fb2c9a0b7809cc1a553592b2a9b82a3cbc41a1afd044b7
+DIST jdk-6u33-linux-ia64.bin 63591748 SHA256 020a5ca1c666e7a57c6ab5bad4d1f42657a9b2d7478665f8933aa5b1f0e0c4f7 SHA512 e45dc2c802074cf4a6729680536301b5e11f8fc6673437787f907d6af43ca2c316827899f6948530dbf4d72e3c7c09ab2c99a0aa14dd9b1e5ed27136db9dfd8f WHIRLPOOL 1fc2a66ef69d4cc06b2e5cb78d09b6eb2ec6e0da585e9de45d896f295b9d1051ea4eff6b13b2e12a220c47d0fa6342750a02d3a892437987421ae6df0b0d9a39
+DIST jdk-6u33-linux-x64-demos.tar.gz 12132657 SHA256 61f9cafb45d806e54b35bc861980606ace85dfcd1caad6055ba2ee443ec0b6f3 SHA512 cea5e898911e2c66c15733a9402d5ef42d20a7ddb1ff0f477aa68c30329fe443c44f49259544af1e262245251d05e4e5d841902d718a2316b37baf03bed2c814 WHIRLPOOL ece217a31cfa3d55a28fd2d9939f71fa2cbb074de238d37e49955c6cc66d3a947f91083549915cbdb7a4f819657c34a19785148bce2f95b2f7316d2fa27b67c3
+DIST jdk-6u33-linux-x64.bin 72029394 SHA256 215e38e49f7b1b8f0b66383598a51125dbaf04dbcc79de14732406df5e342fb9 SHA512 b6c264b1e2f96cbeaf578d079cc2bce7b479e6dac03e88ed76c99c0723c34a36a7b5a0d736bff13805d24b4abfa10816c837183392eec20bd68b584c5882b3d7 WHIRLPOOL d23e2579f206c3297931ed243ddb1c2172598a096108e9806e45274f613134d4c7f2c6ada5bfeedec4c9159f8e4a7e44254f36a48a24a45ab6f6e8a043d201fa
+DIST jdk-6u33-solaris-i586-demos.tar.Z 17931370 SHA256 32c42d714ce98bbb3e4292860cda5fa0bbd91264a97339700522dfeae18624a3 SHA512 664e0bb37ee60e5df884980ed0dd13459a7ce9502b65dc46e2e349fbcd3382949ddb6a04d3915bd80b0686692236030de2bc530e73d15e72c9592f25b6db803c WHIRLPOOL 07958030b73e0121a9aff29eb9bba9f4988b0899b65126e616d058e5e72a936470a6e0365cfc869249d415a3b68aa1062d4ee19ce8e83f95eecdfe23cba72b76
+DIST jdk-6u33-solaris-i586.sh 71652871 SHA256 163ff6d49c9a4590fdb07803f0ab44e2edf6f2e214da4964619c937502bdb32b SHA512 81e100cba6d4b70d4c9337bc5734b6b850474e00266d4bc7915594ac130e1488616395157017841a24013cc97238040a2aec88d51c0f8900e748b3f4700ca4be WHIRLPOOL 75f9e7e8a99865fd798d86a7af6636524c15b7def0a170d1892ca2df753dd7d120117398c0070e61864ed2c32b1cfc2f8cdad192924d4d9ab74603ae5bd898d4
+DIST jdk-6u33-solaris-sparc-demos.tar.Z 17943121 SHA256 1b004449497fa5937fbbf5cf8684e95cb1c1ec64d85608d78e13d90b129d94d3 SHA512 0f1e18adee886807b84c3bee78869931862dd638abd5ba3da4b6f71a4eaf701cd6301e41c04eba7b3b5b5ad67bca6164ce0bcdd35b724ed34e17269abb36b1b4 WHIRLPOOL 2a7c4cdab93ee27016fa24bee53f34bc9e0c7c5dff5b27c78a04f2e77665ba30ef78ec5c91c7c076e212b706690b6f84ac89770951eaaa11fdc881016d5aba09
+DIST jdk-6u33-solaris-sparc.sh 76857349 SHA256 97761ffd54aad64d1df69c6d72fc44dbfb5ddd5949ef1ef6397b02664093abb4 SHA512 52ecf78cfea6006d4ab39c53b055cc24a4d7aabfcdc78cefb703611e80694762b39af73643af2d80f1ac268ff0159f33adeb040bbc8b75db72d96932ece19080 WHIRLPOOL 36b25300949ecb01f9342b152059c17a225b79f8e1813272eee87b503fa372e3b257fdb2257a8baf1adcda716f41017a7e35d9722533cda631da3d412b52e25e
+DIST jdk-6u33-solaris-sparcv9-demos.tar.Z 67965 SHA256 1e947ed5240f917c42aafb52d0caadfbb4ac0ae414f1f0c2b31019ad5fa7a68b SHA512 c7021ae78b9f56c8fba0c3ee3f824d7aae29660f622547f1b96b8846c2db1912342f61cc6bb8319df7b3eeb037a53398332f0c9ebd238a827f883d3ebd6ff1fb WHIRLPOOL 8da21e2e2f9d527a499662dd29cc3f7d70f248e37d84047f43868e889af1a1b1d23d58a496e53174e920048e95c1b56d81bbbcdf978c87691066861da8f9c12a
+DIST jdk-6u33-solaris-sparcv9.sh 12775334 SHA256 811211905119ec6282e4e97e1451b5bfd2611babeb605dcbfbc50f46885bb7bf SHA512 72e8561f1156a866642b1baa42717b68884b244352073314a74d3bbc8f6e028a5bb2d8be96981e2666226d7111d11ef1d954fadf3f71667de4ca782eccef2354 WHIRLPOOL 2d4762e918e06ede0eab9cde7da021fe4194b0f84ebd124cbbb9e5fe6d65000e172da48be524c0ee2356855a85322479686b6dfd31e5eebed8b80ffa4802257c
+DIST jdk-6u33-solaris-x64-demos.tar.Z 72813 SHA256 162105f32471eb493a2b0124d45e9df1255002be57edb4cc9c39ae5469ceb261 SHA512 a8e7bcdab50a677868c74a97aa40d7ffc71754532da426f167a5d38920086c0d81eb8b830be52ad719413ad5f83a2baa8617c16dbcc959fcb6d688fe2914f38c WHIRLPOOL 152e6617388bb0283f9f19a1e1cb2cc78b3ce90a27e123549233a6b419481648709dc753541cefb85d3ddcafde1bea570bc09a9fd5e3d58f6ee7f02645b1a283
+DIST jdk-6u33-solaris-x64.sh 8853398 SHA256 de96b05ebd9bd0008ad57277e70323c00c354a43cf6ba50d67d91323e3ca0e55 SHA512 850511516e1aec4e7afdfbd4d211779b97b6fd2f4dcfb23be6e9ed5551015a222d04fcd0aa6418fe0f966ea56d40d83c7473c7dbf47478ed346985e9bd0cf02c WHIRLPOOL 540e4b53114efc9c58a524db5650b8e9ad699c2bb890eb30689d4c156e66703cfad5f514350ac3f066ff689f81a9c93ca0fc907b156120f9871a5263a9a9d266
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.33-r1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.33-r1.ebuild
@ -0,0 +1,363 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.33-r1.ebuild,v 1.1 2012/07/13 15:44:28 sera Exp $
+
+EAPI="4"
+
+inherit java-vm-2 eutils prefix versionator
+
+# This URIs need to be updated when bumping!
+JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk6-downloads-1637591.html"
+
+MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
+S_PV="$(replace_version_separator 3 '_')"
+
+X86_AT="jdk-${MY_PV}-linux-i586.bin"
+AMD64_AT="jdk-${MY_PV}-linux-x64.bin"
+IA64_AT="jdk-${MY_PV}-linux-ia64.bin"
+SOL_X86_AT="jdk-${MY_PV}-solaris-i586.sh"
+SOL_AMD64_AT="jdk-${MY_PV}-solaris-x64.sh"
+SOL_SPARC_AT="jdk-${MY_PV}-solaris-sparc.sh"
+SOL_SPARCv9_AT="jdk-${MY_PV}-solaris-sparcv9.sh"
+
+X86_DEMOS="jdk-${MY_PV}-linux-i586-demos.tar.gz"
+AMD64_DEMOS="jdk-${MY_PV}-linux-x64-demos.tar.gz"
+IA64_DEMOS="jdk-${MY_PV}-linux-ia64-demos.tar.gz"
+SOL_X86_DEMOS="jdk-${MY_PV}-solaris-i586-demos.tar.Z"
+SOL_AMD64_DEMOS="jdk-${MY_PV}-solaris-x64-demos.tar.Z"
+SOL_SPARC_DEMOS="jdk-${MY_PV}-solaris-sparc-demos.tar.Z"
+SOL_SPARCv9_DEMOS="jdk-${MY_PV}-solaris-sparcv9-demos.tar.Z"
+
+DESCRIPTION="Oracle's Java SE Development Kit"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+SRC_URI="
+	x86? ( ${X86_AT}
+		examples? ( ${X86_DEMOS} ) )
+	amd64? ( ${AMD64_AT}
+		examples? ( ${AMD64_DEMOS} ) )
+	ia64? ( ${IA64_AT}
+		examples? ( ${IA64_DEMOS} ) )
+	x86-solaris? ( ${SOL_X86_AT}
+		examples? ( ${SOL_X86_DEMOS} ) )
+	x64-solaris? ( ${SOL_X86_AT} ${SOL_AMD64_AT}
+		examples? ( ${SOL_X86_DEMOS} ${SOL_AMD64_DEMOS} ) )
+	sparc-solaris? ( ${SOL_SPARC_AT}
+		examples? ( ${SOL_SPARC_DEMOS} ) )
+	sparc64-solaris? ( ${SOL_SPARC_AT} ${SOL_SPARCv9_AT}
+		examples? ( ${SOL_SPARC_DEMOS} ${SOL_SPARCv9_DEMOS} ) )"
+
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="1.6"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="X alsa derby doc examples jce kernel_SunOS nsplugin +source"
+
+RESTRICT="fetch strip"
+
+RDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXt
+		x11-libs/libXtst
+	)
+	alsa? ( media-libs/alsa-lib )
+	doc? ( dev-java/java-sdk-docs:1.6.0 )
+	jce? ( dev-java/sun-jce-bin:1.6 )
+	kernel_SunOS? ( app-arch/unzip )
+	!prefix? ( sys-libs/glibc )"
+
+S="${WORKDIR}/jdk${S_PV}"
+
+_set_at() {
+	if use x86; then
+		AT=${X86_AT}
+	elif use amd64; then
+		AT=${AMD64_AT}
+	elif use ia64; then
+		AT=${IA64_AT}
+	elif use x86-solaris; then
+		AT=${SOL_X86_AT}
+	elif use x64-solaris; then
+		AT="${SOL_X86_AT} and ${SOL_AMD64_AT}"
+	elif use sparc-solaris; then
+		AT=${SOL_SPARC_AT}
+	elif use sparc64-solaris; then
+		AT="${SOL_SPARC_AT} and ${SOL_SPARCv9_AT}"
+	fi
+}
+
+_set_demos() {
+	if use x86; then
+		DEMOS=${X86_DEMOS}
+	elif use amd64; then
+		DEMOS=${AMD64_DEMOS}
+	elif use ia64; then
+		DEMOS=${IA64_DEMOS}
+	elif use x86-solaris; then
+		DEMOS=${SOL_X86_DEMOS}
+	elif use x64-solaris; then
+		DEMOS="${SOL_X86_DEMOS} and ${SOL_AMD64_DEMOS}"
+	elif use sparc-solaris; then
+		DEMOS=${SOL_SPARC_AT}
+	elif use sparc64-solaris; then
+		DEMOS="${SOL_SPARC_AT_DEMOS} and ${SOL_SPARCv9_DEMOS}"
+	fi
+}
+
+pkg_nofetch() {
+	_set_at
+	_set_demos
+
+	einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package"
+	einfo "has become fetch restricted again. Alternatives are switching to"
+	einfo "dev-java/icedtea-bin:6 or the source-based dev-java/icedtea:6"
+	einfo ""
+	einfo "Please download ${AT} from:"
+	einfo "${JDK_URI}"
+	einfo "and move it to ${DISTDIR}"
+
+	if use examples; then
+		einfo ""
+		einfo "Also download ${DEMOS} from:"
+		einfo "${JDK_URI}"
+		einfo "and move it to ${DISTDIR}"
+	fi
+}
+
+_sol_src_unpack() {
+	for i in ${AT}; do
+		[[ ${i} == "and" ]] && continue
+		rm -f "${S}"/jre/{LICENSE,README} "${S}"/LICENSE
+		# don't die on unzip, it always "fails"
+		unzip "${DISTDIR}"/${i}
+	done
+	for f in $(find "${S}" -name "*.pack") ; do
+		"${S}"/bin/unpack200 ${f} ${f%.pack}.jar
+		rm ${f}
+	done
+	if use examples ; then
+		for i in ${DEMOS}; do
+			[[ ${i} == "and" ]] && continue
+			use examples && unpack ${i}
+		done
+		mv "${WORKDIR}"/SUNWj6dmo/reloc/jdk/instances/jdk1.6.0/{demo,sample} \
+			"${S}"/ || die
+	fi
+}
+
+src_unpack() {
+	_set_at
+	_set_demos
+	if use kernel_SunOS; then
+		_sol_src_unpack
+	else
+		sh "${DISTDIR}"/${AT} -noregister || die "Failed to unpack"
+		use examples && unpack ${DEMOS}
+	fi
+}
+
+src_compile() {
+	# This needs to be done before CDS - #215225
+	java-vm_set-pax-markings "${S}"
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	if use x86; then
+		bin/java -client -Xshare:dump || die
+	fi
+	# limit heap size for large memory on x86 #405239
+	# this is a workaround and shouldn't be needed.
+	bin/java -server -Xmx64m -Xshare:dump || die
+}
+
+src_install() {
+	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
+	# writable executable segments
+	if use x86; then
+		rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \
+			{,jre/}lib/i386/libjavaplugin_nscp*.so
+		rm -vrf jre/plugin/i386
+	fi
+	# Without nsplugin flag, also remove the new plugin
+	local arch=${ARCH};
+	use x86 && arch=i386;
+	if ! use nsplugin; then
+		rm -vf {,jre/}lib/${arch}/libnpjp2.so \
+			{,jre/}lib/${arch}/libjavaplugin_jni.so
+	fi
+
+	dodir /opt/${P}
+	cp -pPR bin include jre lib man "${ED}"/opt/${P} || die
+
+	if use derby; then
+		cp -pPR db "${ED}"/opt/${P} || die
+	fi
+
+	if use examples; then
+		cp -pPR demo sample "${ED}"/opt/${P} || die
+	fi
+
+	# Remove empty dirs we might have copied
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	dodoc COPYRIGHT
+	dohtml README.html
+
+	if use jce; then
+		dodir /opt/${P}/jre/lib/security/strong-jce
+		mv "${ED}"/opt/${P}/jre/lib/security/US_export_policy.jar \
+			"${ED}"/opt/${P}/jre/lib/security/strong-jce || die
+		mv "${ED}"/opt/${P}/jre/lib/security/local_policy.jar \
+			"${ED}"/opt/${P}/jre/lib/security/strong-jce || die
+		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar \
+			/opt/${P}/jre/lib/security/US_export_policy.jar
+		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar \
+			/opt/${P}/jre/lib/security/local_policy.jar
+	fi
+
+	if use nsplugin; then
+		install_mozilla_plugin /opt/${P}/jre/lib/${arch}/libnpjp2.so
+	fi
+
+	if use source; then
+		cp src.zip "${ED}"/opt/${P} || die
+	fi
+
+	# Install desktop file for the Java Control Panel.
+	# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
+	# make_desktop_entry can't be used as ${P} would end up in filename.
+	newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
+		sun-jcontrol-${PN}-${SLOT}.png || die
+	sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT} (sun-jdk)#" \
+		-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
+		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}.png#" \
+		jre/lib/desktop/applications/sun_java.desktop > \
+		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
+	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
+
+	# bug #56444
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties-r1 "${T}"/fontconfig.properties || die
+	eprefixify "${T}"/fontconfig.properties
+	insinto /opt/${P}/jre/lib/
+	doins "${T}"/fontconfig.properties
+
+	set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
+	java-vm_revdep-mask
+}
+
+QA_TEXTRELS_x86="
+	opt/${P}/jre/lib/i386/client/libjvm.so
+	opt/${P}/jre/lib/i386/motif21/libmawt.so
+	opt/${P}/jre/lib/i386/server/libjvm.so"
+QA_FLAGS_IGNORED="
+	/opt/${P}/bin/appletviewer
+	/opt/${P}/bin/apt
+	/opt/${P}/bin/extcheck
+	/opt/${P}/bin/idlj
+	/opt/${P}/bin/jar
+	/opt/${P}/bin/jarsigner
+	/opt/${P}/bin/java
+	/opt/${P}/bin/javac
+	/opt/${P}/bin/javadoc
+	/opt/${P}/bin/javah
+	/opt/${P}/bin/javap
+	/opt/${P}/bin/javaws
+	/opt/${P}/bin/jconsole
+	/opt/${P}/bin/jdb
+	/opt/${P}/bin/jhat
+	/opt/${P}/bin/jinfo
+	/opt/${P}/bin/jmap
+	/opt/${P}/bin/jps
+	/opt/${P}/bin/jrunscript
+	/opt/${P}/bin/jsadebugd
+	/opt/${P}/bin/jstack
+	/opt/${P}/bin/jstat
+	/opt/${P}/bin/jstatd
+	/opt/${P}/bin/keytool
+	/opt/${P}/bin/native2ascii
+	/opt/${P}/bin/orbd
+	/opt/${P}/bin/pack200
+	/opt/${P}/bin/policytool
+	/opt/${P}/bin/rmic
+	/opt/${P}/bin/rmid
+	/opt/${P}/bin/rmiregistry
+	/opt/${P}/bin/schemagen
+	/opt/${P}/bin/serialver
+	/opt/${P}/bin/servertool
+	/opt/${P}/bin/tnameserv
+	/opt/${P}/bin/unpack200
+	/opt/${P}/bin/wsgen
+	/opt/${P}/bin/wsimport
+	/opt/${P}/bin/xjc
+	/opt/${P}/demo/jvmti/gctest/lib/libgctest.so
+	/opt/${P}/demo/jvmti/heapTracker/lib/libheapTracker.so
+	/opt/${P}/demo/jvmti/heapViewer/lib/libheapViewer.so
+	/opt/${P}/demo/jvmti/minst/lib/libminst.so
+	/opt/${P}/demo/jvmti/mtrace/lib/libmtrace.so
+	/opt/${P}/demo/jvmti/versionCheck/lib/libversionCheck.so
+	/opt/${P}/demo/jvmti/waiters/lib/libwaiters.so
+	/opt/${P}/jre/bin/java
+	/opt/${P}/jre/bin/java_vm
+	/opt/${P}/jre/bin/javaws
+	/opt/${P}/jre/bin/keytool
+	/opt/${P}/jre/bin/orbd
+	/opt/${P}/jre/bin/pack200
+	/opt/${P}/jre/bin/policytool
+	/opt/${P}/jre/bin/rmid
+	/opt/${P}/jre/bin/rmiregistry
+	/opt/${P}/jre/bin/servertool
+	/opt/${P}/jre/bin/tnameserv
+	/opt/${P}/jre/bin/unpack200
+	/opt/${P}/jre/lib/jexec
+	/opt/${P}/lib/jexec
+	/opt/${P}/lib/visualvm/profiler/lib/deployed/jdk15/linux-amd64/libprofilerinterface.so
+	/opt/${P}/lib/visualvm/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so"
+for java_system_arch in amd64 i386; do
+	QA_FLAGS_IGNORED+="
+		/opt/${P}/jre/lib/${java_system_arch}/headless/libmawt.so
+		/opt/${P}/jre/lib/${java_system_arch}/jli/libjli.so
+		/opt/${P}/jre/lib/${java_system_arch}/libattach.so
+		/opt/${P}/jre/lib/${java_system_arch}/libawt.so
+		/opt/${P}/jre/lib/${java_system_arch}/libcmm.so
+		/opt/${P}/jre/lib/${java_system_arch}/libdcpr.so
+		/opt/${P}/jre/lib/${java_system_arch}/libdeploy.so
+		/opt/${P}/jre/lib/${java_system_arch}/libdt_socket.so
+		/opt/${P}/jre/lib/${java_system_arch}/libfontmanager.so
+		/opt/${P}/jre/lib/${java_system_arch}/libhprof.so
+		/opt/${P}/jre/lib/${java_system_arch}/libinstrument.so
+		/opt/${P}/jre/lib/${java_system_arch}/libioser12.so
+		/opt/${P}/jre/lib/${java_system_arch}/libj2gss.so
+		/opt/${P}/jre/lib/${java_system_arch}/libj2pcsc.so
+		/opt/${P}/jre/lib/${java_system_arch}/libj2pkcs11.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjaas_unix.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjava_crw_demo.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjavaplugin_jni.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjava.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjawt.so
+		/opt/${P}/jre/lib/${java_system_arch}/libJdbcOdbc.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjdwp.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjpeg.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjsig.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjsoundalsa.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjsound.so
+		/opt/${P}/jre/lib/${java_system_arch}/libmanagement.so
+		/opt/${P}/jre/lib/${java_system_arch}/libmlib_image.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnative_chmod_g.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnative_chmod.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnet.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnio.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnpjp2.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnpt.so
+		/opt/${P}/jre/lib/${java_system_arch}/librmi.so
+		/opt/${P}/jre/lib/${java_system_arch}/libsaproc.so
+		/opt/${P}/jre/lib/${java_system_arch}/libsplashscreen.so
+		/opt/${P}/jre/lib/${java_system_arch}/libunpack.so
+		/opt/${P}/jre/lib/${java_system_arch}/libverify.so
+		/opt/${P}/jre/lib/${java_system_arch}/libzip.so
+		/opt/${P}/jre/lib/${java_system_arch}/motif21/libmawt.so
+		/opt/${P}/jre/lib/${java_system_arch}/native_threads/libhpi.so
+		/opt/${P}/jre/lib/${java_system_arch}/server/libjvm.so
+		/opt/${P}/jre/lib/${java_system_arch}/xawt/libmawt.so"
+done
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@ -1,7 +1,7 @@
-DIST jre-6u31-linux-i586.bin 21699103 SHA256 c7c6882b8018e95ded4d145ae28692e2a0a4c13e66c5310d8f5c42b90b5b4dd0
-DIST jre-6u31-linux-x64.bin 21312981 SHA256 3af56f72a76ad48940b45726f94770f12285c21b5f3194fc56cd63c3d4ed3329
-DIST jre-6u32-linux-i586.bin 21694324 SHA256 2261ef71f3fa889e34cf304200561488d4f921b3de93eaa1fe5688d4e3672611
-DIST jre-6u32-linux-x64.bin 21305045 SHA256 1b72f2d71717ffa98e1f0002485d6691ad53fc63e9088f96deeecd77acbba88f
-DIST jre-6u33-linux-i586.bin 21693745 SHA256 6e406b3552f276238141e40c65f83928df0bf93af5f11c74ac6970cde6758f0e SHA512 00f6fe61b20c907ff589aaad47d2e8c9f9e420cc1d904b85ca65c2ab3f40f36057a34838fea5a46413c3a703f1b7645a6e944498f45843bf5107fdda70ce46cf WHIRLPOOL a3c450785cbe1b3a90eea1898613335d63ca8cef20ee1e453df8a9ca5ba52b90e9322a2eefecf6d9c287e612362730db69b4a46406736a4bf402008b346914b4
-DIST jre-6u33-linux-ia64.bin 22876388 SHA256 d39f06a0f6a18e94cc1d884f8d1c9d695ef002a9453efd087dbdf23f1ac83ed3
-DIST jre-6u33-linux-x64.bin 21301090 SHA256 2ea0e55cf517e07ed752fb33957c7aa6d4427558f13bd223765870919a4d2817
+DIST jre-6u31-linux-i586.bin 21699103 SHA256 c7c6882b8018e95ded4d145ae28692e2a0a4c13e66c5310d8f5c42b90b5b4dd0 SHA512 55b360877c21499d9031193c50d74d055ab581a83d21f12aed186184fa1bf697fbf71275cdcd0947259d987da223a11e0e2b06dc184d92bd098811852342f19b WHIRLPOOL b936620fb4d55fa697a16c10d4156693f9cb6b7db865a891d18a11f9f93af1fea547ca6febca6da462a59fba2670c4e5a6fd9fac2913b250cd2fc39c0792d4ce
+DIST jre-6u31-linux-x64.bin 21312981 SHA256 3af56f72a76ad48940b45726f94770f12285c21b5f3194fc56cd63c3d4ed3329 SHA512 d31249812cae7a01a5e2410c04cd663fa97d2e5128b0fbb2a724a4924941c03418d8b7524205d9383e2e1c4826f6303b5cc1b665c30c15617524d1bf483aaf92 WHIRLPOOL 39cf25f22d67f319b5d87a629f0fb5604c6393ec4065a2ff100af8093869c8f1393d5ff98f1d26bf735f4b079b2e86033a1e213e68cd104f43407d2f75c2a2d4
+DIST jre-6u32-linux-i586.bin 21694324 SHA256 2261ef71f3fa889e34cf304200561488d4f921b3de93eaa1fe5688d4e3672611 SHA512 5e6a0a4c13e4d37031c30f61de205ef7a0d473271220cb7ef17f646779a951d5dd09e4fd599bbb77eae567d9e651882170d5421c67de4ad9500e3b72f0a6d4b9 WHIRLPOOL eccd13b13d64a3f9ebe9badd7f0409430f2dce6c22e61d45a1c5a5b7505b5c941d3da9266eeccbcfc53cde812e30a17034c9fafc43b018583ca80f68e81abbca
+DIST jre-6u32-linux-x64.bin 21305045 SHA256 1b72f2d71717ffa98e1f0002485d6691ad53fc63e9088f96deeecd77acbba88f SHA512 5aa19a5eed6375ba811a2dd1df14c1dce3aab8b290862577bdf28200129551816549cbf34901ee8d42285a8e951ad867c9aad7e04edfdfbd426a009045d4a70c WHIRLPOOL f9686f8ae1325004d223fd18c3e80b75fe8ac0c985ebf4176921da180043c01578ae3261c9b327be09f5d697047db222dc9190ba68933349e1907c80014d2ae2
+DIST jre-6u33-linux-i586.bin 21693738 SHA256 a824c38cb57110642678f21739fe995e84c876dfcbc3d64f3091ef08adacad4a SHA512 71e92b9c650234a3c0069f7c23146e78043fbac4f9e75cb37f0401b5a2d43bf5d64471f14890bd2d7680d5fa7b2a38b443321815c207e1df378ac688827226bb WHIRLPOOL 5a001c0358edb77f169972f269a68809301f777b80f85634d2c8a214ac451ab52c65fa42900e1969c2092ac37e194c0a6eaf31458d150e2a62c9e17b3c6484c1
+DIST jre-6u33-linux-ia64.bin 22876388 SHA256 d39f06a0f6a18e94cc1d884f8d1c9d695ef002a9453efd087dbdf23f1ac83ed3 SHA512 8fbfbcfec1900db8f931f6812800f835ce4ca493b7e1c0b8e90d3ffa9c611f8df3d034ac5c9412ae2356f37ca8529c0632baef930b35364839f279b45981a75d WHIRLPOOL 5225a721e7d35a2f3fe1f66f7e1802479d6a759fbfc590de03069dec4717644f83757bf1bb65a2ee9b5be464220348269862eaa921537ffe94fe27b7dd4fe2fe
+DIST jre-6u33-linux-x64.bin 21300793 SHA256 c8a596ece07c79131fd33c65ab61f6099b203a42c0fe2daedb24360a15ab70ab SHA512 ced532e0eedab8312dfd242c624e59fde3ed8428eb1ec443ca0183522261b4af5979b566e3c88e27882e7eca9af7210735ed88841164ca06a9fb2d0fd6db1349 WHIRLPOOL 6ffcbd081e277e32e596eb0f4faf2de47b5c523622f7972e2bee4e7c60e8caea13111fea677bde7a076c1e051529a80bce1d0bc03713dcb4a837aabd63a28711
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.33-r1.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.33-r1.ebuild
@ -0,0 +1,208 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.33-r1.ebuild,v 1.1 2012/07/13 15:46:53 sera Exp $
+
+EAPI="4"
+
+inherit java-vm-2 eutils prefix versionator
+
+# This URIs need to be updated when bumping!
+JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre6-downloads-1637595.html"
+
+MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
+S_PV="$(replace_version_separator 3 '_')"
+
+X86_AT="jre-${MY_PV}-linux-i586.bin"
+AMD64_AT="jre-${MY_PV}-linux-x64.bin"
+IA64_AT="jre-${MY_PV}-linux-ia64.bin"
+
+DESCRIPTION="Oracle's Java SE Runtime Environment"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+SRC_URI="
+	amd64? ( ${AMD64_AT} )
+	ia64? ( ${IA64_AT} )
+	x86? ( ${X86_AT} )"
+
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="1.6"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="X alsa jce nsplugin"
+
+RESTRICT="fetch strip"
+
+RDEPEND="
+	X? (
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libX11
+	)
+	alsa? ( media-libs/alsa-lib )
+	jce? ( dev-java/sun-jce-bin:1.6 )
+	!prefix? ( sys-libs/glibc )"
+
+S="${WORKDIR}/jre${S_PV}"
+
+pkg_nofetch() {
+	if use x86; then
+		AT=${X86_AT}
+	elif use amd64; then
+		AT=${AMD64_AT}
+	elif use ia64; then
+		AT=${IA64_AT}
+	fi
+
+	einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package"
+	einfo "has become fetch restricted again. Alternatives are switching to"
+	einfo "dev-java/icedtea-bin:6 or the source-based dev-java/icedtea:6"
+	einfo ""
+	einfo "Please download ${AT} from:"
+	einfo "${JRE_URI}"
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_unpack() {
+	sh "${DISTDIR}"/${A} -noregister || die "Failed to unpack"
+}
+
+src_compile() {
+	# This needs to be done before CDS - #215225
+	java-vm_set-pax-markings "${S}"
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	if use x86; then
+		bin/java -client -Xshare:dump || die
+	fi
+	# limit heap size for large memory on x86 #405239
+	# this is a workaround and shouldn't be needed.
+	bin/java -server -Xmx64m -Xshare:dump || die
+}
+
+src_install() {
+	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
+	# writable executable segments
+	if use x86; then
+		rm -vf lib/i386/libjavaplugin_oji.so \
+			lib/i386/libjavaplugin_nscp*.so
+		rm -vrf plugin/i386
+	fi
+	# Without nsplugin flag, also remove the new plugin
+	local arch=${ARCH};
+	use x86 && arch=i386;
+	if ! use nsplugin; then
+		rm -vf lib/${arch}/libnpjp2.so \
+			lib/${arch}/libjavaplugin_jni.so
+	fi
+
+	dodir /opt/${P}
+	cp -pPR bin lib man "${ED}"/opt/${P} || die
+
+	# Remove empty dirs we might have copied
+	find "${D}" -type d -empty -exec rmdir {} + || die
+
+	dodoc COPYRIGHT README
+
+	if use jce; then
+		dodir /opt/${P}/lib/security/strong-jce
+		mv "${ED}"/opt/${P}/lib/security/US_export_policy.jar \
+			"${ED}"/opt/${P}/lib/security/strong-jce || die
+		mv "${ED}"/opt/${P}/lib/security/local_policy.jar \
+			"${ED}"/opt/${P}/lib/security/strong-jce || die
+		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar \
+			/opt/${P}/lib/security/US_export_policy.jar
+		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar \
+			/opt/${P}/lib/security/local_policy.jar
+	fi
+
+	if use nsplugin; then
+		install_mozilla_plugin /opt/${P}/lib/${arch}/libnpjp2.so
+	fi
+
+	# Install desktop file for the Java Control Panel.
+	# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
+	# make_desktop_entry can't be used as ${P} would end up in filename.
+	newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
+		sun-jcontrol-${PN}-${SLOT}.png || die
+	sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT} (${PN})#" \
+		-e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \
+		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}.png#" \
+		lib/desktop/applications/sun_java.desktop > \
+		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
+	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
+
+	# bug #56444
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties-r1 "${T}"/fontconfig.properties || die
+	eprefixify "${T}"/fontconfig.properties
+	insinto /opt/${P}/lib/
+	doins "${T}"/fontconfig.properties
+
+	set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
+	java-vm_revdep-mask
+}
+
+QA_TEXTRELS_x86="
+	opt/${P}/lib/i386/client/libjvm.so
+	opt/${P}/lib/i386/motif21/libmawt.so
+	opt/${P}/lib/i386/server/libjvm.so"
+QA_FLAGS_IGNORED="
+	/opt/${P}/bin/java
+	/opt/${P}/bin/java_vm
+	/opt/${P}/bin/javaws
+	/opt/${P}/bin/keytool
+	/opt/${P}/bin/orbd
+	/opt/${P}/bin/pack200
+	/opt/${P}/bin/policytool
+	/opt/${P}/bin/rmid
+	/opt/${P}/bin/rmiregistry
+	/opt/${P}/bin/servertool
+	/opt/${P}/bin/tnameserv
+	/opt/${P}/bin/unpack200
+	/opt/${P}/lib/jexec"
+for java_system_arch in amd64 i386; do
+	QA_FLAGS_IGNORED+="
+		/opt/${P}/lib/${java_system_arch}/headless/libmawt.so
+		/opt/${P}/lib/${java_system_arch}/jli/libjli.so
+		/opt/${P}/lib/${java_system_arch}/libawt.so
+		/opt/${P}/lib/${java_system_arch}/libcmm.so
+		/opt/${P}/lib/${java_system_arch}/libdcpr.so
+		/opt/${P}/lib/${java_system_arch}/libdeploy.so
+		/opt/${P}/lib/${java_system_arch}/libdt_socket.so
+		/opt/${P}/lib/${java_system_arch}/libfontmanager.so
+		/opt/${P}/lib/${java_system_arch}/libhprof.so
+		/opt/${P}/lib/${java_system_arch}/libinstrument.so
+		/opt/${P}/lib/${java_system_arch}/libioser12.so
+		/opt/${P}/lib/${java_system_arch}/libj2gss.so
+		/opt/${P}/lib/${java_system_arch}/libj2pcsc.so
+		/opt/${P}/lib/${java_system_arch}/libj2pkcs11.so
+		/opt/${P}/lib/${java_system_arch}/libjaas_unix.so
+		/opt/${P}/lib/${java_system_arch}/libjava_crw_demo.so
+		/opt/${P}/lib/${java_system_arch}/libjavaplugin_jni.so
+		/opt/${P}/lib/${java_system_arch}/libjava.so
+		/opt/${P}/lib/${java_system_arch}/libjawt.so
+		/opt/${P}/lib/${java_system_arch}/libJdbcOdbc.so
+		/opt/${P}/lib/${java_system_arch}/libjdwp.so
+		/opt/${P}/lib/${java_system_arch}/libjpeg.so
+		/opt/${P}/lib/${java_system_arch}/libjsig.so
+		/opt/${P}/lib/${java_system_arch}/libjsoundalsa.so
+		/opt/${P}/lib/${java_system_arch}/libjsound.so
+		/opt/${P}/lib/${java_system_arch}/libmanagement.so
+		/opt/${P}/lib/${java_system_arch}/libmlib_image.so
+		/opt/${P}/lib/${java_system_arch}/libnative_chmod_g.so
+		/opt/${P}/lib/${java_system_arch}/libnative_chmod.so
+		/opt/${P}/lib/${java_system_arch}/libnet.so
+		/opt/${P}/lib/${java_system_arch}/libnio.so
+		/opt/${P}/lib/${java_system_arch}/libnpjp2.so
+		/opt/${P}/lib/${java_system_arch}/libnpt.so
+		/opt/${P}/lib/${java_system_arch}/librmi.so
+		/opt/${P}/lib/${java_system_arch}/libsplashscreen.so
+		/opt/${P}/lib/${java_system_arch}/libunpack.so
+		/opt/${P}/lib/${java_system_arch}/libverify.so
+		/opt/${P}/lib/${java_system_arch}/libzip.so
+		/opt/${P}/lib/${java_system_arch}/motif21/libmawt.so
+		/opt/${P}/lib/${java_system_arch}/native_threads/libhpi.so
+		/opt/${P}/lib/${java_system_arch}/server/libjvm.so
+		/opt/${P}/lib/${java_system_arch}/xawt/libmawt.so"
+done
--- a/dev-java/xt/xt-20051206-r1.ebuild
+++ b/dev-java/xt/xt-20051206-r1.ebuild
@ -1,54 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xt/xt-20051206-r1.ebuild,v 1.4 2007/07/12 22:38:23 betelgeuse Exp $
-
-JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 eutils java-ant-2
-
-DESCRIPTION="Java Implementation of XSL-Transformations"
-SRC_URI="http://www.blnz.com/xt/${P}-src.zip"
-HOMEPAGE="http://www.blnz.com/xt/"
-LICENSE="JamesClark"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-COMMON_DEP="~dev-java/servletapi-2.4"
-RDEPEND=">=virtual/jre-1.4
-	dev-java/xp
-	${COMMON_DEP}"
-DEPEND="
-	>=virtual/jdk-1.4
-	app-arch/unzip
-	${COMMON_DEP}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/20051206-java5.patch"
-
-	rm -v lib/*.jar || die
-	rm -v thirdparty/servlet/*.jar || die
-	rm -vr ant || die
-
-	cd lib
-	java-pkg_jar-from servletapi-2.4 servlet-api.jar servlets.jar
-}
-
-EANT_BUILD_TARGET="compile"
-EANT_EXTRA_ARGS="-Dunzip.done=true"
-
-src_install() {
-	java-pkg_newjar lib/${PN}${PV}.jar
-	java-pkg_dolauncher ${PN} \
-		--main com.jclark.xsl.sax.Driver
-	# loads this only on runtime
-	java-pkg_register-dependency xp
-
-	dodoc README.txt || die
-	dohtml index.html || die
-
-	use doc && java-pkg_dojavadoc docs/api
-	use source && java-pkg_dosrc src/xt/java/com
-}
--- a/dev-lang/v8/Manifest
+++ b/dev-lang/v8/Manifest
@ -1,5 +1,5 @@
 DIST v8-3.10.8.19.tar.bz2 10062768 SHA256 609c74b3f9d5b9be3f27fc31875d6e79605f19340bd5e26d73d500edae87481d SHA512 4633588aab43d9a43bcd690fb48a077988e5129a737f67aa2b2a3f621c930bd991fe6a709a2fbd1e72df957f72103c4b501fcd650be41c8c8fc8c1a3020c94f3 WHIRLPOOL f1cd3a338bc4638f8688a3afa9efddcd7c220e6e71be074865a9abb7fce01e54a37517b079f5804396e88750f128ed9b1c15486dbbacc5cd0117c8910e9d43ac
 DIST v8-3.10.8.20.tar.bz2 10063381 SHA256 e9d7afb462405c2df1fb8560daf33665a2356ef8458801f3b8c66e56e290781d SHA512 57e88a4019259cba17b7d043772eb212de14df8269a02d1973a05c2a112cd02c6a93006449aa97af41525c695fb1bb24aa48e2996f19665058d88ba999ceefca WHIRLPOOL 1c2c0266d7e098b64a7cde1cf0eae68e044ddccd350962d22bf5b9c68079f4cbdc1d78e1cb97b08f4fb731201e45bbe5090c89a17835213745974e36765f26d8
 DIST v8-3.11.10.12.tar.bz2 10116949 SHA256 fc7b0e54ba1d5f07ce0bb9cf0f09aab66c9aa14861e5e8a28ef0bb2a3f729430 SHA512 ba301094cbb8d718959808414e31f3a2b2012153e104b0495220ac94a197c82a70f108356f600b58bd9a8460f44b982742180239c81031d062530f9aadfc5d33 WHIRLPOOL e0611c0370f40e0f7552dc3c0bbed0ee77601499bda544e0b189d34b49e92e672d1571babfa9f423299a36e7258c9620d94a587bae191dabbbbcdfd3f1faf281
-DIST v8-3.11.10.6.tar.bz2 10106628 SHA256 b726249aad91dfaa6b8e327a867a190396036c0e37bb341863d707c114aec9b2 SHA512 5f8eb4274ee2a847a1389f0feb75cd5fbc118ee3c4faaf0e73bace3fbe45c529d0e3a0805f866daa1b122bf09a30d96172b593c5ee70b89d2fd302930a11986f WHIRLPOOL 9869c2faba13df9842fbb60fa6bdf91a1e2310d1db37c58f9c834289c7be3a57a668e26210fb7ddb64b025c02156bf77d1ba45b45dd7b7bba17050c39b1c501f
+DIST v8-3.11.10.14.tar.bz2 10115801 SHA256 96eef3b2320fbf342272f5998f391b6d984c9a40f1dcc09f8a05e52cce319dd3 SHA512 24bfe6b0b7436c2540ca5502b8c7f95e0849b0370281819314f63176fb7cac3446ba5dacf8ca118a6e98b7fa40684ec23670df01041825bee09d1dd98356e05f WHIRLPOOL 26cecf542c6f095ed8a36f86dc89d8c0edb6f146687d1ad752a2cd4911d3be4890974e6bf35ada71447851902979ca815abd56a365a465fe03908ca24b764fc1
 DIST v8-3.12.9.tar.bz2 10164026 SHA256 7e80ae92c5883f3394213df8e31c349cb058915c69fd6c0396f49307c1600c8e SHA512 88644ab31fe5de75163e00eea6e5d9058b7563a0bfdd0d4d839d7726b1b5ef8dde73c2ba9ecd63279e65b93681143da50a3bd679a13b4120c6446eedaaaefa8a WHIRLPOOL 6728791a7fb386fe944a506b821aac4928b5508f4dd0648b697cba384c88f1e82859399d8fd521aa86e01e55ec79d5c23a7fd0a2d45a0d77e6cbd506a801fd16
--- a/dev-lang/v8/v8-3.11.10.14.ebuild
+++ b/dev-lang/v8/v8-3.11.10.14.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/v8/v8-3.11.10.6.ebuild,v 1.2 2012/07/10 03:20:28 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.11.10.14.ebuild,v 1.1 2012/07/13 19:23:17 floppym Exp $

 EAPI="4"

@ -23,11 +23,6 @@ pkg_setup() {
 }

 src_prepare() {
-	# strip unsupported -arch (in Prefix) for OSX, e.g. bug #417401
-	epatch "${FILESDIR}"/${PN}-3.10.8.10-darwin-arch.patch
-	# make sure we don't target an anchient version of OSX
-	# issue http://code.google.com/p/v8/issues/detail?id=2151
-	#sed -i -e "/MACOSX_DEPLOYMENT_TARGET/d" build/standalone.gypi || die
 	epatch "${FILESDIR}"/${PN}-3.10.8.10-freebsd9.patch
 }

--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@ -1,3 +1,3 @@
 DIST findlib-1.2.7.tar.gz 163452 SHA256 c920b129e48b3b313e67b915a078ab06a9ddd2e072f3353edfa74144f256029b SHA512 3eb17979c324dda03cf3ec0109ec21c1532e0c51a4900fa3f2520c5902c77a221875d615ed41bbbf668a4b7e10f72300c5fb9c0cc936803bae6e76f0933f258e WHIRLPOOL 80611cb66f59723835dd1859b8d0dd354cdc97203b8aeb41b788dd4c066d5a7e76f96aac6c60dc46049f92cd61d2564ce95319f1ad27d29cfb910c7326327b1d
 DIST findlib-1.3.1.tar.gz 229719 SHA256 9e4b063c3b10f36006521fb4ef457d87c2a0684a55e76c1776fbce707422b978 SHA512 5fa9767bdb5fd3257d3801b1ba09b770b9ebe645e2198d9aec487ec31ecf82e894e636c0272802cccfac9f846a8a61192597a722b140990a7d9967dae868bf20 WHIRLPOOL 6969f88f2feb22b41f4663178edad0bf058d03d4a53abcfb7fbf45077c16bbf0936c3d9419fa3a0d825c1efed740b8c794fe366ba2ae78073d4171c84fe034b0
-DIST findlib-1.3.2.tar.gz 230556 SHA256 056450c2449aee2a61335cfa1d96f2fb1a14ad50bcd99d7ddf9308307ba90bc3 SHA512 698cb727b36892a6d59f0d95a2e1f9b05ad22fba0c3bb2df2b784db23eaaef4c49a5c0d600af7a2a6702eda0c0d1418fac6408f80e8615c196dfb711c68bcfa9 WHIRLPOOL 56b59ba0831afa1dfb5f73819156f67ec31eacd6ac30870ae8c6b61023c33ad3343c7f3d12f9661702f90da4a0a3f3280e3c0ac2dccfac13831afbe3d31154a7
+DIST findlib-1.3.3.tar.gz 231414 SHA256 981f5c67118a2be015efa79f3af3cb0063376b93123b5d695e7cb5c586b1d45c SHA512 c5e5a6911a0f79c2036ad59e5ac2bc16a0de9b086c29e30625c49748d3f54844730d0f9a9aaadc7e7c47f4bcbeec4ad9351a4179ff9a0743b30b6c7e8da6159d WHIRLPOOL 6ee0d11ac7f4b496586b044afe94550b59d9b5eab9164d142d5f95796d494cff4b1711eba2c0a80f9c8c79f88a9cba21253e79edd26f169e0dcf0ae517abef06
--- a/dev-ml/findlib/findlib-1.3.3.ebuild
+++ b/dev-ml/findlib/findlib-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-ml/findlib/findlib-1.3.2.ebuild,v 1.1 2012/06/10 20:17:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.3.3.ebuild,v 1.1 2012/07/13 22:18:36 aballier Exp $

 EAPI=2

@ -18,7 +18,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"

-DEPEND=">=dev-lang/ocaml-4.00.0_alpha[ocamlopt?,tk?]"
+DEPEND=">=dev-lang/ocaml-3.10[ocamlopt?,tk?]"
 RDEPEND="${DEPEND}"

 ocamlfind_destdir="/usr/$(get_libdir)/ocaml"
--- a/dev-perl/Cache-Memcached/Cache-Memcached-1.290.0.ebuild
+++ b/dev-perl/Cache-Memcached/Cache-Memcached-1.290.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/Cache-Memcached/Cache-Memcached-1.290.0.ebuild,v 1.7 2012/07/03 20:36:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Cache-Memcached/Cache-Memcached-1.290.0.ebuild,v 1.8 2012/07/14 04:42:27 hattya Exp $

 EAPI=4

@ -12,7 +12,7 @@ DESCRIPTION="Perl API for memcached"
 HOMEPAGE="http://www.danga.com/memcached/ ${HOMEPAGE}"

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

 DEPEND="dev-perl/string-crc32"
--- a/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.100.0.ebuild
+++ b/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.100.0.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.100.0.ebuild,v 1.1 2012/07/13 18:14:58 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=BDFOY
+MODULE_VERSION=1.10
+inherit perl-module
+
+DESCRIPTION="Crypt::CBC compliant Rijndael encryption module"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	test? (
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage
+	)"
+
+SRC_TEST="do"
--- a/dev-perl/Crypt-Rijndael/Manifest
+++ b/dev-perl/Crypt-Rijndael/Manifest
@ -1 +1,2 @@
 DIST Crypt-Rijndael-1.09.tar.gz 28994 SHA256 922c74fb29157d440f585e7c28bb6767edef15a1bd86c25c5053c543c644ae18 SHA512 4faf374574784ade481f302cfc6d23bee198b0f78cda0cdffff4cb91ac7d5e614a7bae8d6a1def676610a87c71d558a1e194f39a5eda8b349749e374413d3bb5 WHIRLPOOL 57324fe0239c9866a452b028d296652c2e4505b89d91d1edcf47c40472c1b3cc3de59e89b9375e1d7d4ef260965a0fa19d6f8e6968baf0222ab10b43d7cbe0b1
+DIST Crypt-Rijndael-1.10.tar.gz 29254 SHA256 9a3e097598cc459aeee0a4fada7e227006ac4848714635da3449a9f60b08e349 SHA512 6688db900932e41c1f65493c7b355b57e44fe91babcb2a9fc3a7c6200cac2de9340291df7651075c130df10d356b1af7d70a61060335cf55d95e0ed0403d6ac9 WHIRLPOOL 827035ab5734dfe6e8c58dc82974dbf406294f4c902e68fde22ca50c630c8634f27644db55bfc5a2664a9aeb157010fcf569875ec5a896fecc95864cf4abec78
--- a/dev-perl/DBIx-Class/DBIx-Class-0.81.980.ebuild
+++ b/dev-perl/DBIx-Class/DBIx-Class-0.81.980.ebuild
@ -0,0 +1,93 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBIx-Class/DBIx-Class-0.81.980.ebuild,v 1.1 2012/07/13 18:11:58 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=FREW
+MODULE_VERSION=0.08198
+inherit perl-module
+
+DESCRIPTION="Extensible and flexible object <-> relational mapper"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test admin admin_script deploy replicated"
+
+RDEPEND_MOOSE_BASIC="
+	>=dev-perl/Moose-0.98
+	>=dev-perl/MooseX-Types-0.21
+"
+RDEPEND_ADMIN_BASIC="
+	>=dev-perl/JSON-Any-1.22
+	>=dev-perl/MooseX-Types-JSON-0.02
+	>=dev-perl/MooseX-Types-Path-Class-0.05
+	>=dev-perl/namespace-autoclean-0.09
+"
+
+#	>=dev-perl/Class-DBI-Plugin-DeepAbstractSearch-0.08
+#	dev-perl/Class-Trigger
+#	>=dev-perl/DBIx-ContextualFetch-1.03
+#	>=dev-perl/Date-Simple-3.03
+#	dev-perl/DateTime-Format-MySQL
+#	dev-perl/DateTime-Format-Pg
+#	dev-perl/DateTime-Format-SQLite
+#	dev-perl/DateTime-Format-Strptime
+#	dev-perl/Devel-Cycle
+#	dev-perl/Time-Piece-MySQL
+
+RDEPEND="
+	admin? (
+		${RDEPEND_MOOSE_BASIC}
+		${RDEPEND_ADMIN_BASIC}
+	)
+	admin_script? (
+		${RDEPEND_MOOSE_BASIC}
+		${RDEPEND_ADMIN_BASIC}
+		>=dev-perl/Getopt-Long-Descriptive-0.081
+		>=dev-perl/Text-CSV-1.16
+	)
+	deploy? (
+		>=dev-perl/SQL-Translator-0.110.60
+	)
+	replicated? (
+		${RDEPEND_MOOSE_BASIC}
+		>=dev-perl/Hash-Merge-0.12
+	)
+	>=dev-perl/DBD-SQLite-1.29
+	>=dev-perl/Carp-Clan-6.00
+	>=dev-perl/Class-Accessor-Grouped-0.100.20
+	>=dev-perl/Class-C3-Componentised-1.0.900
+	>=dev-perl/Class-Inspector-1.24
+	>=dev-perl/Config-Any-0.20
+	dev-perl/Data-Compare
+	>=dev-perl/Data-Page-2.01
+	>=dev-perl/DBI-1.609
+	dev-perl/Devel-GlobalDestruction
+	>=virtual/perl-File-Path-2.08
+	dev-perl/Hash-Merge
+	>=dev-perl/Math-Base36-0.07
+	>=virtual/perl-Math-BigInt-1.80
+	>=dev-perl/MRO-Compat-0.11
+	>=dev-perl/Module-Find-0.06
+	>=dev-perl/Moo-0.9.100
+	>=dev-perl/Path-Class-0.18
+	>=dev-perl/SQL-Abstract-1.730
+	>=dev-perl/Sub-Name-0.04
+	>=dev-perl/Data-Dumper-Concise-2.20
+	>=dev-perl/Scope-Guard-0.03
+	dev-perl/Context-Preserve
+	>=dev-perl/Try-Tiny-0.04
+	>=dev-perl/namespace-clean-0.20
+"
+DEPEND="${RDEPEND}
+	test? (
+		>=virtual/perl-File-Temp-0.22
+		>=dev-perl/Package-Stash-0.280.0
+		>=dev-perl/Test-Exception-0.31
+		>=dev-perl/Test-Warn-0.21
+		>=virtual/perl-Test-Simple-0.94
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage )"
+
+SRC_TEST=do
--- a/dev-perl/DBIx-Class/Manifest
+++ b/dev-perl/DBIx-Class/Manifest
@ -1 +1,2 @@
 DIST DBIx-Class-0.08196.tar.gz 667259 SHA256 951eb2a1e4e929eba37b094ce275a404a4f94908d933b322c87c5a9dd79b6196 SHA512 86eef0cf5616b61d13b069d8e923962b1f06b8dcbc816541425f23c91768b7ed598c6bed45be3b3ddd6460a69420f477b3a548ce6cae400de1ce83cf173651be WHIRLPOOL dc50e2ed7b377aa570410013d6d53b233e8a9306c833941ff17e718814faf4cb25357d49e2516d3c5a9a333455bbda764ef5e05fbd52ec5abcc39fe95ef63c00
+DIST DBIx-Class-0.08198.tar.gz 712546 SHA256 7217198273311d63706d5e34658223394796a1f6d749748a1f8099626b6481f7 SHA512 04372b89c0e37bd871714cf2782bcd1431de10c2021c8a7402c7fa9d941438f3270e54d216585851de1dae298c41b0fe6e4d9c03e0c7298ab81d45143aca0f90 WHIRLPOOL b77c900c923da75469b091b703a8dac00a63a268c2dba682c407e0383d58acaa388b0dac64a8efbcab18e3394c0da3d31b4287590254dcc5b526fb948ca35159
--- a/dev-perl/DBIx-Class/metadata.xml
+++ b/dev-perl/DBIx-Class/metadata.xml
@ -65,15 +65,16 @@
    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::ADO::MS_Jet</remote-id>
    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::ADO::MS_Jet::Cursor</remote-id>
    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::ADO::Microsoft_SQL_Server</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::ADO::Microsoft_SQL_Server::Cursor</remote-id>
    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::AutoCast</remote-id>
    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::Cursor</remote-id>
    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::DB2</remote-id>
    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::Firebird</remote-id>
    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::Firebird::Common</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::IdentityInsert</remote-id>
    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::Informix</remote-id>
    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::InterBase</remote-id>
    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::MSSQL</remote-id>
-    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::MultiColumnIn</remote-id>
    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::NoBindVars</remote-id>
    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::ODBC</remote-id>
    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::ODBC::ACCESS</remote-id>
--- a/dev-perl/Email-Simple/Email-Simple-2.102.0.ebuild
+++ b/dev-perl/Email-Simple/Email-Simple-2.102.0.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Email-Simple/Email-Simple-2.102.0.ebuild,v 1.1 2012/07/13 17:31:55 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=RJBS
+MODULE_VERSION=2.102
+inherit perl-module
+
+DESCRIPTION="Simple parsing of RFC2822 message format and headers"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~sparc-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="dev-perl/Email-Date-Format"
+DEPEND="${RDEPEND}
+	test? (
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage
+		virtual/perl-Test-Simple
+	)"
+RDEPEND="${RDEPEND}
+	!dev-perl/Email-Simple-Creator"
+
+SRC_TEST="do"
--- a/dev-perl/Email-Simple/Manifest
+++ b/dev-perl/Email-Simple/Manifest
@ -1,2 +1,3 @@
 DIST Email-Simple-2.100.tar.gz 31007 SHA256 096ad760ad283e5600c3f9fd4d8e63801004faca6edac560e32d2c5d72ba06e1 SHA512 f01d2265c9f631e3829f762f38d169612e683f23fdabd6a21e4e07e22c6ceb05a5f3d87d21f0528402f3c290323ed839f247570f28e28298baef9a638020adb3 WHIRLPOOL e9b5df21542ccd604011d0952f53d376481876ed7528db5419e049082d0c61508854f98e7c26df746c96f99a10d37bd7b82e578c2ccd4128cc4c37f6904c13d9
 DIST Email-Simple-2.101.tar.gz 31327 SHA256 0d98df002d380f0737dcedc28c8224a25dabcee650aae6cc9cfb734de791034f SHA512 b4b217e9f490a8d486fc07751027c4d5ecf658f39fda62a49e8e7f32245c82668aab58168217dea0d3edd45b02ffd6f57a53adf04f96038f7494bb823cb59826 WHIRLPOOL 68207ae6430f24d782e1b374667d2d32f6290ed20f72efd50390df2bda9f89d5e2d192105a0834a2fdefba621d12d1377380ec8b2c4be457486b9057495c8881
+DIST Email-Simple-2.102.tar.gz 31401 SHA256 04db457b12f9d634d1fd6c253c5f7bb2ef0d6396ae06421d863dda6d800aaaa5 SHA512 04d7dc762d938a1f32e8c05ca69ed8f6401bccfeb4326bb3b06096738ca1489f929d056a8132922d25029ed22cae6e04fba4b9127b46099d80100d0e117914ce WHIRLPOOL e991ab26dc5ba6c39b9e558ad60791d228045f1a81393bef9d0a6771305df9a1962909d67d2082f1b454a9f277c920bd7f105bb6fb965fff60c2431711cc2f77
--- a/dev-perl/Encode-Locale/Encode-Locale-1.30.0.ebuild
+++ b/dev-perl/Encode-Locale/Encode-Locale-1.30.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/Encode-Locale/Encode-Locale-1.30.0.ebuild,v 1.8 2012/06/29 14:55:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Encode-Locale/Encode-Locale-1.30.0.ebuild,v 1.9 2012/07/14 03:53:44 hattya Exp $

 EAPI=4

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Determine the locale encoding"

 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 SRC_TEST=do
--- a/dev-perl/File-Listing/File-Listing-6.40.0.ebuild
+++ b/dev-perl/File-Listing/File-Listing-6.40.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/File-Listing/File-Listing-6.40.0.ebuild,v 1.8 2012/06/29 14:55:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Listing/File-Listing-6.40.0.ebuild,v 1.9 2012/07/14 03:59:21 hattya Exp $

 EAPI=4

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Parse directory listings"

 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 RDEPEND="
--- a/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0.ebuild
+++ b/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.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/HTTP-Daemon/HTTP-Daemon-6.10.0.ebuild,v 1.8 2012/07/03 16:47:39 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0.ebuild,v 1.9 2012/07/14 04:11:35 hattya Exp $

 EAPI=4

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Base class for simple HTTP servers"

 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 RDEPEND="
--- a/dev-perl/HTTP-Message/HTTP-Message-6.30.0.ebuild
+++ b/dev-perl/HTTP-Message/HTTP-Message-6.30.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/HTTP-Message/HTTP-Message-6.30.0.ebuild,v 1.8 2012/07/03 16:48:35 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTTP-Message/HTTP-Message-6.30.0.ebuild,v 1.9 2012/07/14 04:15:25 hattya Exp $

 EAPI=4

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Base class for Request/Response"

 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 RDEPEND="
--- a/dev-perl/IPC-Run3/IPC-Run3-0.45.0.ebuild
+++ b/dev-perl/IPC-Run3/IPC-Run3-0.45.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/IPC-Run3/IPC-Run3-0.45.0.ebuild,v 1.8 2012/06/29 15:45:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IPC-Run3/IPC-Run3-0.45.0.ebuild,v 1.9 2012/07/14 04:18:51 hattya Exp $

 EAPI=4

@ -12,7 +12,7 @@ DESCRIPTION="Run a subprocess in batch mode (a la system)"

 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
 IUSE="test"

 RDEPEND=""
--- a/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.20.0.ebuild
+++ b/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.20.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/LWP-MediaTypes/LWP-MediaTypes-6.20.0.ebuild,v 1.8 2012/07/03 16:49:29 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.20.0.ebuild,v 1.9 2012/07/14 04:21:55 hattya Exp $

 EAPI=4

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Media types and mailcap processing"

 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 RDEPEND="
--- a/dev-perl/Net-HTTP/Net-HTTP-6.30.0.ebuild
+++ b/dev-perl/Net-HTTP/Net-HTTP-6.30.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/Net-HTTP/Net-HTTP-6.30.0.ebuild,v 1.8 2012/06/29 15:00:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-HTTP/Net-HTTP-6.30.0.ebuild,v 1.9 2012/07/14 04:25:55 hattya Exp $

 EAPI=4

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Low-level HTTP connection (client)"

 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 RDEPEND="
--- a/dev-perl/Panotools-Script/Manifest
+++ b/dev-perl/Panotools-Script/Manifest
@ -1 +1,2 @@
 DIST Panotools-Script-0.26.tar.gz 153217 SHA256 79bafa5457e0e541442ec558d032127a0049aff8988ac90f5580318362dd6e33 SHA512 2299505c7b93d3f0457f5120ace58470f0f81f8ea356af61278276ffa3355167dfdcc436b263e5720d6a5682260c9d5b7d993c4689daa26ebaa6e02eb202cbff WHIRLPOOL 5fcdd108951043d77082fa39c388d7fa9bb3081407a150ee37a5c26eabfbfe440d97d4664015115ffbaf30e99ba202ecb5d8fb5c14e68a12dedff28af22ab9ec
+DIST Panotools-Script-0.27.tar.gz 154219 SHA256 abcc3f8c72f1d8c5d73a5a787c14aab8c99555e2670b8aa6b6911cb1bb94d611 SHA512 369277485833577d23dd75764746e8eec47bfc33c528fa7df7c8755dcf29bdea2cb9b570f0b2e19fa4572e4e3a9929bce85f5d18ffe9ef53c2c48abfed8d377a WHIRLPOOL 3d4f5e12b9a41ce673ee2f085733282343902cc05cecfa0760c051bfb63e5b4785621539dda4dd58e9d67b514f817c9f45136b451afb63db8b722a8d8b33e279
--- a/dev-perl/Panotools-Script/Panotools-Script-0.270.0.ebuild
+++ b/dev-perl/Panotools-Script/Panotools-Script-0.270.0.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Panotools-Script/Panotools-Script-0.270.0.ebuild,v 1.1 2012/07/13 17:30:04 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=BPOSTLE
+MODULE_VERSION=0.27
+inherit perl-module
+
+DESCRIPTION="A perl module for reading, writing, and manipulating hugin script files"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gui"
+
+RDEPEND="dev-perl/URI
+	dev-perl/libwww-perl
+	>=dev-perl/ImageSize-2.9
+	>=media-libs/exiftool-6
+	gui? ( gnome-extra/zenity )"
+DEPEND=""
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+	if use gui ; then
+		insinto /usr/share/applications
+		doins "${S}"/desktop/*.desktop || die
+	else
+		rm "${D}"/usr/bin/*-gui || die
+	fi
+}
+
+pkg_postinst() {
+	einfo "Some of the scripts require 'nona', 'freepv', 'enblend', 'autotrace', and"
+	einfo "ImageMagick command-line tools which are available in the following"
+	einfo "packages: media-gfx/hugin, media-gfx/freepv, media-gfx/enblend,"
+	einfo "media-gfx/autotrace, and media-gfx/imagemagick."
+}
--- a/dev-perl/Perl-Critic/Manifest
+++ b/dev-perl/Perl-Critic/Manifest
@ -1 +1,2 @@
 DIST Perl-Critic-1.117.tar.gz 645793 SHA256 66c6ba45fdf04458a94a312d0ff0785eac74860a77a407bfe5af4dd2615e199e SHA512 1c9067da94a9a896a5d04d6a8b1ee9f4d99a2bf92b70754fa43ee3adf7dc65100448d5cd9e5131c8649e6c11620b84cbe2ef5056331d2f0ef03afcb6b48238d8 WHIRLPOOL d27a3f7f7faa238dd1c2c4b57547fb5fd131b3ee903e3b40ee574a753a6cf6efd8e4c45dc2edd5ba55e2221f026ac74ce546dd0352dc478c1a513556053078ef
+DIST Perl-Critic-1.118.tar.gz 645371 SHA256 666d2bef3ac924598c06a05277680da5910e10d94c5ec161336f6509c11155e8 SHA512 d5a66826524ae2c70050bd82e715b97be2704042e477c832669c5c4443b61b3f54ddd7cd246808c1397572f299dcc42c36ab6eece5041a29bcfcd76deb7b9074 WHIRLPOOL 82516f565c28ce86884ff6575a0732c55545da6919a5503518fd3a581cc989aa55b11fe82d0f82770c904cf32cf0b1e959e9dabd6a69c1a3cb30c0d105007f8c
--- a/dev-perl/Perl-Critic/Perl-Critic-1.118.0.ebuild
+++ b/dev-perl/Perl-Critic/Perl-Critic-1.118.0.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Perl-Critic/Perl-Critic-1.118.0.ebuild,v 1.1 2012/07/13 17:27:19 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=THALJEF
+MODULE_VERSION=1.118
+inherit perl-module
+
+DESCRIPTION="Critique Perl source code for best-practices"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE="test"
+
+RDEPEND=">=virtual/perl-Module-Pluggable-3.1
+	>=dev-perl/Config-Tiny-2
+	>=dev-perl/Email-Address-1.88.9
+	dev-perl/List-MoreUtils
+	dev-perl/IO-String
+	dev-perl/perltidy
+	>=dev-perl/PPI-1.215
+	dev-perl/PPIx-Utilities
+	>=dev-perl/PPIx-Regexp-0.27.0
+	dev-perl/Pod-Spell
+	>=dev-perl/set-scalar-1.20
+	dev-perl/File-Which
+	dev-perl/B-Keywords
+	dev-perl/Readonly
+	dev-perl/Exception-Class
+	dev-perl/String-Format
+	>=virtual/perl-version-0.77"
+DEPEND="${RDEPEND}
+	virtual/perl-Module-Build
+	test? (
+		dev-perl/Test-Deep
+		dev-perl/PadWalker
+		dev-perl/Test-Memory-Cycle
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage
+	)"
+
+mydoc="extras/* examples/*"
+
+SRC_TEST="do"
--- a/dev-perl/Perl-Critic/metadata.xml
+++ b/dev-perl/Perl-Critic/metadata.xml
@ -89,7 +89,6 @@
    <remote-id type="cpan-module">Perl::Critic::Policy::Miscellanea::ProhibitTies</remote-id>
    <remote-id type="cpan-module">Perl::Critic::Policy::Miscellanea::ProhibitUnrestrictedNoCritic</remote-id>
    <remote-id type="cpan-module">Perl::Critic::Policy::Miscellanea::ProhibitUselessNoCritic</remote-id>
-    <remote-id type="cpan-module">Perl::Critic::Policy::Miscellanea::RequireRcsKeywords</remote-id>
    <remote-id type="cpan-module">Perl::Critic::Policy::Modules::ProhibitAutomaticExportation</remote-id>
    <remote-id type="cpan-module">Perl::Critic::Policy::Modules::ProhibitConditionalUseStatements</remote-id>
    <remote-id type="cpan-module">Perl::Critic::Policy::Modules::ProhibitEvilModules</remote-id>
--- a/dev-perl/Role-Tiny/Manifest
+++ b/dev-perl/Role-Tiny/Manifest
@ -2,3 +2,4 @@ DIST Role-Tiny-1.000001.tar.gz 9455 SHA256 28c2a565058eb81ea15963e4ef3a31f1d8468
 DIST Role-Tiny-1.001001.tar.gz 18510 SHA256 4ea7097183d24fefd665ff4bcc29ba6118b9d0d97fb3b5555d27954471a9e444 SHA512 3b9379542234de1a191599ecd24f935e1a4d275ecf21c17f9eda20cbf072a68ca31e8378f6b079b7a89b069d1a25ace054a5e99bd97217925ce9ea1f0116d8ed WHIRLPOOL c929d2b9cfc8e97257ff9059685b1e161b0b3483fce9fe02940e1e29ee28510ede70c47fdbc1fa231cba81b1497c6024c087dc42fee91172c86765d0bd0665a7
 DIST Role-Tiny-1.001002.tar.gz 18548 SHA256 8e9d8b6b173c3737ca0c6389e4caff59e171cd448d5d56a588291bf432c14909 SHA512 10e38eb877a2e08b329797845830f6b41dd2d82d1a30b6203f97dee5f3fe0ee1df31b0e1cd2c1485e33d2220d87d94aa8658a8e6769e922796aac459ac91abc2 WHIRLPOOL c656233107953c31184d16da44067ed03773e3b1b90227e01588128afcaf5ba75ff605f708b1e7e341295110b68d4dfafe15946241ec28b3603ca613e64a5ec3
 DIST Role-Tiny-1.001003.tar.gz 19201 SHA256 06a93662e2b4acc44fa50fbcdafeac17087b9862e44b9bddf38fb4830ea4994e SHA512 b8f8b40125566b294b674099484e21a93f7fff6ad63e14556adb82c726c870d1d212ed8c68b8fdde7774fa0e728ece2c843b312ea03b9353be352c1a514014d9 WHIRLPOOL 3d559b081fd0e0b1850d5e1be762c95f581f6bc8216c2fc4091aec3eff99f9b21c54a675d604b1e50c5f5085fabb8b836ef82b45061620ac91e8ba641e0d0db7
+DIST Role-Tiny-1.001004.tar.gz 19386 SHA256 8cf2cc6906ea098930ca86b54327a0681680866e01068956e54688a819cd3b87 SHA512 bad5f539d6e3ba859e999f63a0296a4b80eb8948e7f127486b9405077fcfa46d9fec0347b495570098efbe25c13c8c36d7be57667d4edf2e3d2f105ecf37d653 WHIRLPOOL b40d6edfa830fa50e5c07f292601ec354091707600daa7a1108aec57984330a1d0a010ebf4b4f44349c0bed681275ff8a00bfc0ee335fe2e77ca3fa7e87b4b47
--- a/dev-perl/Role-Tiny/Role-Tiny-1.1.4.ebuild
+++ b/dev-perl/Role-Tiny/Role-Tiny-1.1.4.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Role-Tiny/Role-Tiny-1.1.4.ebuild,v 1.1 2012/07/13 17:17:26 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=MSTROUT
+MODULE_VERSION=1.001004
+inherit perl-module
+
+DESCRIPTION="Roles. Like a nouvelle cuisine portion size slice of Moose"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-solaris"
+IUSE="test"
+
+DEPEND="
+	test? (
+		>=dev-perl/Test-Fatal-0.003
+		>=virtual/perl-Test-Simple-0.96
+		dev-perl/Class-Method-Modifiers
+	)
+"
+RDEPEND="
+	!<dev-perl/Moo-0.9.14
+"
+
+SRC_TEST="do"
--- a/dev-perl/SQL-Abstract/Manifest
+++ b/dev-perl/SQL-Abstract/Manifest
@ -1,2 +1,3 @@
 DIST SQL-Abstract-1.63.tar.gz 63272 SHA256 42a4d6254188ed03f35cbc4541597c72d6ecad53320b57b50af684903b1f90df SHA512 639b2d460095cd689554c46c3c183ba46de84ca244a16fe9e613771e5a3defae2a3d9cd04820311efac1d7d22701d3a724fd311811bdc4e5c467599db12bd90c WHIRLPOOL 524cca3f286bd31e191b9bbc60f6d2c75bf491b646ec378eff8ebf8b762d4e3e3a1ff65a768821130fae9ce7eed4a86c62f0f6e52a95a9d4f341b792db0f0821
 DIST SQL-Abstract-1.72.tar.gz 88235 SHA256 7902abc8c5f4c5f9bc9bd2ffd0a2d4c98c55b5a1bde80d8b0b3a94ff41f94b89 SHA512 6d370a6b1ff5f6d9f4ada2acb1be6f292ced2d46ccb339f63c290116c12964bce991bf2a44eddc5293b102a3e5689db603db9cdbf8263cb97bf28e812a7a5f12 WHIRLPOOL df88f41a93049daf37417a11e27b80366922c7215db9c81db3631fa4b04bdfb4da577b26b5802b9438db09922d5ab6b748ad993501c0d91469785b1309de10f8
+DIST SQL-Abstract-1.73.tar.gz 93037 SHA256 6b26a2ff1e25bc14c3396d456b8b38a8bc74e1d909a7ec2ad4de18a6b7bf3720 SHA512 aec2f7a60bcb362e9da0291af797fe6b6353f34746e425915ade0ae5610c95222be2b6800637f63b630071cf0228d3adecb7a9c173168851cc792f1cd5de9e3b WHIRLPOOL 8968233fba739a2bdda555a6cd414d8735a9d2a3ba66be766bfe58e45667f057cb2c5433157cc133c84ebd2125f41e6ec733d2dc8b8503c8c5fa71a07197f830
--- a/dev-perl/SQL-Abstract/SQL-Abstract-1.730.0.ebuild
+++ b/dev-perl/SQL-Abstract/SQL-Abstract-1.730.0.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/SQL-Abstract/SQL-Abstract-1.730.0.ebuild,v 1.1 2012/07/13 17:15:10 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=FREW
+MODULE_VERSION=1.73
+inherit perl-module
+
+DESCRIPTION="Generate SQL from Perl data structures"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/Class-Accessor-Grouped-0.100.50
+	>=dev-perl/Getopt-Long-Descriptive-0.91.0
+	dev-perl/Hash-Merge
+"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-perl/Test-Deep-0.106
+		dev-perl/Test-Exception
+		dev-perl/Test-Pod
+		>=virtual/perl-Test-Simple-0.92
+		dev-perl/Test-Warn
+		>=dev-perl/Clone-0.31
+	)
+"
+#		dev-perl/Test-Pod-Coverage
+
+SRC_TEST="do"
--- a/dev-perl/Term-ANSIScreen/Term-ANSIScreen-1.500.0.ebuild
+++ b/dev-perl/Term-ANSIScreen/Term-ANSIScreen-1.500.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/Term-ANSIScreen/Term-ANSIScreen-1.500.0.ebuild,v 1.4 2012/07/03 20:36:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Term-ANSIScreen/Term-ANSIScreen-1.500.0.ebuild,v 1.5 2012/07/14 04:28:52 hattya Exp $

 EAPI=4

@ -12,7 +12,7 @@ DESCRIPTION="Terminal control using ANSI escape sequences"

 LICENSE="CC0-1.0-Universal"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ~ppc ~sparc x86"
+KEYWORDS="amd64 hppa ia64 ~ppc ~sparc x86"
 IUSE=""

 SRC_TEST="do"
--- a/dev-perl/XML-Feed/Manifest
+++ b/dev-perl/XML-Feed/Manifest
@ -1 +1,2 @@
 DIST XML-Feed-0.49.tar.gz 51703 SHA256 9a601ab600e884e0ee771913fdb7c2cf270d0c2858f7022c3f3f8d9d04de7960 SHA512 7c6ef857719021967d2bd883ed48d146b78e9cf71b6eb757f50440a2029a82cf2a10384bce041ba1965885091b3578ad63feabf44082ffa3f3bc1ac906e17a75 WHIRLPOOL beee5d3cb37730e6e0468ea50e3edd42ce9fdc1f9f74ed5a8e3b5eca6eea065eac91912b0b499d51661c358fa43a2aa3f2b0af7a7d3a8ac2dc251dedf3b513aa
+DIST XML-Feed-0.50.tar.gz 51081 SHA256 fd6fef9b32a1cabcb1e6c5281c15ef096ef644bc19426c7d013d9c7b8e6d1acb SHA512 fa6e6d8249140b57278fec53ddf2ff4ae4d9bf67bb5bef090ebf9a5a506d3199431288545eae1b9e5b6509b97c4f4a4bcf5fc011c70d782559a8eaf9538f8723 WHIRLPOOL bf1da0201abb8cdb66bc7e78a942e447a3e55cc65ab80648f5b4f0b54e4aaf4cf5f9b557db7af965ed73abece9c30a7d1ddb9f65eb5aa19d848fe432e12efe36
--- a/dev-perl/XML-Feed/XML-Feed-0.500.0.ebuild
+++ b/dev-perl/XML-Feed/XML-Feed-0.500.0.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-Feed/XML-Feed-0.500.0.ebuild,v 1.1 2012/07/13 17:02:59 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=DAVECROSS
+MODULE_VERSION=0.50
+inherit perl-module
+
+DESCRIPTION="Syndication feed parser and auto-discovery"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/Class-ErrorHandler
+	dev-perl/Feed-Find
+	dev-perl/URI-Fetch
+	>=dev-perl/XML-RSS-1.470.0
+	>=dev-perl/XML-Atom-0.380.0
+	dev-perl/DateTime
+	dev-perl/DateTime-Format-Mail
+	dev-perl/DateTime-Format-W3CDTF
+	dev-perl/HTML-Parser
+	dev-perl/libwww-perl
+	virtual/perl-Module-Pluggable"
+DEPEND="${RDEPEND}
+	virtual/perl-Module-Build
+	test? (
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage
+	)
+"
+
+SRC_TEST=do
--- a/dev-perl/XML-LibXML/Manifest
+++ b/dev-perl/XML-LibXML/Manifest
@ -5,3 +5,4 @@ DIST XML-LibXML-1.97.tar.gz 441572 SHA256 043d2deb952b018a7b6398c470054ce4d76b12
 DIST XML-LibXML-1.98.tar.gz 441894 SHA256 6f2cbfdaa7b626bb356f3b6f9b0fc9e6dcc3fed91cbdb0bebec2319245ab6ad9 SHA512 02ada100572b626128d65dfa0c3f9e57468baa25351213c44ca83c685c8dd8d1d36c99c5fd17edc40346f1598ae8751d9b0ced14cdcb4e9f1a8949bdc5e6e0ed WHIRLPOOL 955c443770fbf1cf2d132b1cade9b1bb15ccac7ffcc545ee87dcd48a4d6e82c20ff5472b272c2831ed05d68ad8c5f0817c30eba0cd4c9f2c12476d3d7cdeadb0
 DIST XML-LibXML-1.99.tar.gz 443263 SHA256 05f21424346d658c8a642ef6b91db9fca41a3f57be4bf38fee4af1d099e55c8e SHA512 7cdd8afaa46e1919b1acf512ac422b66a115a54811838a80b0cac948b792ac81050b86c5f823565128e38bf30e98aa93c690ce112d08459a8b62c2576106f930 WHIRLPOOL 5f40d2ef0fb88dcdf98ced094a866d246c7b203b1eb3a34e68c7bc63e7f9dcc0c4b82c139f2c19e4ada2f10010b275ca7f8b852f3eb0d07a4da5dba162f5c9be
 DIST XML-LibXML-2.0001.tar.gz 444112 SHA256 a627f0b7443bb178cdbd4795f1f57467f89d16c781b3c28253df87512276a4ff SHA512 d797e3dffe441cac7985ce2aa1a9a5eebba76f67a8ccc122d068258b0cc3d0a7845597b3a87b7e5cbf49f27d22efbc4f261c97213b4900e7b71276fc935f1ac9 WHIRLPOOL 935592ece191e123ea338a79da300a46df856254dbdaf7888792c9466191ebd8342235fd28c3de1078bce6ec4d5301dc9fa7c5fa89e892fde845acd8eb9b3b85
+DIST XML-LibXML-2.0002.tar.gz 443198 SHA256 9981e074add4b3e89aa13a78620871f43d8d1e97094bb1756e825d49a6710af0 SHA512 ab06beaa6847fe8285a29f6c22fd7f05c8fae2aa0b154a2168f3a4b994cefefcb156c5ef1908c47bd08cf48e12b667addf57f1b556d2cee3366a87be5e1111e3 WHIRLPOOL b6a17ab702521404b04be0fc13e7c5e22fb19c3a1b1c385c04dc9f1e90dffbae1cc3f99ccfb05903667279a2be0b05c2cd7dea8760c50fbdb7523462a008408c
--- a/dev-perl/XML-LibXML/XML-LibXML-2.0.200.ebuild
+++ b/dev-perl/XML-LibXML/XML-LibXML-2.0.200.ebuild
@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-LibXML/XML-LibXML-2.0.200.ebuild,v 1.1 2012/07/13 16:58:19 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=SHLOMIF
+MODULE_VERSION=2.0002
+inherit perl-module
+
+DESCRIPTION="A Perl module to parse XSL Transformational sheets using gnome's libXSLT"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/XML-SAX-0.120.0
+	>=dev-libs/libxml2-2.6.21
+	>=dev-perl/XML-NamespaceSupport-1.70.0
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-perl/Test-Pod
+	)
+"
+
+SRC_TEST="do"
+
+# rac can't discern any difference between the build with or without
+# this, and if somebody wants to reactivate it, get it out of global
+# scope.
+#export PERL5LIB=`perl -e 'print map { ":$ENV{D}/$_" } @INC'`
+mytargets="pure_install doc_install"
+
+src_compile() {
+	export SKIP_SAX_INSTALL=1
+	perl-module_src_compile
+}
+
+pkg_postinst() {
+	pkg_update_parser add XML::LibXML::SAX::Parser
+	pkg_update_parser add XML::LibXML::SAX
+}
+
+pkg_postrm() {
+	pkg_update_parser remove XML::LibXML::SAX::Parser
+	pkg_update_parser remove XML::LibXML::SAX
+}
+
+pkg_update_parser() {
+	# pkg_update_parser [add|remove] $parser_module
+	local action=$1
+	local parser_module=$2
+
+	if [[ "$ROOT" = "/" ]] ; then
+		einfo "Update Parser: $1 $2"
+		perl -MXML::SAX -e "XML::SAX->${action}_parser(q(${parser_module}))->save_parsers()" \
+			|| ewarn "Update Parser: $1 $2 failed"
+	else
+		elog "To $1 $2 run:"
+		elog "perl -MXML::SAX -e 'XML::SAX->${action}_parser(q(${parser_module}))->save_parsers()'"
+	fi
+}
--- a/dev-perl/strictures/Manifest
+++ b/dev-perl/strictures/Manifest
@ -1 +1,2 @@
 DIST strictures-1.003001.tar.gz 5977 SHA256 635438f74c03a7c4bc49882d041ee9576b822c1321ca13b1b009346771f93e8e SHA512 48362c8020fe425c9d67650fc1cfe7e16e69a5608e59a707987b175589cdba81e1d31e2cfe6e8ad62f125fc8e40e526899784add5d9a3215313d99ba3656ffb6 WHIRLPOOL 68b7f9add19c605e1b8d9512eb44c21f19938d4d94c2e90e5aa5ca18c3902bbf2b6ddccc0c53fc096e127d0459460050dac6318f70794b2654148c4555dbdbf1
+DIST strictures-1.004001.tar.gz 6327 SHA256 0b5c0ea6d75b74041e73d332bff18cad249f06690bc24bf626ed371c42a267df SHA512 54b6a1b75dbda0e0ea8dd6ed35e1f34c2e75670755f0bb0604795ce4db8d2e207eb45c4d73a6f738bc9bdce3aef434b6c4295cd440e1c55b2884c4fdecb81c03 WHIRLPOOL 79cea4632b5d9d270f24a10481262610211724cb3079c5978a9e68af363a4a02d70009eaf8b7bc5fa253d82ee862e53f3b3f1ff06f109e6f3743ace214af5535
--- a/dev-perl/strictures/strictures-1.4.1.ebuild
+++ b/dev-perl/strictures/strictures-1.4.1.ebuild
@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/strictures/strictures-1.4.1.ebuild,v 1.1 2012/07/13 16:50:38 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=ETHER
+MODULE_VERSION=1.004001
+inherit perl-module
+
+DESCRIPTION="Turn on strict and make all warnings fatal"
+
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-solaris"
+
+SRC_TEST=do
--- a/dev-perl/yaml/Manifest
+++ b/dev-perl/yaml/Manifest
@ -4,3 +4,4 @@ DIST YAML-0.75.tar.gz 118727 SHA256 7bbdd8f5f9c1c66ecd5d42f070b8077d50e68c5f40a4
 DIST YAML-0.77.tar.gz 118736 SHA256 715d7d5f5247a36f13c83b359d90882122ee90399ffb5984908dce4fd9173295 SHA512 47305718c8156eac19c58755dfe017497309f9a27f755debe07c8453b3e50041b8ce52f6ae2a9e00bf3df5b7e464da4038b0935e2c5028328e5ca212efdd8c3e WHIRLPOOL 8835dd7d04f026f212b40012964ceb965dcf55f2ec932e1c729b19d140c02968dac9364b08b42ced75abddc3559b9f031a41537ac12b4fa46ac673f5834d0dfa
 DIST YAML-0.80.tar.gz 119144 SHA256 81ada73c7eda69dad3cc679b2facba50f2634edcc16c59a7b66bffb9f2fa0e90 SHA512 b9d61568f8b4ea9416443a5f18ca873a4e5977c6d5884ee1924350be2c14fd015a45bd6a0bd51e972648f0da1aa024b9d7ff3c50a8214dcda89da70bfee1a596 WHIRLPOOL 9e606725400e3cb3930ce9c69a0d0fda7da9d3f6bf05a5cf5f91600d647f1552e4ff64e085a21f6422a60163b9df6aed85c2f6634ef5b4f3a62b145837243875
 DIST YAML-0.81.tar.gz 115116 SHA256 1c53b4921a78d6e0be58f6440afac19d6d5dc1159e07aaf28f161fd64a56c099 SHA512 b51ec629989dc952b49672792292fd5607e6b2647cbc5963381adc9365dab60d59540cb2e0ddc1d169dfd8f6d80f1e60633d86e0bc59faefb9cae919e3b9e980 WHIRLPOOL 28d84d1ffec68c8ae2214229217cf94ad1cd2c420017e194341c80f5dc9f560ef1ad001971d346d810a22b24a7c0c0a3b0f5299326e97f8ab22a6c13baa2d77d
+DIST YAML-0.84.tar.gz 121150 SHA256 0a351f0a771526ca4a448c573a781614debdd5296fd0832396fc89f1854d640c SHA512 e892db21b94e374fdada74c8cb36a4c7a565fc935c8e1a81301f4820d34a26990e6aefe6e3e3d5386a54f29a1a758695bcd1e151b8d6f82fe8f558005a669f0f WHIRLPOOL 6639676718a4ce5d2b62f6326eeec9502e02c71cdfa12e65e143f8f75406bf1daa058702ef354caae2d47d1c07858ba544575c29e07ca4f4957b08346c79225f
--- a/dev-perl/yaml/yaml-0.840.0.ebuild
+++ b/dev-perl/yaml/yaml-0.840.0.ebuild
@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/yaml/yaml-0.840.0.ebuild,v 1.1 2012/07/14 09:28:04 tove Exp $
+
+EAPI=4
+
+MY_PN=YAML
+MODULE_AUTHOR=MSTROUT
+MODULE_VERSION=0.84
+inherit perl-module
+
+DESCRIPTION="YAML Ain't Markup Language (tm)"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+SRC_TEST="do"
--- a/dev-php/PEAR-PHP_CodeSniffer/Manifest
+++ b/dev-php/PEAR-PHP_CodeSniffer/Manifest
@ -1 +1,2 @@
 DIST PHP_CodeSniffer-1.3.3.tgz 330476 SHA256 48fc8016b7501aab19d1d75b3471a4c36bf4eabaa8d8cb3d20308917f840608d SHA512 201f05e995f453192ac936254e18a9c929404e090a09ad4588e60cf9b4acdc82a3f72f927d16647348527de5fdd05c609ab8ab1a2d75d075ec5df916de345864 WHIRLPOOL b467bc5cf8a2e77e2346fd5ecb469e11db2196382005169113774c52d53e546dc4e3eddf8900246d7d132eb01d37a8bebc2c57b5d64edba67af54c1be129083d
+DIST PHP_CodeSniffer-1.3.5.tgz 345113 SHA256 deb28c23ae83962aaefaeb022b55de4045c83ab962a430f603464564f4e8fb5e SHA512 2502636bf9273fee02d8b7ed26ef80754672f1d07418b5337c6e814ed783ed73ab2f1fc14d6c9192d15ef4260b8bb54e68ce6d028cc7167da88a8b4b9bcf5a28 WHIRLPOOL 7dba786a1cfb1f66587a26c0961c68f63226b2d8e1a5a22126691635ab3314e387d94985f6f30b06c4e009b9014726fd2d594a8edf2830010e30f4cc44633998
--- a/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-1.3.5.ebuild
+++ b/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-1.3.5.ebuild
@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-1.3.5.ebuild,v 1.1 2012/07/13 19:41:06 olemarkus Exp $
+
+EAPI="4"
+
+inherit php-pear-r1
+
+DESCRIPTION="Tokenises PHP code and detects violations of a defined set of coding standards."
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
--- a/dev-python/autopep8/autopep8-0.7.2.ebuild
+++ b/dev-python/autopep8/autopep8-0.7.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/dev-python/autopep8/autopep8-0.7.2.ebuild,v 1.1 2012/07/13 05:37:39 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/autopep8/autopep8-0.7.2.ebuild,v 1.2 2012/07/13 14:22:53 floppym Exp $

 EAPI=4

@ -33,6 +33,7 @@ src_test() {
 }

 pkg_postinst() {
+	distutils_pkg_postinst
 	ewarn "Since this version of autopep depends on >=dev-python/pep8-1.3"
 	ewarn "it is affected by https://github.com/jcrocholl/pep8/issues/45"
 	ewarn "(indentation checks inside triple-quotes)."
--- a/dev-python/imdbpy/imdbpy-4.7-r1.ebuild
+++ b/dev-python/imdbpy/imdbpy-4.7-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/imdbpy/imdbpy-4.7-r1.ebuild,v 1.3 2012/02/22 08:09:26 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imdbpy/imdbpy-4.7-r1.ebuild,v 1.4 2012/07/13 17:41:06 floppym Exp $

 EAPI="4"
 PYTHON_DEPEND="2"
@ -26,25 +26,10 @@ RDEPEND=""

 S="${WORKDIR}/${MY_PN}-${PV}"

+DISTUTILS_GLOBAL_OPTIONS=("*-jython --without-cutils")
 DOCS="docs/AUTHOR.txt docs/FAQS.txt docs/imdbpy47.dtd docs/imdbpy.cfg docs/README*"
 PYTHON_MODNAME="imdb"

-set_global_options() {
-	if [[ "$(python_get_implementation)" == "Jython" ]]; then
-		DISTUTILS_GLOBAL_OPTIONS=("--without-cutils")
-	else
-		DISTUTILS_GLOBAL_OPTIONS=()
-	fi
-}
-
-distutils_src_compile_pre_hook() {
-	set_global_options
-}
-
-distutils_src_install_pre_hook() {
-	set_global_options
-}
-
 src_prepare() {
 	distutils_src_prepare
 	epatch "${FILESDIR}/${PN}-4.6-data_location.patch"
--- a/dev-python/imdbpy/imdbpy-4.8.2.ebuild
+++ b/dev-python/imdbpy/imdbpy-4.8.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/dev-python/imdbpy/imdbpy-4.8.2.ebuild,v 1.1 2012/04/19 08:05:00 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imdbpy/imdbpy-4.8.2.ebuild,v 1.2 2012/07/13 17:41:06 floppym Exp $

 EAPI="4"
 PYTHON_DEPEND="2"
@ -26,25 +26,10 @@ RDEPEND=""

 S="${WORKDIR}/${MY_PN}-${PV}"

+DISTUTILS_GLOBAL_OPTIONS=("*-jython --without-cutils")
 DOCS="docs/AUTHOR.txt docs/FAQS.txt docs/imdbpy48.dtd docs/imdbpy.cfg docs/README*"
 PYTHON_MODNAME="imdb"

-set_global_options() {
-	if [[ "$(python_get_implementation)" == "Jython" ]]; then
-		DISTUTILS_GLOBAL_OPTIONS=("--without-cutils")
-	else
-		DISTUTILS_GLOBAL_OPTIONS=()
-	fi
-}
-
-distutils_src_compile_pre_hook() {
-	set_global_options
-}
-
-distutils_src_install_pre_hook() {
-	set_global_options
-}
-
 src_prepare() {
 	distutils_src_prepare
 	epatch "${FILESDIR}/${PN}-4.6-data_location.patch"
--- a/dev-python/south/south-0.7.5.ebuild
+++ b/dev-python/south/south-0.7.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-python/south/south-0.7.5.ebuild,v 1.1 2012/05/28 19:30:56 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/south/south-0.7.5.ebuild,v 1.2 2012/07/13 12:28:26 dev-zero Exp $

 EAPI="4"

@ -64,7 +64,7 @@ src_test() {
 			-e "s/\(NAME': '\)/\1test.db/" \
 			southtest/settings.py || die "sed failed"
 		echo "SKIP_SOUTH_TESTS=False" >> southtest/settings.py
-		PYTHONPATH="${S}/build-${PYTHON_ABI}/lib" "$(PYTHON)" manage.py test south || die "tests failed"
+		PYTHONPATH="${S}/build-${PYTHON_ABI}/lib:${S}/south/tests" "$(PYTHON)" manage.py test south || die "tests failed"
 	}
 	python_execute_function testing
 }
--- a/dev-python/urwid/Manifest
+++ b/dev-python/urwid/Manifest
@ -1,3 +1,4 @@
 DIST urwid-0.9.9.1.tar.gz 238005 SHA256 81c95440f84a90872d5bd8f01bc507cd0e5e1ce67a878a62cb435a662e43d5a5 SHA512 04c1f491c6be60bcc0ab7e28022b81509bd9322cbdbba80585f38a10065eb8a86747f822ce9e4652a1f50e01588987fbbb13f24351047dfd50c2cf0f0377c070 WHIRLPOOL e1dbad9d8dc606a7d8ef673b3ae9562e85057ce3e8ce3eecfdc4c5eefbd38845dfe6f621b7ac3b231835d1109090ad980915eff484bb46c87bf342e2de0e7822
 DIST urwid-1.0.0.tar.gz 284293 SHA256 1a16f7db9b46d23e8f70e6c7746e8aa19ef14939930a948ceec1fee54f0479f5 SHA512 d41cbc4dd371738843e91e86777f51f080ad3512dc986dce26ca8d3187ea4035d3651952dc7ffaab4b34fe1ef34dd1ed08aceac55868308b782d4d413d61fb63 WHIRLPOOL e06ebce753fbdeb73feb5ec09f830c1b9fbdea5289a6d1e0d04bf478ffcb0a7492911f2808a96e0231898378afd1c422217baf06e34c1b5745f27efb9024b68f
 DIST urwid-1.0.1.tar.gz 284592 SHA256 14fe06fe6d584293885b78d95bfca2666986c974f111d7197e4f3d4d9a52c034 SHA512 2e8aebd002b2dcdf8f56076c590653f3c0420e1a1ef8fd3638eae06d3dd11650794816008380d17152e6369cbd21425b98399d64ce017741c53a283c633a6828 WHIRLPOOL cc30428c759fc06b59540cf2e56709f4c3c7c0ea8a322e6762520ff8b66f0632b0f1ca6c71f2e7d172ba9edd83ce280e0b68b3c943c798b2f23b1bf44f5d94cb
+DIST urwid-1.0.2.tar.gz 285489 SHA256 2e13bd98dc8162caeb768263b6805f98a468ccb3bc28f6eed54770c80a514b37 SHA512 24061a0075775f7687d984ce4845db17c1acddcd7adad5a72f04ad8ff4cacddeb121397828f38d4fb0cbe0e64415e7c94aa54660e6eef0007edefcf4b5d2f1e8 WHIRLPOOL 4d1312ffeaebd9307f408279e588cfc69140bf52f668381799b6cdc686ac51aa482f5b59b88ac1b39e7e922e916bc169022b37e657dc1d6762cd9badc9dcfe11
--- a/dev-python/urwid/urwid-1.0.2.ebuild
+++ b/dev-python/urwid/urwid-1.0.2.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/urwid-1.0.2.ebuild,v 1.1 2012/07/14 00:42:04 radhermit Exp $
+
+EAPI="4"
+PYTHON_USE_WITH="ncurses"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython"
+PYTHON_TESTS_FAILURES_TOLERANT_ABIS="3.1"
+DISTUTILS_SRC_TEST="setup.py"
+
+inherit distutils
+
+DESCRIPTION="Urwid is a curses-based user interface library for Python"
+HOMEPAGE="http://excess.org/urwid/ http://pypi.python.org/pypi/urwid"
+SRC_URI="http://excess.org/urwid/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="examples"
+
+DEPEND="dev-python/setuptools"
+
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+
+src_install() {
+	distutils_src_install
+
+	dohtml reference.html tutorial.html
+
+	if use examples; then
+		docinto examples
+		dodoc bigtext.py browse.py calc.py dialog.py edit.py \
+			fib.py graph.py input_test.py tour.py
+	fi
+}
--- a/dev-ruby/cri/Manifest
+++ b/dev-ruby/cri/Manifest
@ -1,2 +1 @@
-DIST cri-2.2.0.gem 17920 SHA256 c858e638f5b65db5a936deb1f29666dd03a5be33401ddf152532d6d5f958f05b SHA512 b7e42aa0edc1709d31215ee163becf7502921785e14071bf71dbf9ee275a322ee43a32dab53f61ffb3058658fb6fa6c9ed38e252623956eb9d7ab9e67176f800 WHIRLPOOL c5a0dd6ddb7fba565e03f8e444a403d2b6d079bb4e3a9f2e355989145b0d029bd75fa11034fa9db79c9fc798c68a3c30b62bc8cdaa7127629b3b4878af2873ae
 DIST cri-2.2.1.gem 17920 SHA256 6d14deb35e28eb1fbb069d33027873d75a3bffbc0ef59862d56f95ae8fbde529 SHA512 4d2d90fd4359b8dd5e708866e5d78efe4511a648c2750e2c549f7bad9bfcead4d1046fbb20dc087b37c0f07c30d95531a01aa99b5bae9abdbb1321b7e82e2102 WHIRLPOOL acf7d00ef947940540aaf069f4c3b5fa46a6a4cd80dc6bae436e7649ec9177a7ff0e3cde14a3bc8de0f3e2032fd702d9d25df76a15753ff54d6b61de1dc7117c
--- a/dev-ruby/cri/cri-2.2.0.ebuild
+++ b/dev-ruby/cri/cri-2.2.0.ebuild
@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/cri/cri-2.2.0.ebuild,v 1.3 2012/03/09 09:45:23 naota Exp $
-
-EAPI="2"
-USE_RUBY="ruby18 ruby19 ree18 jruby"
-
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cri is a library for building easy-to-use commandline tools."
-HOMEPAGE="http://rubygems.org/gems/cri"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
--- a/dev-ruby/cri/cri-2.2.1.ebuild
+++ b/dev-ruby/cri/cri-2.2.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/dev-ruby/cri/cri-2.2.1.ebuild,v 1.1 2012/04/07 08:59:26 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/cri/cri-2.2.1.ebuild,v 1.2 2012/07/14 08:26:34 graaff Exp $

 EAPI="2"
 USE_RUBY="ruby18 ruby19 ree18 jruby"
@ -20,3 +20,4 @@ SLOT="0"
 IUSE=""

 ruby_add_bdepend "doc? ( dev-ruby/yard )"
+ruby_add_bdepend "test? ( dev-ruby/yard )"
--- a/dev-ruby/ruby-progressbar/ruby-progressbar-0.0.10.ebuild
+++ b/dev-ruby/ruby-progressbar/ruby-progressbar-0.0.10.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-progressbar/ruby-progressbar-0.0.10.ebuild,v 1.3 2012/06/12 11:46:42 iksaif Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-progressbar/ruby-progressbar-0.0.10.ebuild,v 1.4 2012/07/14 08:00:14 graaff Exp $

 EAPI=3

-USE_RUBY="ruby18 ruby19 ree18 jruby rbx"
+USE_RUBY="ruby18 ruby19 ree18 jruby"

 RUBY_FAKEGEM_TASK_TEST="none"
 RUBY_FAKEGEM_TASK_DOC=""
--- a/dev-ruby/ruby-progressbar/ruby-progressbar-0.0.9-r1.ebuild
+++ b/dev-ruby/ruby-progressbar/ruby-progressbar-0.0.9-r1.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-progressbar/ruby-progressbar-0.0.9-r1.ebuild,v 1.2 2012/06/12 11:46:42 iksaif Exp $
-
-EAPI=2
-
-USE_RUBY="ruby18 ruby19 jruby"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Text Progress Bar Library for Ruby"
-HOMEPAGE="https://github.com/jfelchner/ruby-progressbar"
-
-LICENSE="|| ( Ruby GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-IUSE="test"
-
-each_ruby_test() {
-	# tests need to be run from within the lib dir but they require
-	# lib/progressbar.rb, so we do this silly stuff, but it works at
-	# least
-	cd lib
-	${RUBY} -I.. ../test.rb || die "test failed"
-}
--- a/dev-ruby/termcolor/files/termcolor-1.2.1-fix-spec.patch
+++ b/dev-ruby/termcolor/files/termcolor-1.2.1-fix-spec.patch
@ -0,0 +1,19 @@
+commit c455099b273c514c0ae8e5aad485be207a4e933c
+Author: jugyo <jugyo.org@gmail.com>
+Date:   Mon Aug 30 23:59:04 2010 +0900
+
+    fixed spec
+
+diff --git a/spec/termcolor_spec.rb b/spec/termcolor_spec.rb
+index 888a13d..50d403c 100644
+--- a/spec/termcolor_spec.rb
+++ b/spec/termcolor_spec.rb
+@@ -27,7 +27,7 @@ module TermColor
+     it 'should parse 3' do
+       text = TermColor.parse('aa<30>bbbbbbb<32>cccc<90>ddd</90>c</32>b</30>aaa')
+       puts text
+-      text.should == "aa\e[30mbbbbbbb\e[32mcccc\e[90mddd\e[0m\e[32mc\e[0m\e[30mb\e[0maaa"
+      text.should == "aa\e[30mbbbbbbb\e[32mcccc\e[90mddd\e[0m\e[30m\e[32mc\e[0m\e[30mb\e[0maaa"
+     end
+ 
+     it 'should parse 4' do
--- a/Show More
+++ b/Show More