Sync with portage [Wed Feb 20 01:47:37 MSK 2013].

app-admin/salt/Manifest

@@ -1,3 +1,4 @@
 DIST salt-0.11.0.tar.gz 846339 SHA256 d5ecc48ff6c9a81686db59921e1b24e1c876f889214e7865f95d646ab572a3de SHA512 53c8ef06b2387b5cceb661c2b4805f6cfe84e888668169eec035f1d9edbe8587d2ff9b079e2545ae3d01ffdcf35243ca27fdebef926c830a54c5ca5567f640a4 WHIRLPOOL 5363855ac0921e0316c5435f379cc4fa0e7414e479dd7e550e44e472a61e47d9edd9100556633b6ffea13d857e46210f6cfee6c6b6c89f545b33be8a982167a7
 DIST salt-0.12.0.tar.gz 943176 SHA256 854ab304c111f114b3a3c0089423cd2e022afdef43d4cd74b5b1a0016c3f64c5 SHA512 86f910e1d2b6f4fabb277de9b72a03ccaa7415915b313d38a3e0c493f982c9bf711a35409518759aab61122becf47f3a78833f83788f499aca587c5335d3191a WHIRLPOOL fd81d26f6e83997e9e1e0cab601b7b4474b11865a173ed31a1ee3d8fedd789b920c68251031f24e7988f0d8e7053e429e066a9930964b3ae696b0ef2ea75b682
 DIST salt-0.12.1.tar.gz 940994 SHA256 54ef4c4ce4c002a94e3f5f530f3115d09a1e8f28a3a11c18db5c7f70d5eeba23 SHA512 3b77472d131641df2ad228c424b3f445ecf6e5f91f44f5f928a1e375ad1a97811856bef4f181e14ccd4ff70a4e3f37175b260969317d471bf6853549aa21fb97 WHIRLPOOL 24d6dac1af88f9e9577fc0088557a65f1a49801042d115849e921098ce9163dd9c02becc41371039ad60e4631d19253e3051603b1c9b05f604c1d0fa917dfef4
+DIST salt-0.13.1.tar.gz 1016399 SHA256 944caedffef0d3d4ecdb34e3cf32749e32cdddf5b78fee759f43f63a3fd0430c SHA512 7fc4e63683f25b323e9717fe71e5bf397c60484f0cc65dec9f8a1a0b2f978d231a7a4f847abd523a5406d7afc80a7e38525fe480feeced28b6ed753c84931e4d WHIRLPOOL 21e590bb0f0ccaadeb27fbbeadb6029e68d1b62849e11c0dbc5b128d5339f2c50b924f2c61ee466126cf0cb295bbdcb79067ade0939710f233a644e561f65893

app-admin/salt/files/salt-0.13.1-disable-failing-tests.patch

@@ -0,0 +1,16 @@
+diff --git a/tests/unit/modules/win_status_test.py b/tests/unit/modules/win_status_test.py
+index d3bb7a6..5f8ecb0 100644
+--- a/tests/unit/modules/win_status_test.py
++++ b/tests/unit/modules/win_status_test.py
+@@ -184,8 +184,9 @@ class TestProcsComInitialization(TestProcsBase):
+         self.expected_calls = [call()] * call_count
+ 
+     def test_initialize_and_unintialize_called(self):
+-        pythoncom.CoInitialize.assert_has_calls(self.expected_calls)
+-        pythoncom.CoUninitialize.assert_has_calls(self.expected_calls)
++        pass
++        #pythoncom.CoInitialize.assert_has_calls(self.expected_calls)
++        #pythoncom.CoUninitialize.assert_has_calls(self.expected_calls)
+ 
+ 
+ if __name__ == "__main__":

app-admin/salt/files/salt-0.9.8-syndic-resolution-of-master.patch

@@ -1,25 +0,0 @@
-From 6c25bb24a250eaa41df02a0fe0ea696f227e8d18 Mon Sep 17 00:00:00 2001
-From: Thomas S Hatch <thatch45@gmail.com>
-Date: Sat, 24 Mar 2012 11:51:24 -0600
-Subject: [PATCH] fix issue with syndic resolution of master 1p
-
----
- salt/__init__.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/salt/__init__.py b/salt/__init__.py
-index 61b98e3..bce0065 100644
---- a/salt/__init__.py
-+++ b/salt/__init__.py
-@@ -223,7 +223,7 @@ class Syndic(object):
-             # Some of the opts need to be changed to match the needed opts
-             # in the minion class.
-             opts['master'] = opts['syndic_master']
--            opts['master_ip'] = salt.config.dns_check(opts['master'])
-+            opts['master_ip'] = salt.utils.dns_check(opts['master'])
- 
-             opts['master_uri'] = ('tcp://' + opts['master_ip'] +
-                                   ':' + str(opts['master_port']))
--- 
-1.7.8.5
-

app-admin/salt/salt-0.13.1.ebuild

@@ -0,0 +1,67 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.13.1.ebuild,v 1.1 2013/02/19 18:54:02 chutzpah Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=(python{2_6,2_7})
+
+inherit eutils distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager."
+HOMEPAGE="http://saltstack.org/"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ldap libvirt mongodb mysql openssl redis test"
+
+RDEPEND=">=dev-python/pyzmq-2.1.9
+		dev-python/msgpack
+		dev-python/pyyaml
+		dev-python/m2crypto
+		dev-python/pycrypto
+		dev-python/pycryptopp
+		dev-python/jinja
+		ldap? ( dev-python/python-ldap )
+		openssl? ( dev-python/pyopenssl )
+		libvirt? ( app-emulation/libvirt[python] )
+		mongodb? ( dev-python/pymongo )
+		mysql? ( dev-python/mysql-python )
+		redis? ( dev-python/redis-py )"
+DEPEND="test? (
+			dev-python/virtualenv
+			${RDEPEND}
+		)"
+
+src_prepare() {
+	sed -i '/install_requires=/ d' setup.py || die "sed failed"
+	epatch "${FILESDIR}"/${P}-disable-failing-tests.patch
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	for s in minion master syndic; do
+		newinitd "${FILESDIR}"/${s}-initd-1 salt-${s}
+		newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
+	done
+
+	dodoc README.rst AUTHORS
+}
+
+python_test() {
+	SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report || die
+}

app-benchmarks/bashmark/bashmark-0.6.2.ebuild

@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bashmark/bashmark-0.6.2.ebuild,v 1.5 2008/06/29 10:00:27 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bashmark/bashmark-0.6.2.ebuild,v 1.6 2013/02/19 19:15:42 dirtyepic Exp $
+
+EAPI=5
 
 inherit eutils
 
@@ -13,11 +15,10 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-src_unpack() {
+src_prepare() {
-	unpack ${A}
-	cd "${S}"
 	epatch "${FILESDIR}"/${P}-as-needed.patch
 	epatch "${FILESDIR}"/${P}-gcc43.patch
+	epatch "${FILESDIR}"/${P}-gcc47.patch
 }
 
 src_install() {

app-benchmarks/bashmark/files/bashmark-0.6.2-gcc47.patch

@@ -0,0 +1,29 @@
+ https://bugs.gentoo.org/422577
+
+ error: 'usleep' was not declared in this scope
+
+ 
+ Benchmark.cpp | 1 +
+ main.cpp      | 1 +
+ 2 files changed, 2 insertions(+)
+
+--- a/Benchmark.cpp
++++ b/Benchmark.cpp
+@@ -18,6 +18,7 @@
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.               *
+  ***************************************************************************/
+ #include <cstring>
++#include <unistd.h>
+ #include "Benchmark.hpp"
+ #include "Stopwatch.hpp"
+ #include "Main.hpp"
+--- a/main.cpp
++++ b/main.cpp
+@@ -20,6 +20,7 @@
+ 
+ #include <sstream>
+ #include <cstring>
++#include <unistd.h>
+ using std::stringstream;
+ 
+ 

app-emulation/xen-pvgrub/files/xen-4.2.0-externals.patch

@@ -41,12 +41,11 @@ diff -ur xen-4.2.0.orig/stubdom/Makefile xen-4.2.0/stubdom/Makefile
  
  GNU_TARGET_ARCH:=$(XEN_TARGET_ARCH)
  ifeq ($(XEN_TARGET_ARCH),x86_32)
-@@ -95,12 +95,13 @@
+@@ -95,12 +95,12 @@
  ##############
  
  newlib-$(NEWLIB_VERSION).tar.gz:
 -	$(WGET) $(NEWLIB_URL)/$@
-+#	$(WGET) $(NEWLIB_URL)/$@
  
  newlib-$(NEWLIB_VERSION): newlib-$(NEWLIB_VERSION).tar.gz
  	tar xzf $<
@@ -56,7 +55,7 @@ diff -ur xen-4.2.0.orig/stubdom/Makefile xen-4.2.0/stubdom/Makefile
  	patch -d $@ -p1 < newlib-stdint-size_max-fix-from-1.17.0.patch
  	find $@ -type f | xargs perl -i.bak \
  		-pe 's/\b_(tzname|daylight|timezone)\b/$$1/g'
-@@ -112,7 +113,7 @@
+@@ -112,7 +112,7 @@
  $(NEWLIB_STAMPFILE): mk-headers-$(XEN_TARGET_ARCH) newlib-$(NEWLIB_VERSION)
  	mkdir -p newlib-$(XEN_TARGET_ARCH)
  	( cd newlib-$(XEN_TARGET_ARCH) && \
@@ -65,39 +64,44 @@ diff -ur xen-4.2.0.orig/stubdom/Makefile xen-4.2.0/stubdom/Makefile
  	  $(CROSS_MAKE) && \
  	  $(CROSS_MAKE) install )
  
-@@ -121,7 +122,7 @@
+@@ -121,7 +121,6 @@
  ############
  
  zlib-$(ZLIB_VERSION).tar.gz:
 -	$(WGET) $(ZLIB_URL)/$@
-+#	$(WGET) $(ZLIB_URL)/$@
  
  zlib-$(XEN_TARGET_ARCH): zlib-$(ZLIB_VERSION).tar.gz 
  	tar xzf $<
-@@ -141,7 +142,7 @@
+@@ -132,7 +132,7 @@
+ cross-zlib: $(ZLIB_STAMPFILE)
+ $(ZLIB_STAMPFILE): zlib-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE)
+ 	( cd $< && \
+-	  CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC=$(CC) ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \
++	  CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC="$(CC)" ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \
+ 	  $(CROSS_MAKE) libz.a && \
+ 	  $(CROSS_MAKE) install )
+ 
+@@ -141,7 +142,6 @@
  ##############
  
  pciutils-$(LIBPCI_VERSION).tar.bz2:
 -	$(WGET) $(LIBPCI_URL)/$@
-+#	$(WGET) $(LIBPCI_URL)/$@
  
  pciutils-$(XEN_TARGET_ARCH): pciutils-$(LIBPCI_VERSION).tar.bz2
  	tar xjf $<
-@@ -169,7 +170,7 @@
+@@ -169,7 +170,6 @@
  ######
  
  lwip-$(LWIP_VERSION).tar.gz:
 -	$(WGET) $(LWIP_URL)/$@
-+#	$(WGET) $(LWIP_URL)/$@
  
  lwip-$(XEN_TARGET_ARCH): lwip-$(LWIP_VERSION).tar.gz
  	tar xzf $<
-@@ -325,7 +326,7 @@
+@@ -325,7 +326,6 @@
  ######
  
  grub-$(GRUB_VERSION).tar.gz:
 -	$(WGET) $(GRUB_URL)/$@
-+#$(WGET) $(GRUB_URL)/$@
  
  grub-upstream: grub-$(GRUB_VERSION).tar.gz
  	tar xzf $<

app-emulation/xen-pvgrub/files/xen-4.2.1-CC.patch

@@ -1,12 +0,0 @@
-diff -ur xen-4.2.1.orig/stubdom/Makefile xen-4.2.1/stubdom/Makefile
---- stubdom/Makefile	2012-12-17 23:00:06.000000000 +0800
-+++ stubdom/Makefile	2013-02-10 16:01:01.883644638 +0800
-@@ -130,7 +130,7 @@
- cross-zlib: $(ZLIB_STAMPFILE)
- $(ZLIB_STAMPFILE): zlib-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE)
- 	( cd $< && \
--	  CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC=$(CC) ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \
-+	  CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC="$(CC)" ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \
- 	  $(MAKE) DESTDIR= libz.a && \
- 	  $(MAKE) DESTDIR= install )
- 

app-emulation/xen-pvgrub/files/xen-4.2.1-externals.patch

@@ -36,6 +36,15 @@ diff -ur xen-4.2.0.orig/stubdom/Makefile xen-4.2.0/stubdom/Makefile
  
  zlib-$(XEN_TARGET_ARCH): zlib-$(ZLIB_VERSION).tar.gz 
  	tar xzf $<
+@@ -130,7 +130,7 @@
+ cross-zlib: $(ZLIB_STAMPFILE)
+ $(ZLIB_STAMPFILE): zlib-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE)
+ 	( cd $< && \
+-	  CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC=$(CC) ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \
++	  CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC="$(CC)" ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \
+ 	  $(MAKE) DESTDIR= libz.a && \
+ 	  $(MAKE) DESTDIR= install )
+ 
 @@ -141,7 +142,7 @@
  ##############
  

app-emulation/xen-pvgrub/xen-pvgrub-4.2.0-r1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.0-r1.ebuild,v 1.4 2013/02/04 05:52:15 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.0-r1.ebuild,v 1.5 2013/02/19 19:18:02 idella4 Exp $
 
 EAPI=4
 PYTHON_DEPEND="2:2.6"
@@ -36,8 +36,28 @@ pkg_setup() {
 	python_pkg_setup
 }
 
-src_prepare() {
+retar-externals() {
+	# Purely to unclutter src_prepare
+	local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz zlib-1.2.3.tar.gz"
 
+	# epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
+	sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
+		-i "${WORKDIR}"/zlib-1.2.3/configure
+	sed -e 's:^AR=ar rc:AR=ar:' \
+		-e s':$(AR) $@:$(AR) rc $@:' \
+		-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
+	einfo "zlib Makefile edited"
+
+	cd "${WORKDIR}"
+	tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
+	tar czp grub-0.97 -f grub-0.97.tar.gz
+	tar czp lwip -f lwip-1.3.0.tar.gz
+	tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
+	mv $set "${S}"/stubdom/
+	einfo "tarballs moved to source"
+}
+
+src_prepare() {
 	# if the user *really* wants to use their own custom-cflags, let them
 	if use custom-cflags; then
 		einfo "User wants their own CFLAGS - removing defaults"
@@ -52,16 +72,7 @@ src_prepare() {
 	fi
 
 	#Substitute for internal downloading
-	cp $DISTDIR/zlib-1.2.3.tar.gz \
+	cp $DISTDIR/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not coped to stubdom"
-		$DISTDIR/pciutils-2.2.9.tar.bz2 \
-		$DISTDIR/lwip-1.3.0.tar.gz \
-		$DISTDIR/newlib-1.16.0.tar.gz \
-		$DISTDIR/grub-0.97.tar.gz \
-		./stubdom/ || die "files not coped to stubdom"
-	# Note: tip to patch grub gentoo style, for review soon. This is around 1/3.
-#	cp "${WORKDIR}"/patch/{00[3-6]_all_grub*,010_all_grub*,01[3-9]_all_grub*,0[6-7]0_all_grub*} \
-#		"${WORKDIR}"/patch/{110_all_grub*,300_all_grub*} \
-#		 stubdom/grub.patches/ || die
 	einfo "files copied to stubdom"
 
 	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
@@ -78,6 +89,10 @@ src_prepare() {
 
 	#Sec patch
 	epatch "${FILESDIR}"/${PN/-pvgrub/}-4-CVE-2012-4544-XSA-25.patch
+
+	#Substitute for internal downloading. pciutils copied only due to the only .bz2
+	cp $DISTDIR/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
+	retar-externals || die "re-tar procedure failed"
 }
 
 src_compile() {
@@ -88,16 +103,17 @@ src_compile() {
 
 	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
 
-	if use x86; then
-		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
-		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
 	# TODO; fix those -j1
+	if use x86; then
+		emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
 	elif use amd64; then
-		emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" \
+		emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
 		XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
 		if use multilib; then
 			multilib_toolchain_setup x86
-			emake -j1 XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+			emake -j1 CC="$(tc-getCC)" AR="$(tc-getAR)" \
+			XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
 		fi
 	fi
 }

app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r1.ebuild,v 1.3 2013/02/10 08:20:23 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r1.ebuild,v 1.4 2013/02/19 20:20:56 idella4 Exp $
 
 EAPI=4
 PYTHON_DEPEND="2:2.6"
@@ -36,8 +36,28 @@ pkg_setup() {
 	python_pkg_setup
 }
 
-src_prepare() {
+retar-externals() {
+	# Purely to unclutter src_prepare
+	local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz zlib-1.2.3.tar.gz"
 
+	# epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
+	sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
+		-i "${WORKDIR}"/zlib-1.2.3/configure
+	sed -e 's:^AR=ar rc:AR=ar:' \
+		-e s':$(AR) $@:$(AR) rc $@:' \
+		-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
+	einfo "zlib Makefile edited"
+
+	cd "${WORKDIR}"
+	tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
+	tar czp grub-0.97 -f grub-0.97.tar.gz
+	tar czp lwip -f lwip-1.3.0.tar.gz
+	tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
+	mv $set "${S}"/stubdom/
+	einfo "tarballs moved to source"
+}
+
+src_prepare() {
 	# if the user *really* wants to use their own custom-cflags, let them
 	if use custom-cflags; then
 		einfo "User wants their own CFLAGS - removing defaults"
@@ -51,15 +71,6 @@ src_prepare() {
 			-i {} \;
 	fi
 
-	#Substitute for internal downloading
-	cp $DISTDIR/zlib-1.2.3.tar.gz \
-		$DISTDIR/pciutils-2.2.9.tar.bz2 \
-		$DISTDIR/lwip-1.3.0.tar.gz \
-		$DISTDIR/newlib-1.16.0.tar.gz \
-		$DISTDIR/grub-0.97.tar.gz \
-		./stubdom/ || die "files not coped to stubdom"
-	einfo "files copied to stubdom"
-
 	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
 	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
 
@@ -75,8 +86,9 @@ src_prepare() {
 	#Sec patch
 	epatch "${FILESDIR}"/${PN/-pvgrub/}-4-CVE-2012-6075-XSA-41.patch
 
-	# wrt Bug #455196
+	#Substitute for internal downloading. pciutils copied only due to the only .bz2
-	epatch "${FILESDIR}"/${P/-pvgrub/}-CC.patch
+	cp $DISTDIR/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
+	retar-externals || die "re-tar procedure failed"
 }
 
 src_compile() {
@@ -91,11 +103,12 @@ src_compile() {
 		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
 		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
 	elif use amd64; then
-		emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
 		XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
 		if use multilib; then
 			multilib_toolchain_setup x86
-			emake CC="$(tc-getCC)" XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+			emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
+			XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
 		fi
 	fi
 }

app-i18n/man-pages-ja/man-pages-ja-20111020.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ja/man-pages-ja-20111020.ebuild,v 1.8 2013/02/19 02:34:45 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ja/man-pages-ja-20111020.ebuild,v 1.9 2013/02/19 16:34:47 ago Exp $
 
 EAPI="3"
 GENTOO_MAN_P="portage-${PN}-20060415"
@@ -12,7 +12,7 @@ SRC_URI="http://linuxjm.sourceforge.jp/${P}.tar.gz
 
 LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""
 
 RDEPEND="virtual/man"

app-misc/uptimed/uptimed-0.3.17-r1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/uptimed-0.3.17-r1.ebuild,v 1.6 2013/02/18 20:59:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/uptimed-0.3.17-r1.ebuild,v 1.7 2013/02/19 16:33:12 ago Exp $
 
 inherit autotools user
 
@@ -10,7 +10,7 @@ SRC_URI="http://podgorny.cz/uptimed/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 pkg_setup() {

app-office/lyx/lyx-2.0.5.1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.0.5.1.ebuild,v 1.5 2013/02/18 20:55:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.0.5.1.ebuild,v 1.6 2013/02/19 16:30:22 ago Exp $
 
 EAPI=3
 
@@ -20,7 +20,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x64-macos ~x86-macos"
 IUSE="cups debug nls +latex xetex luatex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant"
 
 LANGS="ar ca cs de da el en es eu fi fr gl he hu ia id it ja nb nn pl pt ro ru sk sr sv tr uk zh_CN zh_TW"

app-office/openerp/Manifest

@@ -1,2 +1,3 @@
 DIST openerp-6.1-1.tar.gz 73310629 SHA256 a89016d706f1693833590d2ce5cf7768fb3586213661014adad5ed16cdc77cd7 SHA512 0cf407fda4d7ce414b548310018609381157e656069b5224bb05ae6dbf7d534b9acbbb5be561ec1f9a26786ec6fc9b917fb78faff3c67340916f663ccb5297cf WHIRLPOOL 384ae795df9d23c07a6e06c0c468cb6d9af0c2625648bda5d895271f2d1e07d00b81e7da3d4255f709d5eed299166c65b29ec335a71307ea1a3f6775b590befe
 DIST openerp-7.0-20130118-002240.tar.gz 58331061 SHA256 adaa96dca146f55efa97f6549ca0916e7ec6087fe85de107650cd2a946bba2c1 SHA512 5b28c7ab7a195a32dc77c761cf9ed28ddf1647db4add613be656e3d71f64e16715c421907fccfff2a0348e5b7999ec6474ba6289c22011a362f383df3ee22563 WHIRLPOOL 7dfc3aab7e168a81e60cc61e2757b77d9c7a32be96107d20b83e3cad4b122a7c843962e036bbbc4b18aa01a1d1fc313eab6aeaaa41dd876661b44ea03cb1ebca
+DIST openerp-7.0-20130219-002614.tar.gz 60420142 SHA256 e4408348259fa8bf86909035a4f86417671f09ac6c4a9ec50c4a55a69e5a3674 SHA512 15cb43d1a698da751a0109c256dd8875b7a064541ee7550c66d70c03143aa6486eb39b05966b1ef77e4cf9b0d333101e84fb8508411a7acf9b0a44a0f8897f3a WHIRLPOOL c4a5840fa9d76840f0da645e4a107296750d32161f21d81b22ba579b35172d2abe2fb24126e2c69de18e0b13a4555a82e938291728f6c370451a150a218fbbeb

app-office/openerp/files/openerp-2

@@ -0,0 +1,23 @@
+#!/sbin/runscript
+
+# Additional options that are passed to the daemon.
+DAEMON_OPTS="-c ${CONFIGFILE}"
+
+depend() {
+	after postgresql
+}
+
+start() {
+	checkpath -q -d -m 0755 -o openerp:openerp /run/openerp
+	ebegin "Starting openerp server"
+	start-stop-daemon --start --quiet --pidfile "${PIDFILE}" --exec /usr/bin/openerp-server \
+		--make-pidfile --user "${USER}" --background -- ${DAEMON_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping openerp server"
+	start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" --signal 9
+	rm -f "${PIDFILE}"
+	eend $?
+}

app-office/openerp/files/openerp-confd-2

@@ -0,0 +1,3 @@
+USER="openerp"
+CONFIGFILE="/etc/openerp/openerp.cfg"
+PIDFILE="/run/openerp/openerp.pid"

app-office/openerp/openerp-7.0.20130219-r1.ebuild

@@ -0,0 +1,105 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/openerp/openerp-7.0.20130219-r1.ebuild,v 1.1 2013/02/19 09:45:53 patrick Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit eutils distutils user
+
+DESCRIPTION="Open Source ERP & CRM"
+HOMEPAGE="http://www.openerp.com/"
+#yes, this is definitely a horrible URI
+MY_PV=${PV/7.0./7.0-}
+FNAME="${PN}-${MY_PV}-002614"
+SRC_URI="http://nightly.openerp.com/7.0/nightly/src/${FNAME}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="+postgres ldap ssl"
+
+CDEPEND="postgres? ( dev-db/postgresql-server )
+	dev-python/psutil
+	dev-python/docutils
+	dev-python/lxml
+	dev-python/psycopg:2
+	dev-python/pychart
+	dev-python/reportlab
+	media-gfx/pydot
+	dev-python/vobject
+	dev-python/mako
+	dev-python/pyyaml
+	dev-python/Babel
+	dev-python/gdata
+	ldap? ( dev-python/python-ldap )
+	dev-python/python-openid
+	dev-python/werkzeug
+	dev-python/xlwt
+	dev-python/feedparser
+	dev-python/python-dateutil
+	dev-python/pywebdav
+	ssl? ( dev-python/pyopenssl )
+	dev-python/vatnumber
+	dev-python/zsi
+	dev-python/mock
+	dev-python/unittest2"
+
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+OPENERP_USER="openerp"
+OPENERP_GROUP="openerp"
+
+S="${WORKDIR}/${FNAME}"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_install() {
+	distutils_src_install
+
+	doinitd "${FILESDIR}/${PN}-2"
+	newconfd "${FILESDIR}/openerp-confd-2" "${PN}"
+	keepdir /var/log/openerp
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openerp.logrotate openerp || die
+	dodir /etc/openerp
+	insinto /etc/openerp
+	newins "${FILESDIR}"/openerp.cfg openerp.cfg || die
+}
+
+pkg_preinst() {
+	enewgroup ${OPENERP_GROUP}
+	enewuser ${OPENERP_USER} -1 -1 -1 ${OPENERP_GROUP}
+
+	fowners ${OPENERP_USER}:${OPENERP_GROUP} /var/log/openerp
+	fowners -R ${OPENERP_USER}:${OPENERP_GROUP} "$(python_get_sitedir)/${PN}/addons/"
+
+	use postgres || sed -i '6,8d' "${D}/etc/init.d/openerp" || die "sed failed"
+}
+
+pkg_postinst() {
+	chown ${OPENERP_USER}:${OPENERP_GROUP} /var/log/openerp
+	chown -R ${OPENERP_USER}:${OPENERP_GROUP} "$(python_get_sitedir)/${PN}/addons/"
+
+	elog "In order to setup the initial database, run:"
+	elog " emerge --config =${CATEGORY}/${PF}"
+	elog "Be sure the database is started before"
+}
+
+psqlquery() {
+	psql -q -At -U postgres -d template1 -c "$@"
+}
+
+pkg_config() {
+	einfo "In the following, the 'postgres' user will be used."
+	if ! psqlquery "SELECT usename FROM pg_user WHERE usename = '${OPENERP_USER}'" | grep -q ${OPENERP_USER}; then
+		ebegin "Creating database user ${OPENERP_USER}"
+		createuser --username=postgres --createdb --no-adduser ${OPENERP_USER}
+		eend $? || die "Failed to create database user"
+	fi
+}

app-office/openerp/openerp-7.0.20130219.ebuild

@@ -0,0 +1,108 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/openerp/openerp-7.0.20130219.ebuild,v 1.1 2013/02/19 09:31:41 patrick Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit eutils distutils
+
+DESCRIPTION="Open Source ERP & CRM"
+HOMEPAGE="http://www.openerp.com/"
+#yes, this is definitely a horrible URI
+MY_PV=${PV/7.0./7.0-}
+FNAME="${PN}-${MY_PV}-002614"
+SRC_URI="http://nightly.openerp.com/7.0/nightly/src/${FNAME}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="+postgres ldap ssl"
+
+CDEPEND="postgres? ( dev-db/postgresql-server )
+	dev-python/psutil
+	dev-python/docutils
+	dev-python/lxml
+	dev-python/psycopg:2
+	dev-python/pychart
+	dev-python/reportlab
+	media-gfx/pydot
+	dev-python/vobject
+	dev-python/mako
+	dev-python/pyyaml
+	dev-python/Babel
+	dev-python/gdata
+	ldap? ( dev-python/python-ldap )
+	dev-python/python-openid
+	dev-python/werkzeug
+	dev-python/xlwt
+	dev-python/feedparser
+	dev-python/python-dateutil
+	dev-python/pywebdav
+	ssl? ( dev-python/pyopenssl )
+	dev-python/vatnumber
+	dev-python/zsi
+	dev-python/mock
+	dev-python/unittest2"
+
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+OPENERP_USER="openerp"
+OPENERP_GROUP="openerp"
+
+S="${WORKDIR}/${FNAME}"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_install() {
+	distutils_src_install
+
+	doinitd "${FILESDIR}/${PN}"
+	newconfd "${FILESDIR}/openerp-confd" "${PN}"
+	keepdir /var/run/openerp
+	keepdir /var/log/openerp
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openerp.logrotate openerp || die
+	dodir /etc/openerp
+	insinto /etc/openerp
+	newins "${FILESDIR}"/openerp.cfg openerp.cfg || die
+}
+
+pkg_preinst() {
+	enewgroup ${OPENERP_GROUP}
+	enewuser ${OPENERP_USER} -1 -1 -1 ${OPENERP_GROUP}
+
+	fowners ${OPENERP_USER}:${OPENERP_GROUP} /var/run/openerp
+	fowners ${OPENERP_USER}:${OPENERP_GROUP} /var/log/openerp
+	fowners -R ${OPENERP_USER}:${OPENERP_GROUP} "$(python_get_sitedir)/${PN}/addons/"
+
+	use postgres || sed -i '6,8d' "${D}/etc/init.d/openerp" || die "sed failed"
+}
+
+pkg_postinst() {
+	chown ${OPENERP_USER}:${OPENERP_GROUP} /var/run/openerp
+	chown ${OPENERP_USER}:${OPENERP_GROUP} /var/log/openerp
+	chown -R ${OPENERP_USER}:${OPENERP_GROUP} "$(python_get_sitedir)/${PN}/addons/"
+
+	elog "In order to setup the initial database, run:"
+	elog " emerge --config =${CATEGORY}/${PF}"
+	elog "Be sure the database is started before"
+}
+
+psqlquery() {
+	psql -q -At -U postgres -d template1 -c "$@"
+}
+
+pkg_config() {
+	einfo "In the following, the 'postgres' user will be used."
+	if ! psqlquery "SELECT usename FROM pg_user WHERE usename = '${OPENERP_USER}'" | grep -q ${OPENERP_USER}; then
+		ebegin "Creating database user ${OPENERP_USER}"
+		createuser --username=postgres --createdb --no-adduser ${OPENERP_USER}
+		eend $? || die "Failed to create database user"
+	fi
+}

app-text/migemo/migemo-0.40-r5.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/migemo/migemo-0.40-r5.ebuild,v 1.9 2013/02/15 22:40:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/migemo/migemo-0.40-r5.ebuild,v 1.10 2013/02/19 16:34:21 ago Exp $
 
 EAPI=4
 # ruby19, jruby: dev-ruby/ruby-romkan not work
@@ -14,7 +14,7 @@ SRC_URI="http://0xcc.net/migemo/stable/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="emacs"
 
 ruby_add_bdepend "dev-ruby/ruby-romkan dev-ruby/bsearch"

app-text/tesseract/tesseract-3.02-r1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-3.02-r1.ebuild,v 1.5 2013/02/18 21:02:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-3.02-r1.ebuild,v 1.6 2013/02/19 16:35:37 ago Exp $
 
 EAPI=4
 
@@ -65,7 +65,7 @@ SRC_URI="${URI_PREFIX}/${P}.${MY_MINOR}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 x86"
 
 IUSE="doc examples jpeg png tiff -webp +scrollview static-libs linguas_ar linguas_bg linguas_ca linguas_chr linguas_cs linguas_de linguas_da linguas_el linguas_es linguas_fi linguas_fr linguas_he linguas_hi linguas_hu linguas_id linguas_it linguas_jp linguas_ko linguas_lt linguas_lv linguas_nl linguas_no linguas_pl linguas_pt linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tl linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW osd"
 

app-text/texlive-core/Manifest

@@ -3,6 +3,7 @@ DIST texlive-20120701-source.tar.xz 131904044 SHA256 9666617d5dac3e82578e696835c
 DIST texlive-core-patches-33.tar.xz 3844 SHA256 ca71e16aabf0a85f5bc514ca30fa959693ba63ff1d0c0e5fa36076a4c5e8ad3a SHA512 cc9d8eeb11b8200bea3589bd390998b523713995efc07353f0ac244915c972a460e462812aba23db4c88c9f37576aefa75c6968d4455c1562df4cd721df84990 WHIRLPOOL a6dfd45e28a6f3dc75dc720bef899d3d1fa93a73f3d92054132a9b0b44ba103fa3388ddb704397b1dea55c5df113e44deb45c8a549ce86d52804f4ea95011c24
 DIST texlive-core-patches-35.tar.xz 4604 SHA256 4be23c4ffd31d2e835a4c0a449522c0a4a7aba8e0064acf41bd0e0f22e8dfd33 SHA512 72afc8321ed96e28abeb53b475ed2a954750f94bf353ca8911c3ec8d59c4133a18e8dc4e9f9475538ce46be7a293883ee8276b7c8fd9d0525c11284da3c0f099 WHIRLPOOL 2fb549686e954b53cd63eed757fc5dfbb603579648abda40431c008e9a227886158bcc087f25c16632722dbfbd9f936370bda5eef48d48696130ce4fb6ebec48
 DIST texlive-core-patches-36.tar.xz 2200 SHA256 409d48ef65032ec3c335be09ba8eaa5e746a02ed88cc13c0b0b0a5de4007652e SHA512 2e09516ec005a76d0c1fad8edf5930dcd57c77983ec2d8f4b0a020f5a95799797190d95e0e0bfdb1ce378df2337de64967d814cc807630666200ade71c2bf571 WHIRLPOOL d6dc2cf107b128ddb334a28b55da1440cfd249f69a7bbbc3860a1e57a3d22cd2e2c12f429c481f953590528955b491c8fa0b0eb14298ff7913d04b7e33570a84
+DIST texlive-core-patches-37.tar.xz 2488 SHA256 ad4a1577ff35e1d6a11f53799495aada4ee757a26e63652de68c4689f552edf9 SHA512 ef1a4ed6d29a1bbe7544a0b8bf671843c7518cd8e2bb0a3f423cc6b589b45ea6111dc996fce0ae43e6326d3342b46b3e079461dc9643dd9dd2eee322ceb6fd23 WHIRLPOOL 949f09e2f9a3b4d05c5fc2bf486f566441243eb972bb75846db7da977e08a090209d0a12fb3b90c4cdbc586a791c49759eccabc917f3cdad8272b9d23931317c
 DIST texlive-core-upstream-patches-1.tar.xz 4316 SHA256 0a3eccc79ad608ea543e2ce04adcca0dbe968dbaebaa43014854f51d609659a5 SHA512 a559700fffbe2985b3eade84a9f8f539ba624ab5f92f2127769180073c6f05a9444c11599fef879d0f91aaa8ecbe76f6d4b4ebda2fae83da48074dc888eaa4b6 WHIRLPOOL f62e16fa7ab92c4f7800b48c82383d916f6450f08f6c39765672590e6c52088e252da398855d3b70a3c857a2f975d7b782ae045be083c4124fe84920dd0a4658
 DIST texlive-module-a2ping-2011.tar.xz 31132 SHA256 72f4cd7b89965d8dedc726dca0fa04c82b882b595630ab2ad7457ad9cae2b193 SHA512 2eedf304738264162ba49675a67ceb9661aa224540ef6ec5a3f1fbc41a43c3618f8c2c098ae47dd7dd15376121764fde4242e633fbf9a8fb4f58ae20d62bf131 WHIRLPOOL e8e0a3dd3a6e87b83680fa00a0fa873fd93e2886f643a0bc18d545eec6f5155c8378698ae9f194832828bfc6e5cdca772d91a2afc2d70ebf9041a4737c31576a
 DIST texlive-module-a2ping-2012.tar.xz 31124 SHA256 37b769091af7c7c9f95c52f92cbc26b22f72dc0de5ecb0e9e37cf1482438605a SHA512 b4f74f037d1113d204d3f0e34c8418e354ae002ab09e8c326458bf7c9c9a9bfa3211317e03bb7e69d7f2e83a2b22851410287477176dab5288dacf5a9ec4a8a6 WHIRLPOOL 5e76ab0e818c3e20d8211c35230a9ee1084f1de830c988b1ed9707036481582540aa97c6ee9e31b0dd1ee2a8346dc3b81197d8c0489563122bba2dd7dffe5fe1

app-text/texlive-core/texlive-core-2012-r1.ebuild

@@ -0,0 +1,346 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2012-r1.ebuild,v 1.1 2013/02/19 15:13:33 aballier Exp $
+
+EAPI=3
+
+#TL_UPSTREAM_PATCHLEVEL="1"
+PATCHLEVEL="37"
+TL_SOURCE_VERSION=20120701
+
+inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="http://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c TeX"
+
+SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
+
+# Fetch patches
+SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
+#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
+
+TL_CORE_BINEXTRA_MODULES="
+	a2ping asymptote bibtex8 bundledoc ctanify ctanupload ctie cweb de-macro dtl
+	dvi2tty dviasm dvicopy dvidvi dviljk dvipng dvipos findhyph fragmaster
+	hyphenex installfont lacheck latex2man latexfileversion latexpand
+	listings-ext match_parens mkjobtexmf patgen pdfcrop pdftools pkfix
+	pkfix-helper purifyeps seetexk sty2dtx synctex texcount texdef texdiff
+	texdirflatten texdoc texliveonfly texloganalyser texware tie tpic2pdftex
+	typeoutfileinfo web	collection-binextra
+	"
+TL_CORE_BINEXTRA_DOC_MODULES="
+	a2ping.doc asymptote.doc bibtex8.doc bundledoc.doc ctanify.doc
+	ctanupload.doc ctie.doc cweb.doc de-macro.doc dvi2tty.doc dvicopy.doc
+	dviljk.doc dvipng.doc dvipos.doc findhyph.doc fragmaster.doc installfont.doc
+	latex2man.doc latexfileversion.doc latexpand.doc listings-ext.doc
+	match_parens.doc mkjobtexmf.doc patgen.doc pdfcrop.doc pdftools.doc
+	pkfix.doc pkfix-helper.doc purifyeps.doc sty2dtx.doc synctex.doc
+	texcount.doc texdef.doc texdiff.doc texdirflatten.doc texdoc.doc
+	texliveonfly.doc texloganalyser.doc texware.doc tie.doc tpic2pdftex.doc
+	typeoutfileinfo web.doc
+	"
+TL_CORE_BINEXTRA_SRC_MODULES="hyphenex.source listings-ext.source mkjobtexmf.source texdef.source"
+
+TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
+
+for i in ${TL_CORE_EXTRA_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+SRC_URI="${SRC_URI} source? ( "
+for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="cjk X doc source tk xetex"
+
+MODULAR_X_DEPEND="X? (
+				x11-libs/libXmu
+				x11-libs/libXp
+				x11-libs/libXpm
+				x11-libs/libICE
+				x11-libs/libSM
+				x11-libs/libXaw
+				x11-libs/libXfont
+	)"
+
+COMMON_DEPEND="${MODULAR_X_DEPEND}
+	!app-text/ptex
+	!app-text/tetex
+	!<app-text/texlive-2007
+	!app-text/xetex
+	!<dev-texlive/texlive-basic-2009
+	!<dev-texlive/texlive-metapost-2011
+	!app-text/dvibook
+	sys-libs/zlib
+	>=media-libs/libpng-1.2.43-r2:0
+	>=app-text/poppler-0.12.3-r3
+	xetex? (
+		app-text/teckit
+		media-libs/fontconfig
+		media-libs/freetype:2
+		media-libs/silgraphite
+	)
+	>=dev-libs/kpathsea-6.1.0_p20120701
+	cjk? ( >=dev-libs/ptexenc-1.2.0_p20120701 )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	sys-apps/ed
+	sys-devel/flex
+	app-arch/xz-utils"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ps2pkm-1.5_p20120701
+	>=app-text/dvipsk-5.992_p20120701
+	>=dev-tex/bibtexu-3.71_p20120701
+	virtual/perl-Getopt-Long
+	xetex? ( >=app-text/xdvipdfmx-0.7.8_p20120701 )
+	tk? ( dev-perl/perl-tk )"
+
+# texdoc needs luatex.
+PDEPEND=">=dev-tex/luatex-0.70"
+
+S="${WORKDIR}/${P}_build"
+B="${WORKDIR}/${MY_PV}"
+
+src_prepare() {
+	mkdir -p "${S}" || die "failed to create build dir"
+	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
+
+	cd "${B}"
+	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+	elibtoolize
+}
+
+src_configure() {
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Bug #265232 and bug #414271:
+	if use hppa; then
+		append-cppflags "-DU_IS_BIG_ENDIAN=1"
+	fi
+
+	# Too many regexps use A-Z a-z constructs, what causes problems with locales
+	# that don't have the same alphabetical order than ascii. Bug #242430
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+	tc-export CC CXX AR
+	ECONF_SOURCE="${B}" \
+		econf -C \
+		--bindir=/usr/bin \
+		--datadir="${S}" \
+		--with-system-freetype2 \
+		--with-freetype2-include=/usr/include \
+		--with-system-zlib \
+		--with-system-libpng \
+		--with-system-xpdf \
+		--with-system-poppler \
+		--with-system-teckit \
+		--with-teckit-includes=/usr/include/teckit \
+		--with-system-graphite \
+		--with-system-kpathsea \
+		--with-system-icu \
+		--with-system-ptexenc \
+		--without-texinfo \
+		--disable-dialog \
+		--disable-multiplatform \
+		--enable-epsfwin \
+		--enable-mftalkwin \
+		--enable-regiswin \
+		--enable-tektronixwin \
+		--enable-unitermwin \
+		--with-ps=gs \
+		--disable-psutils \
+		--disable-t1utils \
+		--enable-ipc \
+		--disable-biber \
+		--disable-bibtexu \
+		--disable-dvipng \
+		--disable-dvipsk \
+		--disable-dvipdfmx \
+		--disable-chktex \
+		--disable-lcdf-typetools \
+		--disable-pdfopen \
+		--disable-ps2eps \
+		--disable-ps2pkm \
+		--disable-detex \
+		--disable-ttf2pk \
+		--disable-tex4htk \
+		--disable-cjkutils \
+		--disable-xdvik \
+		--disable-xindy \
+		--disable-luatex \
+		--disable-dvi2tty \
+		--disable-dvisvgm \
+		--disable-vlna \
+		--disable-xdvipdfmx \
+		--enable-shared \
+		--disable-native-texlive-build \
+		--disable-largefile \
+		$(use_enable xetex) \
+		$(use_enable cjk ptex) \
+		$(use_enable cjk eptex) \
+		$(use_enable cjk uptex) \
+		$(use_enable cjk euptex) \
+		$(use_enable cjk mendexk) \
+		$(use_enable cjk makejvf) \
+		$(use_with X x)
+}
+
+src_compile() {
+	emake SHELL=/bin/sh texmf=${TEXMF_PATH:-/usr/share/texmf} || die "emake failed"
+
+	cd "${B}"
+	# Mimic updmap --syncwithtrees to enable only fonts installed
+	# Code copied from updmap script
+	for i in `egrep '^(Mixed)?Map' "texmf/web2c/updmap.cfg" | sed 's@.* @@'`; do
+		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
+	done > "${T}/updmap_update"
+	{
+		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+	} > "${T}/updmap_update2"
+	sed -f "${T}/updmap_update2" "texmf/web2c/updmap.cfg" >	"${T}/updmap_update3"\
+		&& cat "${T}/updmap_update3" > "texmf/web2c/updmap.cfg"
+}
+
+src_test() {
+	ewarn "Due to modular layout of texlive ebuilds,"
+	ewarn "It would not make much sense to use tests into the ebuild"
+	ewarn "And tests would fail anyway"
+	ewarn "Alternatively you can try to compile any tex file"
+	ewarn "Tex warnings should be considered as errors and reported"
+	ewarn "You can also run fmtutil-sys --all and check for errors/warnings there"
+}
+
+src_install() {
+	dodir ${TEXMF_PATH:-/usr/share/texmf}/web2c
+	emake DESTDIR="${D}" texmf="${D}${TEXMF_PATH:-/usr/share/texmf}" run_texlinks="true" run_mktexlsr="true" install || die "install failed"
+
+	cd "${B}"
+	dodir /usr/share # just in case
+	cp -pR texmf{,-dist} "${D}/usr/share/" || die "failed to install texmf trees"
+	cp -pR "${WORKDIR}"/tlpkg "${D}/usr/share/" || die "failed to install tlpkg files"
+
+	newsbin "${FILESDIR}/texmf-update2010" texmf-update
+
+	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
+	# exist. Instead, it is called mf, so we symlink it to please everything.
+	use X || dosym mf /usr/bin/mf-nowin
+
+	docinto texk
+	cd "${B}/texk"
+	dodoc ChangeLog README || die "failed to install texk docs"
+
+	docinto dviljk
+	cd "${B}/texk/dviljk"
+	dodoc ChangeLog README NEWS || die "failed to install dviljk docs"
+
+	docinto makeindexk
+	cd "${B}/texk/makeindexk"
+	dodoc ChangeLog NOTES README || die "failed to install makeindexk docs"
+
+	docinto web2c
+	cd "${B}/texk/web2c"
+	dodoc ChangeLog NEWS PROJECTS README || die "failed to install web2c docs"
+
+	use doc || rm -rf "${D}/usr/share/texmf/doc"
+	use doc || rm -rf "${D}/usr/share/texmf-dist/doc"
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${D}/etc/env.d/98texlive"
+	# populate /etc/texmf
+	keepdir /etc/texmf/web2c
+
+	# take care of updmap.cfg and language.d files
+	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
+
+	mv "${D}${TEXMF_PATH}/web2c/updmap.cfg"	"${D}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
+
+	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+	# by texmf-update
+	rm -f "${D}${TEXMF_PATH}/web2c/fmtutil.cnf"
+	# Remove bundled and invalid updmap.cfg
+	rm -f "${D}/usr/share/texmf-dist/web2c/updmap.cfg"
+
+	texlive-common_handle_config_files
+
+	keepdir /usr/share/texmf-site
+
+	# the virtex symlink is not installed
+	# The links has to be relative, since the targets
+	# is not present at this stage and MacOS doesn't
+	# like non-existing targets
+	dosym tex /usr/bin/virtex
+	dosym pdftex /usr/bin/pdfvirtex
+
+	# Remove texdoctk if we don't want it
+	if ! use tk ; then
+		rm -f "${D}/usr/bin/texdoctk" "${D}/usr/share/texmf/scripts/tetex/texdoctk.pl" "${D}/usr/share/man/man1/texdoctk.1" || die "failed to remove texdoc tk!"
+	fi
+
+	# Rename mpost to leave room for mplib
+	mv "${D}/usr/bin/mpost" "${D}/usr/bin/mpost-${P}"
+	dosym "mpost-${P}" /usr/bin/mpost
+
+	# Ditto for pdftex
+	mv "${D}/usr/bin/pdftex" "${D}/usr/bin/pdftex-${P}"
+	dosym "pdftex-${P}" /usr/bin/pdftex
+}
+
+pkg_preinst() {
+	# Remove stray files to keep the upgrade path sane
+	if has_version =app-text/texlive-core-2007* ; then
+		for i in pdftex/pdflatex aleph/aleph aleph/lamed omega/lambda omega/omega xetex/xetex xetex/xelatex tex/tex pdftex/etex pdftex/pdftex pdftex/pdfetex ; do
+			for j in log fmt ; do
+				local file="${ROOT}/var/lib/texmf/web2c/${i}.${j}"
+				if [ -f "${file}" ] ; then
+					elog "Removing stray ${file} from TeXLive 2007 install."
+					rm -f "${file}"
+				fi
+			done
+		done
+		for j in base log ; do
+			local file="${ROOT}/var/lib/texmf/web2c/metafont/mf.${j}"
+			if [ -f "${file}" ] ; then
+				elog "Removing stray ${file} from TeXLive 2007 install."
+				rm -f "${file}"
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	etexmf-update
+
+	elog
+	elog "If you have configuration files in /etc/texmf to merge,"
+	elog "please update them and run /usr/sbin/texmf-update."
+	elog
+	ewarn "If you are migrating from an older TeX distribution"
+	ewarn "Please make sure you have read:"
+	ewarn "http://www.gentoo.org/proj/en/tex/texlive-migration-guide.xml"
+	ewarn "in order to avoid possible problems"
+	elog
+	elog "TeXLive has been split in various ebuilds. If you are missing a"
+	elog "package to process your TeX documents, you can install"
+	elog "dev-tex/texmfind to easily search for them."
+	elog
+}

dev-db/phpmyadmin/Manifest

@@ -1,3 +1,4 @@
 DIST phpMyAdmin-3.4.9-all-languages.tar.bz2 4666051 SHA256 5251dc5c5c691c02dd4683692f282c72e8360f453dbb3edfa5f53d9461299f86 SHA512 c006da6606de685403cc253b72dac5c251e0f2613e2ebe68bfaed46a4e408415f00f4f243108e36ffdc5be3f0474a7445dbc1af8f11a37057bd137601d8fe55c WHIRLPOOL f60b893be099b4da799bb3c3eee586e6c7158f7df757eb7f0397b44a762524e12b72f4b76fb92235cc766a60ac01de91a4d066ea6d0a3eb67abb45150d246475
 DIST phpMyAdmin-3.5.2.2-all-languages.tar.xz 3654332 SHA256 d02de081c522d3026f4a8418538f7ff05adf280afa404851a5f7f4ef895b4a7d SHA512 d505f56785e143c76953d37cdac449159c80d6f4035c67bddb957e02cdd1029d067522824344e72a1073022d00922cf7252eae4435d23357b892a9d4377340a6 WHIRLPOOL abd1b0edfcb8667810ce438c16af95fd809240ad1cd02f66e90de9ce70da8e107c4e2d61f974df56f73807dd39edf26fc6dc67f118b32a6df1817c4dad1d1c4c
 DIST phpMyAdmin-3.5.3-all-languages.tar.xz 3663564 SHA256 4d2573d2cad3abc67997361ee3d5bf05cf2c3c6b8fb1b2c611030d32ec0db826 SHA512 a64fffebf4bd2e95a5c6fe2cc305e7e5352a2a6f87eeb0de64c8e1fb1c9146ec0c81960dc7d7b024d79b39144fd9289650773cad5f1639a9741fa58b5deed63f WHIRLPOOL d53d0582b1615690ec0a9dd0d29dac638d194e1cf0aa7c083ae9677881fba36da25a635021ad0a6347c4db79b28049b3c37edbe261b258a360c275c78e5c378f
+DIST phpMyAdmin-3.5.7-all-languages.tar.xz 3753896 SHA256 265ed1a298886512059bbc060bc8027a6113b08e3dcab6f4af6354192c4d88ae SHA512 42c4fb69a6fd0fc6320ee71fabd1d3da04bddf22ed10a3e5c9b9fc2298ede0a66f7df43c7e50fc8b0905ddb0d80395f9b0adb5ed06348c0819850ff45396c618 WHIRLPOOL 91831bf3451af338d134a3993347bf152f01a99e97bc93acf160d33256d87d9c30fb6e5c951ebcf17a668b27847c1b988cced00dd08c6379d460efbe9a817195

dev-db/phpmyadmin/phpmyadmin-3.5.7.ebuild

@@ -0,0 +1,61 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.5.7.ebuild,v 1.1 2013/02/19 18:23:41 blueness Exp $
+
+EAPI="4"
+
+inherit eutils webapp depend.php
+
+MY_PV=${PV/_/-}
+MY_P="phpMyAdmin-${MY_PV}-all-languages"
+
+DESCRIPTION="Web-based administration for MySQL database in PHP"
+HOMEPAGE="http://www.phpmyadmin.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="setup"
+
+RDEPEND="
+	dev-lang/php[crypt,ctype,filter,json,session,unicode]
+	|| (
+		dev-lang/php[mysqli]
+		dev-lang/php[mysql]
+	)
+"
+
+need_httpd_cgi
+need_php_httpd
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc Documentation.txt README RELEASE-DATE-${MY_PV} ChangeLog || die
+	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
+
+	if ! use setup; then
+		rm -rf setup || die "Cannot remove setup utility"
+		elog "The phpMyAdmin setup utility has been removed."
+		elog "It is a regular target of various exploits. If you need it, set USE=setup."
+	else
+		elog "You should consider disabling the setup USE flag"
+		elog "to exclude the setup utility if you don't use it."
+		elog "It regularly is the target of various exploits."
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
+	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
+	webapp_src_install
+}

dev-db/xbase/xbase-3.1.2.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/xbase/xbase-3.1.2.ebuild,v 1.8 2012/08/15 11:00:48 blueness Exp ${PN}/${PN}-2.0.0-r1.ebuild,v 1.6 2012/06/29 14:42:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xbase/xbase-3.1.2.ebuild,v 1.9 2013/02/19 18:02:59 chithanh Exp ${PN}/${PN}-2.0.0-r1.ebuild,v 1.6 2012/06/29 14:42:09 jer Exp $
 
 EAPI=4
 AUTOTOOLS_AUTORECONF=no
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/xdb/${PN}64-${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd"
 IUSE="doc static-libs"
 
 S="${WORKDIR}"/${PN}64-${PV}

dev-lang/R/R-2.10.1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.10.1.ebuild,v 1.18 2012/10/07 13:35:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.10.1.ebuild,v 1.19 2013/02/19 12:31:48 jlec Exp $
 
 EAPI=2
 
@@ -88,7 +88,7 @@ src_prepare() {
 	sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/modules/X11/rbitmap.c || die
 
 	use lapack && \
-		export LAPACK_LIBS="$(pkg-config --libs lapack)"
+		export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
 
 	if use X; then
 		export R_BROWSER="$(type -p xdg-open)"
@@ -108,7 +108,7 @@ src_configure() {
 		--with-system-zlib \
 		--with-system-bzlib \
 		--with-system-pcre \
-		--with-blas="$(pkg-config --libs blas)" \
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
 		--docdir=/usr/share/doc/${PF} \
 		rdocdir=/usr/share/doc/${PF} \
 		$(use_enable nls) \

dev-lang/R/R-2.15.2.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.15.2.ebuild,v 1.1 2012/10/26 21:44:05 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.15.2.ebuild,v 1.2 2013/02/19 12:31:48 jlec Exp $
 
 EAPI=4
 
@@ -96,7 +96,7 @@ src_prepare() {
 		$(grep -Flr ../manual/ doc) || die "sed for HTML links failed"
 
 	use lapack && \
-		export LAPACK_LIBS="$(pkg-config --libs lapack)"
+		export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
 
 	if use X; then
 		export R_BROWSER="$(type -p xdg-open)"
@@ -133,7 +133,7 @@ src_configure() {
 		--with-system-bzlib \
 		--with-system-pcre \
 		--with-system-xz \
-		--with-blas="$(pkg-config --libs blas)" \
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable nls) \

dev-lang/R/metadata.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
+  <herd>sci-mathematics</herd>
-<maintainer>
+  <maintainer>
-  <email>calchan@gentoo.org</email>
+    <email>calchan@gentoo.org</email>
-  <name>Denis Dupeyron</name>
+    <name>Denis Dupeyron</name>
-</maintainer>
+  </maintainer>
-<longdescription lang="en">
+  <longdescription lang="en">
   R is GNU S, a system for statistical computation and graphics. It
   consists of a language plus a run-time environment with graphics, a
   debugger, access to certain system functions, and the ability to run

dev-libs/leveldb/leveldb-1.9.0-r1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/leveldb/leveldb-1.9.0-r1.ebuild,v 1.1 2013/01/31 03:33:43 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/leveldb/leveldb-1.9.0-r1.ebuild,v 1.2 2013/02/19 12:41:49 blueness Exp $
 EAPI=4
 
 PYTHON_DEPEND="2:2.6"
@@ -12,7 +12,7 @@ HOMEPAGE="http://code.google.com/p/leveldb/"
 SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~arm ~x86"
 
 IUSE=""
 

dev-libs/libev/metadata.xml

@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+  <maintainer>
-<email>maintainer-needed@gentoo.org</email>
+    <email>dennis.yxun@gmail.com</email>
-</maintainer>
+    <name>Dennis (dlan) Lan</name>
+    <description>maintainer, assign bugs</description>
+  </maintainer>
+  <maintainer>
+    <email>tomka@gentoo.org</email>
+    <name>Thomas Kahle</name>
+    <description>proxy maintainer, CC on bugs</description>
+  </maintainer>
 </pkgmetadata>
 

dev-libs/libevocosm/files/libevocosm-3.3.1-gcc47.patch

@@ -0,0 +1,20 @@
+ https://bugs.gentoo.org/421607
+
+ evocommon.h:468:29: error: 'usleep' was not declared in this scope
+ 
+ libevocosm/evocommon.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/libevocosm/evocommon.h
++++ b/libevocosm/evocommon.h
+@@ -54,6 +54,10 @@
+ #undef min
+ #endif
+ 
++#if !defined(_MSC_VER)
++#include "unistd.h"
++#endif
++
+ namespace libevocosm
+ {
+     //! The random number generator used by Evocosm

dev-libs/libevocosm/libevocosm-3.3.1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevocosm/libevocosm-3.3.1.ebuild,v 1.1 2009/04/25 22:25:49 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevocosm/libevocosm-3.3.1.ebuild,v 1.2 2013/02/19 17:05:43 dirtyepic Exp $
 
 inherit eutils
 
@@ -17,6 +17,12 @@ RDEPEND="dev-libs/libcoyotl
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc47.patch
+}
+
 src_compile() {
 	ac_cv_prog_HAVE_DOXYGEN="false" econf || die "econf failed"
 	emake || die "emake failed"

dev-libs/mpc/mpc-1.0.1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpc/mpc-1.0.1.ebuild,v 1.6 2013/02/18 22:45:57 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpc/mpc-1.0.1.ebuild,v 1.7 2013/02/19 16:32:49 ago Exp $
 
 # Unconditional dependency of gcc.  Keep this set to 0.
 EAPI="0"
@@ -13,7 +13,7 @@ SRC_URI="http://www.multiprecision.org/mpc/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=">=dev-libs/gmp-4.3.2

dev-libs/wayland/wayland-1.0.4.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/wayland/wayland-1.0.4.ebuild,v 1.4 2013/02/17 22:36:44 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/wayland/wayland-1.0.4.ebuild,v 1.5 2013/02/19 18:09:24 mattst88 Exp $
 
 EAPI=4
 
@@ -38,7 +38,8 @@ src_prepare() {
 }
 
 src_configure() {
-	myconf="$(use_enable static-libs static)"
+	myconf="$(use_enable static-libs static)
+		--disable-documentation"
 	if tc-is-cross-compiler ; then
 		myconf+=" --disable-scanner"
 	fi

dev-libs/zthread/files/zthread-2.3.2-automake-r2.patch

@@ -0,0 +1,75 @@
+From 577b34b74b7a73650d906f371044bfaed6e8b74c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@dev-zero.ch>
+Date: Tue, 19 Feb 2013 10:13:12 +0100
+Subject: [PATCH] Use standard automake rules rather than hand coding the
+ install rules and append linker flags to LDFLAGS and not LDADD, otherwise
+ --as-needed gets ignored (and possibly others).
+
+---
+ Makefile.am     | 21 +++++----------------
+ configure.ac    |  1 -
+ src/Makefile.am |  2 --
+ 3 files changed, 5 insertions(+), 19 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 6c092cf..2d7bddf 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -24,24 +24,13 @@ LICENSE \
+ MIT.TXT \
+ depcomp
+ 
++bin_SCRIPTS = share/zthread-config
+ 
+-## install the config script
+-install-exec-hook:
+-	$(mkinstalldirs) $(bindir)
+-	$(INSTALL_PROGRAM) $(top_srcdir)/share/zthread-config $(bindir)
++aclocaldir = $(datadir)/aclocal
++aclocal_DATA = share/zthread.m4 share/pthread.m4
+ 
+-## install the config script & m4 macros
+-install-data-hook:
+-	$(mkinstalldirs) $(datadir)/aclocal
+-	$(INSTALL_DATA) $(top_srcdir)/share/zthread.m4 $(datadir)/aclocal
+-	$(INSTALL_DATA) $(top_srcdir)/share/pthread.m4 $(datadir)/aclocal
+-	mkdir -p $(DESTDIR)$(includedir)/zthread
+-	cp -pR $(top_srcdir)/include/zthread $(DESTDIR)$(includedir)/
+-
+-## uninstall the config script & m4 macros
+-uninstall-local:
+-	-rm -rf $(datadir)/aclocal/pthread.m4
+-	-rm -rf $(datadir)/aclocal/zthread.m4
++zincludedir = $(includedir)/zthread
++zinclude_HEADERS = include/zthread/*.h
+ 
+ distclean-local: 
+ 	-rm -rf $(top_srcdir)/$(PACKAGE)-$(VERSION).tar.gz
+diff --git a/configure.ac b/configure.ac
+index 866041b..5d32a58 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -226,7 +226,6 @@ AC_TRY_LINK( [#include <windows.h>], [_beginthreadex((void*)0, 0, 0, (void*)0, 0
+ 
+ dnl Configure the final compiler & linker options
+ COMPILER_OPTIONS="$COMPILER_OPTIONS $CXXFLAGS"
+-LINKER_OPTIONS="$LINKER_OPTIONS $LDFLAGS"
+ 
+ dnl Configured flags for compiling ZThreads
+ AC_SUBST(LINKER_OPTIONS)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 04404d6..35dc764 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -21,8 +21,6 @@ AM_CXXFLAGS = @COMPILER_OPTIONS@ @EXTRA_COMPILER_OPTIONS@
+ INCLUDES = -I$(top_srcdir)/include
+ SUBDIRS=.
+ 
+-libdir=$(prefix)/lib
+-
+ lib_LTLIBRARIES = libZThread.la
+ 
+ libZThread_la_LIBADD=@LINKER_OPTIONS@ @EXTRA_LINKER_OPTIONS@
+-- 
+1.8.1.1
+

dev-libs/zthread/zthread-2.3.2-r3.ebuild

@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/zthread/zthread-2.3.2-r3.ebuild,v 1.1 2013/02/19 10:13:10 dev-zero Exp $
+
+EAPI="5"
+
+inherit eutils autotools
+
+MY_P="ZThread-${PV}"
+
+DESCRIPTION="platform-independent multi-threading and synchronization library for C++"
+HOMEPAGE="http://zthread.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zthread/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="debug doc kernel_linux static-libs"
+
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	rm -f include/zthread/{.Barrier.h.swp,Barrier.h.orig} || die
+	epatch \
+		"${FILESDIR}"/${P}-no-fpermissive.diff \
+		"${FILESDIR}"/${P}-m4-quote.patch \
+		"${FILESDIR}"/${P}-automake-r2.patch \
+		"${FILESDIR}"/${P}-gcc47.patch
+
+	AT_M4DIR="share" eautoreconf
+}
+
+src_configure() {
+	local myconf
+	# Autoconf does not support --disable-debug properly.
+	use debug && myconf="--enable-debug"
+
+	econf \
+		$(use_enable kernel_linux atomic-linux) \
+		$(use_enable static-libs static) \
+		${myconf}
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		doxygen doc/zthread.doxygen || die
+		sed -i -e 's|href="html/|href="|' doc/documentation.html || die
+		cp doc/documentation.html doc/html/index.html || die
+		cp doc/{zthread.css,bugs.js} doc/html/ || die
+	fi
+}
+
+src_install() {
+	default
+
+	use doc && dohtml doc/html/*
+
+	prune_libtool_files
+}

dev-perl/DBI/DBI-1.623.0.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBI/DBI-1.623.0.ebuild,v 1.5 2013/02/18 21:04:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBI/DBI-1.623.0.ebuild,v 1.7 2013/02/19 16:36:41 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module eutils
 DESCRIPTION="The Perl DBI Module"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="

dev-perl/IO-Socket-SSL/IO-Socket-SSL-1.840.0.ebuild

@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-Socket-SSL/IO-Socket-SSL-1.840.0.ebuild,v 1.1 2013/02/19 16:30:47 tove Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=SULLR
+MODULE_VERSION=1.84
+inherit perl-module
+
+DESCRIPTION="Nearly transparent SSL encapsulation for IO::Socket::INET"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="idn"
+
+DEPEND="
+	>=dev-perl/Net-SSLeay-1.330.0
+	virtual/perl-Scalar-List-Utils
+	idn? (
+		|| (
+			>=dev-perl/URI-1.50
+			dev-perl/Net-LibIDN
+		)
+	)"
+RDEPEND="${DEPEND}"
+
+SRC_TEST="do"

dev-perl/IO-Socket-SSL/Manifest

@@ -2,3 +2,4 @@ DIST IO-Socket-SSL-1.44.tar.gz 69342 SHA256 8fd6603b4187660553d995f5cfa1a7423201
 DIST IO-Socket-SSL-1.81.tar.gz 76744 SHA256 3ee96f16ca4c4e1ce1bbd9a9e32bfeea3c1c635753caee86146afc7dec95e7ed SHA512 2322dee831e84174ee12ea116485f99235057cdb34dbbbd74dad77dc45438887ddbf68e2763ba388abb9da134743f8e9e290ce338433f4188011cf9c17e45fe0 WHIRLPOOL a9dc7457a3152bc3b9e2ff42e73cad74fd1eef08548ce52dd327b3287fecccd9b6636b0ef9aa8ab680876f3bf0d4cbe868771bc7462f98fb37dfcf72a299ed21
 DIST IO-Socket-SSL-1.82.tar.gz 77330 SHA256 625446f135f295c6b36d76fa1476e976731e14b2f733fbb11628499a12f04789 SHA512 b430b8b27ff05ade9629cb0ad496d7fb9021ea45e015a26fb012842e6ccc43c936d4a2b1ef84c41466392c94980dfc5b16639c7012a882458e87e60851820334 WHIRLPOOL 58bf27e349f4a5fe57e1747066374d6d4272f781a3f8d047497ca5de59cd388cb4790e36ed626be95b145e0905b8f587a4b50685bf18d0b838ec1bd60eb250d8
 DIST IO-Socket-SSL-1.83.tar.gz 79292 SHA256 40c450e299d1a3552c3816b81a9f05d54c887c8176005786aa29240a71735e0d SHA512 cbe778e8ffc98a95652e340c64cad57cfd32a7a625f6aac1ac69966846a625d5c8c3d14d447e3e17d954057ac017cfa74f241eaae21820627cf6c0c570093b8d WHIRLPOOL 47b0ee02d611a4ef0435521f1c5432674ea864b75ec5b398c881826688111481a71be1a19e16dec77d2b6ff733a72b28307f3be79089d2cf7c62fdb1ed1b3d71
+DIST IO-Socket-SSL-1.84.tar.gz 80035 SHA256 31aa31998e968eaff60554c036870eb1a007bca686666fca1fb3bc19cb3d528c SHA512 bf8120b9e10ccfcb7f9061b627dbd3e1426e11e4f9f4b0d3fe678fd599d04126704e7464fe35f18c685d026d2945ee77901df5da694e8dafaa554c36506a5cd6 WHIRLPOOL 9412ab10506491964f0c7c24a0adfb1783bf082c372fe230b2bea9cb919476d0f5b90423ccd9e32476657e0ae1051b2aef3d503459ad04e534e3e4a9a99dc150

dev-perl/MooX-Types-MooseLike/Manifest

@@ -1,2 +1,3 @@
 DIST MooX-Types-MooseLike-0.16.tar.gz 12114 SHA256 753ee74d6567ab265e646fee8aa4791641aaf8d5342a9689f53e7a302f16a727 SHA512 36172d249f81025a4aa679706c75c1e0eceb4d915fbf4ec0390c0e2b2d18b6dfb148acdc0968f129230e8e5af169a6342cc6bc66c67e1d0a0f357715ee94dda1 WHIRLPOOL 1895b75c143ccd7d005d939b655a3909031b5929f6c87cc549000e3b0770e64ed7166a52322f0a00bdfccdea2a31dcf4d034a832c87b5b5181f05ff2f90aa45a
 DIST MooX-Types-MooseLike-0.18.tar.gz 13239 SHA256 96abd7ad5b30393caf7cbd5d82cc1f1da859c728bb5b0d22d74fb818a8448f34 SHA512 338881cec8b15fd57263e2536faa58839715c8fc74b153d82582e619c3a0dcc410b88b8ed72e77f92101709bd7cc6dc6b83cc3dd1cf35f6ccce9f0577d407ca8 WHIRLPOOL 49a00ea5a86f67d48abb0b33acdb5e6f14647e922c42fdd9c24cd9561c88752329d378f54298a4af89cc7a799e52b44355b97240303404c8476543eae72ee349
+DIST MooX-Types-MooseLike-0.21.tar.gz 15730 SHA256 2b599d74d36f835ecc074d390f209bef3f7828f4fd4100936147363df40f27d5 SHA512 97ea40c29e6642442f3323d4bc6302ee7abf451561379ca5851dc51299e14e4e1ad41b4a5aab168419d83d5afffa1bad580aff27895953f515cd9783f322fb4f WHIRLPOOL 44a14f82444e69d1975dc0fa69289eb5becf5b1f3255c30bf1ba8d1fe1eb341f531a456a6c184563f7fbeedf28d57d618085b0bb74137d399154f76aa8055962

dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.210.0.ebuild

@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.210.0.ebuild,v 1.1 2013/02/19 16:17:19 tove Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=MATEU
+MODULE_VERSION=0.21
+inherit perl-module
+
+DESCRIPTION="Some Moosish types and a type builder"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/Module-Runtime-0.12.0
+	>=dev-perl/Moo-0.91.10
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-perl/Set-Object
+		>=dev-perl/Test-Fatal-0.3.0
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
+
+SRC_TEST=do

dev-perl/MooseX-Types-Path-Tiny/Manifest

@@ -1 +1,2 @@
 DIST MooseX-Types-Path-Tiny-0.001.tar.gz 11863 SHA256 fb49c65290beec84afe559d4e855352ae513a8838d12a38368cad60f842eeae3 SHA512 11786287242a583327efa8355db59a520e38542c6cd820b93666300da7197bfcd5edb08ca25f66a46816c9af7679f4d461fd538c7726e54adeaabf602d492c9d WHIRLPOOL 2c9b6bbccffae630bf2eedee8fc7d6ac7d69c0dc9f2cbe160dfd47f9c4c3b56e9dd864e150cdabd73ed35dc9a41d615bdb5170cf986be2d8bd3e82fc441205b7
+DIST MooseX-Types-Path-Tiny-0.002.tar.gz 12703 SHA256 656939c6a2abcbbeab6a28dff4f488e31004c558f2b4daa72c3925a31a9454bb SHA512 371dcbf7a77187a242f9a020e5bfdb4e9919f05bc975f29bfefbda63653e293f206c9e285f4191a5f94c56ca35a9f9c46409d29db8d445f80cc9cadcea2387d9 WHIRLPOOL ba6a72e7c1c30d9b6091a51333b2572f4f62355ce80cee4bd27a60d362a79026ce42656f5e8666847af9606d5117d3f2078f1b6e02f3424310351a612beb8123

dev-perl/MooseX-Types-Path-Tiny/MooseX-Types-Path-Tiny-0.2.0.ebuild

@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MooseX-Types-Path-Tiny/MooseX-Types-Path-Tiny-0.2.0.ebuild,v 1.1 2013/02/19 16:11:48 tove Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=DAGOLDEN
+MODULE_VERSION=0.002
+inherit perl-module
+
+DESCRIPTION="Path::Tiny types and coercions for Moose"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/Path-Tiny
+	>=dev-perl/Moose-2.0.0
+	dev-perl/MooseX-Types
+	dev-perl/MooseX-Types-Stringlike
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? (
+		dev-perl/File-pushd
+		dev-perl/Test-Fatal
+		>=virtual/perl-File-Temp-0.180.0
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
+
+SRC_TEST=do

dev-perl/Net-OpenSSH/Manifest

@@ -1,2 +1,3 @@
 DIST Net-OpenSSH-0.57.tar.gz 50654 SHA256 8c667f430572ebc9c54490165c3ca3530703a054116702fda8693f115681211b SHA512 c201ce4b4418657c0a035a397af7c1ab141e8afc8e9cc0628b475543a21f1910937a961578cc206285d8684a2671b6a04fc878d76cc4286a6bcc8081e7b14d7b WHIRLPOOL b1783beaf2834308930a673ff55f123bef6d81989ebe4b99f377a1badfdab6364b94f999c783cc1dfa9e188e0dad8adda1f082104a6cb1c70be2bb58d8ee7f93
 DIST Net-OpenSSH-0.59.tar.gz 55353 SHA256 0373c0a06f3254077d02b17eb82a67f7e1189f37024223264363a1b617d83a65 SHA512 093e34057028a44310acc332041af6252263a6bc52d9a2a39d0a1dfd5a4810a24ac6ab65baef38dadffe5976ba00530a8a43a20a1510b51e6c5516b4dd95fdba WHIRLPOOL 00133ab0ef4e01d02c37e48cd5c7d5b5aa3ff27d8eebdb0e9a53d8c7224f2eecca0d9609d252f39d7e7b7064fa6cc9db6b956c409555f14f81e91a0351798380
+DIST Net-OpenSSH-0.60.tar.gz 55413 SHA256 c3034cfa8577d314364c9ff2d3ed8a5f5ec7b47d4c134818ab72cc6dce2a29af SHA512 6780ac0a73bdb923bb2915a535ae490a7c198f6667fc0885766fbb50835fc2c457bc8dea8fa2be7488c610621a1b9b1955d5712544e3f8948f54e97d012c6aaa WHIRLPOOL 813fe52d58e52eaba71175452a655e151f3b80ec6707a0308c575e7dfec0af118afa156ec266cc38e636b94ea02e40c322df236bfac8f826e7f221ae5b04e3ab

dev-perl/Net-OpenSSH/Net-OpenSSH-0.600.0.ebuild

@@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-OpenSSH/Net-OpenSSH-0.600.0.ebuild,v 1.1 2013/02/19 16:02:08 tove Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=SALVA
+MODULE_VERSION=0.60
+inherit perl-module
+
+DESCRIPTION="Net::OpenSSH, Perl wrapper for OpenSSH secure shell client"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+IUSE="sftp"
+
+RDEPEND="
+	dev-perl/IO-Tty
+	sftp? (
+		dev-perl/Net-SFTP-Foreign
+	)
+"
+DEPEND="${RDEPEND}"
+
+#SRC_TEST=do

dev-perl/Net-SSH2/Manifest

@@ -1,2 +1,3 @@
 DIST Net-SSH2-0.40.tar.gz 106713 SHA256 96191f3a982e5be8bf5923330ec3027314bff20fa5f02ac5f2aafdd23df90ae5 SHA512 720dc9417748c646642870d64e671d0ccb3b9a5c2f2500b07606e5bb9550f04897bb958668cef647d14bb30621d6c2120928554549967e68509bbe0ef199a942 WHIRLPOOL d88589e3fe9af48c050e6dd15982a94b75f597e6c22e3ad87082cde441873f1697daa6dd57fc4ec8a92154f22193be15279ab4bac2493c2a3789e9c97eceb21b
 DIST Net-SSH2-0.46.tar.gz 112190 SHA256 814f662140956d8b39cae277c1341d17b6be4494283cefbce70d234c8082dfe0 SHA512 36ffed2c96660c3a009b3ad42c944450cd710426953fb909d1e8989dcdb3d0d7807361c672d4904bff33cd1a206479149e7f2dc09c16b806a9ff2a6355e41ed8 WHIRLPOOL 9854701fb497306566bee86c5850fd7fc0466ce639c5ac794f63502b02dc093af60699625e57605660a0fc0a310b808ad3d313b72802a33b771482bbcdcbdd9f
+DIST Net-SSH2-0.47.tar.gz 114097 SHA256 b3f6c01dd98f347a7fa73fb470fb5abeebbe0820349b9ead8b622f02fae0ad4a SHA512 164a1c5752015cd405e733eaab24d8f0399fdc615a1e2bafb3c98f200f6feaa9eee72c59cdb829d373a34c78e2f4581156d96a2a2bf0bb45f402902d58fd6135 WHIRLPOOL 894dac5dd3414ea4b055f8ddf57cab0b4373dd76884a3e7627f6fe71bd431f36e779fab7553d02cd5c3bc90624056e53e30661982cfedb71513bc318cf83ac2f

dev-perl/Net-SSH2/Net-SSH2-0.470.0.ebuild

@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-SSH2/Net-SSH2-0.470.0.ebuild,v 1.1 2013/02/19 16:00:19 tove Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=RKITOVER
+MODULE_VERSION=0.47
+inherit perl-module
+
+DESCRIPTION="Net::SSH2 - Support for the SSH 2 protocol via libssh2."
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gcrypt"
+
+RDEPEND="
+	sys-libs/zlib
+	net-libs/libssh2
+	!gcrypt? (
+		dev-libs/openssl
+	)
+	gcrypt? (
+		dev-libs/libgcrypt
+	)
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.50
+"
+
+SRC_TEST="do"
+
+src_configure() {
+	use gcrypt && myconf=gcrypt
+	perl-module_src_configure
+}

dev-perl/Net-SSH2/metadata.xml

@@ -2,6 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>perl</herd>
+  <use>
+    <flag name="gcrypt">Use libgcrypt instead of openssl</flag>
+  </use>
   <upstream>
     <remote-id type="cpan">Net-SSH2</remote-id>
     <remote-id type="cpan-module">Net::SSH2</remote-id>

dev-perl/TimeDate/Manifest

@@ -1 +1,2 @@
 DIST TimeDate-1.20.tar.gz 29590 SHA256 f8251a791f6692c69952b4af697c01df93981ad1ab133279d034656a03cd3755 SHA512 dc5d938ebf9ce4a5380d38b93a5be1d0421ea3a99d506bb5c09de2f2259bde7fa6cb6a000c88d09eb519ebaaa940b5729b9f24a2cd7dcce29cd3592875c82dea WHIRLPOOL ce79f7ec7f6bed47819df0e70c92b93798e17f4c3d01d348eda93427c899fe5a6a973baad42e5ad62579d54d1e6fa14df50eddf2b3833a44d92e44ead7cb8580
+DIST TimeDate-2.30.tar.gz 31109 SHA256 75bd254871cb5853a6aa0403ac0be270cdd75c9d1b6639f18ecba63c15298e86 SHA512 c6aa7d57fbe82260c7455f74f6dfda55f7c93d7a75914bafb9d09ebfb83b5f57f6bc1e332ab0764d7688d857eb022b0f5e92cf5b685d809c63cdfa93a8d2c221 WHIRLPOOL b50cde9b6636683754e212b8d83a547d5f99ae4b9d9fad36ebe60e9a9fe4366a6848103d33137cd85dde1ba871745b56bd94234e1e68466d317949fdf2328ada

dev-perl/TimeDate/TimeDate-2.300.0.ebuild

@@ -0,0 +1,17 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/TimeDate/TimeDate-2.300.0.ebuild,v 1.1 2013/02/19 15:41:15 tove Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=GBARR
+MODULE_VERSION=2.30
+inherit perl-module
+
+DESCRIPTION="A Date/Time Parsing Perl Module"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+SRC_TEST=do

dev-perl/TimeDate/metadata.xml

@@ -11,6 +11,7 @@
     <remote-id type="cpan-module">Date::Language::Amharic</remote-id>
     <remote-id type="cpan-module">Date::Language::Austrian</remote-id>
     <remote-id type="cpan-module">Date::Language::Brazilian</remote-id>
+    <remote-id type="cpan-module">Date::Language::Bulgarian</remote-id>
     <remote-id type="cpan-module">Date::Language::Chinese</remote-id>
     <remote-id type="cpan-module">Date::Language::Chinese_GB</remote-id>
     <remote-id type="cpan-module">Date::Language::Czech</remote-id>

dev-perl/XML-DT/XML-DT-0.620.0.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-DT/XML-DT-0.620.0.ebuild,v 1.2 2013/02/18 20:33:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-DT/XML-DT-0.620.0.ebuild,v 1.4 2013/02/19 16:36:15 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="A perl XML down translate module"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ppc ~x86"
+KEYWORDS="alpha ~amd64 hppa ppc ~x86"
 IUSE="test"
 
 RDEPEND="

dev-perl/gtk2-fu/gtk2-fu-0.110.0-r1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/gtk2-fu/gtk2-fu-0.110.0-r1.ebuild,v 1.5 2013/02/18 20:57:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/gtk2-fu/gtk2-fu-0.110.0-r1.ebuild,v 1.7 2013/02/19 16:31:47 ago Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI+="
 http://dev.gentoo.org/~tove/distfiles/${CATEGORY}/${MY_PN:-${PN}}/${MY_PN:-${PN}}-${PV}-patch.tar.bz2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 x86"
+KEYWORDS="alpha amd64 hppa ppc ppc64 x86"
 IUSE="test"
 
 RDEPEND="dev-perl/gtk2-perl"

dev-python/numpy/Manifest

@@ -2,3 +2,7 @@ DIST numpy-1.6.0-html.zip 9242421 SHA256 555cfd5899ee54d129169fb70e418c2593d5377
 DIST numpy-1.6.0-ref.pdf 6106335 SHA256 cbeea9b1395e0576bbd256c5de11886c63321d434785c6777df7bdd50109ba9f SHA512 ff00333beae3d886cf96cd72687f68dd0f226c88c390824c3f0cfc18a50ea6b8d6e12035eda76e10a97d58e7bc9b48b6dff7e0447b6045cc4e40fff3225721ec WHIRLPOOL 3ccb0373f0ef0f22a0a1ad967cecc1c7fd8e663d9c4437cfd31bf42a23d121619d89bcfcbb25091609cfdc20f13b551f6d904b1d13b4da6104dfca094734ca19
 DIST numpy-1.6.0-user.pdf 474664 SHA256 d8d51913cb494228f69c5f16d659b8539cbd04c6e584fde72c00c382e86eea8f SHA512 6af1275e46cb0df11d2654f191871504683bb3b5752e45ec6cca92d302babc4e66bd35dc037fdb48c8aad2a8a6414ba239b8874cc590720150c94a832a8cce74 WHIRLPOOL da8fc8a074d8b5a01f566f3c844d668c7652dba03cc618d9d2c162b72fec864a580e05cd940417dd8fcef4bb2c8340bf8e17d166fb582909ff69098332844e91
 DIST numpy-1.6.2.tar.gz 2585329 SHA256 0b83d96ab79711b548470b7aeee1272c4ba8fcbba6586a67116b566a21ed16c6 SHA512 a92667b92ecf2942bef4715189facccb8726866dfd90522b8e4b1e65991d1e6448ab06962e40a7cb83adaebf37eb48cf61417e7ba367da425a2ad7b3302a60a5 WHIRLPOOL 7aa9d7a1ca69bb9a6ce1cc5930997a5b9b8c9573ba261812706c9f12ea9ed42c1fd948552e25049d7b606fd3fda27c6a3ea72e2ffe43fb16e999b0b62515b32d
+DIST numpy-1.7.0.tar.gz 2832457 SHA256 f4fa70b7edbab65ee6432eb63743f5489f1919c614632b20b2fb45aa7e682ac6 SHA512 a485daa556f6c76003de1dbb3e42b3daeee0a320c69c81b31a7d2ebbc2cf8ab8e96c214a4758e5e7bf814295dc1d6aa563092b714db7e719678d8462135861a8 WHIRLPOOL f670aa76673336ac2dcd213112ba2b4c54c6efe56d71343b8f19b7df04cea07671c3bb8247d72b12940d2ae83e9d91c045f687681322b708a9f259b637234e0a
+DIST numpy-html-1.7.0.zip 10831068 SHA256 469a8e6f21544204b6e338eb88519c04ed22a6b5e3f3b098f0cccf0ffe08c8b1 SHA512 b68b44102aa4d2996334adce3ddda090f373a4c5bd006daa9cf59f092445d5b768121afe4d10855058d6489ff52bf70a7645b7ff79555de709417f13568bfaac WHIRLPOOL f696258ebb7c78bdfee948bd9119d868b77048c73c805230f0f40d71be891cbfa5bccf21e714cc4389daf1792abb6aeaf3ae18e91889332b9aafa79c865f34a7
+DIST numpy-ref-1.7.0.pdf 5161456 SHA256 0581709ef96441953404bc1369d70117b83359aff94f44779b960bed30a156d7 SHA512 9a80ab2b412aa34ce019454c438b129d1e94b2264306f3644e97c87f4f7b54317ee626274d865c04891005ca8e8f5e3773681a7af590dd89d64df9462d0f0004 WHIRLPOOL 0f10177fd24cfe93555f28440ddc3567a787f2cef336b2f2774b038caafb6807f738d1f3ee3d5a5f26883c567e4017f8365069f25ec7cba5234c537602351729
+DIST numpy-user-1.7.0.pdf 404104 SHA256 0c8dc1d53cc057a66139039dbaaf65499687cf64e72af5852eb96d9c3cd3ab18 SHA512 20cec2f9742c0604d9db9f2e74e7c8fda1782c081c27437a07c2d8cb7f36be6df3e50e5ddf8cc10a076905b2be2b6927af15d0574e3bee2961cf14aaca55ad78 WHIRLPOOL 792c4ccd155ddbb82d8a93959c218bcc001532a6b3c42626bef64c96eb865601f5ee328d1a1627f1656e0b22085c89ede39d7f94183841e1069d183589542ffe

dev-python/numpy/files/numpy-1.7.0-atlas.patch

@@ -0,0 +1,17 @@
+--- numpy/distutils/system_info.py.orig	2013-02-19 10:15:10.183780548 -0800
++++ numpy/distutils/system_info.py	2013-02-19 10:17:03.565350549 -0800
+@@ -282,13 +282,7 @@
+       1 - display warning message
+       2 - raise error
+     """
+-    cl = {'atlas': atlas_info,  # use lapack_opt or blas_opt instead
+-          'atlas_threads': atlas_threads_info,                # ditto
+-          'atlas_blas': atlas_blas_info,
+-          'atlas_blas_threads': atlas_blas_threads_info,
+-          'lapack_atlas': lapack_atlas_info,  # use lapack_opt instead
+-          'lapack_atlas_threads': lapack_atlas_threads_info,  # ditto
+-          'mkl': mkl_info,
++    cl = {'mkl': mkl_info,
+           'lapack_mkl': lapack_mkl_info,      # use lapack_opt instead
+           'blas_mkl': blas_mkl_info,          # use blas_opt instead
+           'x11': x11_info,

dev-python/numpy/metadata.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+<herd>sci</herd>
-  <herd>python</herd>
+<herd>python</herd>
-  <longdescription lang="en">
+<longdescription lang="en">
   NumPy is a general-purpose array-processing Python package designed to
   efficiently manipulate large multi-dimensional arrays of arbitrary
   records without sacrificing too much speed for small multi-dimensional
@@ -11,4 +11,7 @@
   basic linear algebra and random number generation.
   It is the successor of Numeric and numarray.
 </longdescription>
+<upstream>
+  <remote-id type="pypi">numpy</remote-id>
+</upstream>
 </pkgmetadata>

dev-python/numpy/numpy-1.6.2-r2.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2-r2.ebuild,v 1.3 2013/02/18 00:54:23 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2-r2.ebuild,v 1.4 2013/02/19 15:34:06 jlec Exp $
 
 EAPI=5
 
@@ -45,17 +45,17 @@ src_unpack() {
 }
 
 pc_incdir() {
-	pkg-config --cflags-only-I $@ | \
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
 		sed -e 's/^-I//' -e 's/[ ]*-I/:/g'
 }
 
 pc_libdir() {
-	pkg-config --libs-only-L $@ | \
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
 		sed -e 's/^-L//' -e 's/[ ]*-L/:/g'
 }
 
 pc_libs() {
-	pkg-config --libs-only-l $@ | \
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
 		sed -e 's/[ ]-l*\(pthread\|m\)[ ]*//g' \
 		-e 's/^-l//' -e 's/[ ]*-l/,/g'
 }
@@ -64,7 +64,7 @@ python_prepare_all() {
 	epatch "${FILESDIR}"/${PN}-1.6.1-atlas.patch
 
 	if use lapack; then
-		append-ldflags "$(pkg-config --libs-only-other cblas lapack)"
+		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
 		local libdir="${EPREFIX}"/usr/$(get_libdir)
 		# make sure _dotblas.so gets built
 		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die

dev-python/numpy/numpy-1.6.2.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild,v 1.14 2012/12/29 17:45:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild,v 1.15 2013/02/19 15:34:06 jlec Exp $
 
 EAPI=4
 
@@ -73,17 +73,17 @@ src_unpack() {
 }
 
 pc_incdir() {
-	pkg-config --cflags-only-I $@ | \
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
 		sed -e 's/^-I//' -e 's/[ ]*-I/:/g'
 }
 
 pc_libdir() {
-	pkg-config --libs-only-L $@ | \
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
 		sed -e 's/^-L//' -e 's/[ ]*-L/:/g'
 }
 
 pc_libs() {
-	pkg-config --libs-only-l $@ | \
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
 		sed -e 's/[ ]-l*\(pthread\|m\)[ ]*//g' \
 		-e 's/^-l//' -e 's/[ ]*-l/,/g'
 }
@@ -92,7 +92,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.6.1-atlas.patch
 
 	if use lapack; then
-		append-ldflags "$(pkg-config --libs-only-other cblas lapack)"
+		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
 		local libdir="${EPREFIX}"/usr/$(get_libdir)
 		# make sure _dotblas.so gets built
 		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die

dev-python/numpy/numpy-1.7.0.ebuild

@@ -0,0 +1,145 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.7.0.ebuild,v 1.1 2013/02/19 20:17:28 bicatali Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator
+
+DOC_PV="${PV}"
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="http://numpy.scipy.org/"
+SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz
+	doc? (
+		http://docs.scipy.org/doc/${P}/${PN}-html-${DOC_PV}.zip
+		http://docs.scipy.org/doc/${P}/${PN}-ref-${DOC_PV}.pdf
+		http://docs.scipy.org/doc/${P}/${PN}-user-${DOC_PV}.pdf
+	)"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	lapack? ( virtual/cblas virtual/lapack )"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )
+	lapack? ( virtual/pkgconfig )
+	test? ( >=dev-python/nose-0.10[${PYTHON_USEDEP}] )"
+
+# Uses distutils.command.config.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)[ ]*//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g'
+}
+
+python_prepare_all() {
+	epatch "${FILESDIR}"/${PN}-1.7.0-atlas.patch
+
+	if use lapack; then
+		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		# make sure _dotblas.so gets built
+		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
+		cat >> site.cfg <<-EOF
+			[blas]
+			include_dirs = $(pc_incdir cblas)
+			library_dirs = $(pc_libdir cblas blas):${libdir}
+			blas_libs = $(pc_libs cblas blas)
+			[lapack]
+			library_dirs = $(pc_libdir lapack):${libdir}
+			lapack_libs = $(pc_libs lapack)
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	if use lapack; then
+		append-fflags -fPIC
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile ${NUMPY_FCONFIG}
+}
+
+python_test() {
+	distutils_install_for_testing ${NUMPY_FCONFIG}
+
+	cd "${TMPDIR}" || die
+	"${PYTHON}" -c "
+import numpy, sys
+r = numpy.test()
+sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+
+	rm -f "${D}"$(python_get_sitedir)/numpy/*.txt
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dodoc COMPATIBILITY DEV_README.txt THANKS.txt
+
+	docinto f2py
+	dodoc numpy/f2py/docs/*.txt
+	doman numpy/f2py/f2py.1
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins -r "${WORKDIR}"/html
+		doins "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
+	fi
+}

dev-ruby/aws-sdk/Manifest

@@ -1,2 +1,3 @@
 DIST aws-sdk-ruby-1.8.1.3.tar.gz 1426985 SHA256 f2f2d1a208aa4a02cc6e930ae472f81daaa56dab40c70cba8a664381332e0b26 SHA512 8044f12f88919fc3b63e8ea0bd594687b7fe16a566728ffdf27b1318475224798b7a862beeede79a1ad53ba3a6928e68da1022774731fba4b10e6562c4ae04ee WHIRLPOOL 25e42b26044facda2415ffc28b07212edf86159ed15e6d8537ce2e2de7aa54d0836763ac465fd390b8d1084a73429d986e35cec8f8c45474150e6f660065a00f
 DIST aws-sdk-ruby-1.8.2.tar.gz 1440512 SHA256 2e9d39872f2bb034292ecce46fad2458c4c5462332d8bc517e057d69718e0f6c SHA512 864790e01204a3de25c007a174c7964c84033866d5c24f59fc014a4fed189667c9e9dac9711eea902ad55897d1b19190b0fc69d63c3eb97c42f8ed3aabe7e967 WHIRLPOOL 21f2a1698d24325fefe227574ab2d8c0a0992a95c1e46a1425ce221c59139d66ce3d6398f006c55dd13e5eb3d0db37a7f79f2954ecf1350477e1fdcb7674e138
+DIST aws-sdk-ruby-1.8.3.tar.gz 1452151 SHA256 1553a6dec39463865238a1b290aeea32b3f57deaa98bdba06f6499e0116d9aef SHA512 4183dd61c4d1c471f3ef7bc3932436b3fe6b453dae0f2b9ea524aa05cefa07d7915bda6b525801d7339c9c4666a4aad2bdc7838df2077a18fb6662701e298764 WHIRLPOOL 0ea24e2bc09be02d767eabecb8470ad1fd14df758e26a818ec0e2b5169939680e1dc33b20a95f1329011515987b0a1cf534f5fde41dfd820efd245bea6130baa

dev-ruby/aws-sdk/aws-sdk-1.8.3.ebuild

@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/aws-sdk/aws-sdk-1.8.3.ebuild,v 1.1 2013/02/19 10:35:45 flameeyes Exp $
+
+EAPI=5
+
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="ca-bundle.crt"
+
+GITHUB_USER="aws"
+GITHUB_PROJECT="${PN}-ruby"
+RUBY_S="${GITHUB_PROJECT}-${PV}"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Official SDK for Amazon Web Services"
+HOMEPAGE="http://aws.amazon.com/sdkforruby"
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "virtual/ruby-ssl
+	>=dev-ruby/json-1.4
+	>=dev-ruby/nokogiri-1.4.4
+	>=dev-ruby/uuidtools-2.1"
+
+all_ruby_prepare() {
+	sed -i -e 's:~>:>=:' "${RUBY_FAKEGEM_GEMSPEC}" || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	insinto /usr/share/doc/${PF}
+	doins -r recipebook samples
+}

dev-tcltk/expect-lite/expect-lite-4.3.3.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect-lite/expect-lite-4.3.3.ebuild,v 1.1 2012/12/10 03:34:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect-lite/expect-lite-4.3.3.ebuild,v 1.2 2013/02/19 08:03:37 vapier Exp $
 
 DESCRIPTION="quick and easy command line automation tool built on top of expect"
 HOMEPAGE="http://expect-lite.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug examples"
 
 RDEPEND="dev-tcltk/expect

dev-util/ccache/ccache-3.1.9.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ccache-3.1.9.ebuild,v 1.5 2013/02/18 21:04:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ccache-3.1.9.ebuild,v 1.6 2013/02/19 16:37:37 ago Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://samba.org/ftp/ccache/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"

dev-util/cdiff/Manifest

@@ -1,2 +1,4 @@
 DIST cdiff-0.3.tar.gz 10734 SHA256 0e7342a325f0d95261eb2e8c1b9271f63235ee4c5d24cbb39d02033658ec2b99 SHA512 ea27da03eee5a19369d20eb10ee5def04a0b26038956834234f2a7a680431d948524ad14e17774535f99ba67c8c99b481a0fd44fa92116e2b389775f14158b78 WHIRLPOOL 0bba1919ec52f8783768c17a04b88ac33d03a4ddac080655e9363a3d9aa436ac46ff17d2ca04c8530e3ee603e7c56997019e3bda0561a5d48192eb2070c3cfe0
 DIST cdiff-0.4.tar.gz 14153 SHA256 a3145d303915eaeb18a53134bcfec176e52a2f0ac5c407ad49c203c24fb1a6a0 SHA512 95485ef9c178f4fa3c9dc5f86fe87d4988e7f1a222b07f09f74b729f16d778d02d3839b753278426c87d967fbe39be5044f1d4385834e9d9aff2c8ce6da08fe8 WHIRLPOOL 41ae0f24157b97686e460518e332450334a41b9554320e9baa086703543d8cbe83a48c88076fa0695ccf1a45e26c277387a4b1091c4fd309d0942a1abdfa8e64
+DIST cdiff-0.5.1.tar.gz 18084 SHA256 4f0b2d0bcaf061a53910cc6b42342affef65d543e328455a914aa6e198bb5edd SHA512 56c99563520427eeb66ddf5d74a1a2da0121a76ba4ed24ff58e5c052a269d5b60dd3b919fa175420b5d384109a4ecae942c1e65da4a0da49b23b7890907134d8 WHIRLPOOL 4a8f40a1c2b77e6ae25fbf96dba8058fe267db2e6b944568af354df93fa5590167d291a5b445b9dacf1a4f17824b1e310a856acb7caa1d58a3adcd61bc6b9af7
+DIST cdiff-0.5.tar.gz 17719 SHA256 f6241da6ed304ef7a0423d06f88eb5f735c3d1498988c9251f2793885de66464 SHA512 b2394f3ef9ebca26b60314796305fa1364e425145ab7a18d4095a3b135e92207c31590467f7f16d0da7c7ae4ea7ed595805fc60965d33fd8fa60e984fe94a6bc WHIRLPOOL 3766b9416685ff9f6a51493f1ba5671ca7a0f70f81b88d042d39b266ef2ee6796265a367032f3e0745e2932d79a955b5dd167b4d972a7df91ba3335e5d0d7664

dev-util/cdiff/cdiff-0.5.1.ebuild

@@ -0,0 +1,22 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.5.1.ebuild,v 1.1 2013/02/19 18:40:06 tomwij Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
+DOCS=( CHANGES README.rst )
+
+inherit distutils-r1
+
+DESCRIPTION="Colored, side-by-side diff terminal viewer."
+HOMEPAGE="https://github.com/ymattw/${PN}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="!app-misc/colordiff
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"

dev-util/cdiff/cdiff-0.5.ebuild

@@ -0,0 +1,22 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.5.ebuild,v 1.1 2013/02/19 18:40:06 tomwij Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
+DOCS=( CHANGES README.rst )
+
+inherit distutils-r1
+
+DESCRIPTION="Colored, side-by-side diff terminal viewer."
+HOMEPAGE="https://github.com/ymattw/${PN}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="!app-misc/colordiff
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"

dev-util/ddd/ddd-3.3.12-r3.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ddd/ddd-3.3.12-r3.ebuild,v 1.5 2013/02/18 20:58:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ddd/ddd-3.3.12-r3.ebuild,v 1.6 2013/02/19 16:35:12 ago Exp $
 
 EAPI="4"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnu.org/software/ddd"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3 FDL-1.1"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="+gnuplot readline"
 

dev-util/eric/Manifest

@@ -1,50 +1,30 @@
-DIST eric4-4.5.6.tar.gz 8122753 SHA256 39ed7952487cb5427780d62dcdd258076081c9b52c5e7b44d75b18586c46308e SHA512 bdcb1ab22c3fbe5143a8851addbe59f928fcd9857e83299b0faf0428a5dc68f619f430384d1a429dea2b2262cecc0deeb7f248fb525c51a5b4c9109783ee310b WHIRLPOOL 3f25496ac795cfb28cd45f5f7822d0bf487a008c7b216b5ff8c5ac66e1c39aafa77c41894ebe6aaaca0019489e4192d01282f3a82b24cab96762c85aeaf64efe
 DIST eric4-4.5.8.tar.gz 8233545 SHA256 092d3debd356ddeaa2d37197f72902c31bbb35f488ff2831577c49b0eb355383 SHA512 53d446f57713c6e364a1eee0ddcea5dc6ea492e327965bea54d391fd88b60a9ef3ae345c91b2c8907d9c5c787407555e920fbc3fdae13ed76feeea25c0a99a61 WHIRLPOOL f0d34dddae19f2e2e6edb7b8102fc25a900bee078495617905e3b9533d1572845bb3b6407998a5213750f8007265ca71264b3a47adbe49454120379e42566d10
-DIST eric4-i18n-cs-4.5.6.tar.gz 457972 SHA256 708de6a658e5eeaf8f2fb297829438ca4de4c4fcea1c150d6b01c6464c02cef0 SHA512 85dbfd835270d238d2fc39677cbdb57140c2751b6a139a9000bf496182a6ced3042ebefdc5ab5372a60deb53d1449e264b8efc897c3b6c9bdb183b8c46ec992c WHIRLPOOL 94923f5f41ffea876d9ddf58269298fca04a4b53ced5f9a62646dc02bdce4eac53e9b5f7b76fc4452654182c1df0874bd9b30e4445837487bea548c86a9ad8fa
 DIST eric4-i18n-cs-4.5.8.tar.gz 458405 SHA256 8419eaf1432f7f0720a8a0a1def67c78be36bebd8010bc9159235d8100045701 SHA512 e148ff7023f204dd4daa3571137a3f1f02fe75b02ae8847fa241f4b2b93c0f70e636bcd2c1531e23e52217b74ef867135778c58ef6672a8b1853f316566b195e WHIRLPOOL 1cf1723990eeed8f1aeacded503f6c4b14864254188a25d24942c5b12f334d31f15a9cceb410448ea6773f9c290b682498333a33384add46533929de8d39a19a
-DIST eric4-i18n-de-4.5.6.tar.gz 471115 SHA256 c0abe68762381f66cfb022883fe7f372d31575af1444f6ac661df608e504fbed SHA512 24b83bfc87409c60944ca27638af68380771018d0f931ccb1cc13515450c0919c6386a2353a7dd61e70606fe35a0ca21c5783f77df065b418fd0e8aa9103149e WHIRLPOOL 748536f275b85d58cb692a28638aa7811f63c9565b834ed27ef466f61d31a200cf0d1b9fa038b2cf004cdee41dc67907e3ef967cee42b4fc450a36c5b11c65dc
 DIST eric4-i18n-de-4.5.8.tar.gz 471367 SHA256 f10e1cc7a3a68d7696d14fc95bed1d1811b52f83aef2431f4133655c7e1f6542 SHA512 aae8cd6bb388d4433e83413fc4d0261fd5f0553a81c5b518b09e62f95a23b3ca915c8badfb85e9663b5b032b0c4c347bdbfa13d859712a289f554b2e816bda05 WHIRLPOOL 365e65989fe017eda626172defa22ec166abf41b23865220c7805a1e87174f8e60ce6642e63707fc76fdb1357dfc67328d81d901b2c363ab73f3bdaff973fe6d
-DIST eric4-i18n-en-4.5.6.tar.gz 127219 SHA256 8664c92bd8705f5fa7093b1ecfdf3d71ca8fd2d08642b598913e677476743066 SHA512 1c5060455ff1027e33ea16d0adb4bf5506bad24f209e6aa6ed92fba16af85358d070c8f3c9d1b21705f86ef07146e26afb4030981e7643626418562a0e17273f WHIRLPOOL 64fff59c94eaae7e922636d78d77d790685b74a78412cccb9d5b6c257d304e82de71222e93a4ba4a5bcf3fe0724fdcf0e34fb8581c93a7561ab2a8462abb6e40
 DIST eric4-i18n-en-4.5.8.tar.gz 127634 SHA256 39af2c6928ce07ce6ae19e1d1325e18d9be767173a0b2e3658a4ea1bc1239504 SHA512 f2f6269d54d6d6d260dd0de2d182a2e53915ddb311a8b1634c9fb9ddef55e238d8bb4a42e35e85296ca72f1a178789b9c7e7d821786121660c8a581770881f99 WHIRLPOOL c83c20672ffccbe8da4aa5c553755c8b8c0b50365440004963978b7c6fdae191679eb733bcbe0d4c2fac794256c0b5ce6ec19fd9eeb04011acb7c8242b793e96
-DIST eric4-i18n-es-4.5.6.tar.gz 475844 SHA256 67de224648355891f7acf51c2af0362b6a341f3b2493ae1df097c53c95468e7b SHA512 ee475b73e140518ea1627a5a1d5d36026d9d1f0642fbc8f9e01b64b078078063e5ace02da732eff138ba731d4d61e7b7ed943309be6fc7c1d5f72f94fc1c6b89 WHIRLPOOL acc3ff7367a8101d357339a9900263036074283be8a21d1754c8f9aa65069aaf9b10b92fee6884e07a18ea46f3c299cc9ba58f093956e085f997416c4b0edf0f
 DIST eric4-i18n-es-4.5.8.tar.gz 476196 SHA256 322dc7157c276aa8bf134e8df921592fd54835380fc09c0edcfbdc55cb98319f SHA512 75b147f03ccfcd1b17476476dfef3052dfff8ec01c325de35fac00eb646e079674511d7713c666e481a37fde2350158353d46500a2da91598265bc53af17507e WHIRLPOOL 09ddf7eb4abbc2fb1774bca9af48d0a3773bb751a4d58cabb9fbc8befccc984178fb617b9f64c6193fc2dde885198c0afcdea0d83a6ef247e577f11018f6e12d
-DIST eric4-i18n-fr-4.5.6.tar.gz 472752 SHA256 cf2f4e4ea6af60efc98d9324d6291d3b1918b1ae3be1e7abe8f8c595f14f6267 SHA512 4d1f2e077e11f5d75a14a972d53cf992a7cb7ac10fd42231a28f8afadeb17f466f37727e1abe4f5ce573e294fe36f6a447c2aea1ec58ce877ab8fa8fadf738ce WHIRLPOOL fe6b441661ff39bf2ee1a6a99052a558cb0739d2403a73aee623d1cd87a4ccd3ad405682b219c40fa2e0a0b6b5b622cf47611c31398130b927e0239b4eef38a3
 DIST eric4-i18n-fr-4.5.8.tar.gz 473212 SHA256 4c27a65fc691f11e26e6b1ae0ec447fff54a4d2b3edffa957605a16ac41eb096 SHA512 a383d61bcf88dcffea674ca6efee6138d3c4b3f1c1f71611847fb853a35f6e83fc8cc62e1ac26b6d17f5bc6dccc4a8a500b08698bdaffc829abf9e4745aebd45 WHIRLPOOL 6c62b1a08b38907500e412f720da04985654edc76ba0f5bb2d0bda37168cf495f64526b0a32133887d81b408c8787b891b3a5e715c831ac9b30f66cafd5b7aba
-DIST eric4-i18n-it-4.5.6.tar.gz 462548 SHA256 7c3d4289aa2e0244f145fa31287ceed960c01231052d6cf9c5ea99914ab3ab64 SHA512 bbfb727a28601d9d6d760e667f194fb341fb195923a3eebdecfab5f1f2374ec48c6561a1388e8d07a2b8ada6a54897af13638c72168dfc113ec67cd0919f1833 WHIRLPOOL 2c6b4bf6a4e5d6a23b346742c1f716db5053172141ce42019e9a8b99949bccf155c5c01954b11d1737d1873264e775c32334e8ab3b2d40bfabd0080bb8a5cacb
 DIST eric4-i18n-it-4.5.8.tar.gz 462945 SHA256 5a2dd86a40fa7b297320c2a439b3d70176dcb06348f7b01cbb83820c6abd9990 SHA512 17cb0ee16d2c03fa6eb5e181995b4ff3a22747a05059dd876a50f09a60c3f4fb578bd9540e34efcacdffcd6e07518641ddc03a9c028f3dad0fc4269c4788003d WHIRLPOOL b5b80b30820ffa7bb49d0ec1747fd86f3621717e55ae4737b779a13ffe5a41cc1f620e9cb4a14335f5a3264d3b78d2640eb247046946579702d348456fb97bc5
-DIST eric4-i18n-ru-4.5.6.tar.gz 480196 SHA256 e229290448aa36dc7f98c146bb2f18d42590676cb2abf833fcf58e2c8a0e17b3 SHA512 fc0a376f18d11b1bb735072ebc0b77979400f8df8003c45d6cca3372d75235c44f1d929e72ac7fad3dfdf4907ad09f6284360b7e8ba98bcaacc6ace1d5f41618 WHIRLPOOL f80980288d12a8cbabc2759a101e8ad9ff24c06f9f764186a9a8ddf49cb9bf2271002d038f0d644ac6ec4d7ca9434a568f50444830e73a8dfb600d7ecbec1a77
 DIST eric4-i18n-ru-4.5.8.tar.gz 480610 SHA256 998e658e094cb40d08a8bbb2454b4cc48744ebd46c29aab0113a163b781d322e SHA512 266b9045a686dfcfd935179ab2092af2d3a2583a3b32ad51bd8e9db53f1d8b6eb72a0335bc000c76cbb4194824a14ea1b60f57ad6130b0e0e4cae796f4b9f47b WHIRLPOOL ed55d48dc960bd20c670b6f68b79747c5e3e0dc8e1c4d4d64c87b69577b9358d31a50476bcda130db680edbb83c85780ef9720d28ce73d5dc5a382c0ce558c69
-DIST eric4-i18n-tr-4.5.6.tar.gz 356759 SHA256 9c1d71a48eb0890ad412634da6de162c5cbf00a243425420c7d233e070131e7c SHA512 f3ef00ed9d53090c0dafc5ad8f38e8395f9fc4eaaed496de9e75e7e4dbff8cfdc1b2b16651e7be4773b587a145468ac46c9f9cc0ed98f3ad8c1a7c2c9df96369 WHIRLPOOL cf8948b330a06af923fdbcd6f44fd97d0e4908508011e61eaaefd458a801dda9fabe19203166936fbec799170ba3c82428243d3cc32b5675d7e8665cff47be82
 DIST eric4-i18n-tr-4.5.8.tar.gz 357112 SHA256 d3e2cba04180077839ea2191ccefe92dcb482b6f492280b8d15099998479d6ec SHA512 6611ad26822a0a79ca1fec46454a575a7ae5ad347d1aefaa54d22f8837e147d85ad1ff38d3a8b5f680d3972e22bb13274334663a956fb8b5cecd60b9fd23993f WHIRLPOOL a03aa58896ca96681df838efdedcdd23941e0b7e92f9c73a75fefeab087505590113e9d95dc3004a98645de83d4aecd975eac39cbc071259d12828da646ed67c
-DIST eric4-i18n-zh_CN.GB2312-4.5.6.tar.gz 389876 SHA256 b62b82e0ba89628dd287d06007855cfe81a1d471957f69bfa92e15777edf5236 SHA512 f0aea62f9298c0d7b2dccf1579e4a3050586c7aa86b34dc808059ceda3f8ff9e9ba8588c457afa25753df8972676e2326e129aefeb42e3e67b07b170e7ad77a5 WHIRLPOOL b78fb2828b7750deb49d3864ecaebcc0d5c4ff894d90e6738048499a93acd664470f8921799aca535e74b60510da59015074fda6dd2d77a5b787bc4e173c8323
 DIST eric4-i18n-zh_CN.GB2312-4.5.8.tar.gz 390605 SHA256 6fc5d2c1d5f1e0051c2f1d6bbf833c6da733c83dda8962a19d12eb52f8aef900 SHA512 2dadde05955d0fff4d6b7911210a25d3ecbb5c704af418e1bc7b319a24ecf9e8fd239be38182790749c683a99b7518c7708de1081b9f6139b3115831c05547f7 WHIRLPOOL 23c9bec71b4be60b120ae0f7640f90d4bbb7914ec2123243ebe35aee72cdfdec8afbfeaf65f2b0b511c6d3bc46f2e1ca259f4f61425764e0f379ba230722ced7
-DIST eric5-5.2.5.tar.gz 8824444 SHA256 0b06536beee515d6f34f8c8da7ba07c2a4eb1734c5d01159e3ec56bdcbf9aba0 SHA512 bbef294af3c61dff20b5dc491f8290e42978c7b5af84db75cd9ab0d9be789e1989a947bc523a2df4b3f949ca332780ae22d11d66ca23993f93c7b8d44d59fd8c WHIRLPOOL 370360622113f543ab2b0c09df7b5e6945b91d9f8cf0de4be351362e1b0f05646684ba04b153b1dc49207304058f62a98a9ea31c023fa06bbd68e0f9b2347653
 DIST eric5-5.2.7.tar.gz 8966287 SHA256 4606f5808a49e99875b35295e416d71417d73f518f400f3795a89e0decceb877 SHA512 e37347c9b335e7d325631cd0cc05fe7b628f94a5695569486d1d0a03b02a437b1554bec2721f6e35966ddd19af89bb9dc43ef48d1ff675c05944673fe27d163d WHIRLPOOL 352bec3c2abea5a82845f607c74bf74704b059508ce47f56060ccf60aa0d514ba4d8039b8dfe16f95053d3141ab8ebb9e9b192ae2b131f0cbd09099d75e38ba2
 DIST eric5-5.3.0.tar.gz 10177882 SHA256 7a696e706d79ff305767cbaf01ee9d8476b6c75bb8395947224a2dd70b83645f SHA512 4dcee264c99dd83bb41b0e437098607302532f0c6cfa331dae76126e0f86746e7c3baee119343314ae92b11736859672a6e546f97e6877a076df4be149872c6d WHIRLPOOL 54e95e22686a7d62cf11e02d70c3d7d63ff565d0d524d2b01cf1644588b6832a88791f08c599efbfd179acff30ec3c5c4b0766ca9406a52d8e7c1a3d3859f8c2
-DIST eric5-i18n-cs-5.2.5.tar.gz 530147 SHA256 d304bf0d43aefed15a10729266c171c38e173d2cd5310dc6e0c03081019c5e99 SHA512 819f598dcc1f286e258c2b5b18ac725f59d4b4f4bca68391ae91f568c70c5b0c694123fe3b2d9818c9c0355496bc3dd664648a7976f10e70f8f715b9017f00fe WHIRLPOOL fd1af3d8c5f9eedb058dfed0a3e15259d0b98ae7dc77956d0e86cabd24de499cda287d4abea65f72c214f03d8f72ee461b86c83d559eee199b5f02312cc1d646
 DIST eric5-i18n-cs-5.2.7.tar.gz 530543 SHA256 762cfcc5819bc9a64e33bcaaf1edee9e8e1db54cf7f7fdf9d42c7a8810c12e0e SHA512 eb95cbf9f71644f843bedadab61ca293f285afa81978a140ac6fb0494a623039723d99efc1004b1db98e19d286a2ab89dd2b4a2babdce71f0d190a5209017726 WHIRLPOOL a8489e1bd6e96e03df5bc47dfd401b3f007c3a80cc82ccea1301be6c33e5a5d4d600ce9594cdfd8a8d034299f3323983f328fc3a8b5c218162a1ef327c0b8d7f
 DIST eric5-i18n-cs-5.3.0.tar.gz 559476 SHA256 3172e2da0d2427efa2c373dd6abaab4b82b9f12c68889573e168bd1bba40b632 SHA512 f29f7d7cd5b7e9d0fb738f9aa24eb8e20b2e4bfa9e9707b85fc8e2ede599b1f5610bef3f87491ad37cee977c584e03e547dc0d4d67bd43149fe692fbe1a4309a WHIRLPOOL 7304c814be05cacef1dc8a1126918fe764f2ff2ebe0dfc95f9bcad871c0cb1d06f2cedd01d6a76d537088459c83de5ced3ad76ed4b8ca9c16ec2d977af8edf25
-DIST eric5-i18n-de-5.2.5.tar.gz 600891 SHA256 7fd729682bedb9fb6eb5e6985a4dfb802f63e7978c17f2a20d738352415937b6 SHA512 1cb0009662c506344e0acc771d9b72e7ad8cd8b15d571cc041eefb7a8b76f2f69617eeeb29070bacdf3af69f40cb745cfa97cae0a3bcc33fe3554da625e4ef5d WHIRLPOOL 1643c5b977d47425e1083f123b8be11d8a3ffbc899c835d464e921dd3a419148e21f9fbc77eb9782226aa4a91728c26c6c3fb2a8f541c2a6b65c6252038e9a37
 DIST eric5-i18n-de-5.2.7.tar.gz 601297 SHA256 9f53bacf3d39b5f8b9d6600a083e7b46db08b8468cf83ddbfb43077810275db0 SHA512 4e45c6cb54176668eecf297ae7d5d3bd404497c948772d96f15a95d56b2d4b9d3af86db4dd284035f815da04e92ecc303fd92c7e1ea04802dbb5542033674d66 WHIRLPOOL fa61391cf9951102f86b6187a503dfeabcc6934b97d50de49111586c82f2801a3ae2f3231bd540f57c376f01e93f8c3ec20961185d270f94b2f3195a023460d5
 DIST eric5-i18n-de-5.3.0.tar.gz 680999 SHA256 4c9211511762bb31797198f06c0c50b56e92c4177178e0892972c75ed0781e9b SHA512 81108247980bc0bf0a07069cac259a3ec6c40646dfa24a2575c9b228633b61fc81351d8bbfdfa9890b61383415e570603f243b2ea983c3a317e8c0b3374bbe54 WHIRLPOOL 468bdeaad5ba9818f91f5859076fd5b1137ac992eec294bcc9c9af53bd7fb6ad83ed13ba59ffda045e5387be3152c5120865a9903b868be4a97d89d31bb554a4
-DIST eric5-i18n-en-5.2.5.tar.gz 163062 SHA256 cd265d8c41a661bcea7efb32afae3fd205b1834d87e581b4c2313c6e45fcddb0 SHA512 e6c42e7da0678065e1ee5da01ebaccf21f0e79853cc5c258e8fb43c08e6ea9251305aab381e604b872509e6943fdb1869032219ffcf0b28b909275bcf03eaaaf WHIRLPOOL fd1b3355ab0aefb400a7eb9442cf0c866d6a8f842f47365ccb27607d4537034ba1bc5ef7e315bd665fc8b3d76a8e479f312c2f13a09041319457ab66363ece2b
 DIST eric5-i18n-en-5.2.7.tar.gz 163428 SHA256 c16ed90e9be30ec12b0b5fc481739d1e9a362c695c07a1c21fecae6262009b02 SHA512 c6e34887bf4b5ff2a0f6d074e31bf549c7222c15b20f46e987fea286ab6ef826a47384b5326ecd03bb6de3618d115897abc84a6ed616d3398966128ce74f50c4 WHIRLPOOL 6297e1d1fad008966456098549dae2bf3ec83dd58d3a8308b18bb4b4eccb4e60ae12d273c6219e9eaf81cee360374bc99385be4fd9e10149a040cfd1923f0690
 DIST eric5-i18n-en-5.3.0.tar.gz 185613 SHA256 10fde1e77ed5acea58cf8d805e113daa5caa93c2ca922a2f5c75f5e6c3dbfa10 SHA512 a51be06466030375980440ca917d56ccd94e0a3da071bac1296c60b211d824751e678640c6fc9fced8d2abcc931d0ec9c253ccbf39267842955f647e405a702a WHIRLPOOL 32905902758e196ba0c0371190e8b5e51ecdd28741337ad52c06c062f1feafd3457a48780d2058d2903a0138f87646a183b2e28ecbec177056fdffb93e114d8f
-DIST eric5-i18n-es-5.2.5.tar.gz 605148 SHA256 bb418b18cd2498433a064a486cf4ee1b5a3055bc8f666050b9cc74498f70e3e5 SHA512 8ccd4e85b7c4c275e73a5d44cca73fbf3fd22cc24bd4967d8e5c50a411f33c718abbc9104ddc4fc092cf1287467f7f152cab52ce14c53dd345ce212838a70ebd WHIRLPOOL 19d8c3ca62147c55bc6e205b71ef2ce7b844ccecc158ab381e4b49b49029d70dd4c488de14f7c171c054e02de98fc31d798f6579d80ffc442a64a5681e34c5ea
 DIST eric5-i18n-es-5.2.7.tar.gz 605586 SHA256 b8518b522d7fbebc88d551c559480776e4b320841791056acea3d2f6a05e6cfa SHA512 09d54abdf66dad6cd1ae183e86c4315d53518a9eb701e714db5f6b7f66c37a33421d0d1398849e1443ba0d542a2854f6d393eb0c4f0523d58f1b711af5609249 WHIRLPOOL 2e65808b0469e7b653b48ec43c3b4714009a6a37146ae8832848f0e2e9c0719e38dc0689562487b207525e83ba50e46e0c274847c00638b248a2feb010afa33b
 DIST eric5-i18n-es-5.3.0.tar.gz 685444 SHA256 f9786bd44ca3e947f7240b65d56b1aa96a23a03ecc1c792d3b7d5d71619d1fcb SHA512 91a494a9e94f3a74bf1243a0ea43b5b1f1cd22cae21f8b7359ec53641e8671f96dbf92a543e630310a197277d40a34ea61a20701032a5ef5604dc3d00aeaad63 WHIRLPOOL cb42e0fbd8e026f9e5c5711504cf6ced1875f9f8b2541d4a47b61d33a25123f3ffcbcf28f94892077f1c035dee75b3041b0dad7017dd15134d1840ead1f2c8b1
-DIST eric5-i18n-fr-5.2.5.tar.gz 470840 SHA256 4ec505b188b3383e71c24cfdb19af56b27125de7e0c8c3f6f0ec9aae9bd35810 SHA512 8b119b27655999d4c43aef66ee1877b8b48e6f0de55b324859bb1b02355b8e2ad062fdf3ae9ae2cfc2ac29ca14422063ee8c291aba0a14410d20660c865a21d8 WHIRLPOOL cfd9802f31e250dd21c0f11adf113a5df8ef1e30c214d74d484a5a26cfe40ae1fef10835947eb9e3c7fbe093672c7c6ec5d6aaf6c5bc950eb9f3a91d854ecacd
 DIST eric5-i18n-fr-5.2.7.tar.gz 469738 SHA256 466c13b436f307b312fc6b10ecdf08ed828dea62f0e62934d2a589ffc1df88d1 SHA512 10fd39d20d70e2f9066ad498033204611d1c48497ad421c934c2bb84f9cc57697da5bb5aff48ee83b4d9abcaabbf484942353fdae8390e9ea18466e7c14fe3ea WHIRLPOOL fb95a7108aedc95fa6b5cb0ad227c9eac6ad8dd1f863f14ffbcd12b32d2bfd928976b305e36467fe540ec43d7aefe66bcb95463367f17a918dbf3cf63fdaa5d8
 DIST eric5-i18n-fr-5.3.0.tar.gz 517809 SHA256 bdb39a14e3f1e46d4c59ed59f09214ccbc8524cec50ce9ee19b8d340f837a69c SHA512 104a53e72f2fce8c9fb53415110062565548be20c409b5d6128aa38eca6fc15e06167eb3bc509ce25d7eb7f2912735c7307923193e6bb5136cd6ad9697c0d902 WHIRLPOOL 50721c72a17214e89362594729249a4ed84515a6d77fe3348c0730faf62a743db91b1038e47630cdfadda018effae68ca49b9fcbf40a80566c330b9de1673c8d
-DIST eric5-i18n-it-5.2.5.tar.gz 547836 SHA256 6fb490f2f0781966c37a511cd3580fc27e5eb994104f830b35a679041137b5a6 SHA512 0235eb0c8fdaa8aa88a812a1910377eb9f5a69958cded078732c722f1a5b21d5db54538718903f7cf4a54033d906c4125c2bd8dc58f4143dd86b5cc09335ade8 WHIRLPOOL a88df81ac1dabc479eea6c699469c1cdd0a5b5559ce05175bf94203babf32389d182ea3f6df4695a18c0d178e75e1427680589cac6041a1cbb631cc2f974f0bb
 DIST eric5-i18n-it-5.2.7.tar.gz 547563 SHA256 7ed6cbc6e48648c1651e02fe5bd377b659565cb4bf97a82ea1b7570c7a6f341a SHA512 6ca89440e4c3cb7f99f06a27120d6e6ba1f72441f4331b05725730ead0d13e21e227dce103a0fe517e06e28cdb327ed042f98de096a867aa0abe119f6b9f3a90 WHIRLPOOL 33e090f390c5125a20c8d9abae1f26f39345b23bae18d4b8106f67fdf5ad89d9af7e52bfefaa117bd7965c422b7e16110cd63e6af2afcab9b3ea1683e5a95970
 DIST eric5-i18n-it-5.3.0.tar.gz 579134 SHA256 c7b0589eb6530b38965f1e4dcf0eaed217d9e2ee086b4888504a9202ea02b026 SHA512 37eb2ee9ba9ed9d1abb32a6966354316186048c817785626f951da41540d7c49c622206eee6343c8dec79fadc450adf6e4f980f6c72fcb15bb0c9ab41c4a7a0a WHIRLPOOL 210a0e8be05e01b8f1e5f2b83e5b7153e1f4c3beae667ffd2f89d374e0a5e2bb6d821de9057562ba68eac0db2910dc537e9f2e9433dc0d4295c3186691eb70fe
-DIST eric5-i18n-ru-5.2.5.tar.gz 576916 SHA256 f67334d7577f4be79fecdc7fb2d586602dc600d817d2b22ec1c0e4a564c5f9b5 SHA512 19795a500d623930f018aee1998a66c96ddcf30e06078c66015bd1e09ed06d48420aefd0a234aebf7a5c3befde658b269efac0360f332ed3a65245e828d15f57 WHIRLPOOL f364f5e304815880572b1d55e94328bd74c1049f44d3cbae25985498e6f650747bbfae93bb67b25d995d182f454fd38328a36f43c763502738b97863bb5a5cf5
 DIST eric5-i18n-ru-5.2.7.tar.gz 577414 SHA256 06edf77e4ab0cec76a916c099eadb11079d2c884ff153bb984f751897ba9e082 SHA512 60c03fef08e863969a24ba55125f79250c29e6b946cb5258e083543684e5654531f8b6ad203ea2e489a56b35d7e8f689f645002512cf764df35ac31b2975ef69 WHIRLPOOL ed5464fd9496aef7d6d156460196587d22142a5bddf6d005e35b9a9459244f3bf45558627491c9d1d69348d0f3d089e89e1c4609e36583aa979b141fc7af6ef1
 DIST eric5-i18n-ru-5.3.0.tar.gz 608117 SHA256 6427eb5c00e8c9fac47c65cab1c05b094fcdffb09d111110d8d6d072666c5d15 SHA512 5a1d6226e9de3a11e421dc4fe87bcf3ce7fad9d5d4cf08ab5353b8381267888736170c2689c87be96687cc563050540ff1603daac05b86aa4524fe9dddf8ccdd WHIRLPOOL 88030a04cdd182cdb309671e276a037bb88682996b7955d445bdcbffbe2f83eb0d7d062dddfc991c69ab812f059eb8ecda5647649d953dd5d2eba74ed64918a6
-DIST eric5-i18n-tr-5.2.5.tar.gz 450362 SHA256 701b4e270540abbe071c097d21219f90c7b85dc4337be591d17d2e770cc8ca6a SHA512 c534bfe74f29ca54a80918d1f26f17008783e51ca9868ff3831ff6656b4279a2545c9475d24dd7fd418478f6b0b0a7e07dd35ebf58a160bfa07c76d6a0829820 WHIRLPOOL 48efa238623d97f24b2680ad9dd8e7c9b12b49b0f3c64c374cbf4a9f1b0611cb2bb6369aae17773cdccc3df6ce27e0da045a46d75c857fa4e5bf08ece46b9081
 DIST eric5-i18n-tr-5.2.7.tar.gz 450746 SHA256 2fdbf504e83de53081009f61350fb0f4f781cd5bf6469c415bca77ead4ed0f2c SHA512 98d96dbb0793457bd5ea2cb9658db7de24c991003aa3d9c95cdb749ecf7d4fddb816e81be3365b5924bff16e0ef91b33cf50f66d77b2b08cc86a76a47119035d WHIRLPOOL 1fd0cd73af7262070218ab6d9f1331854c74eea7b87d6ed7b5f2f995727bd6ddc250b05437cac9a58fa636f5ec08b309aa3213b95f5addc47dc9060bb8dcbdf1
 DIST eric5-i18n-tr-5.3.0.tar.gz 480273 SHA256 23207be03616f1b8da96a12309400797e8673eee97fb57472435d20456155976 SHA512 d6068a9c019f6bf5fb1f08b26a40864e158fcbf78578191b615e43838031338a21963b572e450598807301b6c6d2123c133b1ed20886e50cbfd6e99180680102 WHIRLPOOL c39e639f3aae82ade40476990fe6953a9b969903b3d316f547596b3fe3bcf449ec0588cb3d35d0d34ee7af96a0f7c416fde0a4dc66245176de8b9714e46bf1c7
-DIST eric5-i18n-zh_CN.GB2312-5.2.5.tar.gz 436238 SHA256 cabde401fc1eb6d5456c07185304191fbf75f507e48e2c37582c959a41297ade SHA512 d8331ac5d8c20d6b4805efff2e6b89c1a774043d66ed50e29cf00af1bd710df46307c7819093c7fcb4459202352f728ff48b904d838a1870ccb9413e39119205 WHIRLPOOL 4a01e9dd6349af174e57921b763d8967f2d3a8981e63bf74126939a8e217c097fa7bd32e6b800a2627560b382f2e540ac394a92681e1f150726ba48d64f02b5b
 DIST eric5-i18n-zh_CN.GB2312-5.2.7.tar.gz 436691 SHA256 a61b3737c5a4621b3f65bdbe4713cf519b93625fe3dc225d1088a76869580d39 SHA512 9f655b960e69d7e8ac7857661ee88ff256451aa2682bf7cb9064e2f570c0211527e0f8afd697b37e7a99512faaa435dff7dc9e97e762ca3d5ef256ad13c760f2 WHIRLPOOL 5d40cc5d836a936b3c84ea66ff1269c99be0111a2ce774717e4f4c5c1c0f35099bc555d868a36e64cdc3e1643b1f3300c2aa7d5936e37e9d00ba70352a72b315
 DIST eric5-i18n-zh_CN.GB2312-5.3.0.tar.gz 464865 SHA256 c33c5d4db7e6d094faccce79fd821055ae586936ac3489e8c567257a4cea6cb1 SHA512 827cecf3e037bfe967515ef931d7b8d512c3fc8d913cbcdc9ab4dd479ca71a662c0e6b0ebee0bb5fd52ce779693c6b194fa6a98f1c6dcd863ee14af85f9f48fc WHIRLPOOL 29959261ebbe1d55bdc51f0d9f9d43efaef5db890a149759bda0fd138abe3be6a5d3025f91ce35d0f902a3a6c89755b97fc12a40b90aa9eaf595586f760630ba

dev-util/eric/eric-4.5.6.ebuild

@@ -1,101 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.5.6.ebuild,v 1.4 2012/12/26 03:46:58 pesa Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-# 2.4 and 2.5 are restricted to avoid conditional dependency on dev-python/simplejson.
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython 2.7-pypy-*"
-
-inherit eutils python
-
-SLOT="4"
-MY_PN="${PN}${SLOT}"
-MY_PV="${PV/_pre/-snapshot-}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="A full featured Python IDE using PyQt4 and QScintilla"
-HOMEPAGE="http://eric-ide.python-projects.org/"
-BASE_URI="mirror://sourceforge/eric-ide/${MY_PN}/stable/${PV}"
-SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="kde spell"
-
-DEPEND="
-	>=dev-python/sip-4.12.4
-	|| ( >=dev-python/PyQt4-4.9.6-r1[X,help,svg,webkit]
-		<dev-python/PyQt4-4.9.6-r1[X,assistant,svg,webkit] )
-	>=dev-python/qscintilla-python-2.3
-	kde? ( kde-base/pykde4 )
-"
-RDEPEND="${DEPEND}
-	>=dev-python/chardet-2.0.1
-	>=dev-python/coverage-3.0.1
-	>=dev-python/pygments-1.3.1
-"
-PDEPEND="
-	spell? ( dev-python/pyenchant )
-"
-
-LANGS="cs de en es fr it ru tr zh_CN"
-for L in ${LANGS}; do
-	SRC_URI+=" linguas_${L}? ( ${BASE_URI}/${MY_PN}-i18n-${L/zh_CN/zh_CN.GB2312}-${MY_PV}.tar.gz )"
-	IUSE+=" linguas_${L}"
-done
-unset L
-
-S=${WORKDIR}/${MY_P}
-
-PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/.*")
-
-src_prepare() {
-	epatch "${FILESDIR}/eric-4.4-no-interactive.patch"
-	use kde || epatch "${FILESDIR}/eric-4.4-no-pykde.patch"
-
-	# Delete internal copies of dev-python/chardet, dev-python/coverage,
-	# dev-python/pygments and dev-python/simplejson.
-	rm -fr eric/ThirdParty
-	rm -fr eric/DebugClients/Python{,3}/coverage
-	sed -i -e '\|/coverage/|d' eric/${MY_PN}.e4p || die
-	sed -i -e 's/from DebugClients\.Python3\?\.coverage /from coverage /' \
-		$(grep -lr 'from DebugClients\.Python3\?\.coverage' .) || die
-}
-
-src_install() {
-	installation() {
-		"$(PYTHON)" install.py \
-			-z \
-			-b "${EPREFIX}/usr/bin" \
-			-i "${T}/images/${PYTHON_ABI}" \
-			-d "${EPREFIX}$(python_get_sitedir)" \
-			-c
-	}
-	python_execute_function installation
-	python_merge_intermediate_installation_images "${T}/images"
-
-	doicon eric/icons/default/eric.png || die
-	make_desktop_entry "${MY_PN} --nosplash" ${MY_PN} eric "Development;IDE;Qt"
-}
-
-pkg_postinst() {
-	python_mod_optimize ${MY_PN}{,config.py,plugins}
-
-	elog
-	elog "If you want to use Eric with mod_python, have a look at"
-	elog "\"${EROOT}$(python_get_sitedir -b -f)/${MY_PN}/patch_modpython.py\"."
-	elog
-	elog "The following packages will give Eric extended functionality:"
-	elog "  dev-python/pylint"
-	elog "  dev-python/pysvn"
-	elog
-	elog "This version has a plugin interface with plugin-autofetch from"
-	elog "the application itself. You may want to check those as well."
-	elog
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${MY_PN}{,config.py,plugins}
-}

dev-util/eric/eric-5.2.5.ebuild

@@ -1,104 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.2.5.ebuild,v 1.4 2012/12/26 03:46:58 pesa Exp $
-
-EAPI="4"
-PYTHON_DEPEND="3:3.1"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.* *-jython 2.7-pypy-*"
-
-inherit eutils python
-
-SLOT="5"
-MY_PN="${PN}${SLOT}"
-MY_PV="${PV/_pre/-snapshot-}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="A full featured Python IDE using PyQt4 and QScintilla"
-HOMEPAGE="http://eric-ide.python-projects.org/"
-BASE_URI="mirror://sourceforge/eric-ide/${MY_PN}/stable/${PV}"
-SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="spell"
-
-DEPEND="
-	>=dev-python/sip-4.12.4
-	|| ( >=dev-python/PyQt4-4.9.6-r1[X,help,svg,webkit]
-		<dev-python/PyQt4-4.9.6-r1[X,assistant,svg,webkit] )
-	>=dev-python/qscintilla-python-2.4
-"
-RDEPEND="${DEPEND}
-	>=dev-python/chardet-2.0.1
-	>=dev-python/coverage-3.2
-	>=dev-python/pygments-1.4
-"
-PDEPEND="
-	spell? ( dev-python/pyenchant )
-"
-
-LANGS="cs de en es fr it ru tr zh_CN"
-for L in ${LANGS}; do
-	SRC_URI+=" linguas_${L}? ( ${BASE_URI}/${MY_PN}-i18n-${L/zh_CN/zh_CN.GB2312}-${MY_PV}.tar.gz )"
-	IUSE+=" linguas_${L}"
-done
-unset L
-
-S=${WORKDIR}/${MY_P}
-
-PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/.*")
-
-src_prepare() {
-	# Avoid file collisions between different slots of Eric.
-	sed -e "s/^Icon=eric$/&${SLOT}/" -i eric/${MY_PN}.desktop || die
-	sed -e "s/\([^[:alnum:]]\)eric\.png\([^[:alnum:]]\)/\1eric5.png\2/" \
-		-i $(grep -lr "eric\.png" .) || die
-	mv eric/icons/default/eric{,5}.png || die
-	mv eric/pixmaps/eric{,5}.png || die
-	rm -f eric/APIs/Python/zope-*.api
-	rm -f eric/APIs/Ruby/Ruby-*.api
-
-	# Delete internal copies of dev-python/chardet,
-	# dev-python/coverage and dev-python/pygments.
-	rm -fr eric/ThirdParty
-	rm -fr eric/DebugClients/Python{,3}/coverage
-	sed -i -e '\|/coverage/|d' eric/${MY_PN}.e4p || die
-	sed -i -e 's/from DebugClients\.Python3\?\.coverage /from coverage /' \
-		$(grep -lr 'from DebugClients\.Python3\?\.coverage' .) || die
-}
-
-src_install() {
-	installation() {
-		"$(PYTHON)" install.py \
-			-z \
-			-b "${EPREFIX}/usr/bin" \
-			-i "${T}/images/${PYTHON_ABI}" \
-			-d "${EPREFIX}$(python_get_sitedir)" \
-			-c
-	}
-	python_execute_function installation
-	python_merge_intermediate_installation_images "${T}/images"
-
-	doicon eric/icons/default/${MY_PN}.png || die
-}
-
-pkg_postinst() {
-	python_mod_optimize -x "/eric5/(DebugClients/Python|UtilitiesPython2)/" ${MY_PN}{,config.py,plugins}
-
-	elog
-	elog "If you want to use Eric with mod_python, have a look at"
-	elog "\"${EROOT}$(python_get_sitedir -b -f)/${MY_PN}/patch_modpython.py\"."
-	elog
-	elog "The following packages will give Eric extended functionality:"
-	elog "  dev-python/pylint"
-	elog "  dev-python/pysvn"
-	elog
-	elog "This version has a plugin interface with plugin-autofetch from"
-	elog "the application itself. You may want to check those as well."
-	elog
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${MY_PN}{,config.py,plugins}
-}

dev-util/eric/eric-5.3.0.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.3.0.ebuild,v 1.1 2013/02/04 05:01:00 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.3.0.ebuild,v 1.2 2013/02/19 09:04:51 pesa Exp $
 
 EAPI="4"
 PYTHON_DEPEND="3:3.1"
@@ -25,13 +25,13 @@ IUSE="spell"
 
 DEPEND="
 	>=dev-python/sip-4.12.4
-	>=dev-python/PyQt4-4.9.6-r1[X,help,svg,webkit]
+	>=dev-python/PyQt4-4.9.6-r1[X,help,sql,svg,webkit]
-	>=dev-python/qscintilla-python-2.4
+	>=dev-python/qscintilla-python-2.6
 "
 RDEPEND="${DEPEND}
 	>=dev-python/chardet-2.0.1
 	>=dev-python/coverage-3.2
-	>=dev-python/pygments-1.4
+	>=dev-python/pygments-1.5
 "
 PDEPEND="
 	spell? ( dev-python/pyenchant )
@@ -65,6 +65,9 @@ src_prepare() {
 	sed -i -e '\|/coverage/|d' eric/${MY_PN}.e4p || die
 	sed -i -e 's/from DebugClients\.Python3\?\.coverage /from coverage /' \
 		$(grep -lr 'from DebugClients\.Python3\?\.coverage' .) || die
+
+	# Fix desktop files (bug 458092).
+	sed -i -e '/^Categories=/s:Python:X-&:' eric/eric5{,_webbrowser}.desktop || die
 }
 
 src_install() {

dev-util/valgrind/files/valgrind-3.8.1-glibc-2.17.patch

@@ -0,0 +1,26 @@
+diff -Nuar valgrind-3.8.1.orig/configure.in valgrind-3.8.1/configure.in
+--- valgrind-3.8.1.orig/configure.in	2012-09-18 15:17:32.000000000 -0400
++++ valgrind-3.8.1/configure.in	2013-02-19 13:00:26.000000000 -0500
+@@ -906,6 +906,13 @@
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.17)
++	AC_MSG_RESULT(2.17 family)
++	AC_DEFINE([GLIBC_2_17], 1, [Define to 1 if you're using glibc 2.17.x])
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++	;;
+      darwin)
+ 	AC_MSG_RESULT(Darwin)
+ 	AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
+@@ -919,7 +926,7 @@
+ 
+      *)
+ 	AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
+-	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.16])
++	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.17])
+ 	AC_MSG_ERROR([or Darwin libc])
+ 	;;
+ esac

dev-util/valgrind/valgrind-3.8.1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.8.1.ebuild,v 1.1 2012/09/20 20:49:50 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.8.1.ebuild,v 1.2 2013/02/19 18:06:53 blueness Exp $
 
 EAPI="4"
 inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
@@ -37,6 +37,9 @@ src_prepare() {
 	# warning about executable stacks.
 	epatch "${FILESDIR}"/${PN}-3.8.0-non-exec-stack.patch
 
+	# Fix for glibc 2.18, bug #458326
+	epatch "${FILESDIR}"/${PN}-3.8.1-glibc-2.17.patch
+
 	# Regenerate autotools files
 	eautoreconf
 }

games-board/hexxagon/hexxagon-1.0.2.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/hexxagon/hexxagon-1.0.2.ebuild,v 1.1 2013/01/16 03:08:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/hexxagon/hexxagon-1.0.2.ebuild,v 1.2 2013/02/19 15:19:22 nimiux Exp $
 
 EAPI=5
 inherit eutils games
@@ -11,7 +11,7 @@ SRC_URI="http://www.nesqi.se/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="dev-cpp/glibmm:2

games-board/peg-e/Manifest

@@ -1,3 +1,2 @@
 DIST peg-e-1.1.0-src.tar.bz2 57510 SHA256 ecd82c94a628161d014700d19c36f9299995c0963b053fb096e3f3b173d2655b
-DIST peg-e-1.1.1-src.tar.bz2 89146 SHA256 a1ec62976426acf0b35843d8978c25459b4826c91b077a2c366b89bd6d121553 SHA512 67aba2d3e545a10d6b202b77122376939a7704c36cd8e2387ca12e2e18cce69f0a0c06e29286d5ffc16f83e8aed4af9efb39a825b44a338b2ad54d7f98c28f5b WHIRLPOOL f2c8008f6d8f554a5573c69a939fa84c18aa6737eaa2c1ac11a9f3139d74385199e0e4d340b4d9d8ff20e1053b71dcd4d7b14fdb399dda7255fd298334ddd171
 DIST peg-e-1.1.2-src.tar.bz2 151224 SHA256 2eefce91eea0f3a412fa79193ed5f66b25d5eb86b8e35e58c3a4f3b62e7cf59d SHA512 d4a09dfb528cfb46222a9ee788de88b4804762125a9dc13203be29a6ec26d01f23249ebbcd25bfe207ab8c40d8bce060fc2f7f131bb1e5b263e19b97852cee53 WHIRLPOOL f7a4c383853712485a6b1ccd96af60d5cf4f29e59603bea93e845d72d19819665ced9e119b8dd7304723e353feb11f67a7c79e8250e6728ac4201d3acfd03911

games-board/peg-e/peg-e-1.1.1.ebuild

@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/peg-e/peg-e-1.1.1.ebuild,v 1.1 2013/01/20 02:26:10 mr_bones_ Exp $
-
-EAPI=2
-inherit eutils qt4-r2 games
-
-DESCRIPTION="A peg solitaire game"
-HOMEPAGE="http://gottcode.org/peg-e/"
-SRC_URI="http://gottcode.org/peg-e/${P}-src.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="x11-libs/qt-gui:4"
-
-src_configure() {
-	eqmake4
-}
-
-src_install() {
-	dogamesbin ${PN} || die
-	doicon icons/${PN}.png
-	domenu icons/${PN}.desktop
-	dodoc CREDITS ChangeLog
-	prepgamesdirs
-}

games-mud/tintin/tintin-2.00.9.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/tintin/tintin-2.00.9.ebuild,v 1.1 2013/01/17 23:16:26 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-mud/tintin/tintin-2.00.9.ebuild,v 1.2 2013/02/19 19:31:12 nimiux Exp $
 
 EAPI=2
 inherit games
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/tintin/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="sys-libs/zlib

games-puzzle/xye/xye-0.12.1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xye/xye-0.12.1.ebuild,v 1.1 2013/01/17 21:25:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xye/xye-0.12.1.ebuild,v 1.2 2013/02/19 19:19:26 nimiux Exp $
 
 EAPI=5
 inherit autotools eutils games
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xye/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[video]

games-util/nml/nml-0.2.4-r1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/nml/nml-0.2.4-r1.ebuild,v 1.1 2013/01/17 16:04:36 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/nml/nml-0.2.4-r1.ebuild,v 1.2 2013/02/19 19:53:00 nimiux Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://bundles.openttdcoop.org/nml/releases/${PV}/${P}.src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~x86"
 IUSE=""
 
 RDEPEND="dev-python/imaging

mail-filter/spamprobe/Manifest

@@ -1 +1 @@
-DIST spamprobe-1.4d.tar.gz 262761 RMD160 4a9e098b92e6900d8b03d7ed5e8d052f2b2e8c56 SHA1 fbcd65eb21097cd860d5e5ee2c4c2524c717a237 SHA256 217ce47dcc6f58d8201fbb0a5e2dc38b5b06349fadb1378fb3647ad8a3f44d68
+DIST spamprobe-1.4d.tar.gz 262761 SHA256 217ce47dcc6f58d8201fbb0a5e2dc38b5b06349fadb1378fb3647ad8a3f44d68 SHA512 176097b7e9de04a26a0a6a2c6b331ff375108ef7eb20cdfbda9abeec7ceb24a52c0edc932d8fcd8a5731f06b891469b4ee328562f4e88fbe6c737b719f45a8d8 WHIRLPOOL 854a8a4b711bcd4d8dccc1f7cfc5ee935eeba1af1b46e9c427da57c4f5a9742b1c49ee0bd6f9a471e42ca5ec7385656f118f8373e220ad45c3dd8031e2f5bd03

mail-filter/spamprobe/files/spamprobe-1.4d-gcc47.patch

@@ -0,0 +1,28 @@
+ https://bugs.gentoo.org/421769
+
+ ../../src/includes/Ref.h:248:5: error: 'assign' was not declared in this scope, and no declarations were found by argument-dependent lookup at the point of instantiation
+ 
+
+ src/includes/Ref.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/src/includes/Ref.h
++++ b/src/includes/Ref.h
+@@ -189,7 +189,7 @@ public:
+ 
+   CRef<T> &operator=(const CRef<T> &other)
+   {
+-    assign(other);
++    this->assign(other);
+     return *this;
+   }
+ 
+@@ -245,7 +245,7 @@ public:
+ 
+   Ref<T> &operator=(const Ref<T> &other)
+   {
+-    assign(other);
++    this->assign(other);
+     return *this;
+   }
+ 

mail-filter/spamprobe/spamprobe-1.4d.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/spamprobe-1.4d.ebuild,v 1.7 2011/02/26 17:05:15 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/spamprobe-1.4d.ebuild,v 1.8 2013/02/19 17:26:44 dirtyepic Exp $
 
 EAPI=2
 inherit eutils
@@ -22,7 +22,8 @@ DEPEND="berkdb? ( >=sys-libs/db-3.2 )
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.4b-gcc43.patch \
 		"${FILESDIR}"/${P}-libpng14.patch \
-		"${FILESDIR}"/${P}+db-5.0.patch
+		"${FILESDIR}"/${P}+db-5.0.patch \
+		"${FILESDIR}"/${P}-gcc47.patch
 }
 
 src_configure() {

media-gfx/esci-interpreter-gt-s80/Manifest

@@ -1,2 +1,4 @@
 DIST esci-interpreter-gt-s80-0.2.0-2.i386.rpm 191098 SHA256 c808b27f0e7cc61fecf0e7b71c51243e02321e55c1725a65d2317027a42ec060 SHA512 ac1d6641449e41ad96bc5e4b9ed63f5dc9d869ca3567b996fc17de8de44b56280f12f596b27048feea3af5ee7a1cf7f75219da683daddd703df5cc0215c21181 WHIRLPOOL 97f7e1dfadd361e7f5a1d362e1129a33f9cc97893d0677ea377b9739ba900c5fae113828918784c3d9a345f980080fbd962f7ede8af2dd05a3122b5687a0fd85
 DIST esci-interpreter-gt-s80-0.2.0-2.x86_64.rpm 71333 SHA256 364e8e770ed5a4f14aa88abd4b0b5ab19bb13d3e789618752eb7becd722bbf28 SHA512 32800583aedc506c8548826f4de8cc25e81aef383700fdc3ca2b59d2c3dfe34acee85273a56c47f2bef69925ac98f6767cfacf18eef61e624279506b4c9445f3 WHIRLPOOL ff1265d919acab68b392c6b7c7e49eecdd8bffa48dfb694429aa9d29b6645203a7441f9d52189cf02dc886d97365b4159986cb496d44bd7320ae6e2067811e66
+DIST esci-interpreter-gt-s80-0.2.1-1.i386.rpm 191157 SHA256 7f2b85fd0d7adaa1a9c604a5447b36ed895f1d1bfd765651556e5f69a8846ea6 SHA512 abcf9228e1265d309f07b3b77081e9c8b21a4f186ef49b857df2e53b1d9e11f11e0975673c02760bd00f96d916fe5108f9218b0bea67bc59ff78ff4c9a09eb69 WHIRLPOOL 0d642bd6747d76b19259a9579c4b4e5dff3c8fb45c68576e3f08119163d84bef2f4db6ef7b555091e1b396987e8d73a07d79ae38018772a465f67355ebb1e636
+DIST esci-interpreter-gt-s80-0.2.1-1.x86_64.rpm 71423 SHA256 6380c4ec2edd70bea1b3387b40ed669dd376823db33727e25a8b84205609693c SHA512 3977255a939630391e35775651094f6c873288c5e2c70ee70c4e19064b78e721372cdd40c7f70ae937e74b572b9a15d9b558fdd6a1dc9905bbd78abce8bd57e5 WHIRLPOOL c46dd664e947a479a47c7b9d5a2e7fb40c474146940b96afa1befeeaa50eaea929f55b909d9f3dcc412dab3ea5e14d42409cfc3558e20269f6dc78238a8c26c5

media-gfx/esci-interpreter-gt-s80/esci-interpreter-gt-s80-0.2.1.1.ebuild

@@ -0,0 +1,81 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/esci-interpreter-gt-s80/esci-interpreter-gt-s80-0.2.1.1.ebuild,v 1.1 2013/02/19 10:35:21 flameeyes Exp $
+
+EAPI=4
+
+inherit rpm versionator multilib
+
+MY_PV="$(get_version_component_range 1-3)"
+MY_PVR="$(replace_version_separator 3 -)"
+
+DESCRIPTION="Epson GT-S50 and GT-S80 scanner plugins for SANE 'epkowa' backend."
+HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
+SRC_URI="amd64? ( http://dev.gentoo.org/~flameeyes/avasys/${PN}-${MY_PVR}.x86_64.rpm )
+	x86? ( http://dev.gentoo.org/~flameeyes/avasys/${PN}-${MY_PVR}.i386.rpm )"
+
+LICENSE="AVASYS"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+IUSE=""
+
+DEPEND=">=media-gfx/iscan-2.28.0"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/opt/iscan/esci/libesci-interpreter-gt-s80.so*
+	/opt/iscan/esci/libesci-interpreter-gt-s50.so*"
+
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	dodoc usr/share/doc/*/*
+
+	# install scanner plugins
+	exeinto /opt/iscan/esci
+	doexe "${WORKDIR}/usr/$(get_libdir)/esci/"*
+}
+
+pkg_setup() {
+	basecmds=(
+		"iscan-registry --COMMAND interpreter usb 0x04b8 0x0136 /opt/iscan/esci/libesci-interpreter-gt-s80"
+		"iscan-registry --COMMAND interpreter usb 0x04b8 0x0137 /opt/iscan/esci/libesci-interpreter-gt-s50"
+		"iscan-registry --COMMAND interpreter usb 0x04b8 0x0144 /opt/iscan/esci/libesci-interpreter-gt-s80"
+		"iscan-registry --COMMAND interpreter usb 0x04b8 0x0143 /opt/iscan/esci/libesci-interpreter-gt-s50"
+	)
+}
+
+pkg_postinst() {
+	[[ -n ${REPLACING_VERSIONS} ]] && return
+
+	if [[ ${ROOT} == "/" ]]; then
+		for basecmd in "${basecmds[@]}"; do
+			eval ${basecmd/COMMAND/add}
+		done
+	else
+		ewarn "Unable to register the plugin and firmware when installing outside of /."
+		ewarn "execute the following command yourself:"
+		for basecmd in "${basecmds[@]}"; do
+			ewarn "${basecmd/COMMAND/add}"
+		done
+	fi
+}
+
+pkg_prerm() {
+	[[ -n ${REPLACED_BY_VERSION} ]] && return
+
+	if [[ ${ROOT} == "/" ]]; then
+		for basecmd in "${basecmds[@]}"; do
+			eval ${basecmd/COMMAND/remove}
+		done
+	else
+		ewarn "Unable to register the plugin and firmware when installing outside of /."
+		ewarn "execute the following command yourself:"
+		for basecmd in "${basecmds[@]}"; do
+			ewarn "${basecmd/COMMAND/remove}"
+		done
+	fi
+}

media-gfx/gimmage/Manifest

@@ -1 +1 @@
-DIST gimmage-0.2.3.tar.gz 193777 RMD160 d3fd105390e21548cf9c83b199681b53616f3640 SHA1 732dee063553b787b65a0a5bd3d207bdb5d01df1 SHA256 3d5ce3c3fd22efc9fd930e97e33e2c13a755e0a9cf099d12d5f7ecf92cab907b
+DIST gimmage-0.2.3.tar.gz 193777 SHA256 3d5ce3c3fd22efc9fd930e97e33e2c13a755e0a9cf099d12d5f7ecf92cab907b SHA512 ff8fdf860d4712502e6e8656a14e5327a5b89af49f312e54de5f0e80cd6e406214a61228c79ad643c2640268d5eacfd760c83acbebdc7fa9b6e7c094728be167 WHIRLPOOL 7d1a9485da568baec8c430dc5a9fc12eb7dd8943fa17e5fbdc00ea4334548f1f42cad1690c6f171ecb682853a86d79e0e8324e49472c5ccbd8831a800d863792

media-gfx/gimmage/files/gimmage-0.2.3-gcc47.patch

@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/422453
+
+error: 'get_current_dir_name' was not declared in this scope
+
+
+ src/FileManager.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/FileManager.cpp
++++ b/src/FileManager.cpp
+@@ -30,7 +30,7 @@ Copyright 2006 Bartek Kostrzewa
+ 
+ extern "C" {
+ #include <libintl.h>
+-// #include <unistd.h>
++#include <unistd.h>
+ #include <sys/stat.h>
+ }
+ 

media-gfx/gimmage/gimmage-0.2.3.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimmage/gimmage-0.2.3.ebuild,v 1.11 2012/05/05 07:00:25 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimmage/gimmage-0.2.3.ebuild,v 1.12 2013/02/19 18:45:27 dirtyepic Exp $
 
 EAPI=2
 inherit autotools eutils
@@ -25,7 +25,8 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gcc43.patch \
 		"${FILESDIR}"/${P}-as-needed.patch \
-		"${FILESDIR}"/${P}-desktop-entry.patch
+		"${FILESDIR}"/${P}-desktop-entry.patch \
+		"${FILESDIR}"/${P}-gcc47.patch
 	eautoreconf
 }
 

media-gfx/iscan-data/Manifest

@@ -1,2 +1,3 @@
-DIST iscan-data_1.13.0-1.tar.gz 92925 RMD160 b83f4c31c5b040622c93647d900e2734ec8a6626 SHA1 a81a7ac8e16bc20c125f351ba3c38ea6b84de236 SHA256 fda8040db87a4ac5fa465f7c15527273c51ab3bf4fece37d760c96f602592ea0
+DIST iscan-data_1.13.0-1.tar.gz 92925 SHA256 fda8040db87a4ac5fa465f7c15527273c51ab3bf4fece37d760c96f602592ea0 SHA512 e2f5360a0e6d8ca7c1bfbc1536368bdec137f7db8ef694ebd6afdd2ca53bcea053a452fd4819a47531695f57022e7dc5953160c54cabe6af2882d54c1af49ec4 WHIRLPOOL b0c7d27a563aba8273a7c819f1352309f28f9078b6e375bc484b3836a6819bfe3fea4ea626de1fee91b17c7a10121c4d6c087a40d9d017892db947ab51012dd3
-DIST iscan-data_1.9.0-1.tar.gz 90850 RMD160 ce40b50be14db0dee690521ef43f2fe4c14d3e8b SHA1 1ea0974196525295fa503627efeb7344e0dfd338 SHA256 2a1a93281f5cda949b4524bdb198328f0fc70ce56f8a60173c0c458130806f5d
+DIST iscan-data_1.22.0-1.tar.gz 96626 SHA256 e6ef1c275488d907869f48eb7889d9a01e564ea4b39e291e90843feb59e92ef8 SHA512 2adc6c125045803ffd269abab4f58d6d1c87ebd4c959985e6689d0b2e7f5a84fb1956d0e559c35b1704a1e330bc639e668c37f718c871e076a7ccf6c35562e6f WHIRLPOOL f4b7aaf68396c54295b40999653b4f1f8777d154e38ff1612a2458c2449570a6213fd41abeb13d6d06cba09828f8f35d485a6cce7303e8657a7ce87887657cc2
+DIST iscan-data_1.9.0-1.tar.gz 90850 SHA256 2a1a93281f5cda949b4524bdb198328f0fc70ce56f8a60173c0c458130806f5d SHA512 945b5aaf3946773c58bfd2c8abae3d95e2769e5cc3b61317791d63d0827086618b635a1dcfb331539fff3676bec4c30c9c1e2fa84dfdf89536e23c30850c4fb7 WHIRLPOOL 97121436ccb95c7f267505d0867deb79a648caafa0457c1825fc14e83709daf79f96c450658ebf4046bc0652b925452d085c5ff120af7ceac140d5f2170fc489

media-gfx/iscan-data/iscan-data-1.22.0.1.ebuild

@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan-data/iscan-data-1.22.0.1.ebuild,v 1.1 2013/02/19 10:38:54 flameeyes Exp $
+
+EAPI=4
+
+inherit eutils versionator
+
+MY_PV="$(get_version_component_range 1-3)"
+MY_PVR="$(replace_version_separator 3 -)"
+
+DESCRIPTION="Image Scan! for Linux data files"
+HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
+SRC_URI="http://dev.gentoo.org/~flameeyes/avasys/${PN}_${MY_PVR}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/libxslt"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# create udev rules
+	dodir /lib/udev/rules.d
+	"${D}usr/$(get_libdir)/iscan-data/make-policy-file" \
+		--force --quiet --mode udev \
+		-d "${D}usr/share/iscan-data/epkowa.desc" \
+		-o "${D}$(get_libdir)/udev/rules.d/99-iscan.rules"
+
+	# install docs
+	dodoc NEWS SUPPORTED-DEVICES KNOWN-PROBLEMS
+}

media-gfx/iscan/Manifest

@@ -1,3 +1,6 @@
-DIST iscan_2.26.2-1.tar.gz 1106921 SHA256 e528070f588fe6166c321610dcdeed6c7cf8110152303fdbf03240e68a593659
+DIST iscan_2.26.2-1.tar.gz 1106921 SHA256 e528070f588fe6166c321610dcdeed6c7cf8110152303fdbf03240e68a593659 SHA512 82655969a8c0a7006d03d570158219f036cf5fb3fd645088177cedf52c2e30325e85c888c254d8342997ac3ac70b943402a4922cc95f66820a640ed572fd55fb WHIRLPOOL ad905f9cd8ff497f0821fa60d6b44e23e9010f7c5bdccb2fd13f7be50dd7853461da21dd515490d75914c3153e81764f244909411aa227e2df29c389a1910897
-DIST iscan_2.28.1-3.tar.gz 1195938 SHA256 97fbaf4d66697762a32768b96f3ecb59c3582b6fdc1c1919119f8b73aa2d3b13
+DIST iscan_2.28.1-3.tar.gz 1195938 SHA256 97fbaf4d66697762a32768b96f3ecb59c3582b6fdc1c1919119f8b73aa2d3b13 SHA512 0c7421d3b06ced928dc0d25376eff88496d2f90e61e19c28cd74b403012b6c23652bd5d2f5571aa793e453834604101668ca94c937afef3d301802d286375004 WHIRLPOOL c880672c1123b44e040089797cb6f95b33f708a518822117ed438485cb562804889b45a4e52702886ac7cd5ec86c978cc42135c43b531ad39ad893fefd6958aa
-DIST userg_revL_e.pdf 574224 SHA256 e68a45d600f702311d10a0e13d42c5b32036df172e8f07728604291b823ec876
+DIST iscan_2.29.1-5.tar.gz 1217266 SHA256 7198b5fb081bd1b6dd3747ca645c9d36ab1fef03970803145ea3d31d2c1fffb4 SHA512 945dbe0e55670b9172a455f8c067e3175aae88eff79a900fc1d5221c2246f06daadae16673e6a7bd6a0e00f6fc810ed16d5d1f6c7e93237d64dbd1f81416e20e WHIRLPOOL ea9cd332fbbe1f20a843dc45fb1b7edca617b127440f78938c399f763f70d32951a61069b5313c1d9e5fc6e534d9c7b32e15b9fa9638c2521a0bcfe9851d145a
+DIST userg_revL_e.pdf 574224 SHA256 e68a45d600f702311d10a0e13d42c5b32036df172e8f07728604291b823ec876 SHA512 59cb65ed90913669a4f69fffbdd8dcd1965eabad482f08302c384e9aa75252acfe68470f66ae8ac29cc2b4d109d9395115b9723fbd9cbcb31d2847c55fcc4c18 WHIRLPOOL 082cbf872e43604c4359ed7388aa2cd2519aead961187230a1232592b3952161c850fb4c060a787aefbd4bc58c2853a1489c0144687afadd45e65affcad04289
+DIST userg_revQ_e.pdf 627189 SHA256 7f40dfb94bf747a5059c17cba21e72e2485226ea41655453d010b46ed96e8a1c SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc WHIRLPOOL f1497a87ad9b991a05a7a93ff5603944b1cadf00b5162498ff4c0ff1d85615de922324ee5574d0f8540e2d44fc2dede2a25157e562633f51b75eb8e4d4e56dc2
+DIST userg_revQ_j.pdf 734920 SHA256 22d29bd17fe8c5772cdcdfb5201eff54eeaadebe3c94563ee4fcfc04579a1c4d SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90 WHIRLPOOL 0f567a4d3543ea0df1d49e92211ba3811a03f200f828d4348eb00bb695df915ae75001faec52d616ff98d4da617ef6cfe95795ece33eeb114b0378892294647e

media-gfx/iscan/files/iscan-2.29.1-drop-ltdl.patch

@@ -0,0 +1,64 @@
+diff -Naur iscan-2.29.1.orig/backend/Makefile.am iscan-2.29.1/backend/Makefile.am
+--- iscan-2.29.1.orig/backend/Makefile.am	2012-06-11 23:33:33.000000000 -0500
++++ iscan-2.29.1/backend/Makefile.am	2013-02-18 20:29:05.091814060 -0600
+@@ -58,7 +58,6 @@
+ 
+ libepkowa_la_CPPFLAGS = \
+ 	$(AM_CPPFLAGS) \
+-	$(LTDLINCL) \
+ 	-I$(top_srcdir)/include \
+ 	-I$(top_srcdir)/non-free \
+ 	$(XML_CFLAGS) \
+@@ -70,7 +69,7 @@
+ 	-lm \
+ 	$(XML_LIBS) \
+ 	$(LIBUSB_1_0_LIBS) \
+-	$(LIBLTDL)
++	-lltdl
+ libepkowa_la_SOURCES = \
+ 	$(sane_backends_files) \
+ 	ipc.c \
+diff -Naur iscan-2.29.1.orig/configure.ac iscan-2.29.1/configure.ac
+--- iscan-2.29.1.orig/configure.ac	2012-06-11 23:33:34.000000000 -0500
++++ iscan-2.29.1/configure.ac	2013-02-18 20:30:10.413311997 -0600
+@@ -266,13 +266,10 @@
+ dnl  The somewhat obscure LT_AC_PROG_SED is here to make sure that the
+ dnl  SED environment variable gets set before it's used by the libtool
+ dnl  machinery.  This works around buggy libtool versions.
+-LT_AC_PROG_SED
+-AC_LIBLTDL_INSTALLABLE
+-AC_LIBTOOL_DLOPEN
+ AC_PROG_LIBTOOL
+-AC_LIB_LTDL
+-AC_SUBST(LTDLINCL)
+-AC_SUBST(LIBLTDL)
++AC_LTDL_SHLIBPATH
++AC_LTDL_SHLIBEXT
++AC_LTDL_SYSSEARCHPATH
+ 
+ 
+ dnl  Graphic file format options
+diff -Naur iscan-2.29.1.orig/frontend/Makefile.am iscan-2.29.1/frontend/Makefile.am
+--- iscan-2.29.1.orig/frontend/Makefile.am	2012-06-11 23:33:33.000000000 -0500
++++ iscan-2.29.1/frontend/Makefile.am	2013-02-18 20:30:38.764092975 -0600
+@@ -34,7 +34,7 @@
+ iscan_LDADD = \
+ 	$(top_builddir)/lib/libimage-stream.la \
+ 	-lsane \
+-	@LIBLTDL@ \
++	-lltdl \
+ 	@GTK_LIBS@ \
+ 	@GDK_IMLIB_LIBS@ \
+ 	$(top_builddir)/non-free/libesmod.so
+diff -Naur iscan-2.29.1.orig/lib/Makefile.am iscan-2.29.1/lib/Makefile.am
+--- iscan-2.29.1.orig/lib/Makefile.am	2012-06-11 23:33:34.000000000 -0500
++++ iscan-2.29.1/lib/Makefile.am	2013-02-18 20:30:58.852936051 -0600
+@@ -30,7 +30,7 @@
+ libimage_stream_la_CPPFLAGS = -I$(top_srcdir)/include
+ libimage_stream_la_LDFLAGS = -static
+ libimage_stream_la_LIBADD  = \
+-	$(LIBLTDL) \
++	-lltdl \
+ 	$(top_builddir)/lib/pdf/libpdf.la
+ libimage_stream_la_SOURCES = \
+ 	$(libimage_stream_la_files)

media-gfx/iscan/iscan-2.29.1.5.ebuild

@@ -0,0 +1,173 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/iscan-2.29.1.5.ebuild,v 1.1 2013/02/19 10:39:15 flameeyes Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic autotools versionator
+
+# HINTS:
+# -> non-free modules are x86 and amd64 only
+# -> iscan frontend needs non-free modules
+# -> sane-epkowa should be usable on every arch
+# -> ${P}-${SRC_REV}.tar.gz    (for gcc 3.2/3.3)
+# -> ${P}-${SRC_REV}.c2.tar.gz (for gcc 3.4 or later)
+
+# FIXME:
+# Make jpeg/png optional. The problem is, that the configure script ignores --disable-*,
+# if the corresponding lib is found on the system.
+# Furthermore, iscan doesn't compile w/o libusb, this should be fixed somehow.
+
+# TODO:
+# (re)add closed-source binary modules which are needed for some scanners.
+
+KEYWORDS="~amd64 ~x86"
+
+MY_PV="$(get_version_component_range 1-3)"
+MY_PVR="$(replace_version_separator 3 -)"
+MY_DOC="userg_revQ"
+
+DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend)"
+HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
+SRC_URI="http://dev.gentoo.org/~flameeyes/avasys/${PN}_${MY_PVR}.tar.gz
+	doc? ( http://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_e.pdf 
+		linguas_ja? ( http://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_j.pdf )
+	)"
+LICENSE="GPL-2 AVASYS"
+SLOT="0"
+
+IUSE="X gimp jpeg png tiff doc"
+IUSE_LINGUAS="ar de es fr it ja ko nl pt zh_CN zh_TW"
+
+for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done
+
+QA_PRESTRIPPED="usr/$(get_libdir)/libesmod.so.*"
+QA_TEXTRELS="${QA_PRESTRIPPED}"
+QA_FLAGS_IGNORED="${QA_PRESTRIPPED}"
+
+# Upstream ships broken sanity test
+RESTRICT="test"
+
+RDEPEND="media-gfx/iscan-data
+	media-gfx/sane-backends
+	virtual/udev
+	virtual/libusb:0
+	X? (
+		x11-libs/gtk+:2
+		gimp? ( media-gfx/gimp )
+		png? ( media-libs/libpng )
+		jpeg? ( virtual/jpeg )
+		tiff? ( media-libs/tiff )
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	X? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	local i
+
+	# convert japanese docs to UTF-8
+	if use linguas_ja; then
+		for i in {NEWS,README}.ja non-free/*.ja.txt; do
+			if [ -f "${i}" ]; then
+				echo ">>> Converting ${i} to UTF-8"
+				iconv -f eucjp -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
+			fi
+		done
+	fi
+
+	# disable checks for gtk+
+	if ! use X; then
+		sed -i -e "s:PKG_CHECK_MODULES(GTK,.*):AC_DEFINE([HAVE_GTK_2], 0):g" \
+			-e "s:\(PKG_CHECK_MODULES(GDK_IMLIB,.*)\):#\1:g" configure.ac
+	fi
+
+	epatch "${FILESDIR}"/iscan-2.29.1-drop-ltdl.patch
+	epatch "${FILESDIR}"/iscan-2.25.0-fix-g++-test.patch
+	epatch "${FILESDIR}"/iscan-2.28.1.3+libpng-1.5.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -D_GNU_SOURCE  # needed for 'strndup'
+	local myconf="--enable-dependency-reduction"
+
+	if use X; then
+		myconf="${myconf}
+			--enable-frontend
+			$(use_enable gimp)
+			$(use_enable jpeg)
+			$(use_enable png)
+			$(use_enable tiff)"
+	else
+		myconf="${myconf}
+			--disable-frontend --disable-gimp
+			--disable-jpeg --disable-png --disable-tiff"
+	fi
+
+	econf --disable-static ${myconf}
+}
+
+src_install() {
+	local MY_LIB="/usr/$(get_libdir)"
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# install docs
+	dodoc AUTHORS NEWS README
+	use linguas_ja && dodoc NEWS.ja README.ja
+
+	# install sane config
+	insinto /etc/sane.d
+	doins backend/epkowa.conf
+
+	# install extra docs
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		if use linguas_ja; then
+			doins "${DISTDIR}/${MY_DOC}_j.pdf"
+		else
+			doins "${DISTDIR}/${MY_DOC}_e.pdf"
+		fi
+	fi
+
+	# link iscan so it is seen as a plugin in gimp
+	if use X && use gimp; then
+		local plugindir
+		if [ -x /usr/bin/gimptool ]; then
+			plugindir="$(gimptool --gimpplugindir)/plug-ins"
+		elif [ -x /usr/bin/gimptool-2.0 ]; then
+			plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
+		else
+			die "Can't find GIMP plugin directory."
+		fi
+		dodir "${plugindir}"
+		dosym /usr/bin/iscan "${plugindir}"
+	fi
+
+	# install desktop entry
+	if use X; then
+		make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner
+	fi
+}
+
+pkg_postinst() {
+	local i
+	local DLL_CONF="/etc/sane.d/dll.conf"
+	local EPKOWA_CONF="/etc/sane.d/epkowa.conf"
+
+	elog
+	if grep -q "^[ \t]*\<epkowa\>" ${DLL_CONF}; then
+		elog "Please edit ${EPKOWA_CONF} to suit your needs."
+	elif grep -q "\<epkowa\>" ${DLL_CONF}; then
+		elog "Hint: to enable the backend, add 'epkowa' to ${DLL_CONF}"
+		elog "Then edit ${EPKOWA_CONF} to suit your needs."
+	else
+		echo "epkowa" >> ${DLL_CONF}
+		elog "A new entry 'epkowa' was added to ${DLL_CONF}"
+		elog "Please edit ${EPKOWA_CONF} to suit your needs."
+	fi
+}

media-libs/alsa-lib/alsa-lib-1.0.26-r1.ebuild

@@ -0,0 +1,69 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.26-r1.ebuild,v 1.1 2013/02/19 14:15:48 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit autotools eutils multilib python-single-r1
+
+DESCRIPTION="Advanced Linux Sound Architecture Library"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc debug alisp python"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	>=media-sound/alsa-headers-1.0.25
+	doc? ( >=app-doc/doxygen-1.2.6 )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/1.0.25-extraneous-cflags.diff
+	eautoreconf
+	epunt_cxx
+}
+
+src_configure() {
+	local myconf
+	use elibc_uclibc && myconf="--without-versioned"
+
+	econf \
+		--enable-shared \
+		--disable-resmgr \
+		--enable-rawmidi \
+		--enable-seq \
+		--enable-aload \
+		$(use_with debug) \
+		$(use_enable alisp) \
+		$(use_enable python) \
+		${myconf}
+}
+
+src_compile() {
+	emake
+
+	if use doc; then
+		emake doc
+		fgrep -Zrl "${S}" "${S}/doc/doxygen/html" | \
+			xargs -0 sed -i -e "s:${S}::"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	prune_libtool_files --all
+	find "${ED}"/usr/$(get_libdir)/alsa-lib -name '*.a' -exec rm -f {} +
+
+	dodoc ChangeLog TODO
+	use doc && dohtml -r doc/doxygen/html/*
+}

media-libs/freeimage/Manifest

@@ -1,2 +1,4 @@
 DIST FreeImage3153.pdf 1004540 SHA256 325767978f0208a6dd2d2f6cb1cc184cea6aec843d9948a051c41b6a16284546 SHA512 91775a5ec9227fc5a42431383157d82d2d2bd40b92e234518e4b347cfd20c873fb29ec84289d7bdee127b01c02b9eb5da24c386d6f78a7346684fccee158f939 WHIRLPOOL afdad90143a9ed3a62fa8dd0666355fdeaa3689e15873778b47927f6a6c170da88d7891f94f5889c94a5a54d608845c16a6c033a65afc9477d9deec9f12af5ee
 DIST FreeImage3153.zip 4681769 SHA256 4618d59f2d9a20583b0f5fec99dcf832ccc3f317897b10592b85e7648375c044 SHA512 2cc38218cf1e8d403faa71d2337009ff6c0c60e1833eea2e19ddaf2fedba001198f4bff9805c4e815653d7bee79bac6a9132a7c9af69f59d5ee1cae531ad2069 WHIRLPOOL 89f8ecd1152d303b7c5613314ab7f2b68d66fb5c1cccf214e58a8c031a6d22ad842a5b37240ab38d9f6eb035f6d6a688afe6591da9c22898e882b1baecac0e50
+DIST FreeImage3154.pdf 1007480 SHA256 455b0ba7cf571f3fc3027681a70abf3c2321d0a4fd7956c5ba58bd7ccb7b5373 SHA512 cebde5e2609c9a0c06b4e07e1c595d7d6714895095cd9935f59c8b2ff9b34116248f5453b41f469f6242d87cae79be82d59f6a9ec0f75b1ea3df61ac1f651b28 WHIRLPOOL a1e8b575d198b61e74db9eb31e9472460158e86989ed822c156cae3f625f6ea0d156e4b7ddffc8b7a1d16a601be39b4cf0e20558d36bb4dd73195fea4faa43e7
+DIST FreeImage3154.zip 5513923 SHA256 eb6361519d33131690a0e726b085a05825e5adf9fb72c752d8d39100e48dc829 SHA512 0db9eb7d0ed8e08e10ff4fa274c4484541ca119c3d437a85fdc3b2d9232bf14a7877c79b1e62c8c99278d7020a9f623c161f2342475f3ee526233404138112cc WHIRLPOOL 2747bb7a35d8de24a1a876616626a9e840495f06da836ce15135aafaa21bc1d8d9cece17f7512424b66edfcc521ed096ea85da5ea5b5b90b4c032bf080356b4d

media-libs/freeimage/files/freeimage-3.15.4-unbundling.patch

@@ -0,0 +1,639 @@
+lots of fixes here:
+	- use system graphics libraries
+	- make all of them optional
+	- drop root users from install (fix user installs)
+	- make static lib build optional
+	- link with CXX and CXXFLAGS (since this is C++ code)
+
+--- Makefile.gnu
++++ Makefile.gnu
+@@ -11,7 +11,24 @@
+ # Converts cr/lf to just lf
+ DOS2UNIX = dos2unix
+ 
+-LIBRARIES = -lstdc++
++PKG_CONFIG ?= pkg-config
++
++USE_EXR ?= yes
++USE_JPEG ?= yes
++USE_JPEG2K ?= yes
++USE_MNG ?= yes
++USE_PNG ?= yes
++USE_TIFF ?= yes
++USE_RAW ?= yes
++
++LIBRARIES-yes = $(shell $(PKG_CONFIG) --libs zlib)
++LIBRARIES-$(USE_EXR)    += $(shell $(PKG_CONFIG) --libs OpenEXR)
++LIBRARIES-$(USE_JPEG)   += -ljpeg
++LIBRARIES-$(USE_JPEG2K) += $(shell $(PKG_CONFIG) --libs libopenjpeg)
++LIBRARIES-$(USE_MNG)    += -lmng
++LIBRARIES-$(USE_PNG)    += $(shell $(PKG_CONFIG) --libs libpng)
++LIBRARIES-$(USE_TIFF)   += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase)
++LIBRARIES-$(USE_RAW)    += $(shell $(PKG_CONFIG) --libs libraw)
+ 
+ MODULES = $(SRCS:.c=.o)
+ MODULES := $(MODULES:.cpp=.o)
+@@ -64,13 +81,15 @@
+ 	$(AR) r $@ $(MODULES)
+ 
+ $(SHAREDLIB): $(MODULES)
+-	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
++	$(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES-yes)
+ 
+ install:
+ 	install -d $(INCDIR) $(INSTALLDIR)
+-	install -m 644 -o root -g root $(HEADER) $(INCDIR)
+-	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
+-	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
++	install -m 644 $(HEADER) $(INCDIR)
++ifneq ($(STATICLIB),)
++	install -m 644 $(STATICLIB) $(INSTALLDIR)
++endif
++	install -m 755 $(SHAREDLIB) $(INSTALLDIR)
+ 	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
+ 	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	
+ #	ldconfig
+--- Source/FreeImage/J2KHelper.cpp
++++ Source/FreeImage/J2KHelper.cpp
+@@ -21,7 +21,7 @@
+ 
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../LibOpenJPEG/openjpeg.h"
++#include <openjpeg.h>
+ 
+ /**
+ Divide an integer by a power of 2 and round upwards
+--- Source/FreeImage/PluginEXR.cpp
++++ Source/FreeImage/PluginEXR.cpp
+@@ -22,16 +22,16 @@
+ 
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../OpenEXR/IlmImf/ImfIO.h"
+-#include "../OpenEXR/Iex/Iex.h"
+-#include "../OpenEXR/IlmImf/ImfOutputFile.h"
+-#include "../OpenEXR/IlmImf/ImfInputFile.h"
+-#include "../OpenEXR/IlmImf/ImfRgbaFile.h"
+-#include "../OpenEXR/IlmImf/ImfChannelList.h"
+-#include "../OpenEXR/IlmImf/ImfRgba.h"
+-#include "../OpenEXR/IlmImf/ImfArray.h"
+-#include "../OpenEXR/IlmImf/ImfPreviewImage.h"
+-#include "../OpenEXR/Half/half.h"
++#include <ImfIO.h>
++#include <Iex.h>
++#include <ImfOutputFile.h>
++#include <ImfInputFile.h>
++#include <ImfRgbaFile.h>
++#include <ImfChannelList.h>
++#include <ImfRgba.h>
++#include <ImfArray.h>
++#include <ImfPreviewImage.h>
++#include <half.h>
+ 
+ 
+ // ==========================================================
+--- Source/FreeImage/PluginJ2K.cpp
++++ Source/FreeImage/PluginJ2K.cpp
+@@ -21,7 +21,7 @@
+ 
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../LibOpenJPEG/openjpeg.h"
++#include <openjpeg.h>
+ 
+ // ==========================================================
+ // Plugin Interface
+--- Source/FreeImage/PluginJP2.cpp
++++ Source/FreeImage/PluginJP2.cpp
+@@ -21,7 +21,7 @@
+ 
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../LibOpenJPEG/openjpeg.h"
++#include <openjpeg.h>
+ 
+ // ==========================================================
+ // Plugin Interface
+--- Source/FreeImage/PluginPNG.cpp
++++ Source/FreeImage/PluginPNG.cpp
+@@ -37,8 +37,8 @@
+ 
+ // ----------------------------------------------------------
+ 
+-#include "../ZLib/zlib.h"
+-#include "../LibPNG/png.h"
++#include <zlib.h>
++#include <png.h>
+ 
+ // ----------------------------------------------------------
+ 
+--- Source/transupp.c
++++ Source/transupp.c
+@@ -15,8 +15,7 @@
+ /* Although this file really shouldn't have access to the library internals,
+  * it's helpful to let it call jround_up() and jcopy_block_row().
+  */
+-#define JPEG_INTERNALS
+-
++#include <jerror.h>
+ #include "jinclude.h"
+ #include "jpeglib.h"
+ #include "transupp.h"		/* My own external interface */
+--- Source/FreeImage/ZLibInterface.cpp
++++ Source/FreeImage/ZLibInterface.cpp
+@@ -19,10 +19,10 @@
+ // Use at your own risk!
+ // ==========================================================
+ 
+-#include "../ZLib/zlib.h"
++#include <zlib.h>
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../ZLib/zutil.h"	/* must be the last header because of error C3163 in VS2008 (_vsnprintf defined in stdio.h) */
++#define OS_CODE 0x03
+ 
+ /**
+ Compresses a source buffer into a target buffer, using the ZLib library. 
+--- Source/FreeImage/PluginG3.cpp
++++ Source/FreeImage/PluginG3.cpp
+@@ -20,7 +20,7 @@
+ // Use at your own risk!
+ // ==========================================================
+ 
+-#include "../LibTIFF4/tiffiop.h"
++#include "tiffiop.h"
+ 
+ #include "FreeImage.h"
+ #include "Utilities.h"
+--- Source/FreeImage/PluginJPEG.cpp
++++ Source/FreeImage/PluginJPEG.cpp
+@@ -35,11 +35,15 @@
+ #undef FAR
+ #include <setjmp.h>
+ 
+-#include "../LibJPEG/jinclude.h"
+-#include "../LibJPEG/jpeglib.h"
+-#include "../LibJPEG/jerror.h"
++#include <string.h>
++#include <stdio.h>
++#include <jconfig.h>
++#include <jpeglib.h>
++#include <jerror.h>
+ }
+ 
++#define SIZEOF(object)        ((size_t) sizeof(object))
++
+ #include "FreeImage.h"
+ #include "Utilities.h"
+ 
+--- Source/FreeImageToolkit/JPEGTransform.cpp
++++ Source/FreeImageToolkit/JPEGTransform.cpp
+@@ -25,10 +25,11 @@
+ #undef FAR
+ #include <setjmp.h>
+ 
+-#include "../LibJPEG/jinclude.h"
+-#include "../LibJPEG/jpeglib.h"
+-#include "../LibJPEG/jerror.h"
+-#include "../LibJPEG/transupp.h"
++#include <string.h>
++#include <stdio.h>
++#include <jpeglib.h>
++#include <jerror.h>
++#include "transupp.h"
+ }
+ 
+ #include "FreeImage.h"
+--- Makefile.fip
++++ Makefile.fip
+@@ -11,7 +11,24 @@
+ # Converts cr/lf to just lf
+ DOS2UNIX = dos2unix
+ 
+-LIBRARIES = -lstdc++
++PKG_CONFIG ?= pkg-config
++
++USE_EXR ?= yes
++USE_JPEG ?= yes
++USE_JPEG2K ?= yes
++USE_MNG ?= yes
++USE_PNG ?= yes
++USE_TIFF ?= yes
++USE_RAW ?= yes
++
++LIBRARIES-yes = $(shell $(PKG_CONFIG) --libs zlib)
++LIBRARIES-$(USE_EXR)    += $(shell $(PKG_CONFIG) --libs OpenEXR)
++LIBRARIES-$(USE_JPEG)   += -ljpeg
++LIBRARIES-$(USE_JPEG2K) += $(shell $(PKG_CONFIG) --libs libopenjpeg)
++LIBRARIES-$(USE_MNG)    += -lmng
++LIBRARIES-$(USE_PNG)    += $(shell $(PKG_CONFIG) --libs libpng)
++LIBRARIES-$(USE_TIFF)   += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase)
++LIBRARIES-$(USE_RAW)    += $(shell $(PKG_CONFIG) --libs libraw)
+ 
+ MODULES = $(SRCS:.c=.o)
+ MODULES := $(MODULES:.cpp=.o)
+@@ -65,14 +82,18 @@
+ 	$(AR) r $@ $(MODULES)
+ 
+ $(SHAREDLIB): $(MODULES)
+-	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
++	$(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES-yes)
+ 
+ install:
+ 	install -d $(INCDIR) $(INSTALLDIR)
+-	install -m 644 -o root -g root $(HEADER) $(INCDIR)
+-	install -m 644 -o root -g root $(HEADERFIP) $(INCDIR)
+-	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
+-	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
++	install -m 644 $(HEADER) $(INCDIR)
++	install -m 644 $(HEADERFIP) $(INCDIR)
++ifneq ($(STATICLIB),)
++	install -m 644 $(STATICLIB) $(INSTALLDIR)
++endif
++	install -m 755 $(SHAREDLIB) $(INSTALLDIR)
++	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
++	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
+ 
+ clean:
+ 	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
+--- Makefile.srcs
++++ Makefile.srcs
+@@ -1,6 +1,14 @@
++USE_EXR ?= yes
++USE_JPEG ?= yes
++USE_JPEG2K ?= yes
++USE_MNG ?= yes
++USE_PNG ?= yes
++USE_TIFF ?= yes
++USE_RAW ?= yes
++
+ VER_MAJOR = 3
+ VER_MINOR = 15.4
+-SRCS = \
++SRCS-yes = \
+ 	Source/FreeImage/BitmapAccess.cpp \
+ 	Source/FreeImage/ColorLookup.cpp \
+ 	Source/FreeImage/FreeImage.cpp \
+@@ -17,36 +25,74 @@ SRCS = \
+ 	Source/FreeImage/GetType.cpp \
+ 	Source/FreeImage/MemoryIO.cpp \
+ 	Source/FreeImage/PixelAccess.cpp \
++
++SRCS-$(USE_JPEG2K) += \
+ 	Source/FreeImage/J2KHelper.cpp \
++
++SRCS-$(USE_MNG) += \
+ 	Source/FreeImage/MNGHelper.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/Plugin.cpp \
+ 	Source/FreeImage/PluginBMP.cpp \
+ 	Source/FreeImage/PluginCUT.cpp \
+ 	Source/FreeImage/PluginDDS.cpp \
++
++SRCS-$(USE_EXR) += \
+ 	Source/FreeImage/PluginEXR.cpp \
++
++SRCS-$(USE_TIFF) += \
+ 	Source/FreeImage/PluginG3.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/PluginGIF.cpp \
+ 	Source/FreeImage/PluginHDR.cpp \
+ 	Source/FreeImage/PluginICO.cpp \
+ 	Source/FreeImage/PluginIFF.cpp \
++
++SRCS-$(USE_JPEG2K) += \
+ 	Source/FreeImage/PluginJ2K.cpp \
++
++SRCS-$(USE_MNG) += \
+ 	Source/FreeImage/PluginJNG.cpp \
++
++SRCS-$(USE_JPEG2K) += \
+ 	Source/FreeImage/PluginJP2.cpp \
++
++SRCS-$(USE_JPEG) += \
+ 	Source/FreeImage/PluginJPEG.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/PluginKOALA.cpp \
++
++SRCS-$(USE_MNG) += \
+ 	Source/FreeImage/PluginMNG.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/PluginPCD.cpp \
+ 	Source/FreeImage/PluginPCX.cpp \
+ 	Source/FreeImage/PluginPFM.cpp \
+ 	Source/FreeImage/PluginPICT.cpp \
++
++SRCS-$(USE_PNG) += \
+ 	Source/FreeImage/PluginPNG.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/PluginPNM.cpp \
+ 	Source/FreeImage/PluginPSD.cpp \
+ 	Source/FreeImage/PluginRAS.cpp \
++
++SRCS-$(USE_RAW) += \
+ 	Source/FreeImage/PluginRAW.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/PluginSGI.cpp \
+ 	Source/FreeImage/PluginTARGA.cpp \
++
++SRCS-$(USE_TIFF) += \
+ 	Source/FreeImage/PluginTIFF.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/PluginWBMP.cpp \
+ 	Source/FreeImage/PluginXBM.cpp \
+ 	Source/FreeImage/PluginXPM.cpp \
+@@ -83,7 +129,11 @@ SRCS = \
+ 	Source/Metadata/IPTC.cpp \
+ 	Source/Metadata/TagConversion.cpp \
+ 	Source/Metadata/TagLib.cpp \
++
++SRCS-$(USE_TIFF) += \
+ 	Source/Metadata/XTIFF.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImageToolkit/Background.cpp \
+ 	Source/FreeImageToolkit/BSplineRotate.cpp \
+ 	Source/FreeImageToolkit/Channels.cpp \
+@@ -92,10 +142,18 @@ SRCS = \
+ 	Source/FreeImageToolkit/CopyPaste.cpp \
+ 	Source/FreeImageToolkit/Display.cpp \
+ 	Source/FreeImageToolkit/Flip.cpp \
++
++SRCS-$(USE_JPEG) += \
+ 	Source/FreeImageToolkit/JPEGTransform.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImageToolkit/MultigridPoissonSolver.cpp \
+ 	Source/FreeImageToolkit/Rescale.cpp \
+ 	Source/FreeImageToolkit/Resize.cpp \
++
++SRCS-$(USE_JPEG) += \
++	Source/transupp.c
++SRCS = $(SRCS-yes)
+ INCLS = \
+ 	Examples/OpenGL/TextureManager/TextureManager.h \
+ 	Examples/Plugin/PluginCradle.h \
+@@ -116,7 +174,17 @@
+ 	Wrapper/FreeImagePlus/test/fipTest.h \
+ 	TestAPI/TestSuite.h
+ 
+-INCLUDE = -I. \
++INCLUDE-yes = -I. \
+ 	-ISource \
+ 	-ISource/Metadata \
+ 	-ISource/FreeImageToolkit \
++
++INCLUDE-yes += $(shell $(PKG_CONFIG) --cflags-only-I zlib)
++INCLUDE-$(USE_EXR)    += -DUSE_EXR    $(shell $(PKG_CONFIG) --cflags-only-I OpenEXR)
++INCLUDE-$(USE_JPEG)   += -DUSE_JPEG
++INCLUDE-$(USE_JPEG2K) += -DUSE_JPEG2K $(shell $(PKG_CONFIG) --cflags-only-I libopenjpeg)
++INCLUDE-$(USE_MNG)    += -DUSE_MNG
++INCLUDE-$(USE_PNG)    += -DUSE_PNG    $(shell $(PKG_CONFIG) --cflags-only-I libpng)
++INCLUDE-$(USE_TIFF)   += -DUSE_TIFF   $(shell $(PKG_CONFIG) --cflags-only-I libtiff-4 IlmBase)
++INCLUDE-$(USE_RAW)    += -DUSE_RAW    $(shell $(PKG_CONFIG) --cflags-only-I libraw)
++INCLUDE = $(INCLUDE-yes)
+--- fipMakefile.srcs
++++ fipMakefile.srcs
+@@ -1,6 +1,14 @@
++USE_EXR ?= yes
++USE_JPEG ?= yes
++USE_JPEG2K ?= yes
++USE_MNG ?= yes
++USE_PNG ?= yes
++USE_TIFF ?= yes
++USE_RAW ?= yes
++
+ VER_MAJOR = 3
+ VER_MINOR = 15.4
+-SRCS = \
++SRCS-yes = \
+ 	Source/FreeImage/BitmapAccess.cpp \
+ 	Source/FreeImage/ColorLookup.cpp \
+ 	Source/FreeImage/FreeImage.cpp \
+@@ -9,36 +17,74 @@
+ 	Source/FreeImage/GetType.cpp \
+ 	Source/FreeImage/MemoryIO.cpp \
+ 	Source/FreeImage/PixelAccess.cpp \
++
++SRCS-$(USE_JPEG2K) += \
+ 	Source/FreeImage/J2KHelper.cpp \
++
++SRCS-$(USE_MNG) += \
+ 	Source/FreeImage/MNGHelper.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/Plugin.cpp \
+ 	Source/FreeImage/PluginBMP.cpp \
+ 	Source/FreeImage/PluginCUT.cpp \
+ 	Source/FreeImage/PluginDDS.cpp \
++
++SRCS-$(USE_EXR) += \
+ 	Source/FreeImage/PluginEXR.cpp \
++
++SRCS-$(USE_TIFF) += \
+ 	Source/FreeImage/PluginG3.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/PluginGIF.cpp \
+ 	Source/FreeImage/PluginHDR.cpp \
+ 	Source/FreeImage/PluginICO.cpp \
+ 	Source/FreeImage/PluginIFF.cpp \
++
++SRCS-$(USE_JPEG2K) += \
+ 	Source/FreeImage/PluginJ2K.cpp \
++
++SRCS-$(USE_MNG) += \
+ 	Source/FreeImage/PluginJNG.cpp \
++
++SRCS-$(USE_JPEG2K) += \
+ 	Source/FreeImage/PluginJP2.cpp \
++
++SRCS-$(USE_JPEG) += \
+ 	Source/FreeImage/PluginJPEG.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/PluginKOALA.cpp \
++
++SRCS-$(USE_MNG) += \
+ 	Source/FreeImage/PluginMNG.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/PluginPCD.cpp \
+ 	Source/FreeImage/PluginPCX.cpp \
+ 	Source/FreeImage/PluginPFM.cpp \
+ 	Source/FreeImage/PluginPICT.cpp \
++
++SRCS-$(USE_PNG) += \
+ 	Source/FreeImage/PluginPNG.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/PluginPNM.cpp \
+ 	Source/FreeImage/PluginPSD.cpp \
+ 	Source/FreeImage/PluginRAS.cpp \
++
++SRCS-$(USE_RAW) += \
+ 	Source/FreeImage/PluginRAW.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/PluginSGI.cpp \
+ 	Source/FreeImage/PluginTARGA.cpp \
++
++SRCS-$(USE_TIFF) += \
+ 	Source/FreeImage/PluginTIFF.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImage/PluginWBMP.cpp \
+ 	Source/FreeImage/PluginXBM.cpp \
+ 	Source/FreeImage/PluginXPM.cpp \
+@@ -75,7 +121,11 @@
+ 	Source/Metadata/IPTC.cpp \
+ 	Source/Metadata/TagConversion.cpp \
+ 	Source/Metadata/TagLib.cpp \
++
++SRCS-$(USE_TIFF) += \
+ 	Source/Metadata/XTIFF.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImageToolkit/Background.cpp \
+ 	Source/FreeImageToolkit/BSplineRotate.cpp \
+ 	Source/FreeImageToolkit/Channels.cpp \
+@@ -84,7 +134,11 @@
+ 	Source/FreeImageToolkit/CopyPaste.cpp \
+ 	Source/FreeImageToolkit/Display.cpp \
+ 	Source/FreeImageToolkit/Flip.cpp \
++
++SRCS-$(USE_JPEG) += \
+ 	Source/FreeImageToolkit/JPEGTransform.cpp \
++
++SRCS-yes += \
+ 	Source/FreeImageToolkit/MultigridPoissonSolver.cpp \
+ 	Source/FreeImageToolkit/Rescale.cpp \
+ 	Source/FreeImageToolkit/Resize.cpp \
+@@ -95,6 +149,11 @@
+ 	Wrapper/FreeImagePlus/src/fipTag.cpp \
+ 	Wrapper/FreeImagePlus/src/fipWinImage.cpp \
+ 	Wrapper/FreeImagePlus/src/FreeImagePlus.cpp 
++
++SRCS-$(USE_JPEG) += \
++	Source/transupp.c
++
++SRCS = $(SRCS-yes)
+ INCLUDE = -I. \
+ 	-ISource \
+ 	-ISource/Metadata \
+--- Source/FreeImage/PluginRAW.cpp
++++ Source/FreeImage/PluginRAW.cpp
+@@ -19,7 +19,7 @@
+ // Use at your own risk!
+ // ==========================================================
+ 
+-#include "../LibRawLite/libraw/libraw.h"
++#include <libraw.h>
+ 
+ #include "FreeImage.h"
+ #include "Utilities.h"
+--- Source/Metadata/XTIFF.cpp
++++ Source/Metadata/XTIFF.cpp
+@@ -29,7 +29,7 @@
+ #pragma warning (disable : 4786) // identifier was truncated to 'number' characters
+ #endif
+ 
+-#include "../LibTIFF4/tiffiop.h"
++#include "tiffiop.h"
+ 
+ #include "FreeImage.h"
+ #include "Utilities.h"
+--- Source/FreeImage/PluginTIFF.cpp
++++ Source/FreeImage/PluginTIFF.cpp
+@@ -37,9 +37,9 @@
+ 
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../LibTIFF4/tiffiop.h"
++#include "tiffiop.h"
+ #include "../Metadata/FreeImageTag.h"
+-#include "../OpenEXR/Half/half.h"
++#include <half.h>
+ 
+ #include "FreeImageIO.h"
+ #include "PSDParser.h"
+--- Source/tiffiop.h
++++ Source/tiffiop.h
+@@ -30,7 +30,9 @@
+  * ``Library-private'' definitions.
+  */
+ 
+-#include "tif_config.h"
++#include <tiffconf.h>
++#define HAVE_SEARCH_H
++#define HAVE_FCNTL_H
+ 
+ #ifdef HAVE_FCNTL_H
+ # include <fcntl.h>
+--- Source/FreeImage/Plugin.cpp
++++ Source/FreeImage/Plugin.cpp
+@@ -223,23 +223,33 @@
+ 			*/
+ 			s_plugins->AddNode(InitBMP);
+ 			s_plugins->AddNode(InitICO);
++#ifdef USE_JPEG
+ 			s_plugins->AddNode(InitJPEG);
++#endif
++#ifdef USE_MNG
+ 			s_plugins->AddNode(InitJNG);
++#endif
+ 			s_plugins->AddNode(InitKOALA);
+ 			s_plugins->AddNode(InitIFF);
++#ifdef USE_MNG
+ 			s_plugins->AddNode(InitMNG);
++#endif
+ 			s_plugins->AddNode(InitPNM, NULL, "PBM", "Portable Bitmap (ASCII)", "pbm", "^P1");
+ 			s_plugins->AddNode(InitPNM, NULL, "PBMRAW", "Portable Bitmap (RAW)", "pbm", "^P4");
+ 			s_plugins->AddNode(InitPCD);
+ 			s_plugins->AddNode(InitPCX);
+ 			s_plugins->AddNode(InitPNM, NULL, "PGM", "Portable Greymap (ASCII)", "pgm", "^P2");
+ 			s_plugins->AddNode(InitPNM, NULL, "PGMRAW", "Portable Greymap (RAW)", "pgm", "^P5");
++#ifdef USE_PNG
+ 			s_plugins->AddNode(InitPNG);
++#endif
+ 			s_plugins->AddNode(InitPNM, NULL, "PPM", "Portable Pixelmap (ASCII)", "ppm", "^P3");
+ 			s_plugins->AddNode(InitPNM, NULL, "PPMRAW", "Portable Pixelmap (RAW)", "ppm", "^P6");
+ 			s_plugins->AddNode(InitRAS);
+ 			s_plugins->AddNode(InitTARGA);
++#ifdef USE_TIFF
+ 			s_plugins->AddNode(InitTIFF);
++#endif
+ 			s_plugins->AddNode(InitWBMP);
+ 			s_plugins->AddNode(InitPSD);
+ 			s_plugins->AddNode(InitCUT);
+@@ -248,14 +258,22 @@
+ 			s_plugins->AddNode(InitDDS);
+ 	        s_plugins->AddNode(InitGIF);
+ 	        s_plugins->AddNode(InitHDR);
++#ifdef USE_TIFF
+ 			s_plugins->AddNode(InitG3);
++#endif
+ 			s_plugins->AddNode(InitSGI);
++#ifdef USE_EXR
+ 			s_plugins->AddNode(InitEXR);
++#endif
++#ifdef USE_JPEG2K
+ 			s_plugins->AddNode(InitJ2K);
+ 			s_plugins->AddNode(InitJP2);
++#endif
+ 			s_plugins->AddNode(InitPFM);
+ 			s_plugins->AddNode(InitPICT);
++#ifdef USE_RAW
+ 			s_plugins->AddNode(InitRAW);
++#endif
+ 			
+ 			// external plugin initialization
+ 

media-libs/freeimage/freeimage-3.15.4.ebuild

@@ -0,0 +1,99 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/freeimage-3.15.4.ebuild,v 1.1 2013/02/19 20:01:28 vapier Exp $
+
+EAPI="4"
+
+inherit toolchain-funcs eutils multilib
+
+MY_PN=FreeImage
+MY_PV=${PV//.}
+MY_P=${MY_PN}${MY_PV}
+
+DESCRIPTION="Image library supporting many formats"
+HOMEPAGE="http://freeimage.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
+	mirror://sourceforge/${PN}/${MY_P}.pdf"
+
+LICENSE="|| ( GPL-2 FIPL-1.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff"
+
+# The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and
+# uses code from it to handle 16bit<->float conversions.
+RDEPEND="sys-libs/zlib
+	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/openjpeg )
+	mng? ( media-libs/libmng )
+	openexr? ( media-libs/openexr )
+	png? ( media-libs/libpng )
+	raw? ( media-libs/libraw )
+	tiff? (
+		media-libs/ilmbase
+		media-libs/tiff
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	app-arch/unzip"
+
+S=${WORKDIR}/${MY_PN}
+
+src_prepare() {
+	cd Source
+	cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die
+	cp LibTIFF4/{tiffiop,tif_dir}.h . || die
+	rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG || die
+	cd ..
+	edos2unix Makefile.{gnu,fip,srcs} fipMakefile.srcs */*.h */*/*.cpp
+	sed -i \
+		-e "s:/./:/:g" \
+		-e "s: ./: :g" \
+		-e 's: Source: \\\n\tSource:g' \
+		-e 's: Wrapper: \\\n\tWrapper:g' \
+		-e 's: Examples: \\\n\tExamples:g' \
+		-e 's: TestAPI: \\\n\tTestAPI:g' \
+		-e 's: -ISource: \\\n\t-ISource:g' \
+		-e 's: -IWrapper: \\\n\t-IWrapper:g' \
+		Makefile.srcs fipMakefile.srcs || die
+	sed -i \
+		-e "/LibJPEG/d" \
+		-e "/LibPNG/d" \
+		-e "/LibTIFF/d" \
+		-e "/Source\/ZLib/d" \
+		-e "/LibOpenJPEG/d" \
+		-e "/OpenEXR/d" \
+		-e "/LibRawLite/d" \
+		-e "/LibMNG/d" \
+		Makefile.srcs fipMakefile.srcs || die
+	epatch "${FILESDIR}"/${PN}-3.15.4-unbundling.patch
+}
+
+foreach_make() {
+	local m
+	for m in Makefile.{gnu,fip} ; do
+		emake -f ${m} \
+			USE_EXR=$(usex openexr) \
+			USE_JPEG=$(usex jpeg) \
+			USE_JPEG2K=$(usex jpeg2k) \
+			USE_MNG=$(usex mng) \
+			USE_PNG=$(usex png) \
+			USE_TIFF=$(usex tiff) \
+			USE_RAW=$(usex raw) \
+			$(usex static-libs '' STATICLIB=) \
+			"$@"
+	done
+}
+
+src_compile() {
+	tc-export AR PKG_CONFIG
+	foreach_make \
+		CXX="$(tc-getCXX) -fPIC" \
+		CC="$(tc-getCC) -fPIC" \
+		${MY_PN}
+}
+
+src_install() {
+	foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED}"/usr/$(get_libdir)
+	dodoc Whatsnew.txt "${DISTDIR}"/${MY_P}.pdf
+}

media-libs/leptonica/leptonica-1.68.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/leptonica/leptonica-1.68.ebuild,v 1.8 2013/02/18 21:03:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/leptonica/leptonica-1.68.ebuild,v 1.9 2013/02/19 16:35:54 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.leptonica.com/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 x86"
 IUSE="gif jpeg png tiff webp utils zlib static-libs"
 
 DEPEND="gif? ( media-libs/giflib )

media-libs/opengtl/opengtl-0.9.17.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opengtl/opengtl-0.9.17.ebuild,v 1.3 2012/12/04 15:39:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opengtl/opengtl-0.9.17.ebuild,v 1.4 2013/02/19 18:05:42 chithanh Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="http://download.opengtl.org/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug test"
 
 RDEPEND="

media-sound/musique/Manifest

@@ -1,4 +1,2 @@
-DIST musique-1.0.tar.gz 766324 SHA256 a3bbc377f4d73080a5fe0d4a348e03c56d6e5fb559a8e541af7407098cb94de3
-DIST musique-1.1.tar.gz 358081 SHA256 26bd8a65aa649a83fe772dc1f5c31c4f31bf32568c66f1b2c6ae1b5ff50b67c6 SHA512 f8958eafb4840e366b97d4dfd03ca49f766c41c193f8575ec7950f6b30dcb792ca5c22b48ca3366b930a54914f3f465d15e7127a8b4db4c1d1bf5a7e7c6264ac WHIRLPOOL 521118aa07deee618ab0f8b50c0c2adcb793059730b0650d554ebdcf7cd2e986003299b4aafa2b639d20b6df99c8e789becd1c437e48eb0462c992aa46fbde23
 DIST musique-1.2.1.tar.gz 374601 SHA256 cc0f626d7de981ff7fdd776fb9eab6a7750443ad55f6978132d9c9d11abd1f38 SHA512 b6d52d8345c69e5b4bfa6419cab4baeb5ed1c81106fbe98b74943cc4c6aa0712444e2189605132da2a2362d38de322926eb3f6ef0b8f25bb45e3e86e3b74cd33 WHIRLPOOL 775751a857dd2e4fbc1f9e50dea9ed0c9d40edd8af7c1bc0a9c7eb186aad39680760825b5c04bbc439d9ac98682952cf5fc2d8e8db595e0f0a99125e6112a078
 DIST musique-1.2.tar.gz 370654 SHA256 fb66b65e35b1c1a604df2556e86c9836ccb54552ba3ef8cb1950b7b1ce1fe130 SHA512 5bec10d10e8b9027f7b91f1ae13f9654312c503e81157510c744383031bbeb4200c284c7a5a69301ddfbee4b20727f6bd1e25567f24a6e62c10edecbc7efab04 WHIRLPOOL 4e5b7352b8a1b9347a374fe0c34e23f237f6ab1ad93e42ad886e63a62b22f7983ac6af2755c498e7bf38e48ecd3ae9144ed7eec4a2346d00c4f69744bcd17924