Sync with portage [Tue Jul 15 11:46:04 MSK 2014].

10 years ago · e89602f4de
parent d2383ec409
commit e89602f4de
542 changed files with 6437 additions and 4725 deletions
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/metadata.xml
@ -112,4 +112,4 @@
 		<flag name='collectd_plugins_write_mongodb'>Build the write_mongodb output plugin (sends the values collected by collectd to a MongoDB)</flag>
 		<flag name='contrib'>Install user-contributed files in the doc directory</flag>
 	</use>
-</pkgmetadata>
+</pkgmetadata>
--- a/app-admin/lib_users/Manifest
+++ b/app-admin/lib_users/Manifest
@ -1,2 +1,3 @@
 DIST lib_users-0.6.tar.gz 13314 SHA256 127cacaf8e108e4254401976e376b7ef9520cabc21b7b469b5cce39dd794a2dd SHA512 9f13878a309e0f879630dd45e5a27601cffc6816eec8497026815e85873e60f4991f2d412b9c82985cbc3c9088bcd6b8cb5b06bc15bbd327cfc5b002644f3db0 WHIRLPOOL 36430733778872bb18b83258c5bfe1e13c187d96d336d49fdc237ceccde662a14fb53faf9c6317194c49a943a0c32bd147797f82fcbbac2ec5a7c5f37d94c276
 DIST lib_users-0.7.tar.gz 21857 SHA256 8bf206bf789f29df44f626472ac1371f3ae4eb6af848b22e856a955c09367c87 SHA512 80fb5546585edc66612f0f18067cbb34ebd7af9c7dfed8a4ea5596b9ab34fc604c2611f1af4737c421e5bece481ff88a942da7d1bdcaf6e35577577a7ec5a980 WHIRLPOOL b18bf777afad1fe488ee145e85a275a9f4d8004aea5a926d61421988b677a30d8ea56e1b13ccb7f3e104036bd514572aaa2b7c0d2d8a90a0240c75cdb3e8ae7b
+DIST lib_users-0.8.tar.gz 22988 SHA256 7e5661efa24caa219c01e134db7a54792493ad3ce11b76142a70c20c7dac6846 SHA512 f3c69bf8cd840338ec324d13a891f520d73ebe4ba68029efb358c94351b91471fe1975c78c1f6206236b049d15f574d8f853e81a894734aef826cf43a55904ca WHIRLPOOL 0566d97ae8a15e90dccdbcb0a1c0d8096ce8481783021ccc2f0a6784d1519c040f884e3a290813ae66bff08732175643baa12a3dfcd1f9f599add4ad54d62540
--- a/app-admin/lib_users/lib_users-0.8.ebuild
+++ b/app-admin/lib_users/lib_users-0.8.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lib_users/lib_users-0.8.ebuild,v 1.1 2014/07/14 15:58:20 klausman Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+
+inherit python-r1
+
+DESCRIPTION="Checks /proc for libraries being mapped but marked as deleted"
+HOMEPAGE="http://schwarzvogel.de/software-misc.shtml"
+SRC_URI="http://schwarzvogel.de/pkgs/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND="${PYTHON_DEPS}"
+
+src_test() {
+	python_foreach_impl nosetests --verbosity=2
+}
+
+src_install() {
+	python_foreach_impl python_newscript lib_users.py lib_users
+	dodoc README TODO
+}
--- a/app-crypt/mit-krb5/mit-krb5-1.11.4.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.11.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.11.4.ebuild,v 1.11 2014/05/17 14:37:08 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.11.4.ebuild,v 1.12 2014/07/14 18:51:41 tgall Exp $

 EAPI=5

@ -15,7 +15,7 @@ SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"

 LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="doc +keyutils openldap +pkinit selinux +threads test xinetd"

 RDEPEND="!!app-crypt/heimdal
--- a/app-crypt/mit-krb5/mit-krb5-1.12.1-r1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.12.1-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.12.1-r1.ebuild,v 1.5 2014/06/18 19:01:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.12.1-r1.ebuild,v 1.6 2014/07/14 18:51:41 tgall Exp $

 EAPI=5

@ -15,7 +15,7 @@ SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"

 LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc +keyutils openldap +pkinit selinux +threads test xinetd"

 RDEPEND="!!app-crypt/heimdal
--- a/app-laptop/laptop-mode-tools/Manifest
+++ b/app-laptop/laptop-mode-tools/Manifest
@ -1,3 +1,2 @@
-DIST laptop-mode-tools_1.63.tar.gz 107339 SHA256 04b9bf8cce4172a810ce4026e75e0e7bfd0e05e456bbf3f13b8e9b4178d2c65b SHA512 41e48483883556541e3c5882cff2b029395d1814902d979b36e3db66385dcb22821d99ab2d0720b24b48c23afe02c94692d6222afd268a38063a1bb2bfe4c87a WHIRLPOOL 4d2b26fbe66cfa706ad660800936f2d795e493234b9154e3267db81bd476e5cb0b2f9c528d0df895238ea1ce618e2a3d87739ec5ae5dec367a787feb9dcedf79
 DIST laptop-mode-tools_1.64.tar.gz 110165 SHA256 68b2016f51759285755a79a187a35466a4e46a7cfe4ef05bb1fcac7036c29605 SHA512 539388f5a86fc73a171aadafe8d3a04385cadedb41d3cb53822d4ad55b77262a82e717bfa910ec64c1ebba4d14cc02c9e1fab575c752ef8a77c2f67a023c8188 WHIRLPOOL 7201b1a69ea4265a1be9c659286a720cbfd66d840c43706a7f8099959b481fb1c018a2cb5f76c4bf7fdecbdcd3974da207e7af2b4439321b1961c87123a8900a
 DIST laptop-mode-tools_1.65.tar.gz 111023 SHA256 b0a365758e7bc4f258e5af98bf16ad720cb4fdbd025760ceac994987babd446a SHA512 8d5c91631b783b6e3207bd5f8277d5d1b85e189b162ada8e4706555b8159e233e63dc1e3f92d12b38c101249114a7eb4f85b5370b2cd4a1a21773fdd34af3a33 WHIRLPOOL 680d54253c91fc2c3392930e7871dbccc470db4c45f96fae41877a22023edcf1ccdae15115f9658e3e20a4922fc99eee751b9bdd1f62caf8ce4f74068f83b65b
--- a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-conf.patch
+++ b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-conf.patch
@ -1,29 +0,0 @@
-From 6f81613ebd2ef7eba88ea2edd596f9441be2c294 Mon Sep 17 00:00:00 2001
-From: Ritesh Raj Sarraf <rrs@debian.org>
-Date: Thu, 13 Jun 2013 12:18:45 +0530
-Subject: [PATCH] Honor .conf files only
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Thanks: Sven Köhler
---
- usr/sbin/laptop_mode | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/usr/sbin/laptop_mode b/usr/sbin/laptop_mode
-index 71beab2..070f1de 100755
--- a/usr/sbin/laptop_mode
-+++ b/usr/sbin/laptop_mode
-@@ -234,7 +234,7 @@ lmt_load_config ()
-     test -d /etc/laptop-mode/conf.d/board-specific && CONF_DIR="$CONF_DIR /etc/laptop-mode/conf.d/board-specific"
- 
-     for PER_DIR in $CONF_DIR; do
-	    for CONF in $PER_DIR/*; do
-+	    for CONF in $PER_DIR/*.conf; do
- 		    if [ -r "$CONF" ] ; then
- 			    . "$CONF"
- 			    #Handle individual module debug settings
-- 
-1.8.1.6
-
--- a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-killall.patch
+++ b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-killall.patch
@ -1,38 +0,0 @@
-From a68a8d051b476ceae87e0490001b7c60ac5ea942 Mon Sep 17 00:00:00 2001
-From: Ritesh Raj Sarraf <rrs@debian.org>
-Date: Wed, 17 Apr 2013 12:11:01 +0530
-Subject: [PATCH] Don't call killall with the -g argument.
-
-It kills the entire group of processes
-https://bugs.gentoo.org/show_bug.cgi?id=463944
-
-Thanks: Murray Campbell
---
- usr/sbin/laptop_mode | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/usr/sbin/laptop_mode b/usr/sbin/laptop_mode
-index 74a129c..cfd99c1 100755
--- a/usr/sbin/laptop_mode
-+++ b/usr/sbin/laptop_mode
-@@ -1130,7 +1130,7 @@ if [ x$ENABLE_BATTERY_LEVEL_POLLING = x1 ] && [ x$BLACKLIST_IN_FLOCK = x1 ]; the
- 		log "VERBOSE" "On AC, stopping the polling daemon."
- 
- 		# In AC mode we disable the polling daemon.
-		killall -g -q lm-polling-daemon
-+		killall -q lm-polling-daemon
- 	elif [ x$ON_AC = x0 ]; then
- 		exec 7>$LMT_BATTPOLL_LOCK;
- 		if $FLOCK -n -x -w 1 7; then
-@@ -1149,7 +1149,7 @@ if [ x$ENABLE_BATTERY_LEVEL_POLLING = x1 ] && [ x$BLACKLIST_IN_FLOCK = x1 ]; the
- 		# should be killed.
- 		if [ x$INITSCRIPT_STOP = x1 ]; then
- 			log "VERBOSE" "On Battery, but init script stop is called. Killing lm-polling-daemon"
-			killall -g -q lm-polling-daemon
-+			killall -q lm-polling-daemon
- 		fi
- 	else
- 		log "ERR" "Unknown ON_AC state: $ON_AC";
-- 
-1.8.1.6
-
--- a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-pcie-aspm-silencing-stderr.patch
+++ b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-pcie-aspm-silencing-stderr.patch
@ -1,34 +0,0 @@
-From f52e9afc8966d3804e6a432b0a98bfa2a758c416 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Manuel=20R=C3=BCger?= <mrueg@rueg.eu>
-Date: Thu, 28 Mar 2013 01:24:39 +0100
-Subject: [PATCH] pcie-aspm: Silencing stderr.
-
---
- usr/share/laptop-mode-tools/modules/pcie-aspm | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/usr/share/laptop-mode-tools/modules/pcie-aspm b/usr/share/laptop-mode-tools/modules/pcie-aspm
-index 1f6eec9..57fe31e 100755
--- a/usr/share/laptop-mode-tools/modules/pcie-aspm
-+++ b/usr/share/laptop-mode-tools/modules/pcie-aspm
-@@ -7,7 +7,7 @@ if [ x$CONTROL_PCIE_ASPM = x1 ] || [ x$ENABLE_AUTO_MODULES = x1 -a x$CONTROL_PCI
-     if [ $ON_AC -eq 1 ]; then
-         log "VERBOSE" "On AC power: setting pcie_aspm to default"
-         if [ -f /sys/module/pcie_aspm/parameters/policy ]; then
-            echo default > /sys/module/pcie_aspm/parameters/policy
-+            echo default > /sys/module/pcie_aspm/parameters/policy 2>/dev/null
-             if [ $? -eq 0 ]; then
-                 log "VERBOSE" "PCIe ASPM set to 'default'"
-             else
-@@ -19,7 +19,7 @@ if [ x$CONTROL_PCIE_ASPM = x1 ] || [ x$ENABLE_AUTO_MODULES = x1 -a x$CONTROL_PCI
-     else
-         log "VERBOSE" "On battery: setting pcie_aspm to powersave"
-         if [ -f /sys/module/pcie_aspm/parameters/policy ]; then
-            echo powersave > /sys/module/pcie_aspm/parameters/policy
-+            echo powersave > /sys/module/pcie_aspm/parameters/policy 2>/dev/null
-             if [ $? -eq 0 ]; then
-                 log "VERBOSE" "PCIe ASPM set to 'powersave'"
-             else
-- 
-1.8.1.5
-
--- a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-udevadm.patch
+++ b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-udevadm.patch
@ -1,25 +0,0 @@
-From f52ccd0c2de1c2d22d8f351579cf2d89d8110933 Mon Sep 17 00:00:00 2001
-From: Alexander Mezin <mezin.alexander@gmail.com>
-Date: Wed, 24 Jul 2013 09:38:56 +0700
-Subject: [PATCH] Replace hardcoded path to udevadm with "which udevadm"
-
---
- usr/share/laptop-mode-tools/modules/hdparm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/usr/share/laptop-mode-tools/modules/hdparm b/usr/share/laptop-mode-tools/modules/hdparm
-index 0115422..ac4f9c0 100755
--- a/usr/share/laptop-mode-tools/modules/hdparm
-+++ b/usr/share/laptop-mode-tools/modules/hdparm
-@@ -41,7 +41,7 @@ is_capable() {
- 	# It assumes more or less recent udev (> 070)
- 	if [ $HAVE_UDEVINFO -ne 0 ] ; then
- 		log "VERBOSE" "Querying $1 media type using udevinfo: "
-		if [ -x /sbin/udevadm ]; then
-+		if [ -x "$(which udevadm 2> /dev/null)" ]; then
- 			eval "$(udevadm info -q env -n $1 | egrep '(ID_TYPE=|ID_BUS=)' )"
- 		else
- 			eval "$(udevinfo -q env -n $1 | egrep '(ID_TYPE=|ID_BUS=)' )"
-- 
-1.8.1.6
-
--- a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.64-ethernet-power.patch
+++ b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.64-ethernet-power.patch
@ -1,97 +0,0 @@
-From c55b44f656c88aa1ef7307664f7040407d23e0de Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 27 May 2014 19:35:11 +0300
-Subject: [PATCH] ethernet: replace sysfs/enabled by 'ip link down'
-
-backport of 8fff5eb2bfdde0
---
- usr/share/laptop-mode-tools/modules/ethernet | 59 +++++++++++-----------------
- 1 file changed, 22 insertions(+), 37 deletions(-)
-
-diff --git a/usr/share/laptop-mode-tools/modules/ethernet b/usr/share/laptop-mode-tools/modules/ethernet
-index 6fd06e2..0c922e2 100755
--- a/usr/share/laptop-mode-tools/modules/ethernet
-+++ b/usr/share/laptop-mode-tools/modules/ethernet
-@@ -24,6 +24,13 @@ if [ x$CONTROL_ETHERNET = x1 ] || [ x$ENABLE_AUTO_MODULES = x1 -a x$CONTROL_ETHE
- 		MIITOOL=/bin/false
- 	fi
- 
-+	if [ -x /bin/ip ]; then
-+		IPTOOL=/bin/ip
-+	else
-+		log "VERBOSE" "ip is not installed"
-+		IPTOOL=/bin/false
-+	fi
-+
- 
- 	if [ $ON_AC -eq 1 ]; then
- 		if [ "$ACTIVATE" -eq 1 ]; then
-@@ -52,43 +59,7 @@ if [ x$CONTROL_ETHERNET = x1 ] || [ x$ENABLE_AUTO_MODULES = x1 -a x$CONTROL_ETHE
- 	fi
- 	
- 	for DEVICE in $ETHERNET_DEVICES ; do
-                DISABLED=0
-                path=`readlink -f /sys/class/net/$DEVICE`
-		dev_path=""
-                log "VERBOSE" "ethernet: $path"
-                if ! [ -z $path ]; then
-                        if [ -d $path/device ]; then
-                          dev_path=`readlink -f $path/device`
-                          log "VERBOSE" "ethernet: $dev_path"
-                        fi
-                fi
-
-                if ! [ -z $dev_path ] && [ -f $dev_path/enable ]; then
-                        if [ x$DISABLE_ETHERNET = x1 ]; then
-                                if [ -f $dev_path/enable ]; then
-                                        echo 0 > $dev_path/enable
-                                        log "VERBOSE" "ethernet: Disabling ethernet device $DEVICE"
-                                        DISABLED=1
-                                fi
-                        elif [ x$DISABLE_ETHERNET = x0 ]; then
-                                if [ -f $dev_path/enable ]; then
-                                        echo 1 > $dev_path/enable
-                                        log "VERBOSE" "ethernet: Re-enabling ethernet device $DEVICE"
-                                        DISABLED=0
-                                fi
-                        elif [ x$DISABLE_ETHERNET = x2 ]; then
-                                DISABLED=0 # Be safe. :-)
-                        else
-                                DISABLED=0 # Same here. Be safe. :-)
-                                           # For all other cases also, just disable it.
-                        fi
-                else
-                        log "VERBOSE" "$DEVICE does not seem to be supporting enable/disable"
-                fi
-
-               if [ x$DISABLED = x1 ]; then
-                       continue
-               fi
-+		log "VERBOSE" "ethernet: $DEVICE"
- 
- 		# Wakeup-on-LAN handling
- 		if [ x$DISABLE_WAKEUP_ON_LAN = x1 ] ; then
-@@ -152,6 +123,20 @@ if [ x$CONTROL_ETHERNET = x1 ] || [ x$ENABLE_AUTO_MODULES = x1 -a x$CONTROL_ETHE
- 				log "VERBOSE" "Could not restore speed for $DEVICE"
- 			fi
- 		fi
-+
-+		# Shut down interface
-+		if [ x$DISABLE_ETHERNET = x1 ]; then
-+			if $IPTOOL link show $DEVICE | grep -q NO-CARRIER; then
-+				log "VERBOSE" "ethernet: Disabling ethernet device $DEVICE"
-+				$IPTOOL link set dev $DEVICE down
-+			else
-+				log "VERBOSE" "ethernet: Not disabling ethernet device $DEVICE with active carrier."
-+			fi
-+		elif [ x$DISABLE_ETHERNET = x0 ]; then
-+			$IPTOOL link set dev $DEVICE up
-+			log "VERBOSE" "ethernet: Re-enabling ethernet device $DEVICE"
-+		fi
-+
- 	done
- else
- 	log "VERBOSE" "Ethernet module is disabled."
-- 
-1.8.5.5
-
--- a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.64-wireless-sysfsattr.patch
+++ b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.64-wireless-sysfsattr.patch
@ -1,41 +0,0 @@
-commit b340a340256c8fc97ec35a1df9e67ab033765480
-Author: Alon Bar-Lev <alon.barlev@gmail.com>
-Date:   Sat May 24 12:59:21 2014 +0300
-
-    wireless: support both sysfs attr enable/enabled
-    
-    backport of commit 8e8a88373079dffdf7196e2e622c5ade209b4439
-    
-    Starting with linux kernel 3.13, the sysfs attribute 'enable' for pci
-    devices was renambed to 'enabled'.
-    
-    Support the two notations to allow seamless migration.
-    
-    Signed-off-by: Stefan Huber <shuber@sthu.org>
-
-diff --git a/usr/share/laptop-mode-tools/modules/wireless-ipw-power b/usr/share/laptop-mode-tools/modules/wireless-ipw-power
-index 3fd93ec..1579c1f 100755
--- a/usr/share/laptop-mode-tools/modules/wireless-ipw-power
-+++ b/usr/share/laptop-mode-tools/modules/wireless-ipw-power
-@@ -71,7 +71,7 @@ if [ x$CONTROL_IPW_POWER = x1 ] || [ x$ENABLE_AUTO_MODULES = x1 -a x$CONTROL_IPW
- 				# the driver.
- 				LINK_TARGET=`readlink $DEVICE/device/driver`
- 				LINK_TARGET=${LINK_TARGET##*/}
-                                ENABLED=`cat $DEVICE/device/enable`
-+				ENABLED=`[ -r $DEVICE/device/enabled ] && cat $DEVICE/device/enabled || cat $DEVICE/device/enable`
- 
- 				if [ $ENABLED -eq 1 -a "$LINK_TARGET" = "$1" ]; then
- 					# add the interface name to the list
-diff --git a/usr/share/laptop-mode-tools/modules/wireless-iwl-power b/usr/share/laptop-mode-tools/modules/wireless-iwl-power
-index ffdedec..ce82e1d 100755
--- a/usr/share/laptop-mode-tools/modules/wireless-iwl-power
-+++ b/usr/share/laptop-mode-tools/modules/wireless-iwl-power
-@@ -24,7 +24,7 @@ findWifiIfsByDriver () {
- 			# the driver.
- 			LINK_TARGET=`readlink $DEVICE/device/driver`
- 			LINK_TARGET=${LINK_TARGET##*/}
-			ENABLED=`cat $DEVICE/device/enable` 
-+			ENABLED=`[ -r $DEVICE/device/enabled ] && cat $DEVICE/device/enabled || cat $DEVICE/device/enable`
- 			
- 			if [ $ENABLED -eq 1 -a "$LINK_TARGET" = "$1" ] ; then
- 				# add the interface name to the list
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r2.ebuild
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r2.ebuild
@ -1,94 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r2.ebuild,v 1.5 2014/05/27 18:48:57 alonbl Exp $
-
-EAPI=5
-inherit eutils multilib systemd udev
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Linux kernel laptop_mode user-space utilities"
-HOMEPAGE="http://www.samwel.tk/laptop_mode/"
-SRC_URI="http://www.samwel.tk/laptop_mode/tools/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="+acpi apm bluetooth scsi"
-
-RDEPEND="net-wireless/wireless-tools
-	sys-apps/ethtool
-	sys-apps/hdparm
-	acpi? ( sys-power/acpid )
-	apm? ( sys-apps/apmd )
-	bluetooth? ( net-wireless/bluez:= )
-	scsi? ( sys-apps/sdparm )"
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-pcie-aspm-silencing-stderr.patch"
-	epatch "${FILESDIR}/${P}-killall.patch"
-
-	# This should avoid conflict with pm-powersave wrt #327443 and #396703
-	cat <<-EOF > "${T}"/${PN}
-	HOOK_BLACKLIST="00powersave"
-	EOF
-}
-
-src_compile() { :; }
-
-src_install() {
-	DESTDIR="${D}" \
-		INIT_D="none" \
-		MAN_D="/usr/share/man" \
-		LIB_D="/usr/$(get_libdir)" \
-		UDEV_D="$(get_udevdir)" \
-		SYSTEMD_UNIT_D="$(systemd_get_unitdir)" \
-		TMPFILES_D="/usr/$(get_libdir)/tmpfiles.d" \
-		ACPI="$(use acpi && echo force || echo disabled)" \
-		PMU="$(false && echo force || echo disabled)" \
-		APM="$(use apm && echo force || echo disabled)" \
-		SYSTEMD=yes \
-		sh ./install.sh || die
-
-	dodoc Documentation/*.txt README
-	newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
-
-	# See src_prepare()
-	insinto /etc/pm/config.d
-	doins "${T}"/${PN}
-}
-
-pkg_postinst() {
-	if use acpi || use apm; then
-		if use acpi; then
-			daemon_name="acpid"
-		elif use apm; then
-			deamon_name="apmd"
-		fi
-		if [ "$(rc-config list default | grep laptop_mode)" = "" ] || [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
-			ewarn "To enable automatic power state event handling,"
-			ewarn "e.g. enabling laptop_mode after unplugging the battery,"
-			ewarn "both laptop_mode and the ${daemon_name} daemon must be"
-			ewarn "added to default runlevel:"
-			if [ "$(rc-config list default | grep laptop_mode)" = "" ]; then
-				ewarn "# rc-update add laptop_mode default"
-			fi
-			if [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
-				ewarn "# rc-update add ${daemon_name} default"
-			fi
-		fi
-	else
-		ewarn "Without USE=\"acpi\" or USE=\"apm\" ${PN} can not"
-		ewarn "automatically disable laptop_mode on low battery."
-		ewarn
-		ewarn "This means you can lose up to 10 minutes of work if running"
-		ewarn "out of battery while laptop_mode is enabled."
-		ewarn
-		ewarn "Please see laptop-mode.txt in /usr/share/doc/${PF} for further"
-		ewarn "information."
-		ewarn
-	fi
-}
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r3.ebuild
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r3.ebuild
@ -1,96 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r3.ebuild,v 1.3 2014/05/27 18:48:57 alonbl Exp $
-
-EAPI=5
-inherit eutils multilib systemd udev
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Linux kernel laptop_mode user-space utilities"
-HOMEPAGE="http://www.samwel.tk/laptop_mode/"
-SRC_URI="http://www.samwel.tk/laptop_mode/tools/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+acpi apm bluetooth scsi"
-
-RDEPEND="net-wireless/wireless-tools
-	sys-apps/ethtool
-	sys-apps/hdparm
-	acpi? ( sys-power/acpid )
-	apm? ( sys-apps/apmd )
-	bluetooth? ( net-wireless/bluez:= )
-	scsi? ( sys-apps/sdparm )"
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-pcie-aspm-silencing-stderr.patch"
-	epatch "${FILESDIR}/${P}-killall.patch"
-	epatch "${FILESDIR}/${P}-conf.patch"
-	epatch "${FILESDIR}/${P}-udevadm.patch"
-
-	# This should avoid conflict with pm-powersave wrt #327443 and #396703
-	cat <<-EOF > "${T}"/${PN}
-	HOOK_BLACKLIST="00powersave"
-	EOF
-}
-
-src_compile() { :; }
-
-src_install() {
-	DESTDIR="${D}" \
-		INIT_D="none" \
-		MAN_D="/usr/share/man" \
-		LIB_D="/usr/$(get_libdir)" \
-		UDEV_D="$(get_udevdir)" \
-		SYSTEMD_UNIT_D="$(systemd_get_unitdir)" \
-		TMPFILES_D="/usr/$(get_libdir)/tmpfiles.d" \
-		ACPI="$(use acpi && echo force || echo disabled)" \
-		PMU="$(false && echo force || echo disabled)" \
-		APM="$(use apm && echo force || echo disabled)" \
-		SYSTEMD=yes \
-		sh ./install.sh || die
-
-	dodoc Documentation/*.txt README
-	newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
-
-	# See src_prepare()
-	insinto /etc/pm/config.d
-	doins "${T}"/${PN}
-}
-
-pkg_postinst() {
-	if use acpi || use apm; then
-		if use acpi; then
-			daemon_name="acpid"
-		elif use apm; then
-			deamon_name="apmd"
-		fi
-		if [ "$(rc-config list default | grep laptop_mode)" = "" ] || [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
-			ewarn "To enable automatic power state event handling,"
-			ewarn "e.g. enabling laptop_mode after unplugging the battery,"
-			ewarn "both laptop_mode and the ${daemon_name} daemon must be"
-			ewarn "added to default runlevel:"
-			if [ "$(rc-config list default | grep laptop_mode)" = "" ]; then
-				ewarn "# rc-update add laptop_mode default"
-			fi
-			if [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
-				ewarn "# rc-update add ${daemon_name} default"
-			fi
-		fi
-	else
-		ewarn "Without USE=\"acpi\" or USE=\"apm\" ${PN} can not"
-		ewarn "automatically disable laptop_mode on low battery."
-		ewarn
-		ewarn "This means you can lose up to 10 minutes of work if running"
-		ewarn "out of battery while laptop_mode is enabled."
-		ewarn
-		ewarn "Please see laptop-mode.txt in /usr/share/doc/${PF} for further"
-		ewarn "information."
-		ewarn
-	fi
-}
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.64-r2.ebuild
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.64-r2.ebuild
@ -1,96 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/laptop-mode-tools-1.64-r2.ebuild,v 1.1 2014/06/11 22:29:13 alonbl Exp $
-
-EAPI=5
-inherit eutils multilib systemd udev
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Linux kernel laptop_mode user-space utilities"
-HOMEPAGE="http://www.samwel.tk/laptop_mode/"
-SRC_URI="http://www.samwel.tk/laptop_mode/tools/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+acpi apm bluetooth scsi"
-
-RDEPEND="net-wireless/wireless-tools
-	sys-apps/iproute2
-	sys-apps/ethtool
-	sys-apps/hdparm
-	sys-apps/which
-	acpi? ( sys-power/acpid )
-	apm? ( sys-apps/apmd )
-	bluetooth? ( net-wireless/bluez:= )
-	scsi? ( sys-apps/sdparm )"
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-ethernet-power.patch"
-	epatch "${FILESDIR}/${P}-wireless-sysfsattr.patch"
-
-	# This should avoid conflict with pm-powersave wrt #327443 and #396703
-	cat <<-EOF > "${T}"/${PN}
-	HOOK_BLACKLIST="00powersave"
-	EOF
-}
-
-src_compile() { :; }
-
-src_install() {
-	DESTDIR="${D}" \
-		INIT_D="none" \
-		MAN_D="/usr/share/man" \
-		LIB_D="/usr/$(get_libdir)" \
-		UDEV_D="$(get_udevdir)" \
-		SYSTEMD_UNIT_D="$(systemd_get_unitdir)" \
-		TMPFILES_D="/usr/$(get_libdir)/tmpfiles.d" \
-		ACPI="$(use acpi && echo force || echo disabled)" \
-		PMU="$(false && echo force || echo disabled)" \
-		APM="$(use apm && echo force || echo disabled)" \
-		SYSTEMD=yes \
-		sh ./install.sh || die
-
-	dodoc Documentation/*.txt README.md
-	newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
-
-	# See src_prepare()
-	insinto /etc/pm/config.d
-	doins "${T}"/${PN}
-}
-
-pkg_postinst() {
-	if use acpi || use apm; then
-		if use acpi; then
-			daemon_name="acpid"
-		elif use apm; then
-			deamon_name="apmd"
-		fi
-		if [ "$(rc-config list default | grep laptop_mode)" = "" ] || [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
-			ewarn "To enable automatic power state event handling,"
-			ewarn "e.g. enabling laptop_mode after unplugging the battery,"
-			ewarn "both laptop_mode and the ${daemon_name} daemon must be"
-			ewarn "added to default runlevel:"
-			if [ "$(rc-config list default | grep laptop_mode)" = "" ]; then
-				ewarn "# rc-update add laptop_mode default"
-			fi
-			if [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
-				ewarn "# rc-update add ${daemon_name} default"
-			fi
-		fi
-	else
-		ewarn "Without USE=\"acpi\" or USE=\"apm\" ${PN} can not"
-		ewarn "automatically disable laptop_mode on low battery."
-		ewarn
-		ewarn "This means you can lose up to 10 minutes of work if running"
-		ewarn "out of battery while laptop_mode is enabled."
-		ewarn
-		ewarn "Please see laptop-mode.txt in /usr/share/doc/${PF} for further"
-		ewarn "information."
-		ewarn
-	fi
-}
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.64.ebuild
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.64.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/laptop-mode-tools-1.64.ebuild,v 1.5 2014/05/27 18:48:57 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/laptop-mode-tools-1.64.ebuild,v 1.6 2014/07/14 15:01:09 ssuominen Exp $

 EAPI=5
 inherit eutils multilib systemd udev
@ -13,7 +13,7 @@ SRC_URI="http://www.samwel.tk/laptop_mode/tools/downloads/${MY_P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="+acpi apm bluetooth scsi"

 RDEPEND="net-wireless/wireless-tools
--- a/app-leechcraft/lc-fenet/lc-fenet-0.6.60.ebuild
+++ b/app-leechcraft/lc-fenet/lc-fenet-0.6.60.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-fenet/lc-fenet-0.6.60.ebuild,v 1.3 2014/04/03 08:12:32 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-fenet/lc-fenet-0.6.60.ebuild,v 1.4 2014/07/14 05:44:01 pinkbyte Exp $

 EAPI="5"

@ -12,5 +12,8 @@ SLOT="0"
 KEYWORDS=" amd64 x86"
 IUSE="debug"

-DEPEND="~app-leechcraft/lc-core-${PV}"
+DEPEND="
+	~app-leechcraft/lc-core-${PV}
+	dev-libs/qjson
+"
 RDEPEND="${DEPEND}"
--- a/app-leechcraft/lc-fenet/lc-fenet-0.6.65.ebuild
+++ b/app-leechcraft/lc-fenet/lc-fenet-0.6.65.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-fenet/lc-fenet-0.6.65.ebuild,v 1.1 2014/04/10 17:53:27 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-fenet/lc-fenet-0.6.65.ebuild,v 1.2 2014/07/14 05:44:01 pinkbyte Exp $

 EAPI="5"

@ -12,5 +12,8 @@ SLOT="0"
 KEYWORDS=" ~amd64 ~x86"
 IUSE="debug"

-DEPEND="~app-leechcraft/lc-core-${PV}"
+DEPEND="
+	~app-leechcraft/lc-core-${PV}
+	dev-libs/qjson
+"
 RDEPEND="${DEPEND}"
--- a/app-leechcraft/lc-fenet/lc-fenet-9999.ebuild
+++ b/app-leechcraft/lc-fenet/lc-fenet-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-fenet/lc-fenet-9999.ebuild,v 1.2 2014/01/08 09:46:08 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-fenet/lc-fenet-9999.ebuild,v 1.3 2014/07/14 05:44:01 pinkbyte Exp $

 EAPI="5"

@ -12,5 +12,8 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug"

-DEPEND="~app-leechcraft/lc-core-${PV}"
+DEPEND="
+	~app-leechcraft/lc-core-${PV}
+	dev-libs/qjson
+"
 RDEPEND="${DEPEND}"
--- a/app-misc/roadnav/roadnav-0.19-r1.ebuild
+++ b/app-misc/roadnav/roadnav-0.19-r1.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/roadnav/roadnav-0.19.ebuild,v 1.4 2012/09/05 07:15:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/roadnav/roadnav-0.19-r1.ebuild,v 1.1 2014/07/14 16:46:10 pacho Exp $

-EAPI=2
+EAPI=5
 WX_GTK_VER=2.8

 inherit eutils wxwidgets
@ -13,15 +13,15 @@ SRC_URI="mirror://sourceforge/roadnav/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="gps festival flite openstreetmap scripting"
+KEYWORDS="~amd64 ~x86"
+IUSE="gps festival openstreetmap scripting" #flite, see bug #516426

-DEPEND="x11-libs/wxGTK:2.8[X]
+DEPEND="
+	x11-libs/wxGTK:2.8[X]
 	~dev-libs/libroadnav-${PV}
-	festival?	( app-accessibility/festival )
-	flite?		( app-accessibility/flite )
-	gps?		( sci-geosciences/gpsd )"
-
+	festival? ( app-accessibility/festival )
+	gps? ( sci-geosciences/gpsd )
+"
 RDEPEND="${DEPEND}"

 src_prepare() {
@ -31,16 +31,15 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable festival) \
-		$(use_enable flite) \
 		$(use_enable gps gpsd) \
 		$(use_enable openstreetmap) \
 		$(use_enable scripting) \
-		--with-wx-config=${WX_CONFIG} \
-		|| die "econf failed"
+		--disable-flite \
+		--with-wx-config=${WX_CONFIG}
 }

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

 	# generic or empty
 	for f in NEWS COPYING INSTALL; do
--- a/app-misc/screenfetch/screenfetch-2.7.7.ebuild
+++ b/app-misc/screenfetch/screenfetch-2.7.7.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screenfetch/screenfetch-2.7.7.ebuild,v 1.3 2014/07/12 13:24:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screenfetch/screenfetch-2.7.7.ebuild,v 1.4 2014/07/14 16:43:15 hwoarang Exp $

 EAPI=4

@ -15,8 +15,7 @@ KEYWORDS="amd64 x86"
 IUSE="X"

 DEPEND="app-arch/unzip"
-RDEPEND="X? ( media-gfx/scrot )
-	x11-apps/xdpyinfo"
+RDEPEND="X? ( media-gfx/scrot x11-apps/xdpyinfo )"

 GIT_HASH="4881270"
 S="${WORKDIR}"/KittyKatt-${MY_PN}-${GIT_HASH}
--- a/app-misc/screenfetch/screenfetch-3.2.2.ebuild
+++ b/app-misc/screenfetch/screenfetch-3.2.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screenfetch/screenfetch-3.2.2.ebuild,v 1.2 2014/07/12 13:24:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screenfetch/screenfetch-3.2.2.ebuild,v 1.3 2014/07/14 16:43:15 hwoarang Exp $

 EAPI=4

@ -23,8 +23,7 @@ SLOT="0"
 IUSE="X"

 DEPEND=""
-RDEPEND="X? ( media-gfx/scrot )
-	x11-apps/xdpyinfo"
+RDEPEND="X? ( media-gfx/scrot x11-apps/xdpyinfo )"

 src_install() {
 	newbin ${PN}-dev ${PN}
--- a/app-misc/screenfetch/screenfetch-9999.ebuild
+++ b/app-misc/screenfetch/screenfetch-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screenfetch/screenfetch-9999.ebuild,v 1.3 2014/07/12 13:24:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screenfetch/screenfetch-9999.ebuild,v 1.4 2014/07/14 16:43:15 hwoarang Exp $

 EAPI=4

@ -23,8 +23,7 @@ SLOT="0"
 IUSE="X"

 DEPEND=""
-RDEPEND="X? ( media-gfx/scrot )
-	x11-apps/xdpyinfo"
+RDEPEND="X? ( media-gfx/scrot x11-apps/xdpyinfo )"

 src_install() {
 	newbin ${PN}-dev ${PN}
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@ -1,2 +1,3 @@
 DIST tracker-0.16.4.tar.xz 5745592 SHA256 9c2f50839c2b8b352ab9a022597ef985c1900e6286c0c3bcb7a64da39dbb3580 SHA512 82cc63f5a89e70e5d7d3c306005c9119b7f52a244cc453b789f19f56ec4858fd4c02421e07ab392dc1198b3352e99022986dfff043f9b4757e59723c038ffda0 WHIRLPOOL 07ec3cb39f619b930fba194c8cb5843786d9b0afa0d759498f72b35305ad06e1b9aba53fee64dad73186d74b7207c80ffa892adc9b5b350a108d882eaead9d9a
 DIST tracker-1.0.1.tar.xz 6060276 SHA256 76e7918e62526a8209f9c9226f82abe592a6332826ac7c12e6e405063181e889 SHA512 b41908756e10a1019901ad9313d795958eff40b7025d72e1c6670810b14f2968e05fa7f35451a53c354ba70d938aeb49e1ee9ab81d88531d1dfd75037b5e38eb WHIRLPOOL 08b46212e7ba5be97044bed416d5966ed5e1ec3ebe134827253fd20b3463f37f13449b82d8e705cb02dd5d29fd8d059911562c159e8ae5012454063f7265b826
+DIST tracker-1.0.2.tar.xz 6046600 SHA256 73491517006a58802630ff28243fc6fe07a24fe8bea563670da0ad28595468c4 SHA512 65a0324948ff6287c122a0de6356372cae366d1c8f0161f551a88c2e442c42066787333192acf6bc173dcdcc709ce9f58e5f88f660c1b5c9409363c680c50f8f WHIRLPOOL 7aa00e80094b441a774ff5cca7b0ceb1dbad69062124b371120d6fc049784b9f6e3b87f040bf02d4e4cacddd80184939b754a0b1d24c4f55242cd23eba2dde65
--- a/app-misc/tracker/tracker-1.0.2.ebuild
+++ b/app-misc/tracker/tracker-1.0.2.ebuild
@ -0,0 +1,259 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-1.0.2.ebuild,v 1.1 2014/07/14 12:29:44 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_{6,7} )
+VALA_MIN_API_VERSION="0.14"
+
+inherit autotools eutils gnome2 linux-info multilib python-any-r1 vala versionator virtualx
+
+DESCRIPTION="A tagging metadata database, search tool and indexer"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/100"
+IUSE="cue eds elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf
+gstreamer gtk iptc +iso +jpeg laptop +miner-fs mp3 nautilus networkmanager
+pdf playlist rss test thunderbird +tiff upnp-av +vorbis +xml xmp xps"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+REQUIRED_USE="
+	?? ( gstreamer ffmpeg )
+	cue? ( gstreamer )
+	upnp-av? ( gstreamer )
+	!miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
+"
+
+# According to NEWS, introspection is non-optional
+# glibc-2.12 needed for SCHED_IDLE (see bug #385003)
+# sqlite-3.7.16 for FTS4 support
+RDEPEND="
+	>=app-i18n/enca-1.9
+	>=dev-db/sqlite-3.7.16:=
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/gobject-introspection-0.9.5
+	>=dev-libs/icu-4.8.1.1:=
+	|| (
+		>=media-gfx/imagemagick-5.2.1[png,jpeg=]
+		media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
+	>=media-libs/libpng-1.2:0=
+	>=media-libs/libmediaart-0.1:1.0
+	>=x11-libs/pango-1:=
+	sys-apps/util-linux
+
+	cue? ( media-libs/libcue )
+	eds? (
+		>=mail-client/evolution-3.3.5:=
+		>=gnome-extra/evolution-data-server-3.3.5:=
+		<mail-client/evolution-3.5.3
+		<gnome-extra/evolution-data-server-3.5.3 )
+	elibc_glibc? ( >=sys-libs/glibc-2.12 )
+	exif? ( >=media-libs/libexif-0.6 )
+	ffmpeg? ( >=virtual/ffmpeg-9 )
+	firefox-bookmarks? ( || (
+		>=www-client/firefox-4.0
+		>=www-client/firefox-bin-4.0 ) )
+	flac? ( >=media-libs/flac-1.2.1 )
+	gif? ( media-libs/giflib )
+	gsf? ( >=gnome-extra/libgsf-1.14.24 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
+	gtk? (
+		>=dev-libs/libgee-0.3:0.8
+		>=x11-libs/gtk+-3:3 )
+	iptc? ( media-libs/libiptcdata )
+	iso? ( >=sys-libs/libosinfo-0.2.9:= )
+	jpeg? ( virtual/jpeg:0 )
+	laptop? ( || ( >=sys-power/upower-0.9 sys-power/upower-pm-utils ) )
+	mp3? ( >=media-libs/taglib-1.6 )
+	networkmanager? ( >=net-misc/networkmanager-0.8 )
+	pdf? (
+		>=x11-libs/cairo-1:=
+		>=app-text/poppler-0.16:=[cairo,utils]
+		>=x11-libs/gtk+-2.12:2 )
+	playlist? ( >=dev-libs/totem-pl-parser-3 )
+	rss? ( net-libs/libgrss:0.5 )
+	thunderbird? ( || (
+		>=mail-client/thunderbird-5.0
+		>=mail-client/thunderbird-bin-5.0 ) )
+	tiff? ( media-libs/tiff )
+	upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 )
+	vorbis? ( >=media-libs/libvorbis-0.22 )
+	xml? ( >=dev-libs/libxml2-2.6 )
+	xmp? ( >=media-libs/exempi-2.1 )
+	xps? ( app-text/libgxps )
+	!gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	$(vala_depend)
+	>=dev-util/gtk-doc-am-1.8
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	gtk? ( >=dev-libs/libgee-0.3 )
+	test? (
+		>=dev-libs/dbus-glib-0.82-r1
+		>=sys-apps/dbus-1.3.1[X] )
+"
+PDEPEND="nautilus? ( ~gnome-extra/nautilus-tracker-tags-${PV} )"
+
+# configure mixes enable-compile-warnings and with-compile-warnings
+# See upstream bug #705315
+QA_CONFIGURE_OPTIONS="--enable-compile-warnings"
+
+function inotify_enabled() {
+	if linux_config_exists; then
+		if ! linux_chkconfig_present INOTIFY_USER; then
+			ewarn "You should enable the INOTIFY support in your kernel."
+			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
+			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
+			die 'missing CONFIG_INOTIFY'
+		fi
+	else
+		einfo "Could not check for INOTIFY support in your kernel."
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	inotify_enabled
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Don't run 'firefox --version' or 'thunderbird --version'; it results in
+	# access violations on some setups (bug #385347, #385495).
+	create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
+	create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh
+
+	# Skip broken tests
+	# https://bugzilla.gnome.org/show_bug.cgi?id=699408
+	sed -e '\%/libtracker-common/file-utils/has_write_access_or_was_created%,+1 d' \
+		-i tests/libtracker-common/tracker-file-utils-test.c || die
+	# Fails inside portage, not outside
+	# https://bugzilla.gnome.org/show_bug.cgi?id=699413
+	sed -e '\%/steroids/tracker/tracker_sparql_update_async%,+3 d' \
+		-i tests/tracker-steroids/tracker-test.c || die
+
+	eautoreconf # See bug #367975
+	gnome2_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local myconf=""
+
+	if use gstreamer ; then
+		myconf="${myconf} --enable-generic-media-extractor=gstreamer"
+		if use upnp-av; then
+			myconf="${myconf} --with-gstreamer-backend=gupnp-dlna"
+		else
+			myconf="${myconf} --with-gstreamer-backend=discoverer"
+		fi
+	elif use ffmpeg ; then
+		myconf="${myconf} --enable-generic-media-extractor=libav"
+	else
+		myconf="${myconf} --enable-generic-media-extractor=external"
+	fi
+
+	# unicode-support: libunistring, libicu or glib ?
+	# According to NEWS, introspection is required
+	# is not being generated
+	# nautilus extension is in a separate package, nautilus-tracker-tags
+	gnome2_src_configure \
+		--disable-hal \
+		--disable-nautilus-extension \
+		--enable-abiword \
+		--enable-artwork \
+		--enable-dvi \
+		--enable-icon \
+		--enable-ps \
+		--enable-text \
+		--enable-guarantee-metadata \
+		--enable-introspection \
+		--enable-libpng \
+		--enable-libmediaart \
+		--enable-tracker-fts \
+		--enable-enca \
+		--with-unicode-support=libicu \
+		$(use_enable cue libcue) \
+		$(use_enable eds miner-evolution) \
+		$(use_enable exif libexif) \
+		$(use_enable firefox-bookmarks miner-firefox) \
+		$(use_with firefox-bookmarks firefox-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/firefox/extensions) \
+		FIREFOX="${S}"/firefox-version.sh \
+		$(use_enable flac libflac) \
+		$(use_enable gif libgif) \
+		$(use_enable gsf libgsf) \
+		$(use_enable gtk tracker-needle) \
+		$(use_enable gtk tracker-preferences) \
+		$(use_enable iptc libiptcdata) \
+		$(use_enable iso libosinfo) \
+		$(use_enable jpeg libjpeg) \
+		$(use_enable laptop upower) \
+		$(use_enable miner-fs) \
+		$(use_enable mp3 taglib) \
+		$(use_enable mp3) \
+		$(use_enable networkmanager network-manager) \
+		$(use_enable pdf poppler) \
+		$(use_enable playlist) \
+		$(use_enable rss miner-rss) \
+		$(use_enable test functional-tests) \
+		$(use_enable test unit-tests) \
+		$(use_enable thunderbird miner-thunderbird) \
+		$(use_with thunderbird thunderbird-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/thunderbird/extensions) \
+		THUNDERBIRD="${S}"/thunderbird-version.sh \
+		$(use_enable tiff libtiff) \
+		$(use_enable vorbis libvorbis) \
+		$(use_enable xml libxml2) \
+		$(use_enable xmp exempi) \
+		$(use_enable xps libgxps) \
+		${myconf}
+}
+
+src_test() {
+	export G_MESSAGES_DEBUG=all # upstream bug #699401#c1
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Manually symlink extensions for {firefox,thunderbird}-bin
+	if use firefox-bookmarks; then
+		dosym /usr/share/xul-ext/trackerfox \
+			/usr/$(get_libdir)/firefox-bin/extensions/trackerfox@bustany.org
+	fi
+
+	if use thunderbird; then
+		dosym /usr/share/xul-ext/trackerbird \
+			/usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org
+	fi
+}
+
+create_version_script() {
+	# Create script $3 that prints "$2 MAX(VERSION($1), VERSION($1-bin))"
+
+	local v=$(best_version ${1})
+	v=${v#${1}-}
+	local vbin=$(best_version ${1}-bin)
+	vbin=${vbin#${1}-bin-}
+
+	if [[ -z ${v} ]]; then
+		v=${vbin}
+	else
+		version_compare ${v} ${vbin}
+		[[ $? -eq 1 ]] && v=${vbin}
+	fi
+
+	echo -e "#!/bin/sh\necho $2 $v" > "$3" || die
+	chmod +x "$3" || die
+}
--- a/app-office/dia2code/Manifest
+++ b/app-office/dia2code/Manifest
@ -1 +1,2 @@
 DIST dia2code-0.8.5.tar.gz 159258 SHA256 981a41b1bfd303174aea0cdea3a71f239bf24d0574ada99eb58600188854724b SHA512 81741be126438848e46ff1d554ad32dc56e6c76a358fdc9852a2689b406c453677ca63ab4daed17d4cec319edfd4edef55a6a2a257a3ffa5d0500136a7c147bc WHIRLPOOL 39b327f77a48f763dc2d30f475283e310073c2816c84a110490e03ca22022278d674fa64e92a782c1e99c74c4ac46c7bc93c07e08801e1312171f325c378631f
+DIST dia2code-0.8.7.tar.gz 173733 SHA256 bebeeea56370bea416241128502144736d54d560b32d875174c5927089843adf SHA512 b02eea93488ab388aa6560ed62aef68d8d0f33e8ebf0237122d5038fd007dd1035180bcfe818edbdeb825d7767553d5c8f115acf57fce8085676cfbf6cb821e3 WHIRLPOOL 43e68f100ceca7acbd062847150086fa7c25edd5c0a819970d5e676ed6037d5d3140807cd57a0784d45cc863178521d721015b253bd745d37c73cb037fbbfa7b
--- a/app-office/dia2code/dia2code-0.8.7.ebuild
+++ b/app-office/dia2code/dia2code-0.8.7.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia2code/dia2code-0.8.7.ebuild,v 1.1 2014/07/14 18:57:33 pacho Exp $
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Convert UML diagrams produced with Dia to various source code flavours"
+HOMEPAGE="http://dia2code.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-libs/libxml2"
+RDEPEND="${DEPEND}
+	>=app-office/dia-0.90.0
+"
+
+src_install() {
+	gnome2_src_install
+	doman dia2code.1
+}
--- a/app-portage/g-cpan/Manifest
+++ b/app-portage/g-cpan/Manifest
@ -1 +1,2 @@
 DIST g-cpan-0.16.4.tar.gz 33641 SHA256 e37a84ee8a959fe42468a4cfeafe6011a8e801fa93f6690dffe813bc46c00613 SHA512 1f9c042bc94af4694e6064a5560a1355e059599ba80b4f122f7282b685f30237ee1849e7e40c6e5c80049a90c4ec9412b302f1675cc923c767c51a1d7d1a83a5 WHIRLPOOL 5009afaee17f4830670c26c7e7c9db9c8b4bc1e65724d88a8b52854e684c589ceb99d49613cc72a47d31816c151361aff49842add6830144c3dcbdbc91f4ddab
+DIST g-cpan-0.16.5.tar.gz 33894 SHA256 929c06ee2cdd3361121b6f359ea7fc9201bc42caff96ef1df45b4cb93ccfd988 SHA512 f2eab23281abe567ee2df42895e3f0783228c6ab5e3a8230089e900fd2700367d736299da20fb228f2d4542491a24da05fd035a81aff7d79ce5132e35c48ad0b WHIRLPOOL 01e0b9fc59264455d57fc64c432e683ae941c74d6efa6e2b3430dea6caac019cfad3e893a4b39de4386a3dadadecf95d828a9fbaa8e8b1260303081e2cc6ce65
--- a/app-portage/g-cpan/g-cpan-0.16.5.ebuild
+++ b/app-portage/g-cpan/g-cpan-0.16.5.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/g-cpan/g-cpan-0.16.5.ebuild,v 1.1 2014/07/14 11:46:01 chainsaw Exp $
+
+EAPI=5
+
+inherit perl-module
+
+DESCRIPTION="g-cpan: generate and install CPAN modules using portage"
+HOMEPAGE="http://www.gentoo.org/proj/en/perl/g-cpan.xml"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+		 http://dev.gentoo.org/~chainsaw/distfiles/${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+		>=dev-perl/yaml-0.60
+		dev-perl/Shell-EnvImporter
+		dev-perl/Log-Agent"
+RDEPEND="${DEPEND}"
+
+src_install() {
+		perl-module_src_install
+		diropts "-m0755"
+		dodir "/var/tmp/g-cpan"
+		keepdir "/var/tmp/g-cpan"
+		dodir "/var/log/g-cpan"
+		keepdir "/var/log/g-cpan"
+}
+
+pkg_postinst() {
+	elog "You may wish to adjust the permissions on /var/tmp/g-cpan"
+	elog "if you have users besides root expecting to use g-cpan."
+	elog "Please note that some CPAN packages need additional manual"
+	elog "parameters or tweaking, due to bugs in their build systems."
+}
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@ -1,2 +1,3 @@
 DIST iso-codes-3.51.tar.xz 3626932 SHA256 5222f79d92ac021a56c7080616c13655c50f7b1ff1a31ec0308da14a684ad77f SHA512 03029f32a69f701875a3bacdc9c73a3b87f0ead62430ab4f913b3c69701f8fe7dc36e8d84e0ec32a66d3638835938ecbca024bbca1b56371ff26212afc9ea100 WHIRLPOOL 91a1e951bc8b279f434d8bc22618a9832764dfac5abcd4ae5fef7244294598257eb1ac0072b8594e60e17bb55914fd594318735139e2c3088326ef0f7810ae5d
 DIST iso-codes-3.54.tar.xz 3766812 SHA256 1fe06e68dff821a4fcc3c9da9dd6674ffd9e847ad4048bc1b3fde85b58f118b6 SHA512 bcab34a8c6f9b9ea92917c5dbc8b63d250e6e18edb763433a3b361b4f425e8cb847ed50080abdbe82150fb7c730a883a60c93c547cf9651d4803df10140d2324 WHIRLPOOL c837bbb8be40941b7bd40b4446f3f72b042d35c8496b9d39865c7cb0f7d1a0a265321561a546fd4c1ff16fdc77d512da23dc5a0e2acfcd339b6330d2c487ebb2
+DIST iso-codes-3.55.tar.xz 3769864 SHA256 6c48f417160fa5f9e6874c19a07b220654974594a838460fdba06965c77e94e6 SHA512 167f4b33d6d7c3824c59060fbf3b8e91f1aa7adce0ee0d6d0f5bb1e8f97d82aa0a0ff6065744fbec304de90b413bc53fb8237b551120149fade25335ce5137d8 WHIRLPOOL cbba121c7cfa8f0588641ba8cfd23fcfc22713d515201f7757e3aabab466c7b0c41b3e3ba0c7776207eb6c1137d48228110f4be42cb12e7b4532a7e9ca737066
--- a/app-text/iso-codes/iso-codes-3.55.ebuild
+++ b/app-text/iso-codes/iso-codes-3.55.ebuild
@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/iso-codes/iso-codes-3.55.ebuild,v 1.1 2014/07/14 18:52:20 pacho Exp $
+
+EAPI="5"
+
+PLOCALES="af am ar as ast az be bg bn bn_IN br bs byn ca crh cs cy da de dz el en eo es et eu fa fi fo fr ga gez gl gu haw he hi hr hu hy ia id is it ja ka kk km kn ko kok ku lt lv mi mk ml mn mr ms mt nb ne nl nn nso oc or pa pl ps pt pt_BR ro ru rw si sk sl so sq sr sr@latin sv sw ta te th ti tig tk tl tr tt tt@iqtelif ug uk ve vi wa wal wo xh zh_CN zh_HK zh_TW zu"
+
+inherit eutils l10n
+
+DESCRIPTION="ISO language, territory, currency, script codes and their translations"
+HOMEPAGE="http://pkg-isocodes.alioth.debian.org/"
+SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	app-arch/xz-utils
+	sys-devel/gettext
+"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_prepare() {
+	local norm loc all_locales mylinguas
+	local all_norms="iso_15924 iso_3166 iso_3166_2 iso_4217 iso_639 iso_639_3 iso_639_5"
+
+	# l10n_find_plocales_changes doesn't support multiple directories
+	einfo "Looking for new locales ..."
+	for norm in ${all_norms}; do
+		pushd "${norm}" > /dev/null || die
+		for loc in *.po; do
+			all_locales+="${loc%.po} "
+		done
+		popd > /dev/null
+	done
+
+	all_locales=$(echo "${all_locales}" | sed 's/ /\n/g' | sort | uniq)
+	all_locales=${all_locales//[[:space:]]/ }
+	all_locales=${all_locales#[[:space:]]}
+	all_locales=${all_locales%[[:space:]]}
+	if [[ ${PLOCALES} != ${all_locales} ]]; then
+		einfo "There are changes in locales! This ebuild should be updated to:"
+		einfo "PLOCALES=\"${all_locales}\""
+	else
+		einfo "Done"
+	fi
+
+	for norm in ${all_norms}; do
+		einfo "Preparing ${norm} ..."
+		pushd "${norm}" > /dev/null || die
+		mylinguas=
+		for loc in *.po; do
+			if use "linguas_"${loc%.po}; then
+				mylinguas+="${loc} "
+			fi
+		done
+
+		sed -e "s:pofiles =.*:pofiles = ${mylinguas} ${NULL}:" \
+			-e "s:mofiles =.*:mofiles = ${mylinguas//.po/.mo} ${NULL}:" \
+			-i Makefile.am Makefile.in || die "sed in ${norm} folder failed"
+		popd > /dev/null
+	done
+}
--- a/app-vim/cfengine-syntax/Manifest
+++ b/app-vim/cfengine-syntax/Manifest
@ -1 +1,2 @@
 DIST cfengine-syntax-20050105.tar.bz2 3584 SHA256 40bad3fee676dd514b35440717985157bc32e09e2718e87284c5879fc3d4caf8 SHA512 02af14388b5df38db0b42d8c1fb48f0e6f53b08954d4d05ad29397da5dbf423549e86cb1b97868cf807e66d0cc28affe0f3f831110625652d7366ee352db87ff WHIRLPOOL 7e42edaa972e4979b68231f5d61ba50da9a94d42039890902737f67140d69b773393f8744ce64ee5ddd8f8b917e9b22810781ee85bb118efb1d211830dd7de29
+DIST cfengine-syntax-20140713.tar.bz2 3692 SHA256 51f0c01c020440e91d54e5040963c4fed84c1512d7be6c8faa46c6b07a298bc1 SHA512 0f9ba2f293c0695efe588218db16c04100085a95ecb89b476ca0e52b07bd63f0ad6169aa7d2ac1d3ff1927444f78cdcec49f1aca8f2e517f167f36df98a48177 WHIRLPOOL 302b6173a825479f9551116676e7b5f0a306a6b80aa3cdbf7d873f4233160494f79e138b04eac882eb20b6edf272e1bd4e4bb7751a5dc32765fcd3a23e1633c9
--- a/app-vim/cfengine-syntax/cfengine-syntax-20140713.ebuild
+++ b/app-vim/cfengine-syntax/cfengine-syntax-20140713.ebuild
@ -0,0 +1,15 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/cfengine-syntax/cfengine-syntax-20140713.ebuild,v 1.1 2014/07/14 18:41:45 radhermit Exp $
+
+EAPI=5
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Cfengine configuration files syntax"
+HOMEPAGE="http://dev.gentoo.org/~ramereth/vim/syntax/cfengine.vim"
+LICENSE="vim.org"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for Cfengine configuration
+files. Detection is by filename (/var/cfengine/inputs/)."
--- a/dev-cpp/gflags/files/gflags-2.1.1-libs.patch
+++ b/dev-cpp/gflags/files/gflags-2.1.1-libs.patch
@ -0,0 +1,45 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 17d38b4..ca2c1df 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -22,6 +22,8 @@ version_numbers (
+     PACKAGE_VERSION_PATCH
+ )
+ 
+set (PACKAGE_SOVERSION "${PACKAGE_VERSION_MAJOR}")
+
+ # ----------------------------------------------------------------------------
+ # options
+ set (GFLAGS_NAMESPACE   "${PACKAGE_NAME}" CACHE STRING "C++ namespace identifier of gflags library.")
+@@ -256,7 +258,9 @@ foreach (TYPE IN ITEMS STATIC SHARED)
+         endif ()
+         set_target_properties (
+           gflags${opts}-${type} PROPERTIES COMPILE_DEFINITIONS "${defines}"
+-                                           OUTPUT_NAME "gflags${opts}"
+                                           OUTPUT_NAME         "gflags${opts}"
+                                           VERSION             "${PACKAGE_VERSION}"
+                                           SOVERSION           "${PACKAGE_SOVERSION}"
+         )
+         if (HAVE_SHLWAPI_H)
+           target_link_libraries (gflags${opts}-${type} shlwapi.lib)
+@@ -280,9 +284,18 @@ if (OS_WINDOWS)
+   set (CONFIG_INSTALL_DIR  CMake)
+ else ()
+   set (RUNTIME_INSTALL_DIR bin)
+-  set (LIBRARY_INSTALL_DIR lib)
+  # The LIB_INSTALL_DIR and LIB_SUFFIX variables are used by the Fedora
+  # package maintainers. Also package maintainers of other distribution
+  # packages need to be able to specify the name of the library directory.
+  if (NOT LIB_INSTALL_DIR)
+    set (LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
+  endif ()
+  set (LIBRARY_INSTALL_DIR "${LIB_INSTALL_DIR}"
+    CACHE PATH "Directory of installed libraries, e.g., \"lib64\""
+  )
+  mark_as_advanced (LIBRARY_INSTALL_DIR)
+   set (INCLUDE_INSTALL_DIR include)
+-  set (CONFIG_INSTALL_DIR  lib/cmake/${PACKAGE_NAME})
+  set (CONFIG_INSTALL_DIR  ${LIBRARY_INSTALL_DIR}/cmake/${PACKAGE_NAME})
+ endif ()
+ 
+ file (RELATIVE_PATH INSTALL_PREFIX_REL2CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/${CONFIG_INSTALL_DIR}" "${CMAKE_INSTALL_PREFIX}")
--- a/dev-cpp/gflags/gflags-2.1.1.ebuild
+++ b/dev-cpp/gflags/gflags-2.1.1.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gflags/gflags-2.1.1.ebuild,v 1.1 2014/07/14 03:34:01 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gflags/gflags-2.1.1.ebuild,v 1.3 2014/07/15 01:32:27 floppym Exp $

 EAPI="5"

-inherit cmake-multilib multilib-minimal
+inherit cmake-multilib

 DESCRIPTION="Google's C++ argument parsing library"
 HOMEPAGE="http://code.google.com/p/gflags/"
@ -13,6 +13,9 @@ SRC_URI="https://github.com/schuhschuh/gflags/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+PATCHES=( "${FILESDIR}/gflags-2.1.1-libs.patch" )

 multilib_src_install_all() {
 	rm -rf "${ED}"/usr/share/doc
--- a/dev-haskell/cabal/cabal-1.18.1.3.ebuild
+++ b/dev-haskell/cabal/cabal-1.18.1.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.18.1.3.ebuild,v 1.3 2014/04/13 13:07:58 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.18.1.3.ebuild,v 1.4 2014/07/14 21:32:32 slyfox Exp $

 EAPI=5

@ -35,7 +35,7 @@ DEPEND="${RDEPEND}

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

-CABAL_CORE_LIB_GHC_PV="7.8.2014* 7.8.0.2014* 7.8.1 7.8.2"
+CABAL_CORE_LIB_GHC_PV="7.8.2014* 7.8.0.2014* 7.8.1 7.8.2 7.8.3"

 src_prepare() {
 	if [[ -n ${LIVE_EBUILD} ]]; then
--- a/dev-haskell/deepseq/Manifest
+++ b/dev-haskell/deepseq/Manifest
@ -1,3 +1,3 @@
-DIST deepseq-1.1.0.2.tar.gz 3619 SHA256 6504d3bcd61e89c2ca6b957e45418028fcb8943727339a6468595825184513c7 SHA512 5231548aee357cf08f0aa43fb6afb036d900adaed542ce3f1b03f864159838df0ad429e96a15934471eb0fd46cf71938f36d62cef4ef57e7acef597d79701710 WHIRLPOOL cce83fac17defdf4b0d73b3c074b6836f23d3143ccc7604e9b9f78c1f26c03e65d279670b1f6d07a907a8a1195f1b18ea5d4f6ef4e196f6329c79eadf5445978
 DIST deepseq-1.3.0.0.tar.gz 3901 SHA256 fee10dbfceda33220fb9869652530c32ab2888694ee628cc86d51ea35a0e537c SHA512 f845b483e7cfd37e63e0a4d8515a54c130a38e219dfe7f3f1a9af2ba0420603097d90985b992f5ff9af3bcbc6ae106f315b821be561c669374115597938cc9fb WHIRLPOOL 16b90220a23d8a1f820d6c41ec9c26c31acedeb331001436c3779a63afdfdbdb61122d38206f937a0be481c27ece452a2c0ea12a6ce51acbd4d095405aa10a0b
 DIST deepseq-1.3.0.1.tar.gz 3900 SHA256 9792d2aff7c65c1e3a9d720ba7fe109eb6aea50a51477ffafd2b5f9e8d9a1f19 SHA512 e04593845d9d1ec427a3448b9e5175e1c0842d55037cd05abd0cb7c3dbc5a5470a824f10c4e8f1fa8b6feae853ba9bdb0fe614e4c419c34298baf86c1f90b8d6 WHIRLPOOL 642336d1ba103a488746ca64871f49dda0602907b1c2b81d1c5dd8c15d01040160cc6fc7e9184a9cffe58065a199333a4d620b711594d981ce03c546e267e562
+DIST deepseq-1.3.0.2.tar.gz 4485 SHA256 779d65aae7d56765089aeb655d9fa26e6b59d626e42fe9e87644a312ca775626 SHA512 c85ba6616747883228813dec1f6d828b03174dbc45049592aa7596a6b4f15fb1aaa6613d2e73b5ff049ef35c66273e102b6dd5895f5e5abd8a1b25b70d9ff71b WHIRLPOOL d57ce527563744d78c2ba4f62de0efb548354abd6eeb7d82d8f496ad85bcb373ccf7e2d58ddac5e2812181164cf90b12be35e5dca017b58a8512a6c25266faeb
--- a/dev-haskell/deepseq/deepseq-1.3.0.2.ebuild
+++ b/dev-haskell/deepseq/deepseq-1.3.0.2.ebuild
@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/deepseq/deepseq-1.1.0.2.ebuild,v 1.5 2012/09/12 15:06:17 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/deepseq/deepseq-1.3.0.2.ebuild,v 1.1 2014/07/14 15:22:26 slyfox Exp $

-# ebuild generated by hackport 0.2.13
+EAPI=5

-EAPI="3"
+# ebuild generated by hackport 0.3.4.9999

-CABAL_FEATURES="lib profile haddock hscolour"
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal

 DESCRIPTION="Deep evaluation of data structures"
@ -14,10 +14,13 @@ HOMEPAGE="http://hackage.haskell.org/package/deepseq"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-macos"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""

-RDEPEND=">=dev-lang/ghc-6.8.2"
+RDEPEND=">=dev-lang/ghc-7.0.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
+	>=dev-haskell/cabal-1.10.0.0
+"
+CABAL_CORE_LIB_GHC_PV="7.8.1 7.8.2 7.8.3 7.9.2014*"
--- a/dev-java/absolutelayout/absolutelayout-6.7_beta-r1.ebuild
+++ b/dev-java/absolutelayout/absolutelayout-6.7_beta-r1.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/absolutelayout/absolutelayout-6.7_beta-r1.ebuild,v 1.1 2014/07/14 07:47:49 ercpe Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="AbsoluteLayout files extracted from Netbeans"
+HOMEPAGE="http://www.netbeans.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-2 CDDL )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4"
+
+S="${WORKDIR}"
--- a/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
+++ b/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aopalliance/aopalliance-1.0-r2.ebuild,v 1.1 2014/07/14 08:03:07 ercpe Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Aspect-Oriented Programming (AOP) Alliance classes"
+SRC_URI="mirror://gentoo/${P}-gentoo.tar.bz2"
+#SRC_URI="mirror://gentoo/${P}.tar.bz2"
+# Tarball creation:
+# cvs -d:pserver:anonymous@aopalliance.cvs.sourceforge.net:/cvsroot/aopalliance login
+# cvs -z3 -d:pserver:anonymous@aopalliance.cvs.sourceforge.net:/cvsroot/aopalliance export -r interception_1_0 aopalliance
+# tar cjvf aopalliance-1.0-gentoo.tar.bz2 aopalliance
+HOMEPAGE="http://aopalliance.sourceforge.net/"
+LICENSE="public-domain"
+SLOT="1"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main"
+
+java_prepare() {
+	rm build.xml || die
+}
--- a/dev-java/apt-mirror/apt-mirror-1.0-r1.ebuild
+++ b/dev-java/apt-mirror/apt-mirror-1.0-r1.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/apt-mirror/apt-mirror-1.0-r1.ebuild,v 1.1 2014/07/14 08:26:08 ercpe Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Annotation processing apt mirror API introduced in J2SE 5.0"
+HOMEPAGE="http://aptmirrorapi.dev.java.net/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+S="${WORKDIR}/apt"
--- a/dev-java/blowfishj/blowfishj-2.14-r2.ebuild
+++ b/dev-java/blowfishj/blowfishj-2.14-r2.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blowfishj/blowfishj-2.14-r2.ebuild,v 1.1 2014/07/14 08:30:52 ercpe Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Blowfish implementation in Java"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+HOMEPAGE="http://blowfishj.sourceforge.net/index.html"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	test? ( =dev-java/junit-3* dev-java/ant-junit ) "
+RDEPEND=">=virtual/jre-1.4"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die
+	java-ant_ignore-system-classes
+	mkdir -p target/lib || die
+	cd target/lib || die
+	use test && java-pkg_jar-from --build-only junit
+}
+
+src_test() {
+	ANT_TASKS="ant-junit" eant test -DJunit.present=true
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/net
+}
--- a/dev-java/ecj-gcj/Manifest
+++ b/dev-java/ecj-gcj/Manifest
@ -1,2 +1,3 @@
 DIST ecjsrc-3.5.2.zip 1298691 SHA256 4ae91449962b1e2781b70713e299f9fa16fb1ce25a4d2bb335c13b55c08d6d74 SHA512 5fb3a38358511c92c12dfebbb4beb91581de25e2a3e3b4593d0388531dea5bae469f677e5154b69d634ede7395375992ae9f043be36f6b5a0fcfa873dbc98558 WHIRLPOOL 54860dd40254521cecd38d6dff645443ce61edd4b5eba036ebc002401560b313d3db26eca24b601f66ff78e288246e76b6db219379a65a88c5e16728a4f31c1d
 DIST ecjsrc-3.6.zip 1310484 SHA256 bc2d624c5ca135d593c71a677674509f5801998ffe98c386749d15a46ee69242 SHA512 23f5be36de85f8a95bf029e42df632aa417ffa58a84b50ab5f6c78dd1fa1882316c61165b4d0d7be2c2568226f1e1c352ea45e391759ca6c5c1fef97e8c5fada WHIRLPOOL d2ea8c0ad3eb34e0d0a09b06d87a5dc89b79b106d0d68bec9e19a627f7e1732348c559ff0b4dc1558eeebbb4822ad68b8f0b59b46db84b5c6a7162e7a12f06c3
+DIST ecjsrc-4.2.1.jar 1417043 SHA256 d261b2158f598640f1923805d2e9bf47eb21d8333f4e1b37f59f847ad00d48f4 SHA512 967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf WHIRLPOOL 3f91bbf654d8ce0621e3ce21b5a1fce5058c86ad1dd24f89269aba6716945bff8686b6e1829c602864c15f62b45c65f5d5fe0430052dd2419da7e0c0225c95d5
--- a/dev-java/ecj-gcj/ecj-gcj-3.5.2-r2.ebuild
+++ b/dev-java/ecj-gcj/ecj-gcj-3.5.2-r2.ebuild
@ -1,109 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ecj-gcj-3.5.2-r2.ebuild,v 1.2 2012/04/15 17:50:45 vapier Exp $
-
-EAPI=2
-
-inherit java-pkg-2 toolchain-funcs
-
-MY_PN="ecj"
-DMF="R-${PV}-201002111343"
-S="${WORKDIR}"
-
-DESCRIPTION="A subset of Eclipse Compiler for Java compiled by gcj, serving as javac in gcj-jdk"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-${PV}.zip"
-
-IUSE="+native userland_GNU"
-
-LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-SLOT="3.5"
-
-MY_PS="${MY_PN}-${SLOT}"
-
-# for compatibility with java eclass functions
-JAVA_PKG_WANT_SOURCE=1.4
-JAVA_PKG_WANT_TARGET=1.4
-
-CDEPEND="sys-devel/gcc[gcj]
-	>=app-admin/eselect-ecj-0.6"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	userland_GNU? ( sys-apps/findutils )
-	!dev-java/eclipse-ecj:3.5[gcj]"
-RDEPEND="${CDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# We don't need the ant adapter here
-	rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die
-	rm -fr org/eclipse/jdt/internal/antadapter || die
-
-	# upstream build.xml excludes this
-	rm -f META-INF/eclipse.inf || die
-
-	# these java6 specific classes cannot compile with ecj
-	rm -fr org/eclipse/jdt/internal/compiler/{apt,tool}/ || die
-}
-
-src_compile() {
-	local javac_opts javac java jar
-
-	local gccbin=$(gcc-config -B)
-	local gccver=$(gcc-fullversion)
-
-	local gcj="${gccbin}/gcj"
-	javac="${gcj} -C"
-	jar="${gccbin}/gjar"
-	java="${gccbin}/gij"
-
-	mkdir -p bootstrap || die
-	cp -pPR org bootstrap || die
-	cd "${S}/bootstrap" || die
-
-	einfo "bootstrapping ${MY_PN} with ${javac} ..."
-	${javac} ${javac_opts} $(find org/ -name '*.java') || die
-	find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' |\
-		xargs ${jar} cf ${MY_PN}.jar
-
-	cd "${S}" || die
-
-	einfo "building ${MY_PN} with bootstrapped ${MY_PN} ..."
-	${java} -classpath bootstrap/${MY_PN}.jar \
-		org.eclipse.jdt.internal.compiler.batch.Main \
-		${javac_opts} -nowarn org || die
-	find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' |\
-		xargs ${jar} cf ${MY_PN}.jar
-
-	if use native; then
-		einfo "Building native ${MY_PS} library, patience needed ..."
-		${gcj} ${CFLAGS} -findirect-dispatch -shared -fPIC -Wl,-Bsymbolic \
-			-o ${MY_PS}.so ${MY_PN}.jar || die
-	fi
-}
-
-src_install() {
-	java-pkg_dojar ${MY_PN}.jar
-	dobin "${FILESDIR}/${PN}-${SLOT}"
-	use native && dolib.so ${MY_PS}.so
-}
-
-pkg_postinst() {
-	if use native; then
-		$(gcc-config -B)/gcj-dbtool -a $(gcj-dbtool -p) \
-			/usr/share/${PN}-${SLOT}/lib/ecj.jar \
-			/usr/$(get_libdir)/${MY_PN}-${SLOT}.so
-	fi
-
-	einfo "To select between slots of ECJ..."
-	einfo " # eselect ecj"
-
-	eselect ecj update ${PN}-${SLOT}
-}
-
-pkg_postrm() {
-	eselect ecj update
-}
--- a/dev-java/ecj-gcj/ecj-gcj-4.2.1-r2.ebuild
+++ b/dev-java/ecj-gcj/ecj-gcj-4.2.1-r2.ebuild
@ -1,43 +1,40 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ecj-gcj-3.6.ebuild,v 1.2 2012/09/16 13:12:54 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ecj-gcj-4.2.1-r2.ebuild,v 1.1 2014/07/14 18:10:59 sera Exp $

-EAPI=4
+EAPI=5

-inherit java-pkg-2 toolchain-funcs
+inherit java-pkg-2 prefix toolchain-funcs

 MY_PN="ecj"
-DMF="R-${PV}-201006080911"
-S="${WORKDIR}"
+DMF="R-${PV}-201209141800"

 DESCRIPTION="A subset of Eclipse Compiler for Java compiled by gcj, serving as javac in gcj-jdk"
 HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-${PV}.zip"
-
-IUSE="+native userland_GNU"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"

 LICENSE="EPL-1.0"
+SLOT="4.2"
 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-SLOT="3.6"
+IUSE="+native"

-MY_PS="${MY_PN}-${SLOT}"
+COMMON_DEPEND="
+	sys-devel/gcc[gcj]
+	|| ( app-admin/eselect-java >=app-admin/eselect-ecj-0.6 )"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+	!dev-java/eclipse-ecj:3.5[gcj]"
+
+S="${WORKDIR}"

 # for compatibility with java eclass functions
 JAVA_PKG_WANT_SOURCE=1.4
 JAVA_PKG_WANT_TARGET=1.4

-CDEPEND="sys-devel/gcc[gcj]
-	>=app-admin/eselect-ecj-0.6"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	userland_GNU? ( sys-apps/findutils )
-	!dev-java/eclipse-ecj:3.5[gcj]"
-RDEPEND="${CDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+MY_PS="${MY_PN}-${SLOT}"

+java_prepare() {
 	# We don't need the ant adapter here
 	rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die
 	rm -fr org/eclipse/jdt/internal/antadapter || die
@ -45,7 +42,7 @@ src_unpack() {
 	# upstream build.xml excludes this
 	rm -f META-INF/eclipse.inf || die

-	# these java6 specific classes cannot compile with ecj
+	# these java6 specific classes cannot compile with gcj
 	rm -fr org/eclipse/jdt/internal/compiler/{apt,tool}/ || die
 }

@ -66,8 +63,8 @@ src_compile() {

 	einfo "bootstrapping ${MY_PN} with ${javac} ..."
 	${javac} ${javac_opts} $(find org/ -name '*.java') || die
-	find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' |\
-		xargs ${jar} cf ${MY_PN}.jar
+	find org/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' -o -name '*.inf' -o -name '*.props' \) \
+		-exec ${jar} cf ${MY_PN}.jar {} + || die

 	cd "${S}" || die

@ -75,27 +72,33 @@ src_compile() {
 	${java} -classpath bootstrap/${MY_PN}.jar \
 		org.eclipse.jdt.internal.compiler.batch.Main \
 		${javac_opts} -nowarn org || die
-	find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' |\
-		xargs ${jar} cf ${MY_PN}.jar
+	find org/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' -o -name '*.inf' -o -name '*.props' \) \
+		-exec ${jar} cf ${MY_PN}.jar {} + || die

 	if use native; then
 		einfo "Building native ${MY_PS} library, patience needed ..."
-		${gcj} ${CFLAGS} -findirect-dispatch -shared -fPIC -Wl,-Bsymbolic \
+		${gcj} ${CFLAGS} ${LDFLAGS} -findirect-dispatch -shared -fPIC -Wl,-Bsymbolic \
 			-o ${MY_PS}.so ${MY_PN}.jar || die
 	fi
 }

 src_install() {
 	java-pkg_dojar ${MY_PN}.jar
-	dobin "${FILESDIR}/${PN}-${SLOT}"
+
+	sed -e "s|@SLOT@|${SLOT}|" \
+		"${FILESDIR}/${PN}.in" \
+		> "${T}"/${PN}-${SLOT} || die
+	eprefixify "${T}/${PN}-${SLOT}"
+	dobin  "${T}/${PN}-${SLOT}"
+
 	use native && dolib.so ${MY_PS}.so
 }

 pkg_postinst() {
 	if use native; then
 		$(gcc-config -B)/gcj-dbtool -a $(gcj-dbtool -p) \
-			/usr/share/${PN}-${SLOT}/lib/ecj.jar \
-			/usr/$(get_libdir)/${MY_PN}-${SLOT}.so
+			"${EPREFIX}"/usr/share/${PN}-${SLOT}/lib/ecj.jar \
+			"${EPREFIX}"/usr/$(get_libdir)/${MY_PN}-${SLOT}.so
 	fi

 	einfo "To select between slots of ECJ..."
--- a/dev-java/ecj-gcj/files/ecj-gcj-3.5
+++ b/dev-java/ecj-gcj/files/ecj-gcj-3.5
@ -1,21 +0,0 @@
-#!/bin/bash
-# gcj-jdk installs /usr/bin/gcj-jdk symlink, depending on it would be circular
-# so we fallback to gcc-config discovery
-GIJ_BIN="/usr/bin/gij"
-if [[ ! -f ${GIJ_BIN} ]]; then
-	GIJ_BIN="$(gcc-config -B)/gij"
-fi
-if [[ ! -f ${GIJ_BIN} ]]; then
-	echo "gij not found! check that gcc is compiled with gcj flag"
-	exit 1
-fi
-# calling java-config would be an unnecessary slowdown here
-
-# we need to append user CLASSPATH otherwise it will be overriden by the -classpath parameter
-# this breaks e.g. bootstrap of ant-core
-ecj_cp="/usr/share/ecj-gcj-3.5/lib/ecj.jar"
-if [[ -n "${CLASSPATH}" ]]; then
-	ecj_cp="${ecj_cp}:${CLASSPATH}"
-fi
-
-${GIJ_BIN} -classpath "${ecj_cp}" org.eclipse.jdt.internal.compiler.batch.Main "${@}"
--- a/dev-java/ecj-gcj/files/ecj-gcj-3.6
+++ b/dev-java/ecj-gcj/files/ecj-gcj-3.6
@ -1,21 +0,0 @@
-#!/bin/bash
-# gcj-jdk installs /usr/bin/gcj-jdk symlink, depending on it would be circular
-# so we fallback to gcc-config discovery
-GIJ_BIN="/usr/bin/gij"
-if [[ ! -f ${GIJ_BIN} ]]; then
-	GIJ_BIN="$(gcc-config -B)/gij"
-fi
-if [[ ! -f ${GIJ_BIN} ]]; then
-	echo "gij not found! check that gcc is compiled with gcj flag"
-	exit 1
-fi
-# calling java-config would be an unnecessary slowdown here
-
-# we need to append user CLASSPATH otherwise it will be overriden by the -classpath parameter
-# this breaks e.g. bootstrap of ant-core
-ecj_cp="/usr/share/ecj-gcj-3.6/lib/ecj.jar"
-if [[ -n "${CLASSPATH}" ]]; then
-	ecj_cp="${ecj_cp}:${CLASSPATH}"
-fi
-
-${GIJ_BIN} -classpath "${ecj_cp}" org.eclipse.jdt.internal.compiler.batch.Main "${@}"
--- a/dev-java/ehcache/ehcache-1.1-r2.ebuild
+++ b/dev-java/ehcache/ehcache-1.1-r2.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ehcache-1.1-r2.ebuild,v 1.1 2014/07/14 10:36:25 ercpe Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Ehcache is a pure Java, fully-featured, in-process cache."
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+HOMEPAGE="http://ehcache.sourceforge.net"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+COMMON_DEPEND="
+		dev-java/commons-collections:0
+		dev-java/concurrent-util:0
+		dev-java/commons-logging:0"
+RDEPEND=">=virtual/jre-1.4
+		${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.4
+		app-arch/zip
+		${COMMON_DEPEND}
+		>=dev-java/ant-core-1.5"
+
+S="${WORKDIR}/${P}"
+
+JAVA_GENTOO_CLASSPATH="commons-collections,concurrent-util,commons-logging"
+
+java_prepare() {
+	unzip ${P}-src.zip || die
+	rm *.jar || die
+	rm -rf src/net/sf/ehcache/hibernate || die
+}
--- a/dev-java/ehcache/ehcache-1.2.4-r3.ebuild
+++ b/dev-java/ehcache/ehcache-1.2.4-r3.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ehcache-1.2.4-r3.ebuild,v 1.1 2014/07/14 10:44:09 ercpe Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Ehcache is a pure Java, fully-featured, in-process cache."
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+HOMEPAGE="http://ehcache.sourceforge.net"
+
+LICENSE="Apache-2.0"
+SLOT="1.2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+COMMON_DEPEND="
+	dev-java/commons-collections:0
+	dev-java/commons-logging:0
+	java-virtuals/servlet-api:2.4"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}/${P}"
+
+JAVA_PKG_WANT_SOURCE="1.4"
+JAVA_PKG_WANT_TARGET="1.4"
+JAVA_SRC_DIR="src"
+
+JAVA_GENTOO_CLASSPATH="commons-collections,commons-logging,servlet-api-2.4"
+
+java_prepare() {
+	unzip -d src ${P}-sources.jar || die
+	rm -rf src/net/sf/ehcache/hibernate || die
+	rm *.jar || die
+}
--- a/dev-java/gcj-jdk/files/javac.in
+++ b/dev-java/gcj-jdk/files/javac.in
@ -0,0 +1,57 @@
+#!/usr/bin/perl -w
+use strict;
+use constant NO_DUP_ARGS => qw(-source -target -d -encoding);
+use constant STRIP_ARGS => qw(-Werror -implicit:none -J-Xbootclasspath/p:);
+
+my $ECJ_WARNINGS="-nowarn";
+
+my ( @bcoption, @source15, @target15, @cp );
+push @bcoption, '-bootclasspath', '@RT_JAR@:@TOOLS_JAR@'
+    unless grep {$_ eq '-bootclasspath'} @ARGV;
+push @source15, '-source', '1.5'
+    unless grep {$_ eq '-source'} @ARGV;
+push @target15, '-target', '1.5'
+    unless grep {$_ eq '-target'} @ARGV;  
+push @cp, '-cp', '.'
+    unless grep {$_ =~ '\-c(p|lasspath)'} @ARGV or $ENV{CLASSPATH};
+my @ecj_parms = ($ECJ_WARNINGS, @bcoption, @source15, @target15, @cp);
+
+# Work around ecj's inability to handle duplicate command-line
+# options and unknown javac options.
+sub gen_ecj_opts
+{
+    my @new_args = @{$_[0]};
+
+    for my $opt (NO_DUP_ARGS) 
+    {
+	my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
+	if (@indices > 1) {
+	    shift @indices;    # keep last instance only
+	    splice @new_args, $_, 2 for @indices;
+	}
+    }
+
+    for my $opt (STRIP_ARGS) 
+    {
+	my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
+	splice @new_args, $_, 1 for @indices;
+    }
+
+    return \@new_args;
+}
+
+sub split_vm_args
+{
+    my @new_args = @{$_[0]};
+
+    my @vm_args = map { substr $_, 2 } grep $_ =~ /^-J/, @new_args;
+    my @javac_args = grep $_ !~ /^-J/, @new_args;
+
+    return (\@vm_args, \@javac_args);
+}
+
+my ($vm_args, $javac_args) = split_vm_args (gen_ecj_opts( \@ARGV ));
+my @CLASSPATH = ('@ECJ_JAR@');
+push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
+$ENV{"CLASSPATH"} = join ':', @CLASSPATH;
+exec '@JAVA@', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args;
--- a/dev-java/gcj-jdk/gcj-jdk-4.5.1-r1.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.5.1-r1.ebuild
@ -1,106 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.5.1-r1.ebuild,v 1.2 2013/12/24 02:08:43 tomwij Exp $
-
-EAPI="2"
-
-inherit java-vm-2 toolchain-funcs multilib versionator
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-ECJ_GCJ_SLOT="3.5"
-
-RDEPEND="~sys-devel/gcc-${PV}[gcj]
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
-DEPEND="${RDEPEND}"
-
-JAVA_PROVIDE="jdbc-stdext jdbc2-stdext gnu-jaxp"
-
-pkg_setup() {
-	if [[ $(gcc-fullversion) != ${PV} ]]; then
-		eerror "Your current GCC version is not set to ${PV} via gcc-config"
-		eerror "Please read http://www.gentoo.org/doc/en/gcc-upgrading.xml before you set it"
-		echo "$(gcc-fullversion) != ${PV}"
-		die "gcc ${PV} must be selected via gcc-config"
-	fi
-
-	java-vm-2_pkg_setup
-}
-
-src_install() {
-	# jre lib paths ...
-	local libarch="$(get_system_arch)"
-	local gccbin=$(gcc-config -B)
-	local gcclib=$(gcc-config -L|cut -d':' -f1)
-	local gcjhome="/usr/lib/${P}"
-	local gcc_version=$(gcc-fullversion)
-	local gccchost="${CHOST}"
-
-	# correctly install gcj
-	dosym ${gccbin}/gij /usr/bin/gij
-	dosym ${gccbin}/gcj-dbtool /usr/bin/gcj-dbtool
-
-	# links
-	dodir ${gcjhome}/bin
-	dodir ${gcjhome}/jre/bin
-	dosym ${gcjhome}/bin/java ${gcjhome}/jre/bin/java
-	dosym ${gccbin}/gjar ${gcjhome}/bin/jar
-	dosym ${gccbin}/gjdoc ${gcjhome}/bin/javadoc
-	dosym ${gccbin}/grmic ${gcjhome}/bin/rmic
-	dosym ${gccbin}/gjavah ${gcjhome}/bin/javah
-	dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap
-	dosym ${gccbin}/gappletviewer ${gcjhome}/bin/appletviewer
-	dosym ${gccbin}/gjarsigner ${gcjhome}/bin/jarsigner
-	dosym ${gccbin}/grmiregistry ${gcjhome}/bin/rmiregistry
-	dosym ${gccbin}/grmiregistry ${gcjhome}/jre/bin/rmiregistry
-	dosym ${gccbin}/gkeytool ${gcjhome}/bin/keytool
-	dosym ${gccbin}/gkeytool ${gcjhome}/jre/bin/keytool
-	dosym ${gccbin}/gnative2ascii ${gcjhome}/bin/native2ascii
-	dosym ${gccbin}/gorbd ${gcjhome}/bin/orbd
-	dosym ${gccbin}/gorbd ${gcjhome}/jre/bin/orbd
-	dosym ${gccbin}/grmid ${gcjhome}/bin/rmid
-	dosym ${gccbin}/grmid ${gcjhome}/jre/bin/rmid
-	dosym ${gccbin}/gserialver ${gcjhome}/bin/serialver
-	dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv
-	dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv
-	dodir ${gcjhome}/jre/lib/${libarch}/client
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
-		${gcjhome}/jre/lib/rt.jar
-	dodir ${gcjhome}/lib
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
-		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}
-
-	dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac;
-	dosym /usr/bin/gij ${gcjhome}/bin/java;
-
-	set_java_env
-}
-
-pkg_postinst() {
-
-	# Do not set as system VM (see below)
-	# java-vm-2_pkg_postinst
-
-	ewarn "gcj does not currently provide all the 1.5 APIs."
-	ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.html"
-	ewarn "Check for existing bugs relating to missing APIs and file"
-	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
-	ewarn
-	ewarn "Due to this and limited manpower, we currently cannot support"
-	ewarn "using gcj-jdk as a system VM. Its main purpose is to bootstrap"
-	ewarn "Icedtea without prior binary VM installation. To do that, execute:"
-	ewarn
-	ewarn "emerge -o icedtea && emerge icedtea"
-
-}
--- a/dev-java/gcj-jdk/gcj-jdk-4.5.2-r1.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.5.2-r1.ebuild
@ -1,106 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.5.2-r1.ebuild,v 1.2 2013/12/24 02:08:43 tomwij Exp $
-
-EAPI="2"
-
-inherit java-vm-2 toolchain-funcs multilib versionator
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-ECJ_GCJ_SLOT="3.5"
-
-RDEPEND="~sys-devel/gcc-${PV}[gcj]
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
-DEPEND="${RDEPEND}"
-
-JAVA_PROVIDE="jdbc-stdext jdbc2-stdext gnu-jaxp"
-
-pkg_setup() {
-	if [[ $(gcc-fullversion) != ${PV} ]]; then
-		eerror "Your current GCC version is not set to ${PV} via gcc-config"
-		eerror "Please read http://www.gentoo.org/doc/en/gcc-upgrading.xml before you set it"
-		echo "$(gcc-fullversion) != ${PV}"
-		die "gcc ${PV} must be selected via gcc-config"
-	fi
-
-	java-vm-2_pkg_setup
-}
-
-src_install() {
-	# jre lib paths ...
-	local libarch="$(get_system_arch)"
-	local gccbin=$(gcc-config -B)
-	local gcclib=$(gcc-config -L|cut -d':' -f1)
-	local gcjhome="/usr/lib/${P}"
-	local gcc_version=$(gcc-fullversion)
-	local gccchost="${CHOST}"
-
-	# correctly install gcj
-	dosym ${gccbin}/gij /usr/bin/gij
-	dosym ${gccbin}/gcj-dbtool /usr/bin/gcj-dbtool
-
-	# links
-	dodir ${gcjhome}/bin
-	dodir ${gcjhome}/jre/bin
-	dosym ${gcjhome}/bin/java ${gcjhome}/jre/bin/java
-	dosym ${gccbin}/gjar ${gcjhome}/bin/jar
-	dosym ${gccbin}/gjdoc ${gcjhome}/bin/javadoc
-	dosym ${gccbin}/grmic ${gcjhome}/bin/rmic
-	dosym ${gccbin}/gjavah ${gcjhome}/bin/javah
-	dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap
-	dosym ${gccbin}/gappletviewer ${gcjhome}/bin/appletviewer
-	dosym ${gccbin}/gjarsigner ${gcjhome}/bin/jarsigner
-	dosym ${gccbin}/grmiregistry ${gcjhome}/bin/rmiregistry
-	dosym ${gccbin}/grmiregistry ${gcjhome}/jre/bin/rmiregistry
-	dosym ${gccbin}/gkeytool ${gcjhome}/bin/keytool
-	dosym ${gccbin}/gkeytool ${gcjhome}/jre/bin/keytool
-	dosym ${gccbin}/gnative2ascii ${gcjhome}/bin/native2ascii
-	dosym ${gccbin}/gorbd ${gcjhome}/bin/orbd
-	dosym ${gccbin}/gorbd ${gcjhome}/jre/bin/orbd
-	dosym ${gccbin}/grmid ${gcjhome}/bin/rmid
-	dosym ${gccbin}/grmid ${gcjhome}/jre/bin/rmid
-	dosym ${gccbin}/gserialver ${gcjhome}/bin/serialver
-	dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv
-	dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv
-	dodir ${gcjhome}/jre/lib/${libarch}/client
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
-		${gcjhome}/jre/lib/rt.jar
-	dodir ${gcjhome}/lib
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
-		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}
-
-	dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac;
-	dosym /usr/bin/gij ${gcjhome}/bin/java;
-
-	set_java_env
-}
-
-pkg_postinst() {
-
-	# Do not set as system VM (see below)
-	# java-vm-2_pkg_postinst
-
-	ewarn "gcj does not currently provide all the 1.5 APIs."
-	ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.html"
-	ewarn "Check for existing bugs relating to missing APIs and file"
-	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
-	ewarn
-	ewarn "Due to this and limited manpower, we currently cannot support"
-	ewarn "using gcj-jdk as a system VM. Its main purpose is to bootstrap"
-	ewarn "IcedTea without prior binary VM installation. To do that, execute:"
-	ewarn
-	ewarn "emerge -o icedtea && emerge icedtea"
-
-}
--- a/dev-java/gcj-jdk/gcj-jdk-4.5.3.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.5.3.ebuild
@ -1,106 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.5.3.ebuild,v 1.3 2013/12/24 02:08:43 tomwij Exp $
-
-EAPI="2"
-
-inherit java-vm-2 toolchain-funcs multilib versionator
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-ECJ_GCJ_SLOT="3.5"
-
-RDEPEND="~sys-devel/gcc-${PV}[gcj]
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
-DEPEND="${RDEPEND}"
-
-JAVA_PROVIDE="jdbc-stdext jdbc2-stdext gnu-jaxp"
-
-pkg_setup() {
-	if [[ $(gcc-fullversion) != ${PV} ]]; then
-		eerror "Your current GCC version is not set to ${PV} via gcc-config"
-		eerror "Please read http://www.gentoo.org/doc/en/gcc-upgrading.xml before you set it"
-		echo "$(gcc-fullversion) != ${PV}"
-		die "gcc ${PV} must be selected via gcc-config"
-	fi
-
-	java-vm-2_pkg_setup
-}
-
-src_install() {
-	# jre lib paths ...
-	local libarch="$(get_system_arch)"
-	local gccbin=$(gcc-config -B)
-	local gcclib=$(gcc-config -L|cut -d':' -f1)
-	local gcjhome="/usr/lib/${P}"
-	local gcc_version=$(gcc-fullversion)
-	local gccchost="${CHOST}"
-
-	# correctly install gcj
-	dosym ${gccbin}/gij /usr/bin/gij
-	dosym ${gccbin}/gcj-dbtool /usr/bin/gcj-dbtool
-
-	# links
-	dodir ${gcjhome}/bin
-	dodir ${gcjhome}/jre/bin
-	dosym ${gcjhome}/bin/java ${gcjhome}/jre/bin/java
-	dosym ${gccbin}/gjar ${gcjhome}/bin/jar
-	dosym ${gccbin}/gjdoc ${gcjhome}/bin/javadoc
-	dosym ${gccbin}/grmic ${gcjhome}/bin/rmic
-	dosym ${gccbin}/gjavah ${gcjhome}/bin/javah
-	dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap
-	dosym ${gccbin}/gappletviewer ${gcjhome}/bin/appletviewer
-	dosym ${gccbin}/gjarsigner ${gcjhome}/bin/jarsigner
-	dosym ${gccbin}/grmiregistry ${gcjhome}/bin/rmiregistry
-	dosym ${gccbin}/grmiregistry ${gcjhome}/jre/bin/rmiregistry
-	dosym ${gccbin}/gkeytool ${gcjhome}/bin/keytool
-	dosym ${gccbin}/gkeytool ${gcjhome}/jre/bin/keytool
-	dosym ${gccbin}/gnative2ascii ${gcjhome}/bin/native2ascii
-	dosym ${gccbin}/gorbd ${gcjhome}/bin/orbd
-	dosym ${gccbin}/gorbd ${gcjhome}/jre/bin/orbd
-	dosym ${gccbin}/grmid ${gcjhome}/bin/rmid
-	dosym ${gccbin}/grmid ${gcjhome}/jre/bin/rmid
-	dosym ${gccbin}/gserialver ${gcjhome}/bin/serialver
-	dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv
-	dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv
-	dodir ${gcjhome}/jre/lib/${libarch}/client
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
-		${gcjhome}/jre/lib/rt.jar
-	dodir ${gcjhome}/lib
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
-		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}
-
-	dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac;
-	dosym /usr/bin/gij ${gcjhome}/bin/java;
-
-	set_java_env
-}
-
-pkg_postinst() {
-
-	# Do not set as system VM (see below)
-	# java-vm-2_pkg_postinst
-
-	ewarn "gcj does not currently provide all the 1.5 APIs."
-	ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.html"
-	ewarn "Check for existing bugs relating to missing APIs and file"
-	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
-	ewarn
-	ewarn "Due to this and limited manpower, we currently cannot support"
-	ewarn "using gcj-jdk as a system VM. Its main purpose is to bootstrap"
-	ewarn "IcedTea without prior binary VM installation. To do that, execute:"
-	ewarn
-	ewarn "emerge -o icedtea && emerge icedtea"
-
-}
--- a/dev-java/gcj-jdk/gcj-jdk-4.5.4.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.5.4.ebuild
@ -1,97 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.5.4.ebuild,v 1.2 2013/12/24 02:08:43 tomwij Exp $
-
-EAPI="4"
-
-inherit java-vm-2 multilib
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-ECJ_GCJ_SLOT="3.5"
-
-RDEPEND="
-	~sys-devel/gcc-${PV}[gcj,awt]
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-src_install() {
-	# jre lib paths ...
-	local libarch="$(get_system_arch)"
-	local gcc_version=${PV}
-	local gccbin=$(gcc-config -B ${gcc_version})
-	gccbin=${gccbin#"${EPREFIX}"}
-	local gcclib=$(gcc-config -L ${gcc_version} | cut -d':' -f1)
-	gcclib=${gcclib#"${EPREFIX}"}
-	local gcjhome="/usr/$(get_libdir)/${P}"
-	local gccchost="${CHOST}"
-	local gcjlibdir=$(echo "${EPREFIX}"/usr/$(get_libdir)/gcj-${gcc_version}-*)
-	gcjlibdir=${gcjlibdir#"${EPREFIX}"}
-
-	# links
-	dodir ${gcjhome}/bin
-	dodir ${gcjhome}/jre/bin
-	dosym ${gccbin}/gij ${gcjhome}/bin/java
-	dosym ${gccbin}/gij ${gcjhome}/jre/bin/java
-	dosym ${gccbin}/gjar ${gcjhome}/bin/jar
-	dosym ${gccbin}/gjdoc ${gcjhome}/bin/javadoc
-	dosym ${gccbin}/grmic ${gcjhome}/bin/rmic
-	dosym ${gccbin}/gjavah ${gcjhome}/bin/javah
-	dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap
-	dosym ${gccbin}/gappletviewer ${gcjhome}/bin/appletviewer
-	dosym ${gccbin}/gjarsigner ${gcjhome}/bin/jarsigner
-	dosym ${gccbin}/grmiregistry ${gcjhome}/bin/rmiregistry
-	dosym ${gccbin}/grmiregistry ${gcjhome}/jre/bin/rmiregistry
-	dosym ${gccbin}/gkeytool ${gcjhome}/bin/keytool
-	dosym ${gccbin}/gkeytool ${gcjhome}/jre/bin/keytool
-	dosym ${gccbin}/gnative2ascii ${gcjhome}/bin/native2ascii
-	dosym ${gccbin}/gorbd ${gcjhome}/bin/orbd
-	dosym ${gccbin}/gorbd ${gcjhome}/jre/bin/orbd
-	dosym ${gccbin}/grmid ${gcjhome}/bin/rmid
-	dosym ${gccbin}/grmid ${gcjhome}/jre/bin/rmid
-	dosym ${gccbin}/gserialver ${gcjhome}/bin/serialver
-	dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv
-	dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv
-
-	dodir ${gcjhome}/jre/lib/${libarch}/client
-	dodir ${gcjhome}/jre/lib/${libarch}/server
-	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
-	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
-	dosym ${gcjlibdir}/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
-
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
-		${gcjhome}/jre/lib/rt.jar
-	dodir ${gcjhome}/lib
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
-		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}
-
-	dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac
-
-	set_java_env
-}
-
-pkg_postinst() {
-	# Do not set as system VM (see below)
-	# java-vm-2_pkg_postinst
-
-	ewarn "gcj does not currently provide all the 1.5 APIs."
-	ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.html"
-	ewarn "Check for existing bugs relating to missing APIs and file"
-	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
-	ewarn
-	ewarn "Due to this and limited manpower, we currently cannot support"
-	ewarn "using gcj-jdk as a system VM. Its main purpose is to bootstrap"
-	ewarn "IcedTea without prior binary VM installation. To do that, execute:"
-	ewarn
-	ewarn "emerge -o icedtea && emerge icedtea"
-}
--- a/dev-java/gcj-jdk/gcj-jdk-4.6.0.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.6.0.ebuild
@ -1,104 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.6.0.ebuild,v 1.2 2013/12/24 02:08:43 tomwij Exp $
-
-EAPI="2"
-
-inherit java-vm-2 toolchain-funcs multilib versionator
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-ECJ_GCJ_SLOT="3.5"
-
-RDEPEND="~sys-devel/gcc-${PV}[gcj]
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if [[ $(gcc-fullversion) != ${PV} ]]; then
-		eerror "Your current GCC version is not set to ${PV} via gcc-config"
-		eerror "Please read http://www.gentoo.org/doc/en/gcc-upgrading.xml before you set it"
-		echo "$(gcc-fullversion) != ${PV}"
-		die "gcc ${PV} must be selected via gcc-config"
-	fi
-
-	java-vm-2_pkg_setup
-}
-
-src_install() {
-	# jre lib paths ...
-	local libarch="$(get_system_arch)"
-	local gccbin=$(gcc-config -B)
-	local gcclib=$(gcc-config -L|cut -d':' -f1)
-	local gcjhome="/usr/lib/${P}"
-	local gcc_version=$(gcc-fullversion)
-	local gccchost="${CHOST}"
-
-	# correctly install gcj
-	dosym ${gccbin}/gij /usr/bin/gij
-	dosym ${gccbin}/gcj-dbtool /usr/bin/gcj-dbtool
-
-	# links
-	dodir ${gcjhome}/bin
-	dodir ${gcjhome}/jre/bin
-	dosym ${gcjhome}/bin/java ${gcjhome}/jre/bin/java
-	dosym ${gccbin}/gjar ${gcjhome}/bin/jar
-	dosym ${gccbin}/gjdoc ${gcjhome}/bin/javadoc
-	dosym ${gccbin}/grmic ${gcjhome}/bin/rmic
-	dosym ${gccbin}/gjavah ${gcjhome}/bin/javah
-	dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap
-	dosym ${gccbin}/gappletviewer ${gcjhome}/bin/appletviewer
-	dosym ${gccbin}/gjarsigner ${gcjhome}/bin/jarsigner
-	dosym ${gccbin}/grmiregistry ${gcjhome}/bin/rmiregistry
-	dosym ${gccbin}/grmiregistry ${gcjhome}/jre/bin/rmiregistry
-	dosym ${gccbin}/gkeytool ${gcjhome}/bin/keytool
-	dosym ${gccbin}/gkeytool ${gcjhome}/jre/bin/keytool
-	dosym ${gccbin}/gnative2ascii ${gcjhome}/bin/native2ascii
-	dosym ${gccbin}/gorbd ${gcjhome}/bin/orbd
-	dosym ${gccbin}/gorbd ${gcjhome}/jre/bin/orbd
-	dosym ${gccbin}/grmid ${gcjhome}/bin/rmid
-	dosym ${gccbin}/grmid ${gcjhome}/jre/bin/rmid
-	dosym ${gccbin}/gserialver ${gcjhome}/bin/serialver
-	dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv
-	dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv
-	dodir ${gcjhome}/jre/lib/${libarch}/client
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
-		${gcjhome}/jre/lib/rt.jar
-	dodir ${gcjhome}/lib
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
-		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}
-
-	dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac;
-	dosym /usr/bin/gij ${gcjhome}/bin/java;
-
-	set_java_env
-}
-
-pkg_postinst() {
-
-	# Do not set as system VM (see below)
-	# java-vm-2_pkg_postinst
-
-	ewarn "gcj does not currently provide all the 1.5 APIs."
-	ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.html"
-	ewarn "Check for existing bugs relating to missing APIs and file"
-	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
-	ewarn
-	ewarn "Due to this and limited manpower, we currently cannot support"
-	ewarn "using gcj-jdk as a system VM. Its main purpose is to bootstrap"
-	ewarn "IcedTea without prior binary VM installation. To do that, execute:"
-	ewarn
-	ewarn "emerge -o icedtea && emerge icedtea"
-
-}
--- a/dev-java/gcj-jdk/gcj-jdk-4.6.1.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.6.1.ebuild
@ -1,104 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.6.1.ebuild,v 1.2 2013/12/24 02:08:43 tomwij Exp $
-
-EAPI="2"
-
-inherit java-vm-2 toolchain-funcs multilib versionator
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-ECJ_GCJ_SLOT="3.6"
-
-RDEPEND="~sys-devel/gcc-${PV}[gcj]
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if [[ $(gcc-fullversion) != ${PV} ]]; then
-		eerror "Your current GCC version is not set to ${PV} via gcc-config"
-		eerror "Please read http://www.gentoo.org/doc/en/gcc-upgrading.xml before you set it"
-		echo "$(gcc-fullversion) != ${PV}"
-		die "gcc ${PV} must be selected via gcc-config"
-	fi
-
-	java-vm-2_pkg_setup
-}
-
-src_install() {
-	# jre lib paths ...
-	local libarch="$(get_system_arch)"
-	local gccbin=$(gcc-config -B)
-	local gcclib=$(gcc-config -L|cut -d':' -f1)
-	local gcjhome="/usr/lib/${P}"
-	local gcc_version=$(gcc-fullversion)
-	local gccchost="${CHOST}"
-
-	# correctly install gcj
-	dosym ${gccbin}/gij /usr/bin/gij
-	dosym ${gccbin}/gcj-dbtool /usr/bin/gcj-dbtool
-
-	# links
-	dodir ${gcjhome}/bin
-	dodir ${gcjhome}/jre/bin
-	dosym ${gcjhome}/bin/java ${gcjhome}/jre/bin/java
-	dosym ${gccbin}/gjar ${gcjhome}/bin/jar
-	dosym ${gccbin}/gjdoc ${gcjhome}/bin/javadoc
-	dosym ${gccbin}/grmic ${gcjhome}/bin/rmic
-	dosym ${gccbin}/gjavah ${gcjhome}/bin/javah
-	dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap
-	dosym ${gccbin}/gappletviewer ${gcjhome}/bin/appletviewer
-	dosym ${gccbin}/gjarsigner ${gcjhome}/bin/jarsigner
-	dosym ${gccbin}/grmiregistry ${gcjhome}/bin/rmiregistry
-	dosym ${gccbin}/grmiregistry ${gcjhome}/jre/bin/rmiregistry
-	dosym ${gccbin}/gkeytool ${gcjhome}/bin/keytool
-	dosym ${gccbin}/gkeytool ${gcjhome}/jre/bin/keytool
-	dosym ${gccbin}/gnative2ascii ${gcjhome}/bin/native2ascii
-	dosym ${gccbin}/gorbd ${gcjhome}/bin/orbd
-	dosym ${gccbin}/gorbd ${gcjhome}/jre/bin/orbd
-	dosym ${gccbin}/grmid ${gcjhome}/bin/rmid
-	dosym ${gccbin}/grmid ${gcjhome}/jre/bin/rmid
-	dosym ${gccbin}/gserialver ${gcjhome}/bin/serialver
-	dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv
-	dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv
-	dodir ${gcjhome}/jre/lib/${libarch}/client
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
-		${gcjhome}/jre/lib/rt.jar
-	dodir ${gcjhome}/lib
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
-		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}
-
-	dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac;
-	dosym /usr/bin/gij ${gcjhome}/bin/java;
-
-	set_java_env
-}
-
-pkg_postinst() {
-
-	# Do not set as system VM (see below)
-	# java-vm-2_pkg_postinst
-
-	ewarn "gcj does not currently provide all the 1.5 APIs."
-	ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.html"
-	ewarn "Check for existing bugs relating to missing APIs and file"
-	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
-	ewarn
-	ewarn "Due to this and limited manpower, we currently cannot support"
-	ewarn "using gcj-jdk as a system VM. Its main purpose is to bootstrap"
-	ewarn "IcedTea without prior binary VM installation. To do that, execute:"
-	ewarn
-	ewarn "emerge -o icedtea && emerge icedtea"
-
-}
--- a/dev-java/gcj-jdk/gcj-jdk-4.6.2-r1.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.6.2-r1.ebuild
@ -1,110 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.6.2-r1.ebuild,v 1.2 2013/12/24 02:08:43 tomwij Exp $
-
-EAPI="4"
-
-inherit java-vm-2 toolchain-funcs multilib versionator
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-linux"
-SLOT="0"
-IUSE=""
-
-ECJ_GCJ_SLOT="3.6"
-
-RDEPEND="~sys-devel/gcc-${PV}[gcj,awt]
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	if [[ $(gcc-fullversion) != ${PV} ]]; then
-		eerror "Your current GCC version is not set to ${PV} via gcc-config"
-		eerror "Please read http://www.gentoo.org/doc/en/gcc-upgrading.xml before you set it"
-		echo "$(gcc-fullversion) != ${PV}"
-		die "gcc ${PV} must be selected via gcc-config"
-	fi
-
-	java-vm-2_pkg_setup
-}
-
-src_install() {
-	# jre lib paths ...
-	local libarch="$(get_system_arch)"
-	local gccbin=$(gcc-config -B)
-	gccbin=${gccbin#"${EPREFIX}"}
-	local gcclib=$(gcc-config -L|cut -d':' -f1)
-	gcclib=${gcclib#"${EPREFIX}"}
-	local gcjhome="/usr/lib/${P}"
-	local gcc_version=$(gcc-fullversion)
-	local gccchost="${CHOST}"
-	local gcjlibdir=$(echo "${EPREFIX}"/usr/$(get_libdir)/gcj-${gcc_version}-*)
-	gcjlibdir=${gcjlibdir#"${EPREFIX}"}
-
-	# correctly install gcj
-	dosym ${gccbin}/gij /usr/bin/gij
-	dosym ${gccbin}/gcj-dbtool /usr/bin/gcj-dbtool
-
-	# links
-	dodir ${gcjhome}/bin
-	dodir ${gcjhome}/jre/bin
-	dosym ${gcjhome}/bin/java ${gcjhome}/jre/bin/java
-	dosym ${gccbin}/gjar ${gcjhome}/bin/jar
-	dosym ${gccbin}/gjdoc ${gcjhome}/bin/javadoc
-	dosym ${gccbin}/grmic ${gcjhome}/bin/rmic
-	dosym ${gccbin}/gjavah ${gcjhome}/bin/javah
-	dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap
-	dosym ${gccbin}/gappletviewer ${gcjhome}/bin/appletviewer
-	dosym ${gccbin}/gjarsigner ${gcjhome}/bin/jarsigner
-	dosym ${gccbin}/grmiregistry ${gcjhome}/bin/rmiregistry
-	dosym ${gccbin}/grmiregistry ${gcjhome}/jre/bin/rmiregistry
-	dosym ${gccbin}/gkeytool ${gcjhome}/bin/keytool
-	dosym ${gccbin}/gkeytool ${gcjhome}/jre/bin/keytool
-	dosym ${gccbin}/gnative2ascii ${gcjhome}/bin/native2ascii
-	dosym ${gccbin}/gorbd ${gcjhome}/bin/orbd
-	dosym ${gccbin}/gorbd ${gcjhome}/jre/bin/orbd
-	dosym ${gccbin}/grmid ${gcjhome}/bin/rmid
-	dosym ${gccbin}/grmid ${gcjhome}/jre/bin/rmid
-	dosym ${gccbin}/gserialver ${gcjhome}/bin/serialver
-	dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv
-	dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv
-	dodir ${gcjhome}/jre/lib/${libarch}/client
-	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
-	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
-	dosym ${gcjlibdir}/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
-		${gcjhome}/jre/lib/rt.jar
-	dodir ${gcjhome}/lib
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
-		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}
-
-	dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac;
-	dosym /usr/bin/gij ${gcjhome}/bin/java;
-
-	set_java_env
-}
-
-pkg_postinst() {
-
-	# Do not set as system VM (see below)
-	# java-vm-2_pkg_postinst
-
-	ewarn "gcj does not currently provide all the 1.5 APIs."
-	ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.html"
-	ewarn "Check for existing bugs relating to missing APIs and file"
-	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
-	ewarn
-	ewarn "Due to this and limited manpower, we currently cannot support"
-	ewarn "using gcj-jdk as a system VM. Its main purpose is to bootstrap"
-	ewarn "IcedTea without prior binary VM installation. To do that, execute:"
-	ewarn
-	ewarn "emerge -o icedtea && emerge icedtea"
-
-}
--- a/dev-java/gcj-jdk/gcj-jdk-4.6.3-r1.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.6.3-r1.ebuild
@ -1,110 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.6.3-r1.ebuild,v 1.2 2013/12/24 02:08:43 tomwij Exp $
-
-EAPI="4"
-
-inherit java-vm-2 toolchain-funcs multilib versionator
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-linux"
-SLOT="0"
-IUSE=""
-
-ECJ_GCJ_SLOT="3.6"
-
-RDEPEND="
-	~sys-devel/gcc-${PV}[gcj,awt]
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	if [[ $(gcc-fullversion) != ${PV} ]]; then
-		eerror "Your current GCC version is not set to ${PV} via gcc-config"
-		eerror "Please read http://www.gentoo.org/doc/en/gcc-upgrading.xml before you set it"
-		echo "$(gcc-fullversion) != ${PV}"
-		die "gcc ${PV} must be selected via gcc-config"
-	fi
-
-	java-vm-2_pkg_setup
-}
-
-src_install() {
-	# jre lib paths ...
-	local libarch="$(get_system_arch)"
-	local gccbin=$(gcc-config -B)
-	gccbin=${gccbin#"${EPREFIX}"}
-	local gcclib=$(gcc-config -L|cut -d':' -f1)
-	gcclib=${gcclib#"${EPREFIX}"}
-	local gcjhome="/usr/$(get_libdir)/${P}"
-	local gcc_version=$(gcc-fullversion)
-	local gccchost="${CHOST}"
-	local gcjlibdir=$(echo "${EPREFIX}"/usr/$(get_libdir)/gcj-${gcc_version}-*)
-	gcjlibdir=${gcjlibdir#"${EPREFIX}"}
-
-	# links
-	dodir ${gcjhome}/bin
-	dodir ${gcjhome}/jre/bin
-	dosym ${gccbin}/gij ${gcjhome}/bin/java
-	dosym ${gccbin}/gij ${gcjhome}/jre/bin/java
-	dosym ${gccbin}/gjar ${gcjhome}/bin/jar
-	dosym ${gccbin}/gjdoc ${gcjhome}/bin/javadoc
-	dosym ${gccbin}/grmic ${gcjhome}/bin/rmic
-	dosym ${gccbin}/gjavah ${gcjhome}/bin/javah
-	dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap
-	dosym ${gccbin}/gappletviewer ${gcjhome}/bin/appletviewer
-	dosym ${gccbin}/gjarsigner ${gcjhome}/bin/jarsigner
-	dosym ${gccbin}/grmiregistry ${gcjhome}/bin/rmiregistry
-	dosym ${gccbin}/grmiregistry ${gcjhome}/jre/bin/rmiregistry
-	dosym ${gccbin}/gkeytool ${gcjhome}/bin/keytool
-	dosym ${gccbin}/gkeytool ${gcjhome}/jre/bin/keytool
-	dosym ${gccbin}/gnative2ascii ${gcjhome}/bin/native2ascii
-	dosym ${gccbin}/gorbd ${gcjhome}/bin/orbd
-	dosym ${gccbin}/gorbd ${gcjhome}/jre/bin/orbd
-	dosym ${gccbin}/grmid ${gcjhome}/bin/rmid
-	dosym ${gccbin}/grmid ${gcjhome}/jre/bin/rmid
-	dosym ${gccbin}/gserialver ${gcjhome}/bin/serialver
-	dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv
-	dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv
-
-	dodir ${gcjhome}/jre/lib/${libarch}/client
-	dodir ${gcjhome}/jre/lib/${libarch}/server
-	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
-	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
-	dosym ${gcjlibdir}/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
-
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
-		${gcjhome}/jre/lib/rt.jar
-	dodir ${gcjhome}/lib
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
-		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}
-
-	dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac
-
-	set_java_env
-}
-
-pkg_postinst() {
-
-	# Do not set as system VM (see below)
-	# java-vm-2_pkg_postinst
-
-	ewarn "gcj does not currently provide all the 1.5 APIs."
-	ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.html"
-	ewarn "Check for existing bugs relating to missing APIs and file"
-	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
-	ewarn
-	ewarn "Due to this and limited manpower, we currently cannot support"
-	ewarn "using gcj-jdk as a system VM. Its main purpose is to bootstrap"
-	ewarn "IcedTea without prior binary VM installation. To do that, execute:"
-	ewarn
-	ewarn "emerge -o icedtea && emerge icedtea"
-
-}
--- a/dev-java/gcj-jdk/gcj-jdk-4.6.3.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.6.3.ebuild
@ -1,110 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.6.3.ebuild,v 1.3 2013/12/24 02:08:43 tomwij Exp $
-
-EAPI="4"
-
-inherit java-vm-2 toolchain-funcs multilib versionator
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-linux"
-SLOT="0"
-IUSE=""
-
-ECJ_GCJ_SLOT="3.6"
-
-RDEPEND="~sys-devel/gcc-${PV}[gcj,awt]
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	if [[ $(gcc-fullversion) != ${PV} ]]; then
-		eerror "Your current GCC version is not set to ${PV} via gcc-config"
-		eerror "Please read http://www.gentoo.org/doc/en/gcc-upgrading.xml before you set it"
-		echo "$(gcc-fullversion) != ${PV}"
-		die "gcc ${PV} must be selected via gcc-config"
-	fi
-
-	java-vm-2_pkg_setup
-}
-
-src_install() {
-	# jre lib paths ...
-	local libarch="$(get_system_arch)"
-	local gccbin=$(gcc-config -B)
-	gccbin=${gccbin#"${EPREFIX}"}
-	local gcclib=$(gcc-config -L|cut -d':' -f1)
-	gcclib=${gcclib#"${EPREFIX}"}
-	local gcjhome="/usr/lib/${P}"
-	local gcc_version=$(gcc-fullversion)
-	local gccchost="${CHOST}"
-	local gcjlibdir=$(echo "${EPREFIX}"/usr/$(get_libdir)/gcj-${gcc_version}-*)
-	gcjlibdir=${gcjlibdir#"${EPREFIX}"}
-
-	# correctly install gcj
-	dosym ${gccbin}/gij /usr/bin/gij
-	dosym ${gccbin}/gcj-dbtool /usr/bin/gcj-dbtool
-
-	# links
-	dodir ${gcjhome}/bin
-	dodir ${gcjhome}/jre/bin
-	dosym ${gcjhome}/bin/java ${gcjhome}/jre/bin/java
-	dosym ${gccbin}/gjar ${gcjhome}/bin/jar
-	dosym ${gccbin}/gjdoc ${gcjhome}/bin/javadoc
-	dosym ${gccbin}/grmic ${gcjhome}/bin/rmic
-	dosym ${gccbin}/gjavah ${gcjhome}/bin/javah
-	dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap
-	dosym ${gccbin}/gappletviewer ${gcjhome}/bin/appletviewer
-	dosym ${gccbin}/gjarsigner ${gcjhome}/bin/jarsigner
-	dosym ${gccbin}/grmiregistry ${gcjhome}/bin/rmiregistry
-	dosym ${gccbin}/grmiregistry ${gcjhome}/jre/bin/rmiregistry
-	dosym ${gccbin}/gkeytool ${gcjhome}/bin/keytool
-	dosym ${gccbin}/gkeytool ${gcjhome}/jre/bin/keytool
-	dosym ${gccbin}/gnative2ascii ${gcjhome}/bin/native2ascii
-	dosym ${gccbin}/gorbd ${gcjhome}/bin/orbd
-	dosym ${gccbin}/gorbd ${gcjhome}/jre/bin/orbd
-	dosym ${gccbin}/grmid ${gcjhome}/bin/rmid
-	dosym ${gccbin}/grmid ${gcjhome}/jre/bin/rmid
-	dosym ${gccbin}/gserialver ${gcjhome}/bin/serialver
-	dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv
-	dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv
-	dodir ${gcjhome}/jre/lib/${libarch}/client
-	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
-	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
-	dosym ${gcjlibdir}/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
-		${gcjhome}/jre/lib/rt.jar
-	dodir ${gcjhome}/lib
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
-		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}
-
-	dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac;
-	dosym /usr/bin/gij ${gcjhome}/bin/java;
-
-	set_java_env
-}
-
-pkg_postinst() {
-
-	# Do not set as system VM (see below)
-	# java-vm-2_pkg_postinst
-
-	ewarn "gcj does not currently provide all the 1.5 APIs."
-	ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.html"
-	ewarn "Check for existing bugs relating to missing APIs and file"
-	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
-	ewarn
-	ewarn "Due to this and limited manpower, we currently cannot support"
-	ewarn "using gcj-jdk as a system VM. Its main purpose is to bootstrap"
-	ewarn "IcedTea without prior binary VM installation. To do that, execute:"
-	ewarn
-	ewarn "emerge -o icedtea && emerge icedtea"
-
-}
--- a/dev-java/gcj-jdk/gcj-jdk-4.7.3-r1.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.7.3-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.6.3-r3.ebuild,v 1.2 2013/12/24 02:08:43 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.7.3-r1.ebuild,v 1.1 2014/07/14 18:45:53 sera Exp $

 EAPI="5"

@ -16,11 +16,14 @@ SLOT="0"
 IUSE="X"

 ECJ_GCJ_SLOT="3.6"
+API_DIFF_PV="4.8.2"

+# perl is needed for javac wrapper
 RDEPEND="
+	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}
+	dev-lang/perl
 	~sys-devel/gcc-${PV}[gcj]
-	X? ( ~sys-devel/gcc-${PV}[awt] )
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
+	X? ( ~sys-devel/gcc-${PV}[awt] )"
 DEPEND="${RDEPEND}"

 S="${WORKDIR}"
@ -74,9 +77,17 @@ src_install() {
 	dodir ${gcjhome}/lib
 	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
 		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}
+	dosym ${gcclib}/include ${gcjhome}/include

-	dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac
+	local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+	exeinto ${gcjhome}/bin
+	sed -e "s#@JAVA@#${gcjhome}/bin/java#" \
+		-e "s#@ECJ_JAR@#${ecj_jar}#" \
+		-e "s#@RT_JAR@#${gcjhome}/jre/lib/rt.jar#" \
+		-e "s#@TOOLS_JAR@#${gcjhome}/lib/tools.jar#" \
+		"${FILESDIR}"/javac.in \
+	| newexe - javac
+	assert

 	set_java_env
 }
@ -85,8 +96,9 @@ pkg_postinst() {
 	# Do not set as system VM (see below)
 	# java-vm-2_pkg_postinst

-	ewarn "gcj does not currently provide all the 1.5 APIs."
-	ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.html"
+	ewarn "gcj does not currently provide all the 1.5 or 1.6 APIs."
+	ewarn "See http://fuseyism.com/japi/ibmjdk15-libgcj-${API_DIFF_PV}.html"
+	ewarn "and http://fuseyism.com/japi/icedtea6-libgcj-${API_DIFF_PV}.html"
 	ewarn "Check for existing bugs relating to missing APIs and file"
 	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
 	ewarn
--- a/dev-java/gcj-jdk/gcj-jdk-4.7.4.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.7.4.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.7.2.ebuild,v 1.2 2013/12/24 02:08:43 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.7.4.ebuild,v 1.1 2014/07/14 18:45:53 sera Exp $

 EAPI="5"

@ -16,11 +16,14 @@ SLOT="0"
 IUSE="X"

 ECJ_GCJ_SLOT="3.6"
+API_DIFF_PV="4.8.2"

+# perl is needed for javac wrapper
 RDEPEND="
+	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}
+	dev-lang/perl
 	~sys-devel/gcc-${PV}[gcj]
-	X? ( ~sys-devel/gcc-${PV}[awt] )
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
+	X? ( ~sys-devel/gcc-${PV}[awt] )"
 DEPEND="${RDEPEND}"

 S="${WORKDIR}"
@ -74,9 +77,17 @@ src_install() {
 	dodir ${gcjhome}/lib
 	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
 		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}
+	dosym ${gcclib}/include ${gcjhome}/include

-	dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac
+	local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+	exeinto ${gcjhome}/bin
+	sed -e "s#@JAVA@#${gcjhome}/bin/java#" \
+		-e "s#@ECJ_JAR@#${ecj_jar}#" \
+		-e "s#@RT_JAR@#${gcjhome}/jre/lib/rt.jar#" \
+		-e "s#@TOOLS_JAR@#${gcjhome}/lib/tools.jar#" \
+		"${FILESDIR}"/javac.in \
+	| newexe - javac
+	assert

 	set_java_env
 }
@ -85,8 +96,9 @@ pkg_postinst() {
 	# Do not set as system VM (see below)
 	# java-vm-2_pkg_postinst

-	ewarn "gcj does not currently provide all the 1.5 APIs."
-	ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.html"
+	ewarn "gcj does not currently provide all the 1.5 or 1.6 APIs."
+	ewarn "See http://fuseyism.com/japi/ibmjdk15-libgcj-${API_DIFF_PV}.html"
+	ewarn "and http://fuseyism.com/japi/icedtea6-libgcj-${API_DIFF_PV}.html"
 	ewarn "Check for existing bugs relating to missing APIs and file"
 	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
 	ewarn
--- a/dev-java/gcj-jdk/gcj-jdk-4.5.4-r1.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.5.4-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.5.4-r1.ebuild,v 1.2 2013/12/24 02:08:43 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.8.2.ebuild,v 1.1 2014/07/14 18:45:53 sera Exp $

 EAPI="5"

@ -11,16 +11,19 @@ HOMEPAGE="http://www.gentoo.org/"
 SRC_URI=""

 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-linux"
 SLOT="0"
 IUSE="X"

-ECJ_GCJ_SLOT="3.5"
+ECJ_GCJ_SLOT="4.2"
+API_DIFF_PV="${PV}"

+# perl is needed for javac wrapper
 RDEPEND="
+	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}
+	dev-lang/perl
 	~sys-devel/gcc-${PV}[gcj]
-	X? ( ~sys-devel/gcc-${PV}[awt] )
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
+	X? ( ~sys-devel/gcc-${PV}[awt] )"
 DEPEND="${RDEPEND}"

 S="${WORKDIR}"
@ -74,9 +77,17 @@ src_install() {
 	dodir ${gcjhome}/lib
 	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
 		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}
+	dosym ${gcclib}/include ${gcjhome}/include

-	dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac
+	local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+	exeinto ${gcjhome}/bin
+	sed -e "s#@JAVA@#${gcjhome}/bin/java#" \
+		-e "s#@ECJ_JAR@#${ecj_jar}#" \
+		-e "s#@RT_JAR@#${gcjhome}/jre/lib/rt.jar#" \
+		-e "s#@TOOLS_JAR@#${gcjhome}/lib/tools.jar#" \
+		"${FILESDIR}"/javac.in \
+	| newexe - javac
+	assert

 	set_java_env
 }
@ -85,8 +96,9 @@ pkg_postinst() {
 	# Do not set as system VM (see below)
 	# java-vm-2_pkg_postinst

-	ewarn "gcj does not currently provide all the 1.5 APIs."
-	ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.html"
+	ewarn "gcj does not currently provide all the 1.5 or 1.6 APIs."
+	ewarn "See http://fuseyism.com/japi/ibmjdk15-libgcj-${API_DIFF_PV}.html"
+	ewarn "and http://fuseyism.com/japi/icedtea6-libgcj-${API_DIFF_PV}.html"
 	ewarn "Check for existing bugs relating to missing APIs and file"
 	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
 	ewarn
--- a/dev-java/gcj-jdk/gcj-jdk-4.6.3-r2.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.6.3-r2.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.6.3-r2.ebuild,v 1.2 2013/12/24 02:08:43 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.8.3.ebuild,v 1.1 2014/07/14 18:45:53 sera Exp $

-EAPI="4"
+EAPI="5"

 inherit java-vm-2 multilib

@ -11,15 +11,19 @@ HOMEPAGE="http://www.gentoo.org/"
 SRC_URI=""

 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-linux"
 SLOT="0"
-IUSE=""
+IUSE="X"

-ECJ_GCJ_SLOT="3.6"
+ECJ_GCJ_SLOT="4.2"
+API_DIFF_PV="4.8.2"

+# perl is needed for javac wrapper
 RDEPEND="
-	~sys-devel/gcc-${PV}[gcj,awt]
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
+	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}
+	dev-lang/perl
+	~sys-devel/gcc-${PV}[gcj]
+	X? ( ~sys-devel/gcc-${PV}[awt] )"
 DEPEND="${RDEPEND}"

 S="${WORKDIR}"
@ -66,16 +70,24 @@ src_install() {
 	dodir ${gcjhome}/jre/lib/${libarch}/server
 	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
 	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
-	dosym ${gcjlibdir}/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
+	use X && dosym ${gcjlibdir}/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so

 	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
 		${gcjhome}/jre/lib/rt.jar
 	dodir ${gcjhome}/lib
 	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
 		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}
+	dosym ${gcclib}/include ${gcjhome}/include

-	dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac
+	local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+	exeinto ${gcjhome}/bin
+	sed -e "s#@JAVA@#${gcjhome}/bin/java#" \
+		-e "s#@ECJ_JAR@#${ecj_jar}#" \
+		-e "s#@RT_JAR@#${gcjhome}/jre/lib/rt.jar#" \
+		-e "s#@TOOLS_JAR@#${gcjhome}/lib/tools.jar#" \
+		"${FILESDIR}"/javac.in \
+	| newexe - javac
+	assert

 	set_java_env
 }
@ -84,8 +96,9 @@ pkg_postinst() {
 	# Do not set as system VM (see below)
 	# java-vm-2_pkg_postinst

-	ewarn "gcj does not currently provide all the 1.5 APIs."
-	ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.html"
+	ewarn "gcj does not currently provide all the 1.5 or 1.6 APIs."
+	ewarn "See http://fuseyism.com/japi/ibmjdk15-libgcj-${API_DIFF_PV}.html"
+	ewarn "and http://fuseyism.com/japi/icedtea6-libgcj-${API_DIFF_PV}.html"
 	ewarn "Check for existing bugs relating to missing APIs and file"
 	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
 	ewarn
--- a/dev-java/ical4j/ical4j-1.0.5.ebuild
+++ b/dev-java/ical4j/ical4j-1.0.5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ical4j/ical4j-1.0.5.ebuild,v 1.1 2014/07/08 08:12:42 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ical4j/ical4j-1.0.5.ebuild,v 1.2 2014/07/14 14:37:55 ercpe Exp $

 EAPI="5"

@ -27,7 +27,7 @@ COMMON_DEP="
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEP}"
 DEPEND=">=virtual/jdk-1.4
-	dev-java/emma
+	dev-java/emma:0
 	${COMMON_DEP}"

 S=${WORKDIR}/${MY_P}
@ -51,7 +51,7 @@ RESTRICT="test"
 src_install() {
 	java-pkg_dojar build/*.jar
 	dodoc README AUTHORS CHANGELOG etc/FAQ \
-		etc/TODO etc/standard_deviations.txt || die "dodoc failed"
+		etc/TODO etc/standard_deviations.txt
 	use doc && java-pkg_dojavadoc docs/api
 	use source && java-pkg_dosrc src/main/java/net
 	use examples && java-pkg_doexamples etc/samples
--- a/dev-java/ical4j/ical4j-1.0_beta2-r1.ebuild
+++ b/dev-java/ical4j/ical4j-1.0_beta2-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ical4j/ical4j-1.0_beta2-r1.ebuild,v 1.1 2014/07/08 08:12:42 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ical4j/ical4j-1.0_beta2-r1.ebuild,v 1.2 2014/07/14 14:37:55 ercpe Exp $

 EAPI="5"

@ -25,7 +25,7 @@ COMMON_DEP="dev-java/commons-logging:0
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEP}"
 DEPEND=">=virtual/jdk-1.4
-	dev-java/emma
+	dev-java/emma:0
 	${COMMON_DEP}"

 S=${WORKDIR}/${MY_P}
@ -48,7 +48,7 @@ RESTRICT="test"
 src_install() {
 	java-pkg_dojar build/*.jar
 	dodoc README AUTHORS CHANGELOG etc/FAQ \
-		etc/TODO etc/standard_deviations.txt || die "dodoc failed"
+		etc/TODO etc/standard_deviations.txt
 	use doc && java-pkg_dojavadoc docs/api
 	use source && java-pkg_dosrc source/net
 	use examples && java-pkg_doexamples etc/samples
--- a/dev-java/jcalendar/Manifest
+++ b/dev-java/jcalendar/Manifest
@ -1 +1,2 @@
 DIST jcalendar-1.3.3.zip 669499 SHA256 1dbbf9037026b32adfd123d3946c3ca272075f8b4ddf205436cddeffae320ac9 SHA512 966cb1f063b15bb941e9e263bd0dcf8a6121a6fa37ed2def69be6031856a1459a198f1b10202d697aafff8c71ad6f4e191449014bb692385c066f2c93b9c73fd WHIRLPOOL 39ef9f370b9ddc7c04717c45b34614919e65e54d52b6c2c0b0898b38d917d470e2442bfde08f2b94d567c8806749651aa00362363d38b4a13ba6fae3171a1b58
+DIST jcalendar-1.4.zip 982517 SHA256 21fb9332aad57d9542e9833376686a4bc7612e979c638e97334421bd15447c4f SHA512 aeab6f98451f4fa8718e127de6c0af345410bebbd1de4fa1ca4b9e7f5a22908f9e455ba96da34ef9e8691b4d462e8a01dbd7881b6565a0f3a65d18fe58b68d9c WHIRLPOOL 8c25a8918ef7d83cce59c347701a7af8e3a1bd307398f80d9e2d9d076afae05daaa56e1430eba167139aaae6193ed84a6c860d68ecd286992be71bec9e0dd388
--- a/dev-java/jcalendar/jcalendar-1.4.ebuild
+++ b/dev-java/jcalendar/jcalendar-1.4.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcalendar/jcalendar-1.4.ebuild,v 1.1 2014/07/14 16:42:30 ercpe Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java date chooser bean for graphically picking a date"
+SRC_URI="http://www.toedter.com/download/${P}.zip"
+HOMEPAGE="http://www.toedter.com/en/jcalendar/"
+
+LICENSE="LGPL-2.1"
+SLOT="1.2"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="dev-java/jgoodies-looks:2.6"
+
+RDEPEND=">=virtual/jdk-1.4
+	${COMMON_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.4
+	>=app-arch/unzip-5.50-r1
+	${COMMON_DEPEND}"
+
+S="${WORKDIR}"
+
+RESTRICT="test"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="jgoodies-looks-2.6"
+EANT_BUILD_XML="src/build.xml"
+EANT_BUILD_TARGET="jar"
+EANT_DOC_TARGET=""
+
+java_prepare() {
+	rm lib/*.jar || die
+}
+
+src_install() {
+	java-pkg_newjar lib/${P}.jar
+
+	dodoc readme.txt
+
+	use doc && java-pkg_dohtml -r doc/*
+	use source && java-pkg_dosrc src/com
+}
--- a/dev-java/xerces/xerces-2.11.0.ebuild
+++ b/dev-java/xerces/xerces-2.11.0.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.11.0.ebuild,v 1.8 2013/06/14 19:37:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.11.0.ebuild,v 1.9 2014/07/14 14:22:30 haubi Exp $

 EAPI=4

@ -16,7 +16,7 @@ SRC_URI="mirror://apache/${PN}/j/${DIST_PN}-src.${PV}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 # they are missing from the upstream tarball"
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@ -1,2 +1 @@
-DIST libcdio-0.90.tar.gz 2650532 SHA256 af7e73825cec045e7775a205924de4804fe8ce60ccd299d605234b5df233f74e SHA512 ca262eb59d0b2078697749eba050ef428c8a2728e534bcf51fcb1aa7b28d111386272029c6ae1b4a7ebe6214124f7a48b2d1b76478e3775562a35ff00df7fc38 WHIRLPOOL 8c092444fc34e76b3bb69945e964d7f9da0c7328b4023db3a7ebf31ffa54c0b4a1b3f5f6b59802045230329ab8bcd37af33d01ccf67fe672bae9a4e83dc1b937
 DIST libcdio-0.92.tar.gz 2710084 SHA256 3336bf352aff43b5023e41a6d23525172a3b4ee433c467bd0fab5b8becb33fad SHA512 aeeb51c87f966683a1f10960e4d000098603adfbd8036cff17f62afa5de08a2dbe4f8df7d1bc1fd0438c0ac5f868b2950ed9379ea17b7d98fbd23ef023777747 WHIRLPOOL 051ba189fef5f28ae8ac98caab7bdb7468423f53d7b423e1a2416a8741339ff5aed76115a665f91d406254462c87cf84274a1b777a8f39064624fe908ff1fb0c
--- a/dev-libs/libcdio/libcdio-0.90-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-0.90-r1.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.90-r1.ebuild,v 1.14 2014/06/18 19:12:07 mgorny Exp $
-
-EAPI=5
-inherit eutils multilib-minimal
-
-DESCRIPTION="A library to encapsulate CD-ROM reading and control"
-HOMEPAGE="http://www.gnu.org/software/libcdio/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="cddb +cxx minimal static-libs test"
-
-RDEPEND="
-	!minimal? (
-		>=sys-libs/ncurses-5.7-r7
-		cddb? ( >=media-libs/libcddb-1.3.2 )
-	)
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	sys-apps/sed
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-lang/perl )"
-DOCS="AUTHORS ChangeLog NEWS README* THANKS TODO"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/cdio/cdio_config.h
-	/usr/include/cdio/version.h
-)
-
-src_prepare() {
-	sed \
-		-e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
-		-i configure || die
-}
-
-multilib_src_configure() {
-	local util_switch
-	if ! multilib_is_native_abi || use minimal ; then
-		util_switch="--without"
-	else
-		util_switch="--with"
-	fi
-
-	# Tests fail if ECONF_SOURCE is not relative
-	ECONF_SOURCE="../${P}" econf \
-		--disable-maintainer-mode \
-		$(use_enable cxx) \
-		--disable-cpp-progs \
-		--disable-example-progs \
-		$(use_enable static-libs static) \
-		$(use_enable cddb) \
-		--disable-vcd-info \
-		${util_switch}-{cd-drive,cd-info,cdda-player,cd-read,iso-info,iso-read}
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
--- a/dev-libs/libcdio/libcdio-0.92.ebuild
+++ b/dev-libs/libcdio/libcdio-0.92.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.92.ebuild,v 1.12 2014/06/18 19:12:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.92.ebuild,v 1.13 2014/07/14 15:15:40 ssuominen Exp $

 EAPI=5
 inherit eutils libtool multilib-minimal
@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"

 LICENSE="GPL-3"
 SLOT="0/15" # subslot is based on SONAME
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"

 RDEPEND="
--- a/dev-libs/libedit/libedit-20130611.3.1-r1.ebuild
+++ b/dev-libs/libedit/libedit-20130611.3.1-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/libedit-20130611.3.1-r1.ebuild,v 1.2 2013/10/13 20:38:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/libedit-20130611.3.1-r1.ebuild,v 1.3 2014/07/14 14:54:02 axs Exp $

 EAPI=5

@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="static-libs"

-DEPEND=">=sys-libs/ncurses-5.7-r5[static-libs?,${MULTILIB_USEDEP}]
+DEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]
 	!<=sys-freebsd/freebsd-lib-6.2_rc1"

 RDEPEND=${DEPEND}
--- a/dev-libs/libedit/libedit-20130712.3.1.ebuild
+++ b/dev-libs/libedit/libedit-20130712.3.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/libedit-20130712.3.1.ebuild,v 1.12 2014/03/14 06:58:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/libedit-20130712.3.1.ebuild,v 1.13 2014/07/14 14:54:02 axs Exp $

 EAPI=5

@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="static-libs"

-DEPEND=">=sys-libs/ncurses-5.7-r5[static-libs?,${MULTILIB_USEDEP}]
+DEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]
 	!<=sys-freebsd/freebsd-lib-6.2_rc1"

 RDEPEND=${DEPEND}
--- a/dev-libs/newt/newt-0.52.15.ebuild
+++ b/dev-libs/newt/newt-0.52.15.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.52.15.ebuild,v 1.7 2014/03/04 21:43:48 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.52.15.ebuild,v 1.8 2014/07/14 16:48:08 hwoarang Exp $

 EAPI="5"

@ -14,7 +14,7 @@ SRC_URI="https://fedorahosted.org/releases/n/e/newt/${P}.tar.gz"

 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="gpm tcl nls"

 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
--- a/dev-perl/PDL/PDL-2.4.11.ebuild
+++ b/dev-perl/PDL/PDL-2.4.11.ebuild
@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/PDL/PDL-2.4.11.ebuild,v 1.12 2014/07/07 18:53:29 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PDL/PDL-2.4.11.ebuild,v 1.13 2014/07/14 13:45:09 zlogene Exp $

-EAPI=4
+EAPI=5

 MODULE_AUTHOR=CHM
 FORTRAN_NEEDED=fortran
--- a/dev-python/argh/Manifest
+++ b/dev-python/argh/Manifest
@ -3,3 +3,4 @@ DIST argh-0.23.1.tar.gz 26088 SHA256 319f323f6e0a37206fc161b915c40820c74f08ae77e
 DIST argh-0.23.2.tar.gz 26339 SHA256 7e7b41f7d6156da42e9643deea78fff09adb80672cd4d7e3da6d12a27d94407b SHA512 886b8a629e8ac5dd58f690c8664c30158a6ad6f1d05a835edf83095116ce43665ff96fd150d68c1efa8dc220abba06e2c652a782388ccf94b84ceda721a92d3a WHIRLPOOL 8fbaab078faf735c578d983a68f8cc065cd141b89f28616e4c9166845b1d6e2480080183a6a252516b50c7497b8f64258f497bf74053ce4b1307d6b5956faf6b
 DIST argh-0.23.3.tar.gz 26232 SHA256 076f27ed25f64339186810075c9eb2aa5121bd330851d42639abde17a9b9774b SHA512 e177cfe1a4c29133cb2543031b81c5927650dc56c8d6d90a3e1777a6f1e9db4d49dca90a0bbb21228f2c797beaa9a83acc5ee426556cc8037301a429e526690f WHIRLPOOL 6f0a411932a9c1e2ee4ddda4073c5c6c38c3a7134764688590cbe055251684ea6387d1f197981a2c5db3f4f1756ae2e096fa75b5a15f3ff3676e01a1705d02a6
 DIST argh-0.24.1.tar.gz 28376 SHA256 4980eb11339c9954885b8e44a1e39a4a1c114b738a7d8942c08494f4902f82a9 SHA512 487c3591fd15b58ed1278688d74ab7dd2655b07a42a4ff191bef34ca248c8d752806a322f825fcaa411b59b46a29df95a23ad424a0d77194f8278aa67c6cf2a7 WHIRLPOOL 21bec5434c36eca48a985aff822505c060fd486c726c97ea9c10b04db22fd941165f20518cee56ddc7b26d22a2647acc0dc46b0cc5e7d02bd5b15685221c0136
+DIST argh-0.25.0.tar.gz 30865 SHA256 f55f004a9077db0abc50e8ef5c0e0d0e3573b4a1c8365439c8186ca69197ff33 SHA512 76d4a1451e7f7bb759525b4e0f7dd5fcae4528b92e2866c3d543519df0394fb8de88511869ac04e2f160ac8ae150c1f0c7d348848af2039a26f71b7179555a69 WHIRLPOOL 4fd748081b2973a87f3d425f7468e2cc03edbf64dcff785e6080829ea9728c931f236cfbb2bc6eb6599a2480adabc9448d6bdd57e9a6bb8f8af825ab1fdf2053
--- a/dev-python/argh/argh-0.25.0.ebuild
+++ b/dev-python/argh/argh-0.25.0.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/argh/argh-0.25.0.ebuild,v 1.1 2014/07/14 06:50:43 patrick Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple argparse wrapper"
+HOMEPAGE="http://packages.python.org/argh/"
+SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="LGPL-3"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+python_test() {
+	# setup.py tries to install argparse for some reason...
+	py.test || die "Tests fail with ${EPYTHON}"
+}
--- a/dev-python/authres/Manifest
+++ b/dev-python/authres/Manifest
@ -5,3 +5,4 @@ DIST authres-0.501.tar.gz 27991 SHA256 3021e6d0bd9ccacc06731b96e409ae7fbb8d36b15
 DIST authres-0.600.tar.gz 16614 SHA256 4bfdff4a51d217c54f611edba14a63417e8563ee15a7cf3e1df9b01e32ebb48a SHA512 d60ea4c061ff82ef9649f668453148e7b467681d3c890aa6241915cd853f38e77c7f5819ddcbddf97ca6c29355effe9ae288b6ad5d3d1fdbb5ff00bcb7b1bcd3 WHIRLPOOL 742c8aac11ef3d7973fa8de6047f36bff32a6f6f0692acb68df67a7339047848af43a6d82882933347627fc7b53c8cf65f1b6b2ba2a32f931ace37cd273eae86
 DIST authres-0.601.tar.gz 17800 SHA256 7710b9635a0547e0c4b37963f9edc08849e3d1caf5d7951e47761999c71e09fc SHA512 683fd8485a0fdb65eb7ac06b3a6330864c2d4a1c57bd3d9e77c02867927fb093c9d5360abc6841b98050f9ea0c976e7637a5ac5862e3f6ecc6803945ac570de7 WHIRLPOOL 1bb8d00b5bf0340275eb75a7b5ca625038e1213af33cf6127254bf5ffc33d2f488030f420b09f2485efad0909407cb8be491ba91bdecd57fab984fa2ba7ab8d9
 DIST authres-0.602.tar.gz 17971 SHA256 41cea7fcc3387e381b520053dbbba1825598b6cb9d45c505ae466d7a2a27edc3 SHA512 3113a23baecf7bb0483e450cd22271eca0e756a772c366e77d36682bec764e528c0befad682f346026aad669b17dc85337f9994f8480535d7184e5a92c0be512 WHIRLPOOL 609e980f1f4b9142fe88272d75a9cbeb187abcb457552bc5e3d8ed9d3a920d3c188b23b93b8037df4b1a2cadd11e0612f3f7c1535c6337334de5ae2ca3ca8b1a
+DIST authres-0.701.tar.gz 18878 SHA256 4536c485ab8da667be84361b040e626d025cc8b3cb5ad7ef156a7764bf9a9b12 SHA512 e4482a8c5494a550a76a0d0b8b0d406d257da271d8fae901569a960d2f90ec616c5de48a578240e831c29f9345d128ecc9cba6f05befbb03f5cd90b4c26af422 WHIRLPOOL cbca8127df9ac573bdb653f22869450184cfd05221aa17a28726183e17572f4cde85b255b6e3583336aa87383e34a1999f4a647c1bac8eb91bc70075b0d0669e
--- a/dev-python/authres/authres-0.701.ebuild
+++ b/dev-python/authres/authres-0.701.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/authres/authres-0.701.ebuild,v 1.1 2014/07/14 07:18:32 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Authentication Results Header Module"
+HOMEPAGE="https://launchpad.net/authentication-results-python http://pypi.python.org/pypi/authres"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+DOCS=( CHANGES README )
+
+python_test() {
+	"${PYTHON}" -c "import sys, ${PN}, doctest; f, t = doctest.testfile('${PN}/tests'); \
+		sys.exit(bool(f))" || return
+}
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@ -2,3 +2,4 @@ DIST bottle-0.11.6.tar.gz 60612 SHA256 2e63802cbe6a21537e35d92ec3c80a1e302dc619d
 DIST bottle-0.11.7.tar.gz 60212 SHA256 8f301e45c522e458e5f51a59e1737b0dd84fc49c691f40f3a8a042b70691bf42 SHA512 d85e2da58df564f7a305cd1003491b69ac0c2d950962580c28183f710346642de1d3c9706605a56aadae3d755d6e5dd62d8c9b76422b8e95c64512f6ba560269 WHIRLPOOL 89e3e4a7145eae16e529b0ffdd360e02ed18294cc95d9d65658fdcbc8e8f5e10058c5222ef970f658def1ce130f480599b561912b5cea120dc8309db5b8d8a37
 DIST bottle-0.12.5.tar.gz 69120 SHA256 1e35b63edf744999cd47d86099aa3d0ab030522e38c25038fc5fd77fbc35b75b SHA512 8a116a84e9b1d273e7c17a9d920044e8283a8916585ebcf265362f767e96e868b05739d20795f98565b07eb359b6ea76128e49a0850002280b37e54cddb237c0 WHIRLPOOL 7a4fc6ac17daf1ae59ba72bd0ffe0a51e95649372300674857c59efef0d08c894813c95236c655d9c6dc53dc67c48a8f254b1eb15cd35172425d588579aca5b9
 DIST bottle-0.12.6.tar.gz 68934 SHA256 2bc3b9e73b8617d0329226eb819fb196fc262fa7db950f8ff26ba073761b8059 SHA512 2e5dec0b76b483c1fa8220d7bfce0ff1f799aa84214c053db782056d312196a3a524d1cf636c234cde201ece382190d1d45bd0da6093c10016af24b34c994b0b WHIRLPOOL 76626cc2e995fa80da41081260c70cae51e86e6026b82cf379e5be7f8da8825acb331d0fb06e27cf30791bfff371c58380389e2e48750d3af445676aab198bd3
+DIST bottle-0.12.7.tar.gz 69375 SHA256 e3ea2191f06ca51af45bf6ca41ed2d1b2d809ceda0876466879fe205be7b2073 SHA512 ef58c0ec3b09b237914a170aae59a577a59e579478cd5f1bcef9fe73a9d3a4776794263d6f7b60dd426629aec2987ee4c3f6b8fa0486a99879792c70e373fcbc WHIRLPOOL dc6a34f9819ed77b0b05c01c13efe553af37fc9c32cfe955d6199277a8e38992a0e4982b8e67b0aab12349f15434d094ec7674a7970c71e264e72f3b74c617f0
--- a/dev-python/bottle/bottle-0.12.7.ebuild
+++ b/dev-python/bottle/bottle-0.12.7.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bottle/bottle-0.12.7.ebuild,v 1.1 2014/07/15 04:38:04 patrick Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
+inherit distutils-r1
+
+DESCRIPTION="A fast and simple micro-framework for small web-applications"
+HOMEPAGE="http://pypi.python.org/pypi/bottle http://bottlepy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+python_prepare_all() {
+	sed -i -e '/scripts/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	elog "Due to problems with bottle.py being in /usr/bin (see bug #474874)"
+	elog "we do as most other distros and do not install the script anymore."
+	elog "If you do want/have to call it directly rather than through your app,"
+	elog "please use the following instead:"
+	elog '  `python -m bottle`'
+}
--- a/dev-python/docopt/Manifest
+++ b/dev-python/docopt/Manifest
@ -1 +1,2 @@
 DIST docopt-0.6.1.tar.gz 25815 SHA256 71ad940a773fbc23be6093e9476ad57b2ecec446946a28d30127501f3b29aa35 SHA512 8316a1fbd7253d2f7bed0baf07bc023d53b29e01abe69a1898a381c54321024e2f075567cc93488283a5125d7a82c32180f2a99ec07a9ec778e064c0a72e9cc1 WHIRLPOOL afa6dd3770904760b6352bf7a2f9c437df4212b28a65856986f3a28fb441dc2aecf1af5ef698e2f463df74c5087a4962fc56eee99d797aa172b7c766b5f22909
+DIST docopt-0.6.2.tar.gz 25901 SHA256 49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491 SHA512 af138feccf8c37b374ee44fcda4938a88107d434df13c173214021b1a3348b152a595095a86982b66ac03a11db8e0f1e9e6a3a65c98deea92330311daeb831a3 WHIRLPOOL d6d00dd8e6e1063ba6d12339b6e7744bd993270173260efe8ba808e71945d3ac26a22adb005563d626ffa1e253022b88bf0bd1f9dd729bf6634be73d20108541
--- a/dev-python/docopt/docopt-0.6.2.ebuild
+++ b/dev-python/docopt/docopt-0.6.2.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docopt/docopt-0.6.2.ebuild,v 1.1 2014/07/14 07:05:07 patrick Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pythonic argument parser, that will make you smile"
+HOMEPAGE="https://pypi.python.org/pypi/docopt https://github.com/docopt/docopt"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://github.com/docopt/docopt/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	esetup.py test
+}
--- a/dev-python/fexpect/Manifest
+++ b/dev-python/fexpect/Manifest
@ -0,0 +1 @@
+DIST fexpect-0.2.tar.gz 6260 SHA256 d037d1282a43ed38b3edc6b33dabaa543b8b274e92753cbb565d21aa10f52a0c SHA512 45b14bfc50f5e2a5dca45594b024a213c270196a89b1ee51c6a8107d6f8b46ab1ca1362331372492307a2e42adef60be444465d33248788ae2ba2728e42cf580 WHIRLPOOL 2dfd4092ab30870c36ad2dedcaaeff65e58bd1530f3a71831c2ad41d4f4dbdb484c8f79a6baffc585dc48e855ddd9e8c08a3f1c8993628c689907dc3c79bf174
--- a/dev-python/fexpect/fexpect-0.2.ebuild
+++ b/dev-python/fexpect/fexpect-0.2.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fexpect/fexpect-0.2.ebuild,v 1.1 2014/07/14 20:27:20 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Extension for fabric to handle prompts through pexpect"
+HOMEPAGE="https://github.com/ilogue/fexpect"
+SRC_URI="https://github.com/ilogue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/fabric[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/shortuuid[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	esetup.py test
+}
--- a/dev-python/fexpect/metadata.xml
+++ b/dev-python/fexpect/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@ -1,2 +1,3 @@
 DIST joblib-0.8.0.tar.gz 309866 SHA256 b0f628f878ee808cb8987ac7fd82abdb7a2a6e3252c65d7ed28e26b806d82a45 SHA512 5dc5f89bea0204975765d88ef5e1f1faac6541a71845a74865e10c23ca3363ee8f39f62eb35b7cd944b0768a85f44f5d9d7deb02a17df80bec36f9e75f071aba WHIRLPOOL 15f65fdd838287c130da28c27989c998b4eccdc2dc899cecb277cf829345ad56a3e7fa39e61e4669e3afcc2ba96ca6624a50d1f5fd10ed7a7d60d96b510e3fd4
 DIST joblib-0.8.1.tar.gz 310038 SHA256 0a8d9707d7f28ee155c1ec174868548ad2ae88f5f8ca08c629ce41c0c96bd36f SHA512 a67521a0e73c38d045031f6b189bcc8d2cda3f3364f229177bed84ddb344e266e7faff0e5acd8b9dbf4463625dd5b1049d29176f447e8e2ea04e05096d271f23 WHIRLPOOL ca2d79a943ffa263c8c1ca45c5bb5a0deaa16d7a48859971ef52f2de96f097b7e3720fef053ad069411493fd17320a8e82e26feee4889dbd0777eb3327b32682
+DIST joblib-0.8.2.tar.gz 311162 SHA256 6434f2855be83796626185be474f06833cea2fd6fc65be765dc3ec39d6e620fc SHA512 63995559346aa032dc256c5995efe071fa5033b4fddaf9bafa45cb783ed74798e331e7bda2641163a8037ea044b8fee372af60860722e824a2f4cb161d7ceeb3 WHIRLPOOL a3892746ff382a2c64d49ed68f50b84b5b838f3a1f21c563646845e9265928946e59c22af2100e2a5f06c7a2b11d8603417075d6edf8bc9fc599d44b9b6fb766
--- a/dev-python/joblib/joblib-0.8.2.ebuild
+++ b/dev-python/joblib/joblib-0.8.2.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/joblib/joblib-0.8.2.ebuild,v 1.1 2014/07/14 07:26:15 patrick Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools to provide lightweight pipelining in Python"
+HOMEPAGE="http://pythonhosted.org/joblib/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+# Usual; req'd for testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build -b html -c doc/ doc/ doc/html || die "docs failed installation"
+	fi
+}
+
+python_test() {
+	# https://github.com/joblib/joblib/issues/143
+	if [[ "${EPYTHON}" == pypy ]]; then
+		sed -e 's:test_func_inspect_errors:_&:' -i ${PN}/test/test_func_inspect.py || die
+		sed -e 's:test_parallel_pickling:_&:' -i ${PN}/test/test_parallel.py || die
+	fi
+
+	nosetests -w ${PN}/test || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+}
--- a/dev-python/jsonpatch/Manifest
+++ b/dev-python/jsonpatch/Manifest
@ -1,3 +1,4 @@
 DIST jsonpatch-0.10.tar.gz 5413 SHA256 86409f5c0a8392a277488dd11fc0f603e7241c95cf547b7048e30e69b7f74107 SHA512 74d2bd0cc7ad8a383da0db7711161e87305f1f23ea2f0f1e0fd9fe3e3aa5e94a0846f51996356d7402c231eeaca062ebc69e7593374a81c7cee6f300efc28904 WHIRLPOOL 7dcd646193efae687ea99f7dfe5693fbe6ba7e69ddbb10dfe237e70c66e32dcce9cb678f0999a377d5a8c90d5cbc55299210beb240b10106cdc3a5763b27d031
 DIST jsonpatch-0.12.tar.gz 5396 SHA256 d62765ac03bd9cc6273bfddcf745ea2b86f7697ea01a9a44f762db2647945886 SHA512 5ce4efcd63c2be32f749f358e4fbdc31ea5746d2832d78b44a7e76caa38fd08472cedeacf2c8d71890d53f11f2ba78fb9e5a4011103775c6e805ad9ebee6de8a WHIRLPOOL 9286ce065db063b8e5aeb42314a40a27c5e83a8d027f6bd1a3273dd348a3264bc86c32b3dbe1198b19a2eecf51190fce1fe77d9d299ba2c5605951b2739c1459
 DIST jsonpatch-1.5.tar.gz 14000 SHA256 5b8874a5bd0b7201d8e917f820bbb3c8bbd55174ae9036220f83ac6dadc2c4df SHA512 5f542620139abc61d835392b7885367979607c2b67ce29cd8279d60b9485228e7e2d5ec9badb25acbb820689910ff0fbe38cda6ddaad217e543eb8c06186e354 WHIRLPOOL e493f45f5c7dca3525c31d5205f36ab0d826353d77c1c54234b6df669291499913400f43e89a868dbf1ed9886eece0e07deb034389a1065279dc34fefcd9acdc
+DIST jsonpatch-1.7.tar.gz 14109 SHA256 14ca0944de01cba9091f54951da058dd515ff3d3a203e6b29e00362eeef67dae SHA512 317d11a875944c7975e17112fe106e134c37993e9fcda5926c317ba5373d2aa63c708c478442d9954ad8759bedd0b3f012c000964ba2841bf2415068e8a1da43 WHIRLPOOL ca908ffc6890bb6b7a65eacae41932ba5977c61ff5e5dd4bfbb050cb2f8250d6fd0d8e3048903f4ab1beb2913555a26d53ce692048ac9b4bde1aaef7451f4c4a
--- a/dev-python/jsonpatch/jsonpatch-1.7.ebuild
+++ b/dev-python/jsonpatch/jsonpatch-1.7.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonpatch/jsonpatch-1.7.ebuild,v 1.1 2014/07/14 07:44:03 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Apply JSON-Patches according to
+	http://tools.ietf.org/html/draft-pbryan-json-patch-04"
+HOMEPAGE="https://github.com/stefankoegl/python-json-patch"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/jsonpointer-1.3[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
+}
--- a/dev-python/jsonpointer/Manifest
+++ b/dev-python/jsonpointer/Manifest
@ -1,2 +1,3 @@
 DIST jsonpointer-0.7.tar.gz 3343 SHA256 790255717b982aa9cb837030d4ad4d19447322ff7b8fb4bf8bb340cadc0a42a4 SHA512 900c7341598d3fef4667bf65d4afac8788e9449b45b7799e8cda1406ab703e790431a69f4387f09ace73456c089f179a93d32293a973ff1023aed0dcfe9740b3 WHIRLPOOL 4e618c55bdb52c7f44271e55768aa46a7e04c686695e5829d8a0a0c01d7334b3a0929f4994564548af238352dec49c9e99f3094828aec17f777c518c03c40958
 DIST jsonpointer-1.3.tar.gz 6829 SHA256 0c60fd449265c301af8492a654e8cb379aeec5f6207ecac9a585fa91e6ccf95c SHA512 9961e29b5a9b3153c0ed97d6da68b86aa2d1f8333e0ff2a8a2accce994276c83ecaead2729100bcdd655ad2120d9d3502422ab365837e93473cc1de5a31e4e7b WHIRLPOOL 3416f4307bedefbcc0e0ef4da6bf0c7eccb9a6d5a0029066d03a6790e83623cfdfffdf80962f256465820578d26a42dd47fa91749fb7a2342ceee43bbce49e55
+DIST jsonpointer-1.4.tar.gz 6936 SHA256 cb9d357edc67fe41a929fbfd583e95a2a6c5fdc71e22522d88ab715c752905b4 SHA512 be1cf5b5df08bd42c25bded242afd4caf04baba8958cc8599859f80041f8db06e4d6aaadadd6cc6f35b2cc78a77a9d94ac45a9c809c21c61a691d7a6d9b5184f WHIRLPOOL 2441143f7c19d54bfb395dc829439ebfdfa0d0331fd9430e6d2e7463a6aa857ee59426424e3d7511169a85be95f32816d7e8c3987aa16e158b08ce05e60cfbb6
--- a/dev-python/jsonpointer/jsonpointer-1.4.ebuild
+++ b/dev-python/jsonpointer/jsonpointer-1.4.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonpointer/jsonpointer-1.4.ebuild,v 1.1 2014/07/14 07:36:24 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Identify specific nodes in a JSON document (according to draft 08)"
+HOMEPAGE="https://github.com/stefankoegl/python-json-pointer https://pypi.python.org/pypi/jsonpointer/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_test() {
+	"${PYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
+}
--- a/dev-python/multipledispatch/Manifest
+++ b/dev-python/multipledispatch/Manifest
@ -1 +1,2 @@
 DIST multipledispatch-0.4.3.tar.gz 6591 SHA256 9d8c20ffe7f3530c9b49529ab56ec65a4759c42e19f005693bc8a188c7427255 SHA512 47b20087f4b79ca5d73f0433923abf158136e7bcf085fdd6ccbd4ba3c0e4f44087b9a92bcc77c35ac54d0c06ac71c4dc6ef20a771812e22f94e12582367d5756 WHIRLPOOL 23c24ce7f1b30ec67ea3517f35b23f52637bf894b2ee1a3c8aff071379fb36103d0703753e3fb1ebe8de625a68438156f040cf44ae384472206ffe0bc2ec4c6d
+DIST multipledispatch-0.4.4.tar.gz 6851 SHA256 891f0786937536ac84d1f60bbafe4c365eafedc4d9eb3a20dd5d4b907f953614 SHA512 4e7968bf1ceab6c869159bad9d9c93bcf2644baea5aa2de9875e6ed04c101ff19398006d5e8418376aef4ef656964b85baf9b605f36db0194f0a4ef511523f6e WHIRLPOOL a6e47a534397d1d619ea0c946ee9c16bef88760e0041ee2612709aadd555f46db07dcce2efca00da730b7f282410cbf9507d5454e0ac2ab69f1bfef6f239d7fd
--- a/dev-python/multipledispatch/multipledispatch-0.4.4.ebuild
+++ b/dev-python/multipledispatch/multipledispatch-0.4.4.ebuild
@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/multipledispatch/multipledispatch-0.4.4.ebuild,v 1.1 2014/07/14 06:59:25 patrick Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_2,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="RESTful HTTP Content Negotiation for Flask, Bottle, web.py and webapp2"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://pypi.python.org/pypi/mimerender"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/mimeparse[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@ -1,3 +1,4 @@
 DIST networkx-1.6.tar.gz 707795 SHA256 a2ee8399758e08bf7bc7910071474cdd92e364bbc22be1aa29bdfe0f26f7ba78 SHA512 c72f41ade51335d9c41e63ce4688b843113f1ac2523cfaca505f4715496c8c61fe5e680f77c6561d1618381ac028d151cedc40ba8035c907ceb5e0179da50002 WHIRLPOOL 4faf788029bfff14737e05462b61c4b5144b0a6761ab7563a8edcdb3f7c327453d2d393f2d96d2929ad089bd40ff5f55d6fa4c4f05c1475214cb44e6b5da3e25
 DIST networkx-1.7.tar.gz 728145 SHA256 eb62de98a0fa74aec9c31fffbac8089a703c6413601678f3fb1a0016bad2bdc1 SHA512 04dcd9c67339428713213b1fe43a96f6f52234189e3924fd45889456566251587c7567cf8c817b032e3993551c226be766a593f9c7dcc54a5c0cab2ae2bd3c65 WHIRLPOOL 3133198faaffe136534335a1a74e58192d0ef585444cb4ccaa9368ebb2c13be559f5fe7296ebae2f58eb5644242c56a967b0c2523d92cc716fa2a7db83b2e528
 DIST networkx-1.8.1.tar.gz 806766 SHA256 b75ba675fd2831f60e3f5a028822a8f7b9993877854599e9694196f8b2f88233 SHA512 89372a1c33fd1a87221f68211490f922df62225b4716d88356cf7c9861a63a77217eb395918bf6907b50115bce1fe94e196eb60cacd534ee126ed5e738c43814 WHIRLPOOL f39a8231e3b01a26517b188c094e10d67410cdcb3e93932705c09175513318ddea1ac19d2cde24b7677a47a3baaa0db559970648a38fa907bd349b6f28bbd612
+DIST networkx-1.9.tar.gz 1035166 SHA256 52e8eea77b0d3f5420cadaca55181c862f06a79a4500f06917b58a0455a12b22 SHA512 0cfcff45087f7ac45b33a91be2e200f3cc816f893591eee23212602a7d2fbd3d71cefdccef5f54f5d0b15f2635216b85c95c22e067b5801af8ff14800f45e95d WHIRLPOOL b8421de11248884d8b70a08798f611536d3d6edd477ee3a4115e814650d27fdd99bf4b567abe5c9346ce9b2554ec1cf9574ffabf4561bcd7be21197c2177187d
--- a/dev-python/networkx/networkx-1.9.ebuild
+++ b/dev-python/networkx/networkx-1.9.ebuild
@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/networkx-1.9.ebuild,v 1.1 2014/07/14 11:14:21 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python tools to manipulate graphs and complex networks"
+HOMEPAGE="http://networkx.github.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples test"
+
+PY2_USEDEP=$(python_gen_usedep python2_7)
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/pygraphviz[${PY2_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' python2_7)
+		$(python_gen_cond_dep 'dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]' python2_7 'python{3_3,3_4}')
+	)
+	test? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)"
+RDEPEND=">=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	examples? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/pygraphviz[${PY2_USEDEP}]
+		dev-python/pyparsing[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed -e "s/'sphinx.ext.intersphinx', //" -i doc/source/conf.py || die
+	 distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sed \
+			-e "s:^\t\./:\t${PYTHON} :g" \
+			-i doc/Makefile || die
+		emake -C doc html
+	fi
+}
+
+python_test() {
+	nosetests -vv || die
+}
+
+python_install_all() {
+	# Oh my.
+	rm -r "${ED}"usr/share/doc/${P} || die
+
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
--- a/dev-python/pyprof2calltree/Manifest
+++ b/dev-python/pyprof2calltree/Manifest
@ -1 +1,2 @@
 DIST pyprof2calltree-1.3.1.tar.gz 6565 SHA256 3afdd4e6ba4d5d02fcf4815f9eebb816c0f74ba936ae34a7e264f26739be1f89 SHA512 ba939fe9ab28066067dc0989221acbf8d5c84b5cdb68850fd90b4579f8ab812883561447ae61cc896b5e461591ba5b1e40e666e21f8a824071b9c98d80e583a9 WHIRLPOOL 1120d15deb1409eb70d9af1483fa0392be124f70848b86779dea1ef5753cef03a3c82b83bc692a1d2ea1e848f0045206d85d2af9bb99b5c429946f8f9c1a35ac
+DIST pyprof2calltree-1.3.2.tar.gz 6609 SHA256 28eac89262d0edd86ee2574d24d1840cbca2d4ed6a1de7e1d8fc05f30ea5a22b SHA512 e85c5a21fe52b246ee6080f59e2ff115b43e3ab634e2842aff0d493b8b996105e0c1698e049ae7d11ea53c1f1fd601ef5f12c6fba62dcea28ddff23ec61a2736 WHIRLPOOL b132fe3179bbf7e3dc999fe3f8da1fdb298b515c302e76de4d96cff4392966875df8180aba66b535a122c8521d22755efbc9f46a133f8a758cce0a230d943bc3
--- a/dev-python/pyprof2calltree/pyprof2calltree-1.3.2.ebuild
+++ b/dev-python/pyprof2calltree/pyprof2calltree-1.3.2.ebuild
@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyprof2calltree/pyprof2calltree-1.3.2.ebuild,v 1.1 2014/07/14 07:33:58 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="convert python profile data to kcachegrind calltree form"
+HOMEPAGE="http://pypi.python.org/pypi/pyprof2calltree/"
+SRC_URI="mirror://pypi/p/${PN}/${PF}.tar.gz"
+IUSE=
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/pypy/files/2.3.1-shared-lib.patch
+++ b/dev-python/pypy/files/2.3.1-shared-lib.patch
@ -0,0 +1,11 @@
+--- rpython/translator/platform/posix.py
+++ rpython/translator/platform/posix.py
+@@ -180,7 +180,7 @@
+                    'int main(int argc, char* argv[]) '
+                    '{ return $(PYPY_MAIN_FUNCTION)(argc, argv); }" > $@')
+             m.rule('$(DEFAULT_TARGET)', ['$(TARGET)', 'main.o'],
+-                   '$(CC_LINK) $(LDFLAGS_LINK) main.o -L. -l$(SHARED_IMPORT_LIB) -o $@')
+                   '$(CC_LINK) $(LDFLAGS_LINK) main.o -L. -l$(SHARED_IMPORT_LIB) \'-Wl,-rpath,$$ORIGIN\' -o $@')
+ 
+         return m
+ 
--- a/dev-python/pypy/pypy-2.3.1-r1.ebuild
+++ b/dev-python/pypy/pypy-2.3.1-r1.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.3.1.ebuild,v 1.2 2014/07/12 21:31:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.3.1-r1.ebuild,v 1.1 2014/07/15 00:34:44 idella4 Exp $

 EAPI=5

-PYTHON_COMPAT=( python2_7 pypy pypy2_0 )
+PYTHON_COMPAT=( python2_7 pypy )
 inherit check-reqs eutils multilib multiprocessing pax-utils \
 	python-any-r1 toolchain-funcs vcs-snapshot versionator

@ -49,8 +49,9 @@ pkg_setup() {
 }

 src_prepare() {
-	epatch "${FILESDIR}/1.9-scripts-location.patch"
-	epatch "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	epatch "${FILESDIR}/1.9-scripts-location.patch" \
+		"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" \
+		"${FILESDIR}"/${PV}-shared-lib.patch	# 517002

 	pushd lib-python/2.7 > /dev/null || die
 	epatch "${FILESDIR}/2.3-21_all_distutils_c++.patch"
@ -132,7 +133,6 @@ src_install() {
 	fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so
 	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so"
 	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
-	dosym ../$(get_libdir)/pypy/libpypy-c.so /usr/$(get_libdir)/libpypy-c.so
 	dodoc README.rst

 	if ! use sqlite; then
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST fexpect-0.2.tar.gz 6260 SHA256 d037d1282a43ed38b3edc6b33dabaa543b8b274e92753cbb565d21aa10f52a0c SHA512 45b14bfc50f5e2a5dca45594b024a213c270196a89b1ee51c6a8107d6f8b46ab1ca1362331372492307a2e42adef60be444465d33248788ae2ba2728e42cf580 WHIRLPOOL 2dfd4092ab30870c36ad2dedcaaeff65e58bd1530f3a71831c2ad41d4f4dbdb484c8f79a6baffc585dc48e855ddd9e8c08a3f1c8993628c689907dc3c79bf174`