Sync with portage [Mon Jan 14 15:42:18 MSK 2013].

12 years ago · f37fc2d9c5
parent 94d6968576
commit f37fc2d9c5
184 changed files with 2464 additions and 7488 deletions
--- a/app-forensics/libewf/Manifest
+++ b/app-forensics/libewf/Manifest
@ -1,3 +1,4 @@
 DIST libewf-20100226.tar.gz 801413 SHA256 aedd2a6b3df6525ff535ab95cd569ebb361a4022eb4163390f26257913c2941a SHA512 6f8d053cd08ff699149e4f88d4d9a74d11e70f3ad73da17ec4c21d83254f2262657f8515b7bc3305074b3ad08e0be715ca0ee9b1c3a0e0f0cd832091f1650766 WHIRLPOOL 58bc62f5523c6a0d0dd9e299f697bdfa725ff95234389e5cef264004bb3462760938dbe65bc8603dfd610fdfe61d3ccbd9a96aa6dad28e49095e4a14865e7ab7
 DIST libewf-20120813.tar.gz 1556190 SHA256 a127713185b11f9387a0b0ae2f7bb56d3bfbc9550c3411509ef081b5bbee5c9c SHA512 ba459a92b78c71a42e985b67666ba1cd15d41c9156109f51626983e43976cb11730f53d2c2c30f332905d9f95c19b5adba7ec1d5cb2e2f24ee80be93e2c25ff4 WHIRLPOOL 533a30fc60d791103b7cd024b62411e322556ad37d1636c2f46622db28d4d796368de7903b2f98abb74fd9766fe3c4d6a1b5538d22262275bf20d81ec62f37ae
 DIST libewf-20121209.tar.gz 1533967 SHA256 1a10c8ec2b4ed756e9becff49c5596c455702444b5ecde9d9943143cf46c5c9c SHA512 fd350a856650e74177526c7e8e1ab8219b05dd6d60439e8ed26fe3970d0c0503925a7f7b02555c7aab5d661f2a8ba016e5aaa694b2869f9d71a8a64a3945074d WHIRLPOOL 86149b7abe4ee04d58cbc30672f4f03c6a5cc0705cd49f38ae105ab20545f564cc7f91b3a460de5216e644ba64d5c174758aa440a54f4fe21ffe215401217898
 DIST libewf-20130105.tar.gz 1534184 SHA256 ea7397872942717ee307766b204651aa545fdbb0d3191ebf0bed98f34eddd50a SHA512 ce396c6badb29eaac04cf08e107fce5d3a89ccad62a283327ab66d332bc6c6b4a6eed30eaeb86f935702e6a3451bf6adb1ca7b03de904e822ace6b060a509091 WHIRLPOOL 1abb3e7ec234c7256c19a2beea2ffeb4d59d0f61b8f7f58468fc7d60482023bea521041ff706bdbdd454a5be66339808deafa34c2bcc64292f621225fff45afe
--- a/app-forensics/libewf/libewf-20121209-r1.ebuild
+++ b/app-forensics/libewf/libewf-20121209-r1.ebuild
@ -0,0 +1,48 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-forensics/libewf/libewf-20121209-r1.ebuild,v 1.1 2013/01/14 05:39:32 radhermit Exp $
 EAPI="5"
 inherit autotools-utils
 DESCRIPTION="Implementation of the EWF (SMART and EnCase) image format"
 HOMEPAGE="http://libewf.sourceforge.net"
 SRC_URI="mirror://sourceforge/libewf/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 # upstream bug #2597171, pyewf has implicit declarations
 #IUSE="debug python rawio unicode"
 IUSE="debug ewf +fuse rawio +ssl static-libs +uuid unicode"
 DEPEND="
 	sys-libs/zlib
 	fuse? ( sys-fs/fuse )
 	uuid? ( sys-apps/util-linux )
 	ssl? ( dev-libs/openssl )"
 RDEPEND="${DEPEND}"
 AUTOTOOLS_IN_SOURCE_BUILD=1
 DOCS=( AUTHORS ChangeLog NEWS README documents/header.txt documents/header2.txt )
 src_configure() {
 	local myeconfargs=(
 		$(use_enable debug debug-output)
 		$(use_enable debug verbose-output)
 		$(use_enable ewf v1-api)
 		$(use_enable rawio low-level-functions)
 		$(use_enable unicode wide-character-type)
 		$(use_with ssl openssl)
 		$(use_with uuid libuuid)
 		$(use_with fuse libfuse)
 	)
 	autotools-utils_src_configure
 }
 src_install() {
 	autotools-utils_src_install
 	doman manuals/*.1 manuals/*.3
 }
--- a/app-forensics/libewf/libewf-20130105.ebuild
+++ b/app-forensics/libewf/libewf-20130105.ebuild
@ -0,0 +1,48 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-forensics/libewf/libewf-20130105.ebuild,v 1.1 2013/01/14 05:47:36 radhermit Exp $
 EAPI="5"
 inherit autotools-utils
 DESCRIPTION="Implementation of the EWF (SMART and EnCase) image format"
 HOMEPAGE="http://code.google.com/p/libewf/"
 SRC_URI="http://libewf.googlecode.com/files/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 # upstream bug #2597171, pyewf has implicit declarations
 #IUSE="debug python rawio unicode"
 IUSE="debug ewf +fuse rawio +ssl static-libs +uuid unicode"
 DEPEND="
 	sys-libs/zlib
 	fuse? ( sys-fs/fuse )
 	uuid? ( sys-apps/util-linux )
 	ssl? ( dev-libs/openssl )"
 RDEPEND="${DEPEND}"
 AUTOTOOLS_IN_SOURCE_BUILD=1
 DOCS=( AUTHORS ChangeLog NEWS README documents/header.txt documents/header2.txt )
 src_configure() {
 	local myeconfargs=(
 		$(use_enable debug debug-output)
 		$(use_enable debug verbose-output)
 		$(use_enable ewf v1-api)
 		$(use_enable rawio low-level-functions)
 		$(use_enable unicode wide-character-type)
 		$(use_with ssl openssl)
 		$(use_with uuid libuuid)
 		$(use_with fuse libfuse)
 	)
 	autotools-utils_src_configure
 }
 src_install() {
 	autotools-utils_src_install
 	doman manuals/*.1 manuals/*.3
 }
--- a/app-forensics/libewf/metadata.xml
+++ b/app-forensics/libewf/metadata.xml
@ -6,5 +6,7 @@
 	<flag name="rawio">Enables raw IO handling</flag>
 	<flag name="ewf2">Enables the v2 API</flag>
 	<flag name="ewf">Enables the v1 API</flag>
 	<flag name="fuse">Enable fuse support for ewfmount</flag>
 	<flag name="uuid">Enable UUID support in the ewftools</flag>
 </use>
 </pkgmetadata>
--- a/app-misc/boxes/Manifest
+++ b/app-misc/boxes/Manifest
@ -1 +1,2 @@
 DIST boxes-1.1.1.src.tar.gz 139140 SHA256 d8529840281618e75a4adf313f08291b89c8cf83928c2c1f4b0ddcd236fb2420 SHA512 bf4060a8db284b8785f0479803562df943dcd6f02584c77c1b28ee193c240d832d2736fe77dee140f2a57e8e9171bc17f418ab1a0c930a656e567b5464c0bdb6 WHIRLPOOL 634205ecebf1fec2b21ceb270b38d1ce664d18053815284a8be3060299a13229a0b40cb348fa80adf30628f9da14ce4d27c1183575d7ec19e6a85a1ff9f48181
 DIST boxes-1.1.src.tar.gz 138279 SHA256 c9f931fc9f8e0aeadb370518e3e66f1cbfa956ba7817bcb8f701630f70b711e3 SHA512 a2cad060fd0b673ae79f38e5bd8313df419408a80bda83324350211c0e82da5f46b28718bf15678c8b4dba15580e923f246081bbb10114d2f79d13bb9fc83acf WHIRLPOOL d305da5ba92553fd576ca111338015afcfb6d46257c2a18cba7ac7f52e23ec322692d67dd9867f724330cd35740285f2076043785d7c9fa9c9af7646d79ed195
--- a/app-misc/boxes/boxes-1.1.1.ebuild
+++ b/app-misc/boxes/boxes-1.1.1.ebuild
@ -0,0 +1,32 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-misc/boxes/boxes-1.1.1.ebuild,v 1.1 2013/01/14 07:21:57 jlec Exp $
 EAPI=5
 inherit eutils toolchain-funcs
 DESCRIPTION="Draw any kind of boxes around your text"
 HOMEPAGE="http://boxes.thomasjensen.com/"
 SRC_URI="http://boxes.thomasjensen.com/download/${P}.src.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-Makefile.patch
 }
 src_compile() {
 	emake CC="$(tc-getCC)"
 }
 src_install() {
 	dobin src/boxes
 	doman doc/boxes.1
 	dodoc README
 	insinto /usr/share/boxes
 	doins boxes-config
 }
--- a/app-misc/boxes/files/boxes-1.1.1-Makefile.patch
+++ b/app-misc/boxes/files/boxes-1.1.1-Makefile.patch
@ -0,0 +1,62 @@
 Makefile            | 2 +-
 src/Makefile        | 8 +++-----
 src/regexp/Makefile | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)
 diff --git a/Makefile b/Makefile
 index 4bfd625..2c75625 100644
 --- a/Makefile
 +++ b/Makefile
@@ -80,7 +80,7 @@
 # The following line (GLOBALCONF) is the only line you should need to edit!
 -GLOBALCONF = /usr/share/boxes
 +GLOBALCONF = /usr/share/boxes/boxes-config
 BVERSION   = 1.1.1
 SNAPFILE   = boxes-SNAP-$(shell date +%Y%m%d)
 diff --git a/src/Makefile b/src/Makefile
 index 7cfab9f..9ed467b 100644
 --- a/src/Makefile
 +++ b/src/Makefile
@@ -86,8 +86,7 @@
 LEX        = flex
 YACC       = bison
 CC         = gcc
 -CFLAGS     = -ansi -I. -Iregexp -Wall -W $(CFLAGS_ADDTL)
 -LDFLAGS    = -Lregexp
 +CFLAGS     += -ansi -I. -Iregexp $(CFLAGS_ADDTL)
 GEN_HDR    = parser.h
 GEN_SRC    = parser.c lex.yy.c
@@ -106,14 +105,13 @@ ALL_OBJ    = $(GEN_SRC:.c=.o) $(ORIG_NORM:.c=.o)
 build:
 -	$(MAKE) CFLAGS_ADDTL=-O boxes
 -	strip boxes
 +	$(MAKE) boxes
 debug:
 	$(MAKE) CFLAGS_ADDTL=-g boxes
 boxes: $(ALL_OBJ)
 	$(MAKE) -C regexp CC=$(CC) libregexp.a
 -	$(CC) $(LDFLAGS) $(ALL_OBJ) -o boxes -lregexp
 +	$(CC) $(LDFLAGS) $(ALL_OBJ) -o boxes -Lregexp -lregexp
 boxes.h:
 	@echo File boxes.h not found or not current. Please run make in the parent directory.
 diff --git a/src/regexp/Makefile b/src/regexp/Makefile
 index 0bd0ace..53966c9 100644
 --- a/src/regexp/Makefile
 +++ b/src/regexp/Makefile
@@ -42,7 +42,7 @@
 #============================================================================
 -CFLAGS   = -O -I. $(CFLAGS_ADDTL)
 +CFLAGS   += -I. $(CFLAGS_ADDTL)
 ALL_CL   = regexp/regexp.c regexp/regsub.c
 C_SRC    = $(notdir $(ALL_CL))
--- a/app-misc/boxes/metadata.xml
+++ b/app-misc/boxes/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+  <herd>shell-tools</herd>
 </pkgmetadata>
--- a/app-misc/gcal/Manifest
+++ b/app-misc/gcal/Manifest
@ -1 +1,2 @@
 DIST gcal-3.6.1.tar.xz 1623788 SHA256 cfaed3fef4b037a4995ca1ec03d7ac2fce528079678287b2d067709768d3b9cf SHA512 73df9297d05e76c5bef1f6c2e85e1782c874dad4f0ff23bb8a57463f9ae6e0edd16543b0fc40d0f1ed3ca62d688ce01da4d05eb3c3785e28330a915d5062f8de WHIRLPOOL 180c7ca450f0a5ab6c510476afae0c7ca4e546460a56aad23849afcc1833a6bfb11ed65f9315dcf684ef2cc0043dbff674605c45528bde6d9b5fcbd871cfa80f
 DIST gcal-3.6.2.tar.xz 1638776 SHA256 1c3f20e81b7a0ceb3b80668704dfeb7b0e7fe309aa3d6bccb5743f23cff12cda SHA512 fd5954eeef82e5683115e8fde220c949ac87702c77bd7bec321337bd508dcd867b3c4f86c288c5c8e69240cb656d21eed47930a572aca1595d22521ed03cd458 WHIRLPOOL 4e3ec708c9cf22bbcf79011af0bc4b47ab61db0fc716ff3e6113f7d9bfdf2563ed8e9f2afbc2ba8c6d3e7cadb69c14a65292b38ce64aea6edd9b37325546537c
--- a/app-misc/gcal/gcal-3.6.2.ebuild
+++ b/app-misc/gcal/gcal-3.6.2.ebuild
@ -0,0 +1,33 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-misc/gcal/gcal-3.6.2.ebuild,v 1.1 2013/01/14 07:32:34 jlec Exp $
 EAPI=5
 inherit eutils flag-o-matic toolchain-funcs
 DESCRIPTION="The GNU Calendar - a replacement for cal"
 HOMEPAGE="http://www.gnu.org/software/gcal/"
 SRC_URI="mirror://gnu/gcal/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ncurses nls unicode"
 DEPEND="
 	app-arch/xz-utils
 	nls? ( >=sys-devel/gettext-0.17 )"
 RDEPEND="nls? ( virtual/libintl )"
 DOCS=( BUGS LIMITATIONS NEWS README THANKS TODO )
 src_configure() {
 	tc-export CC
 	append-flags -D_GNU_SOURCE
 	econf \
 		--disable-rpath \
 		$(use_enable nls) \
 		$(use_enable ncurses term) \
 		$(use_enable unicode)
 }
--- a/app-misc/gcal/metadata.xml
+++ b/app-misc/gcal/metadata.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+  <herd>shell-tools</herd>
-	<longdescription>
+  <longdescription>
  Gcal is a program similar the standard calendar programs BSD "cal" and
  "calendar". Gcal displays hybrid and proleptic Julian and Gregorian calendar
  sheets, respectively, for one month, three months or a whole year. It also
--- a/app-misc/realpath/Manifest
+++ b/app-misc/realpath/Manifest
@ -1,2 +1,4 @@
 DIST realpath_1.17.tar.gz 17800 SHA256 214962d9c6e5a0a446d9cf3368bd1ab6cf2c209fbce1fe52e852763e70da984b SHA512 d4f8105e9256b140918dfa400eaac07bec9c29bced7284ab2a3a96282b13b59dca32ab0af38836dfe89dd4e3bf8b038ef4cf61a96d19951f46ac13264ceeec96 WHIRLPOOL a0b96eb70e5aa27fd76d1f4635de950c1adcac8ce3b2a9414fcd54df5df2b01818f3641b3fc049650a05373ffb45dad2a918bfe949fb057592338d9320b9f0a5
 DIST realpath_1.17_i386.deb 16372 SHA256 07f47353d2552aec26c679c32b2335302cd1fe54e5c1a290ec4b708fd1b0d104 SHA512 15704a27f3f140c4d69411bfd9c319e3205e7b70cccefdc5bec94ad10d6b6c6ad948c2fa51cf2ed69c8884928ba6dcb83a865185f3b010dc6eb343c2125c2118 WHIRLPOOL abf52c219d3b4f8a186bec4549d9e50f933924ea4676298b12c8da3373e3eb82dac301729153cb8ea427d5321ce4500c2872d55c9c83602abaf04392a1a8bbe1
 DIST realpath_1.18.tar.gz 17618 SHA256 e085f617874ef34453be553a2900c15969d78836ce6476b1c6382a69ea4f75de SHA512 98daa53b7a6d4b40ea3ff9ea89b7cb97782dd53f031e41a228a5aa8d2a41ae7920cbc1e2213f568098496e5c25da1381f08fb939f8668733a3c391f744fd16ed WHIRLPOOL c643e4098eb5474956cc4d1ada9a2676b3a494ece47fb2f298cc1a5aa1457d4b494476f65c55f131e4dd309a2ed12224f53071cc5e0863a9cc59b45137ec2526
 DIST realpath_1.18_i386.deb 16426 SHA256 e9b2103ed8b8041ea6c02e587242b18a4f4b4d4ee6d8c990b4969af1d688d1fd SHA512 fb2062041f8089a5ff07f76a9833e9d8bbe9560d72d4d5803c9524aeb782f9f4a135921b9984432ccfa361edc785a0f33785377ddf031a07ed316861a00a6f37 WHIRLPOOL e22ca8a14c1e329c8576001b325a96bf110eda8f82b368ee1bff7da35a68805a4fe19174f5518d6fd614f5c2df5c939b6316e4898e2f4ad75fd465413444fc13
--- a/app-misc/realpath/realpath-1.18.ebuild
+++ b/app-misc/realpath/realpath-1.18.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/app-misc/realpath/realpath-1.18.ebuild,v 1.1 2013/01/14 07:26:41 jlec Exp $
 EAPI=5
 inherit eutils flag-o-matic multilib prefix toolchain-funcs
 DESCRIPTION="Return the canonicalized absolute pathname"
 HOMEPAGE="http://packages.debian.org/unstable/utils/realpath"
 SRC_URI="
 	mirror://debian/pool/main/r/${PN}/${PN}_${PV}.tar.gz
 	nls? ( mirror://debian/pool/main/r/${PN}/${PN}_${PV}_i386.deb )"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 RDEPEND="
 	!sys-freebsd/freebsd-bin
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	x86-interix? ( dev-libs/gnulib )
 	elibc_mintlib? ( virtual/libiconv )"
 src_unpack() {
 	unpack ${PN}_${PV}.tar.gz
 	if use nls; then
 		# Unpack the .deb file, in order to get the preprocessed man page
 		# translations. This way we avoid a dependency on app-text/po4a.
 		mkdir deb
 		cd deb
 		unpack ${PN}_${PV}_i386.deb
 		unpack ./data.tar.gz
 	fi
 }
 src_prepare() {
 	use nls || epatch "${FILESDIR}"/${PN}-1.16-nonls.patch
 	epatch \
 		"${FILESDIR}"/${PN}-1.17-build.patch \
 		"${FILESDIR}"/${PN}-1.14-no-po4a.patch \
 		"${FILESDIR}"/${PN}-1.15-prefix.patch
 	eprefixify common.mk
 }
 src_compile() {
 	tc-export CC
 	use nls && use !elibc_glibc && append-libs -lintl
 	[[ ${CHOST} == *-mint* ]] && append-libs "-liconv"
 	if [[ ${CHOST} == *-irix* || ${CHOST} == *-interix[35]* ]] ; then
 		append-flags -I"${EPREFIX}"/usr/$(get_libdir)/gnulib/include
 		append-ldflags -L"${EPREFIX}"/usr/$(get_libdir)/gnulib/$(get_libdir)
 		append-libs -lgnu
 	fi
 	local subdir
 	for subdir in src man $(usex nls po ''); do
 		emake MAKE_VERBOSE=yes VERSION="${PV}" -C ${subdir}
 	done
 }
 src_install() {
 	emake \
 		VERSION="${PV}" \
 		SUBDIRS="src man $(usex nls po '')" \
 		DESTDIR="${D}" \
 		install
 	newdoc debian/changelog ChangeLog.debian
 	if use nls; then
 		local dir
 		for dir in "${WORKDIR}"/deb/usr/share/man/*; do
 			[ -f "${dir}"/man1/realpath.1 ] || continue
 			newman "${dir}"/man1/realpath.1 realpath.${dir##*/}.1
 		done
 	fi
 }
--- a/app-text/multitail/Manifest
+++ b/app-text/multitail/Manifest
@ -1,2 +1,3 @@
 DIST multitail-5.2.10.tgz 165812 SHA256 947577050ea907da11b2a86d4716a3309559a33327b2e1342a02b24a38a15c57 SHA512 7c3bd022b89328687b0e2cd96344ef7376e3af993993d26f0936919e3c8fd2145ea2bcc234b6e38335f2373938673d5fb80c3f8d92f4c5478f118c68256fffa2 WHIRLPOOL d2cc0c29797b9b1b8cf444516a28b701ae1f036f81e9bf0ef9b14808ba37828a8666c8c885b8f894f2d3abe6b3f39ba5e23296b41f69bfd25114e91b9d49efac
 DIST multitail-5.2.11.tgz 163769 SHA256 2f0fe12b974adb82b24c8fde98b8ed582535c758493ac8200c1a46449359c2e5 SHA512 ed4fe1aab1cff1b4cb80551d166e53982490208b7830b78bc733a75c4d2afd3b7fa547ad811147fd9e6450431e6477fe0c8c7f8797730a87b35add63b097548b WHIRLPOOL 4ee6a4a69f67ce01b453b85146ec589f31ec8ddb9b89ae81d944d0800041278f378d03d744c4d45c2976d6da1fae1b47da3a4918ab06053e2bce6414a19f6dcb
 DIST multitail-5.2.9.tgz 165013 SHA256 b90c65e061d4fe5a8c36dd478d3e618eba42ae4abb5570dde063e9d66e9397f3 SHA512 0d643e499f04f9497cc3a9e82de10fe0f6d6f7f69eb3e200c409c0b7815548516a2aba77912d3961db689673b78afc46f78b062029522c3836d4732231d8b7be WHIRLPOOL 385add81418a7d9b1dd3b5db27334dffcb75931934908600a9c723afec79bec63ff3f8a577def59972c457683542ddb60ee4449e43cadfb3b05713b05c6a5a10
--- a/app-text/multitail/metadata.xml
+++ b/app-text/multitail/metadata.xml
@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+  <herd>shell-tools</herd>
-	<maintainer>
+  <maintainer>
-		<email>wschlich@gentoo.org</email>
+    <email>wschlich@gentoo.org</email>
-		<name>Wolfram Schlich</name>
+    <name>Wolfram Schlich</name>
-		<description>Primary maintainer</description>
+    <description>Primary maintainer</description>
-	</maintainer>
+  </maintainer>
 </pkgmetadata>
--- a/app-text/multitail/multitail-5.2.11.ebuild
+++ b/app-text/multitail/multitail-5.2.11.ebuild
@ -0,0 +1,48 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-text/multitail/multitail-5.2.11.ebuild,v 1.1 2013/01/14 07:12:27 jlec Exp $
 EAPI=5
 inherit eutils flag-o-matic toolchain-funcs
 DESCRIPTION="Tail with multiple windows"
 HOMEPAGE="http://www.vanheusden.com/multitail/index.html"
 SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
 IUSE="debug doc examples"
 DEPEND="sys-libs/ncurses"
 RDEPEND="${DEPEND}"
 src_prepare() {
 	epatch "${FILESDIR}"/5.2.2-as-needed.patch
 	use x86-interix && epatch "${FILESDIR}"/${PN}-5.2.6-interix.patch
 	sed -e '/gcc/d' -i Makefile || die
 }
 src_configure() {
 	tc-export CC
 	use debug && append-flags "-D_DEBUG"
 	use prefix && sed "s:DESTDIR=/:DESTDIR=${EROOT}:g" -i Makefile
 }
 src_install () {
 	dobin multitail
 	insinto /etc
 	doins multitail.conf
 	dodoc Changes readme.txt thanks.txt
 	doman multitail.1
 	use doc && dohtml manual.html
 	docinto examples
 	use examples && dodoc colors-example.{pl,sh} convert-{geoip,simple}.pl
 }
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@ -15,6 +15,12 @@ DIST jdk-7u10-solaris-sparcv9-demos.tar.gz 901123 SHA256 ade404b770eb9e90e779191
 DIST jdk-7u10-solaris-sparcv9.tar.gz 18420859 SHA256 ba304ffd6e954ebcce393ca13fdd2f52a0e24e92bcd35da7d3d8305a8fc77c09 SHA512 4d9076cd7967fd7c30c621cf1e0add9f56ce520cbd151c3a8a397d0f462fe4a9b4e8a89a8fdea6d5ff42e54f6721d19b04955960413ce88978995fe86dbf2a7f WHIRLPOOL 4a129f39a3ac07043a7711723d89dc2e20e09d8296b1ca5c4c52d2169d4e7493ecbcf17124bbaf64ff9430004810c7962d94476f1f4c86a50c7d0c4178e952bd
 DIST jdk-7u10-solaris-x64-demos.tar.gz 864557 SHA256 3fbb897476d97beb34137ecb32d3405829e6a6e7bbc5f26e9a6cebcb34520712 SHA512 4b946daa3b45760c100f6a72a7d3f5eff31cff9813b99ce4b30dbf3ad8782ec271956dc42e662db28a0f34e2be5719c690ac44f591269638245ddb2ef0935bf2 WHIRLPOOL 4a1b4d9f9bdad8d7c14ee36cf1308a5e4703ac2b050622946f8c8a3face118492915486f48af2d834893f1265e2c94e3dc0ec8faf84e190b8efde76050c2c1a7
 DIST jdk-7u10-solaris-x64.tar.gz 15751555 SHA256 50c4317a5f031e1257210dd0b2c66c2576b2889916f8c5858730e448bf748f46 SHA512 a0ead555853133c686fa4b4933175398b16ad3d2042e185355fbb8bacfabff9131600d5ed4252d45717dd0f284a2b6eb21aef1191abd03c544ee7b693f1318bf WHIRLPOOL c8d6ac251d6b80ba12b65b104d4c295eaebfd756fa99518ad5af27e96d66378c0a4c76a732084254fd4d72f7d37710dacd7078c40031a9692db3e1fe01f4ff09
 DIST jdk-7u11-linux-i586.tar.gz 97470187 SHA256 7f8efcbba7d32236a1a9858660ae4e42e32510a487cebffbcf934999deb53d35 SHA512 f7e2d360a08ca39203245c0b4ed0880b1105d86387edadcf3f240c1164a06ddcc3f44036dd0c825609c972bb5c123d836a3ff39790b36379375892a084eb799f WHIRLPOOL 6c6492e1e56abfa5acfab55cb1ca4020f75581f221a6f5ad05fe5be46af84420ebec36a69b07e58d1a726cce9ed412c10e51015f9c30ee95450e4dc461bd7f4c
 DIST jdk-7u11-linux-x64.tar.gz 96158031 SHA256 8ae77f5fd43e72dc87135af1c4ee2e294bd6debcec00778509519e0d1f8e5c35 SHA512 827123cb190e4ee356204ba82cea2fafe6e0054a1882ca860d79ddd18f08ea09d590f00b272da8de7d57c10fd332a7c3c93ba91be46186ea1ee20dc01a1a811e WHIRLPOOL b621f5c848e55b124eb0f9a52a3199b76aa56c62f0938583384b5ed545cbbdc9b94008af307c10d059214c230e1219d4d4e7bc4723bc1ea604716e0f3e8c7d69
 DIST jdk-7u11-solaris-i586.tar.gz 96387338 SHA256 54abb5f664e2a8f878f85ee1076285fb97e432a96d6bdd19cb38462b4649b40c SHA512 89f2f7fbaef358d0d26678ae61e5e058481709e809379f6e3ed184a610f58756e609a3d0584c70921d9f8e76003e75fd1de0b6c44516dd676777031a62fe13bd WHIRLPOOL 6467c0720dc5e7dc254a0ef38c2583aeadf28de3b00774773e2020d922441aed9e0a5415f32798b9d4c1d467d05f99dfa1d540275dd47195d30776911c171326
 DIST jdk-7u11-solaris-sparc.tar.gz 99873516 SHA256 7c3e87765ff00d4bcc872f67f98855492184de66e34d99af27b330a0ca406401 SHA512 389ce205eb5e4bbc8c044cadf00ebfff6dcb9227fc81c14ba01f8c14c444abaf89e876f1b1ba16fdba6c2b573976e6b34c7131b50624c46992720c95ea934dc4 WHIRLPOOL 545263677f73e7dab4422753b6df7b8740e22074b3c868dfa557804b30573cb1555a9abb9d3abb53bf43f49f9b0636ed893dbac212f411175ab0efbc2716be68
 DIST jdk-7u11-solaris-sparcv9.tar.gz 18335505 SHA256 af448282e961d32f0a47dde38c3034e84e0a2a1505c636618562cacf8bc794c9 SHA512 dbb942a45b135702d509b202acc28d781f8c3cbbbdba45c01db5472446c514e78a04cecdb8f44f921567c86d3b14a404d7fe9d1de749272c73b99d6965941b55 WHIRLPOOL db4f597092856712d56be8e2843c25c23558adbee90c6c72f4aa8a1afc25aef31caec28aadda22fbf4f06433ed30d35aed1e2bb9e7bf13af462a9adb2bb2cff4
 DIST jdk-7u11-solaris-x64.tar.gz 15674980 SHA256 fadee8ecefe37e407ac68167d797eee80ea7461eff49f437bd386b325077ed07 SHA512 29eb96b246b2f6dca43e09c9d1b5ad4ef12632f1be5ef039d3297f068e4c9261208638928e8f1c2521a26d37e08590977d42ec9d7bc00ff41ca48a4342d509e6 WHIRLPOOL 9e772a8b243e5867d748a35dac436c4b0db9551535961c9294179fe06ebe7c220ad8f5309a1fe894c4673e11d4417e8c81c8a3f3d625bb64578e7447b0517398
 DIST jdk-7u9-linux-i586-demos.tar.gz 14751397 SHA256 5aa1098fde7b22d0b8b5c8e436c39a11fa52eb37cc52a63ead3732040f3ae2c6 SHA512 1f03b8194109baa64490d840f7ef39f47f7c74c026b01a8a0f2f89cb562577ff3dbdd70ee180ee4694c4e706990ea3dc9b81d0038a7d59f895c1b8f1d1b563f0 WHIRLPOOL 69d314418ca249a23a211de5062939ec7853f187a919250a5cc5d71f3b17723920076ebc56c59e1f9883ebe0c7feb1da4a51e30bc84c1a537678b9f1447bf61c
 DIST jdk-7u9-linux-i586.tar.gz 97361259 SHA256 47e86ceb7f59c821a8d0c54f34530bca84e10c1849ed46da7f4fdb5f621bc8d6 SHA512 7353984417b91482fc4d0c1c8597c49f431d4b63502b446d0bea6f5d1080a7504ce0b8801debe75b38eb18551abc3f81264901f3df159b8f6af5e17668603122 WHIRLPOOL defb1480299e37009a95dda609e2efebf8c3a73f48c88f491983daea070459e1fd33f947fdb9ef73c96a1c832fdd6e38eac5f76627ab219e87c8ee3c16780f47
 DIST jdk-7u9-linux-x64-demos.tar.gz 14762315 SHA256 76b07b6cca4c251b344abc09cf23788621e21bab963979478d77d76cfdde604b SHA512 376a5ab162aad26e85d802295515fae2b1b8d9e85acff0dc9e4695cdecbfabdf25391f3f180f4d7c8793cfe40d48fc9ab27e7c04da5617c1b30e7bf9372b9217 WHIRLPOOL 72782a69856db15712a45ab58caf168a25d0c46feb06711e43c6ff8cb23ae48cc9ccba9a68a66ba66440c01fa80735c842dc7bb4ef81e9a679cb00fb664c61fe
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.11.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.11.ebuild
@ -0,0 +1,233 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.11.ebuild,v 1.1 2013/01/14 06:59:45 sera Exp $
 EAPI="5"
 inherit eutils java-vm-2 prefix versionator
 # This URIs need to be updated when bumping!
 JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html"
 JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
 # This is a list of archs supported by this update.
 # Currently arm comes and goes.
 AT_AVAILABLE=( amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris )
 # Sometimes some or all of the demos are missing, this is to not have to rewrite half
 # the ebuild when it happens.
 #DEMOS_AVAILABLE=( amd64 arm x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris )
 DEMOS_AVAILABLE=()
 FX_VERSION="2_2_4"
 MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
 S_PV="$(replace_version_separator 3 '_')"
 AT_x86="jdk-${MY_PV}-linux-i586.tar.gz"
 AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz"
 AT_arm="jdk-${MY_PV}-linux-arm-sfp.tar.gz"
 AT_x86_solaris="jdk-${MY_PV}-solaris-i586.tar.gz"
 AT_x64_solaris="${AT_x86_solaris} jdk-${MY_PV}-solaris-x64.tar.gz"
 AT_sparc_solaris="jdk-${MY_PV}-solaris-sparc.tar.gz"
 AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz"
 FXDEMOS_linux="javafx_samples-${FX_VERSION}-linux.zip"
 DEMOS_x86="${FXDEMOS_linux} jdk-${MY_PV}-linux-i586-demos.tar.gz"
 DEMOS_amd64="${FXDEMOS_linux} jdk-${MY_PV}-linux-x64-demos.tar.gz"
 DEMOS_arm="${FXDEMOS_linux} jdk-${MY_PV}-linux-arm-sfp-demos.tar.gz"
 DEMOS_x86_solaris="jdk-${MY_PV}-solaris-i586-demos.tar.gz"
 DEMOS_x64_solaris="${DEMOS_x86_solaris} jdk-${MY_PV}-solaris-x64-demos.tar.gz"
 DEMOS_sparc_solaris="jdk-${MY_PV}-solaris-sparc-demos.tar.gz"
 DEMOS_sparc64_solaris="${DEMOS_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz"
 JCE_DIR="UnlimitedJCEPolicy"
 JCE_FILE="${JCE_DIR}JDK7.zip"
 DESCRIPTION="Oracle's Java SE Development Kit"
 HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
 for d in "${AT_AVAILABLE[@]}"; do
 	SRC_URI+=" ${d}? ("
 	SRC_URI+=" $(eval "echo \${$(echo AT_${d/-/_})}")"
 	if has ${d} "${DEMOS_AVAILABLE[@]}"; then
 		SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )"
 	fi
 	SRC_URI+=" )"
 done
 unset d
 SRC_URI+=" jce? ( ${JCE_FILE} )"
 LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
 SLOT="1.7"
 KEYWORDS="-arm ~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+X alsa derby doc examples +fontconfig jce nsplugin pax_kernel source"
 RESTRICT="fetch strip"
 QA_PREBUILT="*"
 RDEPEND="
 	X? (
 		x11-libs/libX11
 		x11-libs/libXext
 		x11-libs/libXi
 		x11-libs/libXrender
 		x11-libs/libXtst
 	)
 	alsa? ( media-libs/alsa-lib )
 	doc? ( dev-java/java-sdk-docs:1.7 )
 	fontconfig? ( media-libs/fontconfig )
 	!prefix? ( sys-libs/glibc )"
 # scanelf won't create a PaX header, so depend on paxctl to avoid fallback
 # marking. #427642
 DEPEND="
 	jce? ( app-arch/unzip )
 	examples? ( kernel_linux? ( app-arch/unzip ) )
 	pax_kernel? ( sys-apps/paxctl )"
 S="${WORKDIR}"/jdk${S_PV}
 check_tarballs_available() {
 	local uri=$1; shift
 	local dl= unavailable=
 	for dl in "${@}"; do
 		[[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}"
 	done
 	if [[ -n "${unavailable}" ]]; then
 		if [[ -z ${_check_tarballs_available_once} ]]; then
 			einfo
 			einfo "Oracle requires you to download the needed files manually after"
 			einfo "accepting their license through a javascript capable web browser."
 			einfo
 			_check_tarballs_available_once=1
 		fi
 		einfo "Download the following files:"
 		for dl in ${unavailable}; do
 			einfo "  ${dl}"
 		done
 		einfo "at '${uri}'"
 		einfo "and move them to '${DISTDIR}'"
 		einfo
 	fi
 }
 pkg_nofetch() {
 	local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
 	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
 		distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
 	fi
 	check_tarballs_available "${JDK_URI}" "${distfiles[@]}"
 	use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}"
 }
 src_prepare() {
 	if use jce; then
 		mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || die
 	fi
 }
 src_compile() {
 	# This needs to be done before CDS - #215225
 	java-vm_set-pax-markings "${S}"
 	# see bug #207282
 	einfo "Creating the Class Data Sharing archives"
 	if use x86; then
 		bin/java -client -Xshare:dump || die
 	fi
 	bin/java -server -Xshare:dump || die
 	# Create files used as storage for system preferences.
 	mkdir jre/.systemPrefs || die
 	touch jre/.systemPrefs/.system.lock || die
 	touch jre/.systemPrefs/.systemRootModFile || die
 }
 src_install() {
 	local dest="/opt/${P}"
 	local ddest="${ED}${dest}"
 	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
 	# writable executable segments
 	if use x86; then
 		rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \
 			{,jre/}lib/i386/libjavaplugin_nscp*.so
 		rm -vrf jre/plugin/i386
 	fi
 	# Without nsplugin flag, also remove the new plugin
 	local arch=${ARCH};
 	use x86 && arch=i386;
 	if ! use nsplugin; then
 		rm -vf {,jre/}lib/${arch}/libnpjp2.so \
 			{,jre/}lib/${arch}/libjavaplugin_jni.so
 	fi
 	dodoc COPYRIGHT
 	dohtml README.html
 	dodir "${dest}"
 	cp -pPR bin include jre lib man "${ddest}" || die
 	if use derby; then
 		cp -pPR db "${ddest}" || die
 	fi
 	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
 		cp -pPR demo sample "${ddest}" || die
 		if use kernel_linux; then
 			cp -pPR "${WORKDIR}"/javafx-samples-${FX_VERSION//_/.} \
 				"${ddest}"/javafx-samples || die
 		fi
 	fi
 	if use jce; then
 		dodir "${dest}"/jre/lib/security/strong-jce
 		mv "${ddest}"/jre/lib/security/US_export_policy.jar \
 			"${ddest}"/jre/lib/security/strong-jce || die
 		mv "${ddest}"/jre/lib/security/local_policy.jar \
 			"${ddest}"/jre/lib/security/strong-jce || die
 		dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
 			"${dest}"/jre/lib/security/US_export_policy.jar
 		dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \
 			"${dest}"/jre/lib/security/local_policy.jar
 	fi
 	if use nsplugin; then
 		install_mozilla_plugin "${dest}"/jre/lib/${arch}/libnpjp2.so
 	fi
 	if use source; then
 		cp src.zip "${ddest}" || die
 	fi
 	# Install desktop file for the Java Control Panel.
 	# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
 	# make_desktop_entry can't be used as ${P} would end up in filename.
 	newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
 		sun-jcontrol-${PN}-${SLOT}.png || die
 	sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \
 		-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
 		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
 		-e "s#Application;##" \
 		-e "/Encoding/d" \
 		jre/lib/desktop/applications/sun_java.desktop \
 		> "${T}"/jcontrol-${PN}-${SLOT}.desktop || die
 	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
 	# Prune all fontconfig files so libfontconfig will be used and only install
 	# a Gentoo specific one if fontconfig is disabled.
 	# http://docs.oracle.com/javase/7/docs/technotes/guides/intl/fontconfig.html
 	rm "${ddest}"/jre/lib/fontconfig.*
 	if ! use fontconfig; then
 		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
 		eprefixify "${T}"/fontconfig.properties
 		insinto "${dest}"/jre/lib/
 		doins "${T}"/fontconfig.properties
 	fi
 	# Remove empty dirs we might have copied
 	find "${D}" -type d -empty -exec rmdir -v {} + || die
 	set_java_env
 	java-vm_revdep-mask
 	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
 }
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@ -1,5 +1,7 @@
 DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d SHA512 02eca7da8f3fffea388431d5352290535a63d53a1f5c795d6511ccba62445787a0ee6ad4bc1852e5262860b6d607ba2a8c6a3dbb0c3e1d7c3a67ac7bbc783204 WHIRLPOOL 02460c7ca54f5f62c3f349addf8e2a101f7a56987e9f62365fac3f703b0c93ac5de4d55697a3d04f78b547b072e0acc95a0720d2ce3b429d2fd5936d50edd1ac
 DIST jre-7u10-linux-i586.tar.gz 48107401 SHA256 0e91c275a87dc1ba049df3cfef16eb958199d80e55bea6a3555900d309615199 SHA512 62f6d6c983fa48e21fef52fc73f13aa30c8b0512fc8d243d341ac465c10c19cd3d8a3f0b93f127e42eac102c0b00cc65502acb8f7dd85593f75a7cd73c5ef8ae WHIRLPOOL be81fa175a52d498598c15b19c3d7ea42fe1814647ac9d0b8684a1a0da6dd0676e7b39514ea400bfcacdb51e4689352beca358bfeef4d3e6cd1219259f8d4786
 DIST jre-7u10-linux-x64.tar.gz 46789584 SHA256 a2a45566f4a87e70c0e13577d3bf2b7eeabcdda3279958a75ded1ece96e070d1 SHA512 9d931f53b83d87458adda191ca4cef7374a3768999c961f8634e77f9bd3fe830e615d85406f5c1d47a3eb3d18d062ee4d5f9c86bc4741eab8ae7cc1752c76219 WHIRLPOOL 01dbdd4ced63598152dfd1662bf2d67a39970493694ffb9ff9d0823579d71a0cc8ace67ae39b8a357797e3f4cb523cb7bcf74c630346f3db73fca292a55e54c3
 DIST jre-7u11-linux-i586.tar.gz 48084234 SHA256 08b6b5cb322305d9b7a5d5b56a180299b4d23bd4f88f093d5dbcfe0b9da3ceda SHA512 a5ad0fd31bf0dc4c1b31a8734e2f9c1b006c0dbc3f891c6c693ed3f194c5fa7bddbbd33c1038ebb6bdd997156e92abbacd0ec2b3b2cf358387e9a5cd6db3f051 WHIRLPOOL bfb4be916b3f48d2998bebf8f63f160c98231366dde1332c54c29272a510c286f917b697a35f68900b412d6e0a01d239db3aaf955d8045cc1e8d0b30b1a9be3d
 DIST jre-7u11-linux-x64.tar.gz 46780809 SHA256 c4f80063fbe4fc6c6b80bdf97971288a142aa1de1e8c790b684c223f4e09068e SHA512 e32518217a53720742f8ad8b1e8116d05dee2bc063b9dbc78bd8d4d87b35a3fe4f24207ed91cf978a469857aa8ffd96502f271a30c2ad0f5b11f938bb7f73082 WHIRLPOOL 2eb8f89022786a70b6734af116a3140a636f7470edc4aadfbc7e0d2bbab8a9596e520a0912d7c3382c053b229d31f64ff0798e03db2a66affd21071eae9e3cc1
 DIST jre-7u9-linux-i586.tar.gz 47995690 SHA256 37310199e770f10d8e5f9410757062655b66723ca2b8c4dd29d9a4e9bd7d98bd SHA512 f3d4fcbd14e3b7c12a3caec5458f60378d1d5e86de89669bd8baa0d137915bba5049cce50304f7e9241e4f3baf96371be80a157763581faa9b87b0f1defffe3f WHIRLPOOL 478482805554188d844ac7d1ced6c6e7fcd1ae5d07a3f527c4a388de887f075e1f4cd840d7859a81cc6176e34db354c6229064619c57e841368974f5325afb52
 DIST jre-7u9-linux-x64.tar.gz 46684531 SHA256 16b573b3f4c18f088fc30786e5d62efc594448e7407180ffaf13a3c67cc4ed0b SHA512 390c9118c0f93f36b37488b9efa29cf1dafb1e17ae8396c89b19b2da6a42fb3e3ad748c629fa6fe07b88ed33baaa17cefc0c7eefe702a87b879826bdf8fa1be6 WHIRLPOOL 20b908a64dbb3a96843f09e514436bec2d70ffa5e1f749b7336954fc2aaf96fb5c487ca95f12ea888b30a23aff213893e95b451ff7ea03e032f9ba1d7a4cf0cc
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.11.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.11.ebuild
@ -0,0 +1,168 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.11.ebuild,v 1.1 2013/01/14 07:14:27 sera Exp $
 EAPI="5"
 inherit java-vm-2 eutils prefix versionator
 MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
 S_PV="$(replace_version_separator 3 '_')"
 X86_AT="jre-${MY_PV}-linux-i586.tar.gz"
 AMD64_AT="jre-${MY_PV}-linux-x64.tar.gz"
 # This URIs need updating when bumping!
 JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre7-downloads-1880261.html"
 JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
 JCE_DIR="UnlimitedJCEPolicy"
 JCE_FILE="${JCE_DIR}JDK7.zip"
 DESCRIPTION="Oracle's Java SE Runtime Environment"
 HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
 SRC_URI="
 	x86? ( ${X86_AT} )
 	amd64? ( ${AMD64_AT} )
 	jce? ( ${JCE_FILE} )"
 LICENSE="Oracle-BCLA-JavaSE"
 SLOT="1.7"
 KEYWORDS="~amd64 ~x86"
 IUSE="X alsa fontconfig jce nsplugin pax_kernel"
 RESTRICT="fetch strip"
 QA_PREBUILT="*"
 RDEPEND="
 	X? (
 		x11-libs/libXext
 		x11-libs/libXi
 		x11-libs/libXrender
 		x11-libs/libXtst
 		x11-libs/libX11
 	)
 	alsa? ( media-libs/alsa-lib )
 	fontconfig? ( media-libs/fontconfig )
 	!prefix? ( sys-libs/glibc )"
 # scanelf won't create a PaX header, so depend on paxctl to avoid fallback
 # marking. #427642
 DEPEND="
 	jce? ( app-arch/unzip )
 	pax_kernel? ( sys-apps/paxctl )"
 S="${WORKDIR}/jre${S_PV}"
 pkg_nofetch() {
 	if use x86; then
 		AT=${X86_AT}
 	elif use amd64; then
 		AT=${AMD64_AT}
 	fi
 	einfo "Please download '${AT}' from:"
 	einfo "'${JRE_URI}'"
 	einfo "and move it to '${DISTDIR}'"
 	if use jce; then
 		einfo "Also download '${JCE_FILE}' from:"
 		einfo "'${JCE_URI}'"
 		einfo "and move it to '${DISTDIR}'"
 	fi
 }
 src_prepare() {
 	if use jce; then
 		mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die
 	fi
 }
 src_compile() {
 	# This needs to be done before CDS - #215225
 	java-vm_set-pax-markings "${S}"
 	# see bug #207282
 	einfo "Creating the Class Data Sharing archives"
 	if use x86; then
 		bin/java -client -Xshare:dump || die
 	fi
 	bin/java -server -Xshare:dump || die
 	# Create files used as storage for system preferences.
 	mkdir .systemPrefs || die
 	touch .systemPrefs/.system.lock || die
 	touch .systemPrefs/.systemRootModFile || die
 }
 src_install() {
 	local dest="/opt/${P}"
 	local ddest="${ED}${dest}"
 	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
 	# writable executable segments
 	if use x86; then
 		rm -vf lib/i386/libjavaplugin_oji.so \
 			lib/i386/libjavaplugin_nscp*.so
 		rm -vrf plugin/i386
 	fi
 	# Without nsplugin flag, also remove the new plugin
 	local arch=${ARCH};
 	use x86 && arch=i386;
 	if ! use nsplugin; then
 		rm -vf lib/${arch}/libnpjp2.so \
 			lib/${arch}/libjavaplugin_jni.so
 	fi
 	dodir "${dest}"
 	cp -pPR bin lib man "${ddest}" || die
 	# Remove empty dirs we might have copied
 	find "${D}" -type d -empty -exec rmdir -v {} + || die
 	dodoc COPYRIGHT README
 	if use jce; then
 		dodir ${dest}/lib/security/strong-jce
 		mv "${ddest}"/lib/security/US_export_policy.jar \
 			"${ddest}"/lib/security/strong-jce || die
 		mv "${ddest}"/lib/security/local_policy.jar \
 			"${ddest}"/lib/security/strong-jce || die
 		dosym "${dest}"/lib/security/${JCE_DIR}/US_export_policy.jar \
 			"${dest}"/lib/security/US_export_policy.jar
 		dosym "${dest}"/lib/security/${JCE_DIR}/local_policy.jar \
 			"${dest}"/lib/security/local_policy.jar
 	fi
 	if use nsplugin; then
 		install_mozilla_plugin "${dest}"/lib/${arch}/libnpjp2.so
 	fi
 	# Install desktop file for the Java Control Panel.
 	# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
 	# make_desktop_entry can't be used as ${P} would end up in filename.
 	newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
 		sun-jcontrol-${PN}-${SLOT}.png || die
 	sed -e "s#Name=.*#Name=Java Control Panel for Oracle JRE ${SLOT}#" \
 		-e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \
 		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
 		-e "s#Application;##" \
 		-e "/Encoding/d" \
 		lib/desktop/applications/sun_java.desktop > \
 		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
 	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
 	# Prune all fontconfig files so libfontconfig will be used and only install
 	# a Gentoo specific one if fontconfig is disabled.
 	# http://docs.oracle.com/javase/7/docs/technotes/guides/intl/fontconfig.html
 	rm "${ddest}"/lib/fontconfig.* || die
 	if ! use fontconfig; then
 		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
 		eprefixify "${T}"/fontconfig.properties
 		insinto "${dest}"/lib/
 		doins "${T}"/fontconfig.properties
 	fi
 	set_java_env
 	java-vm_revdep-mask
 	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
 }
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@ -1,10 +1,12 @@
 DIST pl-6.2.0.tar.gz 14353730 SHA256 be358eacd50bc7013cdcdd1aa763e67c5b1d40f7bbf1833a7a48c0123a6455a8 SHA512 a8e265eecd26fde41732bd965a6201ee61101a31ffbc8ead89f9563e91a6bc85382c7aa0eb6e3eb79cfa7e3f3f7fe89f50776553dd2198eba48b2369c20f5616 WHIRLPOOL 0812b03c4a8e61a17afa7835d2f21ef5b68b8fa0badc09aeba8e7179aff41a783a928a22e55b3773caeaa15d384054ba0e948e0c4111fc067c65c3173dc68b04
 DIST pl-6.2.2.tar.gz 14353692 SHA256 e2d5a62756ea0001f65a2411dfe7d380e1d2ab7b365fe12bc6e110d966fe43dd SHA512 fad8bd48ef496258b86527e9764c748b25a83c25dcc7aa4921fcc78df730e7c442a8c3524356b36f2cb92cdb71a116475f7039e4c829c7f41fc6994ce0fa636e WHIRLPOOL f133afa09055d506e4fbf8e3214b5f290b890a7c42e6bb046d97318fbc8f961be33d788a79076597b4434974d7444bf67ba193829faebe2c768ff13c2ed7801e
 DIST pl-6.2.5.tar.gz 14404112 SHA256 0613e40ebfe7329e542a042587f2e593a74f5710dbbfcf1e116ddba1e6c35167 SHA512 a61084b3f501874bcd44633ab351c01d2e92941e26e5ff9b95b76bf94c7f459e4217f12e5dad21b7b0b6a2ddb821e205f40351d6602eb80414b119e32da373eb WHIRLPOOL 0fe91154a01160c9ba3519c722cfce4e09a5b4c1fd7319563ff1b696fd74ef300b978416f14dfbed9669e5c24f97be4709181a9029029ad08a068a32c1658bb6
 DIST pl-6.2.6.tar.gz 14407455 SHA256 9412f0753a61c30dbcf1afac01fe7c9168002854709e00e09c21f959e1232146 SHA512 0bd8b057241c284e5530965236ac79895153f7ff4b42d72dea67f4c1296f0319c0ed7db363bb17a099686c1742ade4ad06d8f916637ff70f84e2c00d6c122b52 WHIRLPOOL ac5b0ba0fbfab919ebfd00cc01977e82973c23522f6a601416b4fdcfdddb1f902ab87016058aaa1d62533dea512b8f931f440433814e8cb3e0f8b66f7139204e
 DIST pl-6.3.6.tar.gz 14492653 SHA256 0020d2aaff1c47bb2487c6053f231ca7070d97317f2d55993c3263fa2975a88a SHA512 b6179e813c63bba215578f53169890b484477fb7e5efd1be8247afc47c1fe03839dbdd13a21d9a4c96d4b395e813181b4e682e2cb161c47ab4e22f637192f5b8 WHIRLPOOL f792bfa371404d92930b6bec8061adc31b16f0518f0e02bc7584ca843e50785b9d6c0312c8a64c9192145a83150e0744b0b17d3be46008b3babf4713596ae4f6
 DIST pl-6.3.7.tar.gz 14492539 SHA256 1c4c9f79b54f609ee329104112519485b189bf604afd235fb3854e1aeeccb13f SHA512 dd76d368973a7cf1ca104412fb070ab9576ed97d9472ae42309d5ea25dc52f27dac330fd351ccccd35b2090cc26189d472f2d1929563a3689e40e744673f9b3f WHIRLPOOL 0c62732fb44ee6b476c9175ad0a1a49fa403b753e07647e13bbf9caff3de097e78081181119b9d5b06ecbb8bfd243d9de7012766370a2f6c40b1c2aacd5a71ac
 DIST swi-prolog-6.2.0-gentoo-patchset-5.tar.gz 5340 SHA256 94d1ca1c17bba09c00e8d29bf599598574667f2093996651a357eb168e5a3f7a SHA512 2a7bc9998c117a9e509f1bab73898f668922225af97f31a2569f689b89edba6776f6117f32e7023db22354e4fedefb557e7603be31fc5a696f939d271f1aebf2 WHIRLPOOL 5e05b315ff8914eb54ec4b91ce455c98604ae7b514acbafea9f72d70fcb6f68a77579e03a3b292a57c0f8dfe0d3cb6d07fe5fb9b29cdcbd051919dffc5fd5904
 DIST swi-prolog-6.2.2-gentoo-patchset-0.tar.gz 4303 SHA256 824dd784cf3b7e1b45b65e6a923289de6e6e28d3cf0b797e071e4185f2c05f9f SHA512 5c9c579971172e7300c01120bb70c273ea37a9f962d9ede3d0e7bd45dba6441b7f3244b568643bc6f16b8eabd3099b4cbee25f5be17ac4cebe54c06547cf530f WHIRLPOOL db8349096acd6341de46465ee7c914d19087227fb31064cf3bc21593f2c25660bff2d7d7080e78dff92508bb29dde4da0248ce8b290809aa8543882c82cd0638
 DIST swi-prolog-6.2.5-gentoo-patchset-1.tar.gz 2692 SHA256 c4e59e4240effb3383465997020e4056e5967aa4f9bcf0b010a564d1f49bbd71 SHA512 2f31fae8df581931bee3b38bee1687f9fb12567a9f267a01eba5dd011377cea05b3249df942c4b719bb0c2f7cfb86c5665794948083c3090a6854b04fb25ac4e WHIRLPOOL 49685d66ee2ec6ad4a654356bb6d290d8bd81e79c42241786c235d610493b78583cfb2c44be4b20ba49f49891d9da69b90bf5b5c0f9fc59f272c20ff6475c204
 DIST swi-prolog-6.2.6-gentoo-patchset-0.tar.gz 2701 SHA256 9ab62cb8b19816af66adb4b52344ca59449210a6413c08c9edaf4e3fa5cdf3ad SHA512 a0c5961fd3ceb1e8ee59be6a03bd801fa95ecede3eba41d9b66682e39095e532207e87029c13aaa0e8cb90c03e96e6e41889e433b3627df9b864adad9f45851b WHIRLPOOL eafe59ebc256ccef608b635cf8559866e38f0c52667dac96f984ce1fe195de636176fa8f9653d882a87b6619dd56e0019c01efbd413bfbcb48d457dcfb46fac6
 DIST swi-prolog-6.3.6-gentoo-patchset-0.tar.gz 1920 SHA256 1e31ddd82e611cce1299252e67c8c764d5c0d189e7f2586e5fd45bd02f100bbc SHA512 8b562c9f80ff6f8f6fa34596d0444d2ea559ef7d1e46b0080594b99513f8a224416ad2e395aee9245076cc1e8ce8722730488c03e513339acb690b314b60da0a WHIRLPOOL e5bcf46be03074668644fceeaee4901e0861f5bc5a531b9fb4bd10322910eb83f47a5870c6d5359b778ed1a96d423aa16e223cd252496e19581946efc0ac1bed
 DIST swi-prolog-6.3.7-gentoo-patchset-0.tar.gz 1912 SHA256 19cfbe7e9d9ad5e3eff777552fa46e9abc4b152e98391188b83e420b75bb74a3 SHA512 3f523a7379606158e2650ef07096fd18b1996d903b176ddcaea2b2ac6b9bb8b41b2037b9cafae2eb8b513a5ea92e07d03142f37a04f172c0eeb3af98e5945a48 WHIRLPOOL 500fc258311fd1e221b2865932f157507926e3af628e2bf0ed80184ced982df3dc4b77627d340c2d69a1e304e6745f17a0d83bb23f07feb3ad5ee027d7f168bd
--- a/dev-lang/swi-prolog/swi-prolog-6.2.6.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-6.2.6.ebuild
@ -0,0 +1,140 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-6.2.6.ebuild,v 1.1 2013/01/14 09:47:59 keri Exp $
 EAPI=4
 inherit eutils flag-o-matic java-pkg-opt-2 multilib
 PATCHSET_VER="0"
 DESCRIPTION="free, small, and standard compliant Prolog compiler"
 HOMEPAGE="http://www.swi-prolog.org/"
 SRC_URI="http://www.swi-prolog.org/download/stable/src/pl-${PV}.tar.gz
 	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="archive debug doc gmp hardened java minimal odbc readline ssl static-libs test zlib X"
 RDEPEND="sys-libs/ncurses
 	archive? ( app-arch/libarchive )
 	zlib? ( sys-libs/zlib )
 	odbc? ( dev-db/unixODBC )
 	readline? ( sys-libs/readline )
 	gmp? ( dev-libs/gmp )
 	ssl? ( dev-libs/openssl )
 	java? ( >=virtual/jdk-1.4 )
 	X? (
 		virtual/jpeg
 		x11-libs/libX11
 		x11-libs/libXft
 		x11-libs/libXpm
 		x11-libs/libXt
 		x11-libs/libICE
 		x11-libs/libSM )"
 DEPEND="${RDEPEND}
 	X? ( x11-proto/xproto )
 	java? ( test? ( =dev-java/junit-3.8* ) )"
 S="${WORKDIR}/pl-${PV}"
 src_prepare() {
 	EPATCH_FORCE=yes
 	EPATCH_SUFFIX=patch
 	epatch "${WORKDIR}"/${PV}
 	# OSX/Intel ld doesn't like an archive without table of contents
 	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
 }
 src_configure() {
 	append-flags -fno-strict-aliasing
 	use ppc && append-flags -mno-altivec
 	use hardened && append-flags -fno-unit-at-a-time
 	use debug && append-flags -DO_DEBUG
 	# ARCH is used in the configure script to figure out host and target
 	# specific stuff
 	export ARCH=${CHOST}
 	cd "${S}"/src
 	econf \
 		--libdir="${EPREFIX}"/usr/$(get_libdir) \
 		$(use_enable gmp) \
 		$(use_enable readline) \
 		$(use_enable static-libs static) \
 		--enable-shared \
 		--enable-custom-flags COFLAGS="${CFLAGS}"
 	if ! use minimal ; then
 		local jpltestconf
 		if use java && use test ; then
 			jpltestconf="--with-junit=$(java-config --classpath junit)"
 		fi
 		cd "${S}/packages"
 		econf \
 			--libdir="${EPREFIX}"/usr/$(get_libdir) \
 			$(use_with archive) \
 			--with-chr \
 			--with-clib \
 			--with-clpqr \
 			--with-cpp \
 			--with-http \
 			$(use_with java jpl) \
 			${jpltestconf} \
 			--with-nlp \
 			$(use_with odbc) \
 			--with-PDT \
 			--with-pldoc \
 			--with-plunit \
 			--with-protobufs \
 			--with-R \
 			--with-RDF \
 			--with-semweb \
 			--with-sgml \
 			$(use_with ssl) \
 			--with-table \
 			--with-tipc \
 			--with-utf8proc \
 			$(use_with X xpce) \
 			$(use_with zlib) \
 			COFLAGS='"${CFLAGS}"'
 	fi
 }
 src_compile() {
 	cd "${S}"/src
 	emake
 	if ! use minimal ; then
 		cd "${S}/packages"
 		emake
 	fi
 }
 src_test() {
 	cd "${S}/src"
 	emake check
 	if ! use minimal ; then
 		cd "${S}/packages"
 		emake check
 	fi
 }
 src_install() {
 	emake -C src DESTDIR="${D}" install
 	if ! use minimal ; then
 		emake -C packages DESTDIR="${D}" install
 		if use doc ; then
 			emake -C packages DESTDIR="${D}" html-install
 		fi
 	fi
 	dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
 }
--- a/dev-libs/dbus-glib/dbus-glib-0.100-r2.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.100-r2.ebuild
@ -1,9 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/dbus-glib-0.100-r2.ebuild,v 1.1 2013/01/13 17:50:03 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/dbus-glib-0.100-r2.ebuild,v 1.2 2013/01/14 08:35:48 ssuominen Exp $
 EAPI="5"
 EAPI=5
 inherit bash-completion-r1 eutils
 DESCRIPTION="D-Bus bindings for glib"
@ -15,15 +14,12 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug doc static-libs test"
-RDEPEND="
+RDEPEND=">=dev-libs/expat-2
 	>=dev-libs/expat-2
 	>=dev-libs/glib-2.26
-	>=sys-apps/dbus-1.6.2
+	>=sys-apps/dbus-1.6.2"
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.4 )
+	doc? ( >=dev-util/gtk-doc-1.4 )"
 "
 # out of sources build directory
 BD=${WORKDIR}/${P}-build
@ -35,18 +31,17 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.100-fix-tests.patch
 	# Wrong sections.txt file in the tarball; https://bugs.freedesktop.org/show_bug.cgi?id=55830
-	cp "${FILESDIR}/${P}-dbus-glib-sections.txt" doc/reference/dbus-glib-sections.txt || die
+	cp "${FILESDIR}"/${P}-dbus-glib-sections.txt doc/reference/dbus-glib-sections.txt || die
 }
 src_configure() {
 	# gtk-doc needs to be built when using out-of-source build
 	local myconf=(
 		--localstatedir="${EPREFIX}"/var
 		--enable-bash-completion
 		$(use_enable debug verbose-mode)
 		$(use_enable debug asserts)
 		$(use_enable doc gtk-doc)
 		$(use_enable static-libs static)
 		$(use_enable doc gtk-doc)
 		)
 	mkdir "${BD}"
@ -70,23 +65,26 @@ src_configure() {
 src_compile() {
 	cd "${BD}"
 	einfo "Running make in ${BD}"
-	default
+	emake
 	if use test; then
 		cd "${TBD}"
 		einfo "Running make in ${TBD}"
-		default
+		emake
 	fi
 }
 src_test() {
 	cd "${TBD}"
-	default
+	emake check
 }
 src_install() {
 	# NEWS file is obsolete
 	dodoc AUTHORS ChangeLog HACKING README
 	cd "${BD}"
-	default
+	emake DESTDIR="${D}" install
 	newbashcomp "${ED}"/etc/bash_completion.d/dbus-bash-completion.sh dbus
 	rm -rf "${ED}"/etc/bash_completion.d || die
--- a/dev-libs/libzip/libzip-0.10.1-r1.ebuild
+++ b/dev-libs/libzip/libzip-0.10.1-r1.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-libs/libzip/libzip-0.10.1-r1.ebuild,v 1.6 2012/07/25 01:58:55 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/libzip-0.10.1-r1.ebuild,v 1.7 2013/01/14 09:57:59 pinkbyte Exp $
 EAPI=4
@ -15,7 +15,7 @@ SRC_URI="http://www.nih.at/libzip/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 DEPEND="sys-libs/zlib"
--- a/dev-perl/FLV-AudioExtractor/FLV-AudioExtractor-0.010.0.ebuild
+++ b/dev-perl/FLV-AudioExtractor/FLV-AudioExtractor-0.010.0.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-perl/FLV-AudioExtractor/FLV-AudioExtractor-0.010.0.ebuild,v 1.1 2012/12/12 09:53:30 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/FLV-AudioExtractor/FLV-AudioExtractor-0.010.0.ebuild,v 1.2 2013/01/14 09:50:10 pinkbyte Exp $
 EAPI=5
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Extract audio from Flash Videos"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 DEPEND="virtual/perl-ExtUtils-MakeMaker"
--- a/dev-python/django-evolution/django-evolution-0.6.7-r1.ebuild
+++ b/dev-python/django-evolution/django-evolution-0.6.7-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-python/django-evolution/django-evolution-0.6.7-r1.ebuild,v 1.1 2013/01/13 09:21:23 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-evolution/django-evolution-0.6.7-r1.ebuild,v 1.2 2013/01/14 05:45:14 idella4 Exp $
 EAPI=5
@ -26,22 +26,15 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}
-python_test() {
+#python_test() {
-	testing() {
+#	"${PYTHON}" tests/runtests.py || exit_status=1
-		local exit_status=0
+#}
 		"$(PYTHON)" tests/runtests.py || exit_status=1
 		return $exit_status
 	}
 	python_execute_function testing
 }
 src_install() {
 	distutils-r1_src_install
-	local msg="Remove tests to avoid file collisions"
+	einfo "Remove tests to avoid file collisions"
-	rmtests() {
+	rm -rf $(find "${ED}" -name tests) || die
-		rm -rf "${ED}"/$(python_get_sitedir)/tests/
+	
 	}
 	python_execute_function --action-message "$msg" rmtests
 	dodoc -r docs/
 }
--- a/dev-tex/metapost/Manifest
+++ b/dev-tex/metapost/Manifest
@ -1,2 +1,3 @@
 DIST metapost-1.212-src.tar.bz2 4862803 SHA256 bed4fa92cf86c668d4180f6c644f2a00a5cee17be3f0c00dcfc32c6ff842903a SHA512 ec66d756ff4505ce49d74b0a3fbdc715d4cf95eb3e3a3acd2f704310ae3d1bf3cb87bc75aaa2b1f74d32182ac6815ce658ece42a2f8c880d2d065f52c22fbe42 WHIRLPOOL 15c14f54511cbdebda5dfba8a90ff407d4779f2cd0bf341dfe3c80dac06c66d9d3b8963c54a8f531bce25a536455a03ca27ca6a3bb3b1ee502c5ccf4923b7987
 DIST metapost-1.780-src.tar.bz2 7723409 SHA256 aca382bb1c6b4f52d389c0170cad57c4961fa8de634de34ea47b0a37cfabde58 SHA512 3002da0706fcd33a2d183f42b770b7c2d72759a8ba0e49ae24e4a5cee5dd9cd0842e7e8d854e22962beaff4dfd1b943a63f41ee07a7743bb7d50a0cdfb4dd4ff WHIRLPOOL 3095ac3cda9bd65487074882c6cc9d8bf2210d04b69ed741290054f1622a5c29ce9af986cc5b819b910db2757eb14565e1ce9a1968a2f29ae72bca50ce2c90d1
 DIST metapost-beta-1.504-src.tar.bz2 4784579 SHA256 94d37e092c953141cf95c62f6fb441fdbdb786e6c0df5f6b5d6af41658e99562 SHA512 40bf7304df0de3d1df069ab48f5d08b9ddaa7bcba9332c6076dc9fed3a6371351c9bdc6504c297835d454d6c97db15b2f2620a629801089c1acffb9ea9c76771 WHIRLPOOL c62271ebb343d6dd43527f6bda7cbeb5ea9ead9580fc7ea65e343cd69317b2bb8b196b3016eb65a6435a463551ff9e2a45c9eb7d460e4b72973b86c5af02abd4
--- a/dev-tex/metapost/metapost-1.780.ebuild
+++ b/dev-tex/metapost/metapost-1.780.ebuild
@ -0,0 +1,74 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-tex/metapost/metapost-1.780.ebuild,v 1.1 2013/01/14 10:48:16 aballier Exp $
 EAPI=4
 DESCRIPTION="System for producing graphics"
 HOMEPAGE="http://tug.org/metapost.html"
 SRC_URI="http://foundry.supelec.fr/gf/download/frsrelease/395/1879/${P}-src.tar.bz2"
 LICENSE="GPL-2 LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 RDEPEND="dev-libs/kpathsea
 	>=app-admin/eselect-mpost-0.3
 	x11-libs/cairo
 	x11-libs/pixman
 	media-libs/libpng"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 S=${WORKDIR}/${P}/source/texk/web2c
 src_configure() {
 	econf \
 		--disable-all-pkgs \
 		--enable-shared    \
 		--disable-largefile \
 		--disable-ptex \
 		--enable-mp  \
 		--with-system-cairo \
 		--with-system-libpng \
 		--without-ptexenc \
 		--with-system-kpathsea \
 		--with-system-xpdf \
 		--with-system-freetype \
 		--with-system-freetype2 \
 		--with-system-gd \
 		--with-system-teckit \
 		--with-system-t1lib \
 		--with-system-icu \
 		--with-system-graphite \
 		--with-system-zziplib \
 		--with-system-poppler \
 		--with-system-zlib \
 		--with-system-pixman \
 		--disable-native-texlive-build \
 		--without-mf-x-toolkit --without-x
 }
 src_compile() {
 	emake mpost
 }
 src_install() {
 	emake DESTDIR="${D}" \
 		SUBDIRS="" \
 		bin_PROGRAMS="mpost" \
 		nodist_man_MANS="" \
 		dist_man_MANS="" \
 		install-binPROGRAMS
 	# Rename it
 	mv "${D}/usr/bin/mpost" "${D}/usr/bin/mpost-${P}" || die "renaming failed"
 	cd "${WORKDIR}/${P}"
 	dodoc README CHANGES
 }
 pkg_postinst(){
 	einfo "Calling eselect mpost update"
 	eselect mpost update
 }
--- a/dev-util/nvidia-cuda-sdk/Manifest
+++ b/dev-util/nvidia-cuda-sdk/Manifest
@ -1,11 +1,6 @@
 DIST NVIDIA_CUDA_SDK_2.02.0807.1535_linux.run 41918865 SHA256 5ceb6ac9d973b7d3544ed5ee3c52de40451ca234df587fb93bd3c5b73f5610c4
-DIST cuda-sdk-linux-2.10.1215.2015-3233425.run 46618139 SHA256 5d9521f049312fc00fef9e9ed6fa2bd8475e0d309dab109da4b663461d9855bb
+DIST cuda_5.0.35_linux_32_fedora16-1.run 583244929 SHA256 11927b4c0fb23dbf98457b852914b8458ef41cc1b7ea67bce892f2cc6a77d34e SHA512 d1cda0d53fdc86ac6412c5c92a16efd761d3f15f08878e1aa1c17bdf3bad824a0cebb5c211ad89b8dd15a439eddd0f93efe82ed0850dc93adcd3dab529f6daca WHIRLPOOL 11bc905a4a63171009569d6655b40f0d49034f71c0a93a83e1b656e91a4250c813e0a16fdfda87e9fbe4d250a312beb0c9ad073bfb0420fb4e06fdd26faf3cc9
 DIST cuda_5.0.35_linux_64_fedora16-1.run 701310481 SHA256 c2889c779215eea1c3cc6d4b092eb4208b7e1063704b6e5e8d48d04e961c3c0a SHA512 83903587d1715dd3a64db6bd676c0586edb81495da1bec22aac9995de31ca0b0db2460cccf4af0845befe0cee308ab019760c3c88eb351b6db0f255f7d93e546 WHIRLPOOL 33b998c66ebfa059d77eedb6b8465183f5ef4444ed5fe55f622efe6a2eeeef8e50e2cb09b0de4e61e15b5320495123ce46e1b47fc4cbbe96f3bde0ac93ff5dbc
 DIST cudasdk_2.2_linux.run 55951278 SHA256 1962a0a0795a8d2aef7c4e113319bd0bb376a7bb553405d94d731e594ef316fb
 DIST cudasdk_2.3_linux.run 66005555 SHA256 26ec80755b124a8484c93a6481a3c19f4fa7fdae96b087fd889346981c463873
 DIST gpucomputingsdk_3.0-beta1_linux.run 108531376 SHA256 43b1ffe2a069f5e509efcd476d47a2595bad0db8a6967d91375e706445b9b016
 DIST gpucomputingsdk_3.0_linux.run 100306703 SHA256 7a3afdd52023cfa49bc67182729ce498cc85fa370dcd4bd33c299fb75945ec5e
 DIST gpucomputingsdk_3.1_linux.run 222010279 SHA256 57d71cf889df7bbbc8b18ba5e74b2dd9e5a64951867c007d63577c2e07afd7ce
 DIST gpucomputingsdk_3.2.16_linux.run 127914287 SHA256 e815d80e183f4a77ddd5e3d5611432c387102c786d12a57c983b69ad74ce3e45
 DIST gpucomputingsdk_4.0.17_linux.run 129498736 SHA256 d62baf4963ca58d7db711e0366439e2c63bc84ce6c513c8a9dfa82a0fc51f102
 DIST gpucomputingsdk_4.1.28_linux.run 155378846 SHA256 1d6c6b6b25ae70d7a725cb89a06644b7101a63c1508bce69daacd32b32b0f6f9
 DIST gpucomputingsdk_4.2.9_linux.run 152436489 SHA256 b6a53afcf8f8422b5075aa37cec6730b0b9896d50867ee9105da05d62e95b8bb SHA512 1975f005ebd1520005d0a45ac680c8b49806705b8ed64738366b7166f384a304de3d655a05900b6da1088441024b149a1e963296ef78041c524ecbb1bb5e5315 WHIRLPOOL b8ce1f1f6a54b2d52f2531cfbb46f2a48e0b37f0c1dd898ff6222483afed7ac26c6bc57da31cafb0c30b3636b780ace3e3c679f25c6c4eaa26b0e39da00dcb8f
 DIST nvidia-cuda-sdk-5.0.35-asneeded.patch.xz 8892 SHA256 b79db5453350a1149771236e4dbdc4dc1504afd8f19472240c009f51048a27bc SHA512 7797a0ea6b0090e2d452acd644976a950c3b5cb3890073be41021fd3c6c1581a130bc7a8ee2da03131785de8dae6b9f09aff3a01a390ef909508e8c0c55863c8 WHIRLPOOL 0708a2d2eea767a490ce817b70292c2b2e6bfc8e1afb7b2f1bc73a3d170ebbd957a0d5be3a620611bc394cdefc4d37b7e43e2aa83e710396bc083aebc807429c
--- a/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-4.2.9-asneeded.patch
+++ b/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-4.2.9-asneeded.patch
@ -0,0 +1,89 @@
 --- a/sdk/C/common/common.mk
 +++ b/sdk/C/common/common.mk
@@ -268,18 +268,18 @@ endif
 # If dynamically linking to CUDA and CUDART, we exclude the libraries from the LIB
 ifeq ($(USECUDADYNLIB),1)
 -     LIB += ${OPENGLLIB} $(PARAMGLLIB) $(RENDERCHECKGLLIB) ${LIB} -ldl -rdynamic 
 +     LIB += $(RENDERCHECKGLLIB) ${OPENGLLIB} $(PARAMGLLIB) ${LIB} -ldl -rdynamic 
 else
 # static linking, we will statically link against CUDA and CUDART
   ifeq ($(USEDRVAPI),1)
 -     LIB += -lcuda   ${OPENGLLIB} $(PARAMGLLIB) $(RENDERCHECKGLLIB) ${LIB} 
 +     LIB += -lcuda $(RENDERCHECKGLLIB) ${OPENGLLIB} $(PARAMGLLIB) ${LIB} 
   else
      ifeq ($(emu),1) 
          LIB += -lcudartemu
      else 
          LIB += -lcudart
      endif
 -     LIB += ${OPENGLLIB} $(PARAMGLLIB) $(RENDERCHECKGLLIB) ${LIB}
 +     LIB += $(RENDERCHECKGLLIB) ${OPENGLLIB} $(PARAMGLLIB) ${LIB}
   endif
 endif
 --- a/sdk/CUDALibraries/common/common_cudalib.mk
 +++ b/sdk/CUDALibraries/common/common_cudalib.mk
@@ -253,7 +253,7 @@ ifeq ($(USEPARAMGL),1)
 endif
 ifeq ($(USERENDERCHECKGL),1)
 -	RENDERCHECKGLLIB := -lrendercheckgl_$(LIB_ARCH)$(LIBSUFFIX)
 +	RENDERCHECKGLLIB := -L../../../C/lib -lrendercheckgl_$(LIB_ARCH)$(LIBSUFFIX)
 endif
 ifeq ($(USENVCUVID), 1)
 --- a/sdk/CUDALibraries/src/boxFilterNPP/Makefile
 +++ b/sdk/CUDALibraries/src/boxFilterNPP/Makefile
@@ -38,7 +38,7 @@ include ../../common/common_npplib.mk
 # Targets
 ################################################################################
 all:
 -	$(CXX) $(INC) $(LIB) -o boxFilterNPP boxFilterNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH)
 +	$(CXX) $(INC) -o boxFilterNPP boxFilterNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH) $(LIB)
 	mkdir -p ../../bin
 	mkdir -p ../../bin/$(OSLOWER)/
 	mkdir -p ../../bin/$(OSLOWER)/debug
 --- a/sdk/CUDALibraries/src/freeImageInteropNPP/Makefile
 +++ b/sdk/CUDALibraries/src/freeImageInteropNPP/Makefile
@@ -38,7 +38,7 @@ include ../../common/common_npplib.mk
 # Targets
 ################################################################################
 all:
 -	$(CXX) $(INC) $(LIB) -o freeImageInteropNPP freeImageInteropNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH)
 +	$(CXX) $(INC) -o freeImageInteropNPP freeImageInteropNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH) $(LIB)
 	mkdir -p ../../bin
 	mkdir -p ../../bin/$(OSLOWER)
 	mkdir -p ../../bin/$(OSLOWER)/release
 --- a/sdk/CUDALibraries/src/histEqualizationNPP/Makefile
 +++ b/sdk/CUDALibraries/src/histEqualizationNPP/Makefile
@@ -38,7 +38,7 @@ include ../../common/common_npplib.mk
 # Targets
 ################################################################################
 all:
 -	$(CXX) $(INC) $(LIB) -o histEqualizationNPP histEqualizationNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH)
 +	$(CXX) $(INC) -o histEqualizationNPP histEqualizationNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH) $(LIB)
 	mkdir -p ../../bin
 	mkdir -p ../../bin/$(OSLOWER)
 	mkdir -p ../../bin/$(OSLOWER)/release
 --- a/sdk/CUDALibraries/src/imageSegmentationNPP/Makefile
 +++ b/sdk/CUDALibraries/src/imageSegmentationNPP/Makefile
@@ -38,7 +38,7 @@ include ../../common/common_npplib.mk
 # Targets
 ################################################################################
 all:
 -	$(CXX) $(INC) $(LIB) -o imageSegmentationNPP imageSegmentationNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH)
 +	$(CXX) $(INC) -o imageSegmentationNPP imageSegmentationNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH) $(LIB)
 	mkdir -p ../../bin
 	mkdir -p ../../bin/$(OSLOWER)
 	mkdir -p ../../bin/$(OSLOWER)/release
 --- a/sdk/CUDALibraries/src/randomFog/Makefile
 +++ b/sdk/CUDALibraries/src/randomFog/Makefile
@@ -45,6 +45,7 @@ CCFILES		:= randomFog.cpp rng.cpp
 USECURAND   := 1
 USEGLLIB    := 1
 USEGLUT     := 1
 +USERENDERCHECKGL := 1
 ################################################################################
 # Rules and targets
--- a/dev-util/nvidia-cuda-sdk/metadata.xml
+++ b/dev-util/nvidia-cuda-sdk/metadata.xml
@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+  <maintainer>
-		<email>spock@gentoo.org</email>
+    <email>jlec@gentoo.org</email>
-		<name>Michał Januszewski</name>
+    <name>Justin Lecher</name>
-	</maintainer>
+  </maintainer>
-	<use>
+  <use>
-		<flag name='emulation'>
+    <flag name="emulation">
 			Build binaries for device emulation mode.  These binaries
 			will not require a CUDA-capable GPU to run.
 		</flag>
-		<flag name='opencl'>
+    <flag name="opencl">
 			Build OpenCL binaries.
 		</flag>
-		<flag name='cuda'>
+    <flag name="cuda">
 			Build CUDA binaries.
 		</flag>
-	</use>
+  </use>
 </pkgmetadata>
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.1.1215.2015.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.1.1215.2015.ebuild
@ -1,73 +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/nvidia-cuda-sdk/nvidia-cuda-sdk-2.1.1215.2015.ebuild,v 1.8 2012/02/05 05:48:44 vapier Exp $
 inherit eutils unpacker toolchain-funcs
 DESCRIPTION="NVIDIA CUDA Software Development Kit"
 HOMEPAGE="http://developer.nvidia.com/cuda"
 SRC_URI="http://developer.download.nvidia.com/compute/cuda/2_1/SDK/cuda-sdk-linux-2.10.1215.2015-3233425.run"
 LICENSE="CUDPP"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug emulation"
 RDEPEND=">=dev-util/nvidia-cuda-toolkit-2.1
 	>=x11-drivers/nvidia-drivers-180.22
 	media-libs/freeglut"
 DEPEND="${RDEPEND}
 	<sys-devel/gcc-4.4"
 S="${WORKDIR}"
 RESTRICT="binchecks"
 pkg_setup() {
 	if [ "$(gcc-major-version)" == "4" -a $(gcc-minor-version) -ge 4 ]; then
 		eerror "This package requires <=sys-devel/gcc-4.3 to build sucessfully."
 		eerror "Please use gcc-config to switch to a compatible GCC version."
 		die "<=sys-devel/gcc-4.3 required"
 	fi
 }
 src_unpack() {
 	unpack_makeself
 	cd "${S}"
 	sed -i -e 's:CUDA_INSTALL_PATH ?= .*:CUDA_INSTALL_PATH ?= /opt/cuda:' sdk/common/common.mk
 	epatch "${FILESDIR}/nvidia-cuda-sdk-2.10.1215.2015-vararg_inline_fix.patch"
 }
 src_compile() {
 	local myopts=""
 	if use emulation; then
 		myopts="emu=1"
 	fi
 	if use debug; then
 		myopts="${myopts} dbg=1"
 	fi
 	cd "${S}/sdk"
 	MAKEOPTS="${MAKEOPTS} -j1" emake cuda-install=/opt/cuda ${myopts} || die
 }
 src_install() {
 	cd "${S}/sdk"
 	for f in $(find .); do
 		local t="$(dirname ${f})"
 		if [[ "${t/obj\/}" != "${t}" || "${t##*.}" == "a" ]]; then
 			continue
 		fi
 		if [[ -x "${f}" && ! -d "${f}" ]]; then
 			exeinto "/opt/cuda/sdk/$(dirname ${f})"
 			doexe "${f}"
 		else
 			insinto "/opt/cuda/sdk/$(dirname ${f})"
 			doins "${f}"
 		fi
 	done
 }
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.2.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.2.ebuild
@ -1,74 +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/nvidia-cuda-sdk/nvidia-cuda-sdk-2.2.ebuild,v 1.7 2012/02/05 05:48:44 vapier Exp $
 inherit unpacker toolchain-funcs
 DESCRIPTION="NVIDIA CUDA Software Development Kit"
 HOMEPAGE="http://developer.nvidia.com/cuda"
 CUDA_V=${PV//./_}
 SRC_URI="http://developer.download.nvidia.com/compute/cuda/${CUDA_V}/sdk/cudasdk_${PV}_linux.run"
 LICENSE="CUDPP"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug emulation"
 RDEPEND=">=dev-util/nvidia-cuda-toolkit-2.2
 	>=x11-drivers/nvidia-drivers-180.22
 	media-libs/freeglut"
 DEPEND="${RDEPEND}
 	<sys-devel/gcc-4.4"
 S="${WORKDIR}"
 RESTRICT="binchecks"
 pkg_setup() {
 	if [ "$(gcc-major-version)" == "4" -a $(gcc-minor-version) -ge 4 ]; then
 		eerror "This package requires <=sys-devel/gcc-4.3 to build sucessfully."
 		eerror "Please use gcc-config to switch to a compatible GCC version."
 		die "<=sys-devel/gcc-4.3 required"
 	fi
 }
 src_unpack() {
 	unpack_makeself
 	cd "${S}"
 	sed -i -e 's:CUDA_INSTALL_PATH ?= .*:CUDA_INSTALL_PATH ?= /opt/cuda:' sdk/common/common.mk
 }
 src_compile() {
 	local myopts=""
 	if use emulation; then
 		myopts="emu=1"
 	fi
 	if use debug; then
 		myopts="${myopts} dbg=1"
 	fi
 	cd "${S}/sdk"
 	emake cuda-install=/opt/cuda ${myopts} || die
 }
 src_install() {
 	cd "${S}/sdk"
 	for f in $(find .); do
 		local t="$(dirname ${f})"
 		if [[ "${t/obj\/}" != "${t}" || "${t##*.}" == "a" ]]; then
 			continue
 		fi
 		if [[ -x "${f}" && ! -d "${f}" ]]; then
 			exeinto "/opt/cuda/sdk/$(dirname ${f})"
 			doexe "${f}"
 		else
 			insinto "/opt/cuda/sdk/$(dirname ${f})"
 			doins "${f}"
 		fi
 	done
 }
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.3.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.3.ebuild
@ -1,88 +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/nvidia-cuda-sdk/nvidia-cuda-sdk-2.3.ebuild,v 1.4 2012/02/05 05:48:44 vapier Exp $
 EAPI=2
 inherit unpacker toolchain-funcs
 DESCRIPTION="NVIDIA CUDA Software Development Kit"
 HOMEPAGE="http://developer.nvidia.com/cuda"
 CUDA_V=${PV//./_}
 SRC_URI="http://developer.download.nvidia.com/compute/cuda/${CUDA_V}/sdk/cudasdk_${PV}_linux.run"
 LICENSE="CUDPP"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug +doc emulation +examples"
 RDEPEND=">=dev-util/nvidia-cuda-toolkit-2.3
 	examples? ( !emulation? ( >=x11-drivers/nvidia-drivers-190.18 ) )
 	media-libs/freeglut"
 DEPEND="${RDEPEND}
 	<sys-devel/gcc-4.4"
 S="${WORKDIR}"
 RESTRICT="binchecks"
 pkg_setup() {
 	if [ "$(gcc-major-version)" == "4" -a $(gcc-minor-version) -ge 4 ]; then
 		eerror "This package requires <=sys-devel/gcc-4.3 to build sucessfully."
 		eerror "Please use gcc-config to switch to a compatible GCC version."
 		die "<=sys-devel/gcc-4.3 required"
 	fi
 }
 src_prepare() {
 	sed -i -e 's:CUDA_INSTALL_PATH ?= .*:CUDA_INSTALL_PATH ?= /opt/cuda:' sdk/shared/common.mk sdk/C/common/common.mk
 }
 src_compile() {
 	if ! use examples; then
 		return
 	fi
 	local myopts=""
 	if use emulation; then
 		myopts="emu=1"
 	fi
 	if use debug; then
 		myopts="${myopts} dbg=1"
 	fi
 	cd "${S}/sdk/C"
 	emake cuda-install=/opt/cuda ${myopts} || die
 }
 src_install() {
 	cd "${S}/sdk"
 	# This only contains object files.
 	rm -rf projects
 	if ! use doc; then
 		rm -rf C/doc C/ReleaseNotes.html C/releaseNotesData
 	fi
 	if ! use examples; then
 		rm -rf C/bin C/src
 	fi
 	for f in $(find .); do
 		local t="$(dirname ${f})"
 		if [[ "${t/obj\/}" != "${t}" || "${t##*.}" == "a" ]]; then
 			continue
 		fi
 		if [[ -x "${f}" && ! -d "${f}" ]]; then
 			exeinto "/opt/cuda/sdk/${t}"
 			doexe "${f}"
 		else
 			insinto "/opt/cuda/sdk/${t}"
 			doins "${f}"
 		fi
 	done
 }
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-3.0.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-3.0.ebuild
@ -1,94 +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/nvidia-cuda-sdk/nvidia-cuda-sdk-3.0.ebuild,v 1.4 2012/02/05 05:48:44 vapier Exp $
 EAPI=2
 inherit unpacker toolchain-funcs
 DESCRIPTION="NVIDIA CUDA Software Development Kit"
 HOMEPAGE="http://developer.nvidia.com/cuda"
 CUDA_V=${PV//_/-}
 DIR_V=${CUDA_V//./_}
 DIR_V=${DIR_V//beta/Beta}
 SRC_URI="http://developer.download.nvidia.com/compute/cuda/${DIR_V}/sdk/gpucomputingsdk_${CUDA_V}_linux.run"
 LICENSE="CUDPP"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug +doc emulation +examples opencl +cuda"
 RDEPEND=">=dev-util/nvidia-cuda-toolkit-3.0_beta1
 	examples? ( !emulation? ( >=x11-drivers/nvidia-drivers-195.30 ) )
 	media-libs/freeglut"
 DEPEND="${RDEPEND}
 	<sys-devel/gcc-4.4"
 S="${WORKDIR}"
 RESTRICT="binchecks"
 pkg_setup() {
 	if [ "$(gcc-major-version)" == "4" -a $(gcc-minor-version) -ge 4 ]; then
 		eerror "This package requires <=sys-devel/gcc-4.3 to build sucessfully."
 		eerror "Please use gcc-config to switch to a compatible GCC version."
 		die "<=sys-devel/gcc-4.3 required"
 	fi
 }
 src_compile() {
 	if ! use examples; then
 		return
 	fi
 	local myopts=""
 	if use emulation; then
 		myopts="emu=1"
 	fi
 	if use debug; then
 		myopts="${myopts} dbg=1"
 	fi
 	cd "${S}/sdk"
 	if use cuda; then
 		cd C
 		emake cuda-install=/opt/cuda ${myopts} || die
 		cd ..
 	fi
 	if use opencl; then
 		cd OpenCL
 		emake || die
 		cd ..
 	fi
 }
 src_install() {
 	cd "${S}/sdk"
 	if ! use doc; then
 		rm -rf doc ReleaseNotes.htm releaseNotesData
 	fi
 	if ! use examples; then
 		rm -rf bin tools
 	fi
 	for f in $(find .); do
 		local t="$(dirname ${f})"
 		if [[ "${t/obj\/}" != "${t}" || "${t##*.}" == "a" ]]; then
 			continue
 		fi
 		if [[ -x "${f}" && ! -d "${f}" ]]; then
 			exeinto "/opt/cuda/sdk/${t}"
 			doexe "${f}"
 		else
 			insinto "/opt/cuda/sdk/${t}"
 			doins "${f}"
 		fi
 	done
 }
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-3.0_beta1.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-3.0_beta1.ebuild
@ -1,94 +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/nvidia-cuda-sdk/nvidia-cuda-sdk-3.0_beta1.ebuild,v 1.4 2012/02/05 05:48:44 vapier Exp $
 EAPI=2
 inherit unpacker toolchain-funcs
 DESCRIPTION="NVIDIA CUDA Software Development Kit"
 HOMEPAGE="http://developer.nvidia.com/cuda"
 CUDA_V=${PV//_/-}
 DIR_V=${CUDA_V//./_}
 DIR_V=${DIR_V//beta/Beta}
 SRC_URI="http://developer.download.nvidia.com/compute/cuda/${DIR_V}/sdk/gpucomputingsdk_${CUDA_V}_linux.run"
 LICENSE="CUDPP"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug +doc emulation +examples opencl +cuda"
 RDEPEND=">=dev-util/nvidia-cuda-toolkit-3.0_beta1
 	examples? ( !emulation? ( >=x11-drivers/nvidia-drivers-195.30 ) )
 	media-libs/freeglut"
 DEPEND="${RDEPEND}
 	<sys-devel/gcc-4.4"
 S="${WORKDIR}"
 RESTRICT="binchecks"
 pkg_setup() {
 	if [ "$(gcc-major-version)" == "4" -a $(gcc-minor-version) -ge 4 ]; then
 		eerror "This package requires <=sys-devel/gcc-4.3 to build sucessfully."
 		eerror "Please use gcc-config to switch to a compatible GCC version."
 		die "<=sys-devel/gcc-4.3 required"
 	fi
 }
 src_compile() {
 	if ! use examples; then
 		return
 	fi
 	local myopts=""
 	if use emulation; then
 		myopts="emu=1"
 	fi
 	if use debug; then
 		myopts="${myopts} dbg=1"
 	fi
 	cd "${S}/sdk"
 	if use cuda; then
 		cd C
 		emake cuda-install=/opt/cuda ${myopts} || die
 		cd ..
 	fi
 	if use opencl; then
 		cd OpenCL
 		emake || die
 		cd ..
 	fi
 }
 src_install() {
 	cd "${S}/sdk"
 	if ! use doc; then
 		rm -rf doc ReleaseNotes.htm releaseNotesData
 	fi
 	if ! use examples; then
 		rm -rf bin tools
 	fi
 	for f in $(find .); do
 		local t="$(dirname ${f})"
 		if [[ "${t/obj\/}" != "${t}" || "${t##*.}" == "a" ]]; then
 			continue
 		fi
 		if [[ -x "${f}" && ! -d "${f}" ]]; then
 			exeinto "/opt/cuda/sdk/${t}"
 			doexe "${f}"
 		else
 			insinto "/opt/cuda/sdk/${t}"
 			doins "${f}"
 		fi
 	done
 }
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-3.1.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-3.1.ebuild
@ -1,83 +0,0 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-3.1.ebuild,v 1.4 2012/02/05 05:48:44 vapier Exp $
 EAPI=2
 inherit unpacker toolchain-funcs
 DESCRIPTION="NVIDIA CUDA Software Development Kit"
 HOMEPAGE="http://developer.nvidia.com/cuda"
 CUDA_V=${PV//_/-}
 DIR_V=${CUDA_V//./_}
 DIR_V=${DIR_V//beta/Beta}
 SRC_URI="http://developer.download.nvidia.com/compute/cuda/${DIR_V}/sdk/gpucomputingsdk_${CUDA_V}_linux.run"
 LICENSE="CUDPP"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug +doc +examples opencl +cuda"
 RDEPEND=">=dev-util/nvidia-cuda-toolkit-3.1
 	examples? ( >=x11-drivers/nvidia-drivers-256.35 )
 	media-libs/freeglut"
 DEPEND="${RDEPEND}"
 S="${WORKDIR}"
 RESTRICT="binchecks"
 src_compile() {
 	if ! use examples; then
 		return
 	fi
 	local myopts=""
 	if use debug; then
 		myopts="${myopts} dbg=1"
 	fi
 	cd "${S}/sdk"
 	if use cuda; then
 		cd C
 		emake cuda-install=/opt/cuda ${myopts} || die
 		cd ..
 	fi
 	if use opencl; then
 		cd OpenCL
 		emake || die
 		cd ..
 	fi
 }
 src_install() {
 	cd "${S}/sdk"
 	if ! use doc; then
 		rm -rf *.txt doc */doc */Samples.htm */releaseNotesData
 	fi
 	if ! use examples; then
 		rm -rf bin */bin */tools
 	fi
 	for f in $(find .); do
 		local t="$(dirname ${f})"
 		if [[ "${t/obj\/}" != "${t}" || "${t##*.}" == "a" ]]; then
 			continue
 		fi
 		if [[ ! -d "${f}" ]]; then
 			if [[ -x "${f}" ]]; then
 				exeinto "/opt/cuda/sdk/${t}"
 				doexe "${f}"
 			else
 				insinto "/opt/cuda/sdk/${t}"
 				doins "${f}"
 			fi
 		fi
 	done
 }
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-3.2.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-3.2.ebuild
@ -1,91 +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/nvidia-cuda-sdk/nvidia-cuda-sdk-3.2.ebuild,v 1.3 2012/02/05 05:48:44 vapier Exp $
 EAPI=2
 inherit unpacker toolchain-funcs
 DESCRIPTION="NVIDIA CUDA Software Development Kit"
 HOMEPAGE="http://developer.nvidia.com/cuda"
 CUDA_V=${PV//_/-}
 DIR_V=${CUDA_V//./_}
 DIR_V=${DIR_V//beta/Beta}
 SRC_URI="http://developer.download.nvidia.com/compute/cuda/${DIR_V}_prod/sdk/gpucomputingsdk_${CUDA_V}.16_linux.run"
 LICENSE="CUDPP"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug +doc +examples opencl +cuda"
 RDEPEND=">=dev-util/nvidia-cuda-toolkit-3.2
 	examples? ( >=x11-drivers/nvidia-drivers-260.19.21 )
 	media-libs/freeglut"
 DEPEND="${RDEPEND}"
 S="${WORKDIR}"
 RESTRICT="binchecks"
 pkg_setup() {
 	if use cuda || use opencl && [ "$(gcc-major-version)" == "4" -a $(gcc-minor-version) -ge 5 ]; then
 		eerror "This package requires <=sys-devel/gcc-4.4 to build sucessfully."
 		eerror "Please use gcc-config to switch to a compatible GCC version."
 		die "<=sys-devel/gcc-4.4 required"
 	fi
 }
 src_compile() {
 	if ! use examples; then
 		return
 	fi
 	local myopts=""
 	if use debug; then
 		myopts="${myopts} dbg=1"
 	fi
 	cd "${S}/sdk"
 	if use cuda; then
 		cd C
 		emake cuda-install=/opt/cuda ${myopts} || die
 		cd ..
 	fi
 	if use opencl; then
 		cd OpenCL
 		emake || die
 		cd ..
 	fi
 }
 src_install() {
 	cd "${S}/sdk"
 	if ! use doc; then
 		rm -rf *.txt doc */doc */Samples.htm */releaseNotesData
 	fi
 	if ! use examples; then
 		rm -rf bin */bin */tools
 	fi
 	for f in $(find .); do
 		local t="$(dirname ${f})"
 		if [[ "${t/obj\/}" != "${t}" || "${t##*.}" == "a" ]]; then
 			continue
 		fi
 		if [[ ! -d "${f}" ]]; then
 			if [[ -x "${f}" ]]; then
 				exeinto "/opt/cuda/sdk/${t}"
 				doexe "${f}"
 			else
 				insinto "/opt/cuda/sdk/${t}"
 				doins "${f}"
 			fi
 		fi
 	done
 }
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.0.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.0.ebuild
@ -1,91 +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/nvidia-cuda-sdk/nvidia-cuda-sdk-4.0.ebuild,v 1.2 2012/02/05 05:48:44 vapier Exp $
 EAPI=2
 inherit unpacker toolchain-funcs
 DESCRIPTION="NVIDIA CUDA Software Development Kit"
 HOMEPAGE="http://developer.nvidia.com/cuda"
 CUDA_V=${PV//_/-}
 DIR_V=${CUDA_V//./_}
 DIR_V=${DIR_V//beta/Beta}
 SRC_URI="http://developer.download.nvidia.com/compute/cuda/${DIR_V}/sdk/gpucomputingsdk_${CUDA_V}.17_linux.run"
 LICENSE="CUDPP"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug +doc +examples opencl +cuda"
 RDEPEND=">=dev-util/nvidia-cuda-toolkit-4.0
 	examples? ( >=x11-drivers/nvidia-drivers-260.19.21 )
 	media-libs/freeglut"
 DEPEND="${RDEPEND}"
 S="${WORKDIR}"
 RESTRICT="binchecks"
 pkg_setup() {
 	if use cuda || use opencl && [ "$(gcc-major-version)" == "4" -a $(gcc-minor-version) -ge 5 ]; then
 		eerror "This package requires <=sys-devel/gcc-4.4 to build sucessfully."
 		eerror "Please use gcc-config to switch to a compatible GCC version."
 		die "<=sys-devel/gcc-4.4 required"
 	fi
 }
 src_compile() {
 	if ! use examples; then
 		return
 	fi
 	local myopts=""
 	if use debug; then
 		myopts="${myopts} dbg=1"
 	fi
 	cd "${S}/sdk"
 	if use cuda; then
 		cd C
 		emake cuda-install=/opt/cuda ${myopts} || die
 		cd ..
 	fi
 	if use opencl; then
 		cd OpenCL
 		emake || die
 		cd ..
 	fi
 }
 src_install() {
 	cd "${S}/sdk"
 	if ! use doc; then
 		rm -rf *.txt doc */doc */Samples.htm */releaseNotesData
 	fi
 	if ! use examples; then
 		rm -rf bin */bin */tools
 	fi
 	for f in $(find .); do
 		local t="$(dirname ${f})"
 		if [[ "${t/obj\/}" != "${t}" || "${t##*.}" == "a" ]]; then
 			continue
 		fi
 		if [[ ! -d "${f}" ]]; then
 			if [[ -x "${f}" ]]; then
 				exeinto "/opt/cuda/sdk/${t}"
 				doexe "${f}"
 			else
 				insinto "/opt/cuda/sdk/${t}"
 				doins "${f}"
 			fi
 		fi
 	done
 }
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.1.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.1.ebuild
@ -1,92 +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/nvidia-cuda-sdk/nvidia-cuda-sdk-4.1.ebuild,v 1.3 2012/02/05 16:39:02 spock Exp $
 EAPI=2
 inherit unpacker toolchain-funcs
 DESCRIPTION="NVIDIA CUDA Software Development Kit"
 HOMEPAGE="http://developer.nvidia.com/cuda"
 CUDA_V=${PV//_/-}
 DIR_V=${CUDA_V//./_}
 DIR_V=${DIR_V//beta/Beta}
 SRC_URI="http://developer.download.nvidia.com/compute/cuda/${DIR_V}/rel/sdk/gpucomputingsdk_${CUDA_V}.28_linux.run"
 LICENSE="CUDPP"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug +doc +examples opencl +cuda"
 RDEPEND=">=dev-util/nvidia-cuda-toolkit-4.1
 	examples? ( >=x11-drivers/nvidia-drivers-260.19.21 )
 	media-libs/freeglut"
 DEPEND="${RDEPEND}"
 S="${WORKDIR}"
 RESTRICT="binchecks"
 pkg_setup() {
 	if use cuda || use opencl && [ $(gcc-major-version) -lt 4 -o $(gcc-minor-version) -lt 5 ]; then
 		eerror "This package requires >=sys-devel/gcc-4.5 to build sucessfully."
 		eerror "Please use gcc-config to switch to a compatible GCC version."
 		die ">=sys-devel/gcc-4.4 required"
 	fi
 	echo $(gcc-major-version) $(gcc-minor-version)
 }
 src_compile() {
 	if ! use examples; then
 		return
 	fi
 	local myopts=""
 	if use debug; then
 		myopts="${myopts} dbg=1"
 	fi
 	cd "${S}/sdk"
 	if use cuda; then
 		cd C
 		emake cuda-install=/opt/cuda ${myopts} || die
 		cd ..
 	fi
 	if use opencl; then
 		cd OpenCL
 		emake || die
 		cd ..
 	fi
 }
 src_install() {
 	cd "${S}/sdk"
 	if ! use doc; then
 		rm -rf *.txt doc */doc */Samples.htm */releaseNotesData
 	fi
 	if ! use examples; then
 		rm -rf bin */bin */tools
 	fi
 	for f in $(find .); do
 		local t="$(dirname ${f})"
 		if [[ "${t/obj\/}" != "${t}" || "${t##*.}" == "a" ]]; then
 			continue
 		fi
 		if [[ ! -d "${f}" ]]; then
 			if [[ -x "${f}" ]]; then
 				exeinto "/opt/cuda/sdk/${t}"
 				doexe "${f}"
 			else
 				insinto "/opt/cuda/sdk/${t}"
 				doins "${f}"
 			fi
 		fi
 	done
 }
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9-r1.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9-r1.ebuild
@ -0,0 +1,112 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9-r1.ebuild,v 1.1 2013/01/14 10:19:19 jlec Exp $
 EAPI=4
 inherit cuda eutils toolchain-funcs unpacker versionator
 MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
 DESCRIPTION="NVIDIA CUDA Software Development Kit"
 HOMEPAGE="http://developer.nvidia.com/cuda"
 SRC_URI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/sdk/gpucomputingsdk_${PV}_linux.run"
 LICENSE="CUDPP"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug +doc +examples opencl +cuda"
 RDEPEND="
 	>=dev-util/nvidia-cuda-toolkit-${PV}
 	media-libs/freeglut
 	examples? (
 			>=x11-drivers/nvidia-drivers-296
 			media-libs/glew
 		)"
 DEPEND="${RDEPEND}"
 S=${WORKDIR}
 pkg_setup() {
 	if use cuda || use opencl; then
 		cuda_pkg_setup
 	fi
 }
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-asneeded.patch
 	sed \
 		-e 's:-O2::g' \
 		-e 's:-O3::g' \
 		-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
 		-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
 		-e "/LINKFLAGS/s:=:= ${LDFLAGS} :g" \
 		-e "/CC/s:gcc:$(tc-getCC):g" \
 		-e "/CXX/s:g++:$(tc-getCXX):g" \
 		-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
 		-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
 		-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
 		-e 's:-Wimplicit::g' \
 		-e 's:GLEW_x86_64:GLEW:g' \
 		-i $(find sdk -type f -name "*.mk") || die
 	find sdk/shared/inc/GL -delete || die
 	find sdk -type f -name "*\.a" -delete || die
 }
 src_compile() {
 	use examples || return
 	local myopts verbose="verbose=1"
 	use debug && myopts+=" dbg=1"
 	cd sdk
 	use cuda && emake -C C cuda-install="${EPREFIX}/opt/cuda" ${myopts} ${verbose}
 	use opencl && emake -C OpenCL ${verbose}
 }
 src_install() {
 	local i j f t crap=""
 	cd sdk
 	if use doc; then
 		ebegin "Installing docs ..."
 		for i in *; do
 			if [[ -d ${i} ]]; then
 				for j in doc releaseNotesData; do
 					docinto ${i}
 					[[ -d ${i}/${j} ]] && dodoc -r ${i}/${j}
 				done
 			fi
 		done
 		dodoc -r doc
 		dohtml {.,*}/*htm*
 		eend
 	fi
 	crap+=" *.txt doc */doc */Samples.htm* */releaseNotesData"
 	if ! use examples; then
 		crap+=" */bin */tools"
 	fi
 	ebegin "Cleaning before installation..."
 	find ${crap} -delete || die
 	find . \( -name Makefile -o -name "*.mk" \) -delete || die
 	eend
 	ebegin "Moving files..."
 	for f in $(find .); do
 		local t="$(dirname ${f})"
 		if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
 			continue
 		fi
 		if [[ ! -d ${f} ]]; then
 			if [[ -x ${f} ]]; then
 				exeinto /opt/cuda/sdk/${t}
 				doexe ${f}
 			else
 				insinto /opt/cuda/sdk/${t}
 				doins ${f}
 			fi
 		fi
 	done
 	eend
 }
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35.ebuild
@ -0,0 +1,136 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35.ebuild,v 1.1 2013/01/14 10:19:19 jlec Exp $
 EAPI=4
 inherit cuda eutils flag-o-matic toolchain-funcs unpacker versionator
 MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
 DISTRO=fedora16-1
 DESCRIPTION="NVIDIA CUDA Software Development Kit"
 HOMEPAGE="http://developer.nvidia.com/cuda"
 CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel-update-1/installers/"
 SRC_URI="
 	http://dev.gentoo.org/~jlec/distfiles/${P}-asneeded.patch.xz
 	amd64? ( ${CURI}/cuda_${PV}_linux_64_${DISTRO}.run )
 	x86? ( ${CURI}/cuda_${PV}_linux_32_${DISTRO}.run )"
 LICENSE="CUDPP"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug +doc +examples opencl +cuda"
 RDEPEND="
 	>=dev-util/nvidia-cuda-toolkit-${PV}
 	media-libs/freeglut
 	examples? (
 		media-libs/freeimage
 		media-libs/glew
 		>=x11-drivers/nvidia-drivers-304.54
 		)"
 DEPEND="${RDEPEND}"
 S=${WORKDIR}/sdk
 # nvcc doesn't support LDFLAGS
 QA_FLAGS_IGNORED=(
 	opt/cuda/sdk/0_Simple/simpleMPI/simpleMPI
 	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
 	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
 	opt/cuda/sdk/6_Advanced/cdpAdvancedQuicksort/cdpAdvancedQuicksort
 	opt/cuda/sdk/6_Advanced/cdpLUDecomposition/cdpLUDecomposition
 	opt/cuda/sdk/6_Advanced/cdpQuadtree/cdpQuadtree
 	opt/cuda/sdk/bin/linux/release/cdpLUDecomposition
 	opt/cuda/sdk/bin/linux/release/cdpSimpleQuicksort
 	opt/cuda/sdk/bin/linux/release/simpleMPI
 	opt/cuda/sdk/bin/linux/release/cdpAdvancedQuicksort
 	opt/cuda/sdk/bin/linux/release/cdpQuadtree
 	opt/cuda/sdk/bin/linux/release/cdpSimplePrint
 	)
 src_unpack() {
 	unpacker
 	unpacker run_files/cuda-samples*run
 }
 pkg_setup() {
 	if use cuda || use opencl; then
 		cuda_pkg_setup
 	fi
 }
 src_prepare() {
 	epatch "${WORKDIR}"/${P}-asneeded.patch
 	sed \
 		-e 's:-O2::g' \
 		-e 's:-O3::g' \
 		-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
 		-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
 		-e "/LINKFLAGS/s:=:= ${LDFLAGS} :g" \
 		-e "/CC/s:gcc:$(tc-getCC):g" \
 		-e "/GCC/s:g++:$(tc-getCXX):g" \
 		-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
 		-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
 		-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
 		-e 's:-Wimplicit::g' \
 		-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
 		-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$(pkg-config --libs glew)|g" \
 		-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
 		-i $(find . -type f -name "Makefile") || die
 	export RAWLDFLAGS="$(raw-ldflags)"
 	find common/inc/GL -delete || die
 	find . -type f -name "*\.a" -delete || die
 }
 src_compile() {
 	use examples || return
 	local myopts verbose="verbose=1"
 	use debug && myopts+=" dbg=1"
 	emake \
 		cuda-install="${EPREFIX}/opt/cuda" \
 		CUDA_PATH="${EPREFIX}/opt/cuda/" \
 		${myopts} ${verbose}
 }
 src_install() {
 	local i j f t crap=""
 	if use doc; then
 		ebegin "Installing docs ..."
 		dodoc -r doc releaseNotesData
 		dohtml *htm*
 		eend
 	fi
 	crap+=" *.txt doc Samples.htm* releaseNotesData"
 	if ! use examples; then
 		crap+=" */bin */tools"
 	fi
 	ebegin "Cleaning before installation..."
 	find ${crap} -delete || die
 	find . \( -name Makefile -o -name "*.mk" \) -delete || die
 	eend
 	ebegin "Moving files..."
 	for f in $(find .); do
 		local t="$(dirname ${f})"
 		if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
 			continue
 		fi
 		if [[ ! -d ${f} ]]; then
 			if [[ -x ${f} ]]; then
 				exeinto /opt/cuda/sdk/${t}
 				doexe ${f}
 			else
 				insinto /opt/cuda/sdk/${t}
 				doins ${f}
 			fi
 		fi
 	done
 	eend
 }
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@ -1,5 +1,5 @@
-DIST cudatoolkit_3.2.16_linux_32_ubuntu10.04.run 88078059 SHA256 7be5e8d81fae0acaa5fd711ce623ab709f5ed44654319487f169a7d0997ab184
+DIST cuda_5.0.35_linux_32_fedora16-1.run 583244929 SHA256 11927b4c0fb23dbf98457b852914b8458ef41cc1b7ea67bce892f2cc6a77d34e SHA512 d1cda0d53fdc86ac6412c5c92a16efd761d3f15f08878e1aa1c17bdf3bad824a0cebb5c211ad89b8dd15a439eddd0f93efe82ed0850dc93adcd3dab529f6daca WHIRLPOOL 11bc905a4a63171009569d6655b40f0d49034f71c0a93a83e1b656e91a4250c813e0a16fdfda87e9fbe4d250a312beb0c9ad073bfb0420fb4e06fdd26faf3cc9
-DIST cudatoolkit_3.2.16_linux_64_ubuntu10.04.run 114204677 SHA256 20e9d40f5cb94f7fb42920008746eaa32afb126790c3e22c742a1435ba389cf8
+DIST cuda_5.0.35_linux_64_fedora16-1.run 701310481 SHA256 c2889c779215eea1c3cc6d4b092eb4208b7e1063704b6e5e8d48d04e961c3c0a SHA512 83903587d1715dd3a64db6bd676c0586edb81495da1bec22aac9995de31ca0b0db2460cccf4af0845befe0cee308ab019760c3c88eb351b6db0f255f7d93e546 WHIRLPOOL 33b998c66ebfa059d77eedb6b8465183f5ef4444ed5fe55f622efe6a2eeeef8e50e2cb09b0de4e61e15b5320495123ce46e1b47fc4cbbe96f3bde0ac93ff5dbc
 DIST cudatoolkit_4.0.17_linux_32_ubuntu10.10.run 143474501 SHA256 e578f3e800f348005785ec17fef14fbc4c77fa975153aa4a7c89530b501ca8a3
 DIST cudatoolkit_4.0.17_linux_64_ubuntu10.10.run 211915750 SHA256 613eccb8402bc9f9dc9a571c9c24a5fa2ab2d9a9e249ec62fd26c4c81a9bb1c1
 DIST cudatoolkit_4.1.28_linux_32_ubuntu11.04.run 198302412 SHA256 30f8d7ddabccad7f80b01bcc3beb7590bb0f4e82944f757c21e849e9e411c309
--- a/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
+++ b/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
@ -0,0 +1,28 @@
 #!/bin/bash
 SUPPORT_GCC_VERSIONS_BY_CUDA="CUDA_SUPPORTED_GCC"
 _print_help() {
 	cat <<- EOF
 	Usage:
 		$(basename $0) [options]
 		-s | --supported   Returns by current CUDA supported gcc versions
 		-h | --help        Shows this help
 	EOF
 }
 case ${1} in
 	-s|--supported)
 		echo "${SUPPORT_GCC_VERSIONS_BY_CUDA}"
 		exit 0
 		;;
 	-h|--help)
 		_print_help
 		exit -1
 		;;
 	*)
 		_print_help
 		exit 1
 		;;
 esac
--- a/dev-util/nvidia-cuda-toolkit/metadata.xml
+++ b/dev-util/nvidia-cuda-toolkit/metadata.xml
@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+  <herd>sci</herd>
-		<email>spock@gentoo.org</email>
+  <maintainer>
-		<name>Michał Januszewski</name>
+    <email>jlec@gentoo.org</email>
-	</maintainer>
+    <name>Justin Lecher</name>
-	<use>
+  </maintainer>
-		<flag name='profiler'>
+  <use>
    <flag name="profiler">
 			Installs the NVIDIA CUDA visual profiler.
 		</flag>
-		<flag name='debugger'>
+    <flag name="debugger">
 			Installs the CUDA debugger.
 		</flag>
-	</use>
+    <flag name="eclipse">Install the <pkg>dev-util/eclipse-sdk</pkg> plugins</flag>
  </use>
 </pkgmetadata>
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.2.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.2.ebuild
@ -1,141 +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/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.2.ebuild,v 1.11 2012/09/24 00:44:31 vapier Exp $
 EAPI=2
 inherit eutils multilib unpacker
 DESCRIPTION="NVIDIA CUDA Toolkit"
 HOMEPAGE="http://developer.nvidia.com/cuda"
 RESTRICT="binchecks"
 CUDA_V=${PV//_/-}
 DIR_V=${CUDA_V//./_}
 DIR_V=${DIR_V//beta/Beta}
 BASE_URI="http://developer.download.nvidia.com/compute/cuda/${DIR_V}_prod/toolkit"
 SRC_URI="amd64? ( ${BASE_URI}/cudatoolkit_${CUDA_V}.16_linux_64_ubuntu10.04.run )
 	x86? ( ${BASE_URI}/cudatoolkit_${CUDA_V}.16_linux_32_ubuntu10.04.run )"
 LICENSE="NVIDIA"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debugger doc profiler"
 RDEPEND="${DEPEND}
 	>=sys-devel/binutils-2.20
 	>=sys-devel/gcc-4.0
 	profiler? ( x86? (
 		x11-libs/qt-gui:4
 		x11-libs/qt-core:4
 		x11-libs/qt-assistant:4
 		x11-libs/qt-sql:4[sqlite] )
 		media-libs/libpng:1.2
 	)
 	debugger? ( >=sys-libs/libtermcap-compat-2.0.8-r2 )
 	!<=x11-drivers/nvidia-drivers-256.53"
 S="${WORKDIR}"
 #QA_FLAGS_IGNORED_x86="opt/cuda/.*"
 #QA_FLAGS_IGNORED_amd64="opt/cuda/.*"
 src_install() {
 	local DEST=/opt/cuda
 	into ${DEST}
 	dobin bin/*
 	dolib $(get_libdir)/*
 	if ! use debugger; then
 		rm -f "${D}/${DEST}/bin/cuda-gdb"
 	fi
 	chmod a-x "${D}/${DEST}/bin/nvcc.profile"
 	# TODO: Manuals are missing from this release. Remove the following
 	# commented-out lines if they are not restored in the next releases.
 	# doman does not respect DESTTREE
 	#insinto ${DEST}/man/man1
 	#doins man/man1/*
 	#insinto ${DEST}/man/man3
 	#doins man/man3/*
 	#prepman ${DEST}
 	insinto ${DEST}/include
 	doins -r include/*
 	insinto ${DEST}/src
 	doins src/*
 	if use doc ; then
 		insinto ${DEST}/doc
 		doins -r doc/*
 	fi
 	cat > "${T}/env" << EOF
 PATH=${DEST}/bin
 ROOTPATH=${DEST}/bin
 LDPATH=${DEST}/$(get_libdir)
 MANPATH=${DEST}/man
 EOF
 	newenvd "${T}/env" 99cuda
 	if use profiler; then
 		local target="computeprof"
 		into ${DEST}/${target}
 		dobin ${target}/bin/${target}
 		cat > "${T}/env" << EOF
 PATH=${DEST}/${target}/bin
 ROOTPATH=${DEST}/${target}/bin
 EOF
 		if use x86 ; then
 			dosym /usr/bin/assistant ${DEST}/${target}/bin
 			insinto ${DEST}/${target}/bin
 			doins ${target}/bin/cudaapitrace.so
 		else
 			dobin ${target}/bin/assistant
 			insinto ${DEST}/${target}/bin
 			doins ${target}/bin/*.so*
 			insinto ${DEST}/${target}/bin/sqldrivers
 			doins ${target}/bin/sqldrivers/*
 			cat >> "${T}/env" << EOF
 LDPATH=${DEST}/${target}/bin
 EOF
 		fi
 		newenvd "${T}/env" 99${target}
 		if use doc; then
 			insinto ${DEST}/${target}
 			doins ${target}/*.txt
 			insinto ${DEST}/${target}/doc
 			doins ${target}/doc/*
 			insinto ${DEST}/${target}/projects
 			doins ${target}/projects/*
 		fi
 		make_desktop_entry /opt/cuda/computeprof/bin/computeprof "NVIDIA Compute Visual Profiler"
 	fi
 	export CONF_LIBDIR_OVERRIDE="lib"
 	# HACK: temporary workaround until CONF_LIBDIR_OVERRIDE is respected.
 	export LIBDIR_amd64="lib"
 	into ${DEST}/open64
 	dobin open64/bin/*
 	libopts -m0755
 	dolib open64/lib/*
 }
 pkg_postinst() {
 	elog "If you want to natively run the code generated by this version of the"
 	elog "CUDA toolkit, you will need >=x11-drivers/nvidia-drivers-260.19.21."
 	elog ""
 	elog "Run '. /etc/profile' before using the CUDA toolkit. "
 }
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r1.ebuild
@ -0,0 +1,106 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r1.ebuild,v 1.1 2013/01/14 07:47:16 jlec Exp $
 EAPI=5
 inherit cuda unpacker
 MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
 DISTRO=ubuntu11.04
 DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
 HOMEPAGE="http://developer.nvidia.com/cuda"
 CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/toolkit"
 SRC_URI="
 	amd64? ( ${CURI}/cudatoolkit_${PV}_linux_64_${DISTRO}.run )
 	x86? ( ${CURI}/cudatoolkit_${PV}_linux_32_${DISTRO}.run )"
 SLOT="0"
 LICENSE="NVIDIA"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debugger doc eclipse profiler"
 DEPEND=""
 RDEPEND="${DEPEND}
 	|| (
 		sys-devel/gcc:4.4
 		sys-devel/gcc:4.5
 		sys-devel/gcc:4.6
 		)
 	!<=x11-drivers/nvidia-drivers-270.41
 	debugger? ( sys-libs/libtermcap-compat )
 	profiler? ( >=virtual/jre-1.6 )"
 S="${WORKDIR}"
 QA_PREBUILT="opt/cuda/*"
 pkg_setup() {
 	# We don't like to run cuda_pkg_setup as it depends on us
 	:
 }
 src_prepare() {
 	local cuda_supported_gcc
 	cuda_supported_gcc="4.4 4.5 4.6"
 	sed \
 		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
 		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
 	find cuda-installer.pl install-linux.pl libnvvp/jre run_files -delete || die
 }
 src_install() {
 	local cudadir=/opt/cuda
 	local ecudadir="${EPREFIX}"${cudadir}
 	if use doc; then
 		dodoc doc/*{txt,pdf}
 		dohtml -r doc/html/*
 	fi
 	find doc -delete || die
 	use debugger || rm -r bin/cuda-gdb extras/Debugger
 	use eclipse || find libnsight -delete
 	if use profiler; then
 		# hack found in install-linux.pl
 		cat > bin/nvvp <<- EOF
 			#!${EPREFIX}bin/sh
 			LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
 				UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 ${ecudadir}/libnvvp/nvvp
 		EOF
 		chmod a+x bin/nvvp
 	else
 		rm -r extras/CUPTI libnvvp
 	fi
 	dodir ${cudadir}
 	mv * "${ED}"${cudadir}
 	cat > "${T}"/99cuda <<- EOF
 		PATH=${ecudadir}/bin:${ecudadir}/libnvvp
 		ROOTPATH=${ecudadir}/bin
 		LDPATH=${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
 	EOF
 	doenvd "${T}"/99cuda
 	dobin "${T}"/cuda-config
 }
 pkg_postinst() {
 	local a
 	a="$(version_sort $(cuda-config -s))"; a=($a)
 	if [[ $(tc-getCC) == *gcc* ]] && \
 		version_is_at_least "$(gcc-version)" ${a[1]}; then
 			ewarn "gcc >= ${a[1]} will not work with CUDA"
 			ewarn "Make sure you set an earlier version of gcc with gcc-config"
 			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
 			ewarn "${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${a[1]}"
 			ewarn "to the nvcc compiler flags"
 	fi
 }
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild
@ -0,0 +1,111 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild,v 1.1 2013/01/14 07:47:16 jlec Exp $
 EAPI=5
 inherit cuda unpacker
 MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
 DISTRO=fedora16-1
 DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
 HOMEPAGE="http://developer.nvidia.com/cuda"
 CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel-update-1/installers/"
 SRC_URI="
 	amd64? ( ${CURI}/cuda_${PV}_linux_64_${DISTRO}.run )
 	x86? ( ${CURI}/cuda_${PV}_linux_32_${DISTRO}.run )"
 SLOT="0"
 LICENSE="NVIDIA"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debugger doc eclipse profiler"
 DEPEND=""
 RDEPEND="${DEPEND}
 	|| (
 		sys-devel/gcc:4.4
 		sys-devel/gcc:4.5
 		sys-devel/gcc:4.6
 		)
 	!<=x11-drivers/nvidia-drivers-270.41
 	debugger? ( sys-libs/libtermcap-compat )
 	profiler? ( >=virtual/jre-1.6 )"
 S="${WORKDIR}"
 QA_PREBUILT="opt/cuda/*"
 pkg_setup() {
 	# We don't like to run cuda_pkg_setup as it depends on us
 	:
 }
 src_unpack() {
 	unpacker
 	unpacker run_files/cudatoolkit*run
 }
 src_prepare() {
 	local cuda_supported_gcc
 	cuda_supported_gcc="4.4 4.5 4.6"
 	sed \
 		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
 		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
 	find cuda-installer.pl install-linux.pl jre run_files -delete || die
 }
 src_install() {
 	local cudadir=/opt/cuda
 	local ecudadir="${EPREFIX}"${cudadir}
 	if use doc; then
 		dodoc doc/{*.txt,pdf/*}
 		dohtml -r doc/html/*
 	fi
 	find doc -delete || die
 	use debugger || rm -r bin/cuda-gdb extras/Debugger
 	use eclipse || find libnsight -delete
 	if use profiler; then
 		# hack found in install-linux.pl
 		cat > bin/nvvp <<- EOF
 			#!${EPREFIX}bin/sh
 			LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
 				UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 ${ecudadir}/libnvvp/nvvp
 		EOF
 		chmod a+x bin/nvvp
 	else
 		rm -r extras/CUPTI libnvvp
 	fi
 	dodir ${cudadir}
 	mv * "${ED}"${cudadir}
 	cat > "${T}"/99cuda <<- EOF
 		PATH=${ecudadir}/bin:${ecudadir}/libnvvp
 		ROOTPATH=${ecudadir}/bin
 		LDPATH=${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
 	EOF
 	doenvd "${T}"/99cuda
 	dobin "${T}"/cuda-config
 }
 pkg_postinst() {
 	local a
 	a="$(version_sort $(cuda-config -s))"; a=($a)
 	if [[ $(tc-getCC) == *gcc* ]] && \
 		version_is_at_least "$(gcc-version)" ${a[1]}; then
 			ewarn "gcc >= ${a[1]} will not work with CUDA"
 			ewarn "Make sure you set an earlier version of gcc with gcc-config"
 			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
 			ewarn "${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${a[1]}"
 			ewarn "to the nvcc compiler flags"
 	fi
 }
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@ -1,4 +1,5 @@
 DIST jpeg-6b-patches-2.tar.bz2 3703 SHA256 62d8496764330c57cc29137ee46c3cd76ce6463680f9e2e63af8bc4483439b2d SHA512 df507129c2d87e19dd524b212eae5168c72e591fec4c87bd5aa2a50ac47646ab62fcf23d3d08b5891f35c679733532c173ffe99e1e79764bfa19f73c9de742d2 WHIRLPOOL 00ec2f8ab1d5bae74ba5c92e13db6987de1c2be4ad46e19837ecd3a0e5b15c2e2a16d072bfac462c80183772c71402953a007fd4fcf1aab3af82b10fec6a30c5
 DIST jpegsrc.v6b.tar.gz 613261 SHA256 75c3ec241e9996504fe02a9ed4d12f16b74ade713972f3db9e65ce95cd27e35d SHA512 5d37d3695105fc345ca269ab98cd991472e5de72f702c9a8a652a7d114a40eb99670c69a87ecb24bf64e96318fc0ee2bcb44c497d9d3d2a67378c99e4eb348fe WHIRLPOOL ab649fd5ff29dfbcdf52f337b73c65e29d577c3fd0a1c910590177d83985115c8e8e4c392e196f7a497d6346072b40053999171f0cd74ee3325e74c005c5ba9b
 DIST jpegsrc.v8d.tar.gz 991456 SHA256 00029b1473f0f0ea72fbca3230e8cb25797fbb27e58ae2e46bb8bf5a806fe0b3 SHA512 7a8b4cff5b1caf6a7281c5dce4e1efa1b68360bd64dd2e619b60c9e1d49f22624bc8780b681bfab073e7b1d4b7f41008a464a58f0eeeacb0a40ff996d7eb5753 WHIRLPOOL 7489605809b43cfac02230b89013075806df32246b37eb12ac05ef890ee690f85744887e296f5a21fa64012570aa298d2aa54e4469066f4c21dd40141f3bd8a8
 DIST jpegsrc.v9.tar.gz 987900 SHA256 c4e29e9375aaf60b4b79db87a58b063fb5b84f923bee97a88280b3d159e7e535 SHA512 c6a2fa316fad8230ffd137469643276f1fef52667536712eae69b24afeea283415e8182a284c0457b54c6e49d6e93cf90d7ace1f2fed129c1e7f64b51c699c29 WHIRLPOOL e8b597539e10e68e085a750580b498320b664684d475cf75221a6643287d4e210ee3758f017149a3c2f461e0d9eb625d5930ae7c02862307761e62e4e2b57231
 DIST libjpeg8_8d-1.debian.tar.gz 13676 SHA256 70ec6689b0ad85739802cf3ebbdcc12ea01e21edd8f931c614b25b44cf199057 SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040 WHIRLPOOL 94526c31d401eb14c9bf0f7115e13a27886ad58863e25d6653eba2b2f5ef260ec272368d2b9d9934bd75b1e5b5f1afc97230e540248efc24d6e85e5680399d27
--- a/media-libs/jpeg/jpeg-9.ebuild
+++ b/media-libs/jpeg/jpeg-9.ebuild
@ -0,0 +1,66 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-9.ebuild,v 1.1 2013/01/14 11:00:43 ssuominen Exp $
 EAPI=5
 inherit eutils libtool toolchain-funcs
 DESCRIPTION="Library to load, handle and manipulate images in the JPEG format"
 HOMEPAGE="http://jpegclub.org/ http://www.ijg.org/"
 SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
 	mirror://debian/pool/main/libj/lib${PN}8/lib${PN}8_8d-1.debian.tar.gz"
 LICENSE="IJG"
 SLOT="0"
 # Waiting for libjpeg-turbo to gain .so.9 support!
 KEYWORDS=""
 #KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 DOCS="change.log example.c README *.txt"
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-7-maxmem_sysconf.patch
 	elibtoolize
 }
 src_configure() {
 	# Fix building against this library on eg. Solaris and DragonFly BSD, see:
 	# http://mail-index.netbsd.org/pkgsrc-bugs/2010/01/18/msg035644.html
 	local ldverscript=
 	[[ ${CHOST} == *-solaris* ]] && ldverscript="--disable-ld-version-script"
 	econf \
 		$(use_enable static-libs static) \
 		--enable-maxmem=64 \
 		${ldverscript}
 }
 src_compile() {
 	default
 	# Build exifautotran and jpegexiforient
 	cd ../debian/extra
 	emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
 }
 src_install() {
 	default
 	prune_libtool_files
 	# Install exifautotran and jpegexiforient
 	newdoc ../debian/changelog changelog.debian
 	cd ../debian/extra
 	emake \
 		DESTDIR="${D}" prefix="${EPREFIX}"/usr \
 		INSTALL="install -m755" INSTALLDIR="install -d -m755" \
 		install
 }
 pkg_postinst() {
 	ewarn "If you are switching from media-libs/libjpeg-turbo you might need to"
 	ewarn "rebuild reverse dependencies:"
 	ewarn
 	ewarn "# emerge gentoolkit"
 	ewarn "# revdep-rebuild --library libjpeg.so.8"
 }
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Mon, 14 Jan 2013 05:06:51 +0000
+Mon, 14 Jan 2013 11:06:52 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Mon, 14 Jan 2013 05:06:51 +0000
+Mon, 14 Jan 2013 11:06:52 +0000
--- a/metadata/md5-cache/app-forensics/libewf-20121209-r1
+++ b/metadata/md5-cache/app-forensics/libewf-20121209-r1
@ -0,0 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-libs/zlib fuse? ( sys-fs/fuse ) uuid? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl )
 DESCRIPTION=Implementation of the EWF (SMART and EnCase) image format
 EAPI=5
 HOMEPAGE=http://libewf.sourceforge.net
 IUSE=debug ewf +fuse rawio +ssl static-libs +uuid unicode
 KEYWORDS=~amd64 ~hppa ~ppc ~x86
 LICENSE=BSD
 RDEPEND=sys-libs/zlib fuse? ( sys-fs/fuse ) uuid? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/libewf/libewf-20121209.tar.gz
 _eclasses_=autotools	5116b10b2150724f41b564f1cc863e47	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0c172d074d8debd5a75350fb6a4b670b
--- a/metadata/md5-cache/app-forensics/libewf-20130105
+++ b/metadata/md5-cache/app-forensics/libewf-20130105
@ -0,0 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-libs/zlib fuse? ( sys-fs/fuse ) uuid? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl )
 DESCRIPTION=Implementation of the EWF (SMART and EnCase) image format
 EAPI=5
 HOMEPAGE=http://code.google.com/p/libewf/
 IUSE=debug ewf +fuse rawio +ssl static-libs +uuid unicode
 KEYWORDS=~amd64 ~hppa ~ppc ~x86
 LICENSE=BSD
 RDEPEND=sys-libs/zlib fuse? ( sys-fs/fuse ) uuid? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=http://libewf.googlecode.com/files/libewf-20130105.tar.gz
 _eclasses_=autotools	5116b10b2150724f41b564f1cc863e47	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bb34599f4567da1a30984f0c0a86ee71
--- a/metadata/md5-cache/app-misc/boxes-1.1.1
+++ b/metadata/md5-cache/app-misc/boxes-1.1.1
@ -0,0 +1,10 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=Draw any kind of boxes around your text
 EAPI=5
 HOMEPAGE=http://boxes.thomasjensen.com/
 KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://boxes.thomasjensen.com/download/boxes-1.1.1.src.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=da3699e193c401573191cb43b5f34430
--- a/metadata/md5-cache/app-misc/gcal-3.6.2
+++ b/metadata/md5-cache/app-misc/gcal-3.6.2
@ -0,0 +1,13 @@
 DEFINED_PHASES=configure
 DEPEND=app-arch/xz-utils nls? ( >=sys-devel/gettext-0.17 )
 DESCRIPTION=The GNU Calendar - a replacement for cal
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/gcal/
 IUSE=ncurses nls unicode
 KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-3
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/gcal/gcal-3.6.2.tar.xz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5c9d1699bd610f2479eb5fa42a1bac28
--- a/metadata/md5-cache/app-misc/realpath-1.18
+++ b/metadata/md5-cache/app-misc/realpath-1.18
@ -0,0 +1,13 @@
 DEFINED_PHASES=compile install prepare unpack
 DEPEND=!sys-freebsd/freebsd-bin nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) x86-interix? ( dev-libs/gnulib ) elibc_mintlib? ( virtual/libiconv )
 DESCRIPTION=Return the canonicalized absolute pathname
 EAPI=5
 HOMEPAGE=http://packages.debian.org/unstable/utils/realpath
 IUSE=nls
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!sys-freebsd/freebsd-bin nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/r/realpath/realpath_1.18.tar.gz nls? ( mirror://debian/pool/main/r/realpath/realpath_1.18_i386.deb )
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	9aa8a023e062fca0ba79362d9d0cc488	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=685c04c691e69919513884ee020f0a9a
--- a/metadata/md5-cache/app-text/multitail-5.2.11
+++ b/metadata/md5-cache/app-text/multitail-5.2.11
@ -0,0 +1,13 @@
 DEFINED_PHASES=configure install prepare
 DEPEND=sys-libs/ncurses
 DESCRIPTION=Tail with multiple windows
 EAPI=5
 HOMEPAGE=http://www.vanheusden.com/multitail/index.html
 IUSE=debug doc examples
 KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=http://www.vanheusden.com/multitail/multitail-5.2.11.tgz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d31c817520698f5164d4fe3448fe2d96
--- a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.7.0.11
+++ b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.7.0.11
@ -0,0 +1,14 @@
 DEFINED_PHASES=compile install nofetch postinst postrm prepare prerm setup
 DEPEND=jce? ( app-arch/unzip ) examples? ( kernel_linux? ( app-arch/unzip ) ) pax_kernel? ( sys-apps/paxctl ) =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 DESCRIPTION=Oracle's Java SE Development Kit
 EAPI=5
 HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
 IUSE=+X alsa derby doc examples +fontconfig jce nsplugin pax_kernel source
 KEYWORDS=-arm ~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Oracle-BCLA-JavaSE examples? ( BSD )
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) doc? ( dev-java/java-sdk-docs:1.7 ) fontconfig? ( media-libs/fontconfig ) !prefix? ( sys-libs/glibc ) =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 RESTRICT=fetch strip
 SLOT=1.7
 SRC_URI=amd64? ( jdk-7u11-linux-x64.tar.gz ) x86? ( jdk-7u11-linux-i586.tar.gz ) x64-solaris? ( jdk-7u11-solaris-i586.tar.gz jdk-7u11-solaris-x64.tar.gz ) x86-solaris? ( jdk-7u11-solaris-i586.tar.gz ) sparc-solaris? ( jdk-7u11-solaris-sparc.tar.gz ) sparc64-solaris? ( jdk-7u11-solaris-sparc.tar.gz jdk-7u11-solaris-sparcv9.tar.gz ) jce? ( UnlimitedJCEPolicyJDK7.zip )
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b7a0d9dc97d8e755ca863965059500f1
--- a/metadata/md5-cache/dev-java/oracle-jre-bin-1.7.0.11
+++ b/metadata/md5-cache/dev-java/oracle-jre-bin-1.7.0.11
@ -0,0 +1,14 @@
 DEFINED_PHASES=compile install nofetch postinst postrm prepare prerm setup
 DEPEND=jce? ( app-arch/unzip ) pax_kernel? ( sys-apps/paxctl ) =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 DESCRIPTION=Oracle's Java SE Runtime Environment
 EAPI=5
 HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
 IUSE=X alsa fontconfig jce nsplugin pax_kernel
 KEYWORDS=~amd64 ~x86
 LICENSE=Oracle-BCLA-JavaSE
 RDEPEND=X? ( x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/libX11 ) alsa? ( media-libs/alsa-lib ) fontconfig? ( media-libs/fontconfig ) !prefix? ( sys-libs/glibc ) =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 RESTRICT=fetch strip
 SLOT=1.7
 SRC_URI=x86? ( jre-7u11-linux-i586.tar.gz ) amd64? ( jre-7u11-linux-x64.tar.gz ) jce? ( UnlimitedJCEPolicyJDK7.zip )
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=407c1b583f4cd976ed9d469309008cd3
--- a/metadata/md5-cache/dev-lang/swi-prolog-6.2.6
+++ b/metadata/md5-cache/dev-lang/swi-prolog-6.2.6
@ -0,0 +1,13 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
 DEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) X? ( x11-proto/xproto ) java? ( test? ( =dev-java/junit-3.8* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=free, small, and standard compliant Prolog compiler
 EAPI=4
 HOMEPAGE=http://www.swi-prolog.org/
 IUSE=archive debug doc gmp hardened java minimal odbc readline ssl static-libs test zlib X elibc_FreeBSD java
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.swi-prolog.org/download/stable/src/pl-6.2.6.tar.gz mirror://gentoo/swi-prolog-6.2.6-gentoo-patchset-0.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d3f75792be4b508305a389892527eb3c
--- a/metadata/md5-cache/dev-libs/dbus-glib-0.100-r2
+++ b/metadata/md5-cache/dev-libs/dbus-glib-0.100-r2
@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.26 >=sys-apps/dbus-1.6.2
 SLOT=0
 SRC_URI=http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.100.tar.gz
 _eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f65216b002006725b85e9c54fcff52da
+_md5_=84831cfc9d08be030ef49c7135a31063
--- a/metadata/md5-cache/dev-libs/libzip-0.10.1-r1
+++ b/metadata/md5-cache/dev-libs/libzip-0.10.1-r1
@ -4,10 +4,10 @@ DESCRIPTION=Library for manipulating zip archives
 EAPI=4
 HOMEPAGE=http://www.nih.at/libzip/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=BSD
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=http://www.nih.at/libzip/libzip-0.10.1.tar.gz
 _eclasses_=autotools	5116b10b2150724f41b564f1cc863e47	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ef084d338295c1e867052abb52db6b8f
+_md5_=b79ac5457e7cbfc567290b93d2da7fbb
--- a/metadata/md5-cache/dev-perl/FLV-AudioExtractor-0.010.0
+++ b/metadata/md5-cache/dev-perl/FLV-AudioExtractor-0.010.0
@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl[-build]
 DESCRIPTION=Extract audio from Flash Videos
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/FLV-AudioExtractor/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-perl/Moose dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FV/FVOX/FLV-AudioExtractor-0.01.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5aad09450c37feeb2b44cb7d47f7e35b
+_md5_=36a0ddf69f060daf1d50738ce1352cf1
--- a/metadata/md5-cache/dev-python/django-evolution-0.6.7-r1
+++ b/metadata/md5-cache/dev-python/django-evolution-0.6.7-r1
@ -10,4 +10,4 @@ RDEPEND=dev-python/setuptools[python_targets_python2_5?,python_targets_python2_6
 SLOT=0
 SRC_URI=mirror://pypi/d/django_evolution/django_evolution-0.6.7.tar.gz
 _eclasses_=distutils-r1	ddac14029e0508e83c9cb6ddf6ac30fa	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	b9091432451f035281bf6fc17720e820	python-utils-r1	069a968fde0ceb8a9cd5c6a89d77cbc2	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4af7c761314d15b47c157b31f8871533
+_md5_=eeb875e04502816ede1ead3b31fd3c0d
--- a/metadata/md5-cache/dev-tex/metapost-1.780
+++ b/metadata/md5-cache/dev-tex/metapost-1.780
@ -0,0 +1,11 @@
 DEFINED_PHASES=compile configure install postinst
 DEPEND=dev-libs/kpathsea >=app-admin/eselect-mpost-0.3 x11-libs/cairo x11-libs/pixman media-libs/libpng virtual/pkgconfig
 DESCRIPTION=System for producing graphics
 EAPI=4
 HOMEPAGE=http://tug.org/metapost.html
 KEYWORDS=~amd64
 LICENSE=GPL-2 LGPL-3
 RDEPEND=dev-libs/kpathsea >=app-admin/eselect-mpost-0.3 x11-libs/cairo x11-libs/pixman media-libs/libpng
 SLOT=0
 SRC_URI=http://foundry.supelec.fr/gf/download/frsrelease/395/1879/metapost-1.780-src.tar.bz2
 _md5_=a113d0bb482580ec80934f6a0e8d308a
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-2.1.1215.2015
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-2.1.1215.2015
@ -1,13 +0,0 @@
 DEFINED_PHASES=compile install setup unpack
 DEPEND=>=dev-util/nvidia-cuda-toolkit-2.1 >=x11-drivers/nvidia-drivers-180.22 media-libs/freeglut <sys-devel/gcc-4.4
 DESCRIPTION=NVIDIA CUDA Software Development Kit
 HOMEPAGE=http://developer.nvidia.com/cuda
 IUSE=debug emulation
 KEYWORDS=~amd64 ~x86
 LICENSE=CUDPP
 RDEPEND=>=dev-util/nvidia-cuda-toolkit-2.1 >=x11-drivers/nvidia-drivers-180.22 media-libs/freeglut
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=http://developer.download.nvidia.com/compute/cuda/2_1/SDK/cuda-sdk-linux-2.10.1215.2015-3233425.run
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	unpacker	50e1227854e96469a19a63f053496328	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=35bc8f2d63b9d63fc3b7f737bdf1c187
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-2.2
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-2.2
@ -1,13 +0,0 @@
 DEFINED_PHASES=compile install setup unpack
 DEPEND=>=dev-util/nvidia-cuda-toolkit-2.2 >=x11-drivers/nvidia-drivers-180.22 media-libs/freeglut <sys-devel/gcc-4.4
 DESCRIPTION=NVIDIA CUDA Software Development Kit
 HOMEPAGE=http://developer.nvidia.com/cuda
 IUSE=debug emulation
 KEYWORDS=~amd64 ~x86
 LICENSE=CUDPP
 RDEPEND=>=dev-util/nvidia-cuda-toolkit-2.2 >=x11-drivers/nvidia-drivers-180.22 media-libs/freeglut
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=http://developer.download.nvidia.com/compute/cuda/2_2/sdk/cudasdk_2.2_linux.run
 _eclasses_=multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	unpacker	50e1227854e96469a19a63f053496328
 _md5_=efe3e0e54ff355681a71e4c523abeaad
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-2.3
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-2.3
@ -1,14 +0,0 @@
 DEFINED_PHASES=compile install prepare setup unpack
 DEPEND=>=dev-util/nvidia-cuda-toolkit-2.3 examples? ( !emulation? ( >=x11-drivers/nvidia-drivers-190.18 ) ) media-libs/freeglut <sys-devel/gcc-4.4
 DESCRIPTION=NVIDIA CUDA Software Development Kit
 EAPI=2
 HOMEPAGE=http://developer.nvidia.com/cuda
 IUSE=debug +doc emulation +examples
 KEYWORDS=~amd64 ~x86
 LICENSE=CUDPP
 RDEPEND=>=dev-util/nvidia-cuda-toolkit-2.3 examples? ( !emulation? ( >=x11-drivers/nvidia-drivers-190.18 ) ) media-libs/freeglut
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=http://developer.download.nvidia.com/compute/cuda/2_3/sdk/cudasdk_2.3_linux.run
 _eclasses_=multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	unpacker	50e1227854e96469a19a63f053496328
 _md5_=321aede1cdfd01a44522d2fe0a11850f
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-3.0
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-3.0
@ -1,14 +0,0 @@
 DEFINED_PHASES=compile install setup unpack
 DEPEND=>=dev-util/nvidia-cuda-toolkit-3.0_beta1 examples? ( !emulation? ( >=x11-drivers/nvidia-drivers-195.30 ) ) media-libs/freeglut <sys-devel/gcc-4.4
 DESCRIPTION=NVIDIA CUDA Software Development Kit
 EAPI=2
 HOMEPAGE=http://developer.nvidia.com/cuda
 IUSE=debug +doc emulation +examples opencl +cuda
 KEYWORDS=~amd64 ~x86
 LICENSE=CUDPP
 RDEPEND=>=dev-util/nvidia-cuda-toolkit-3.0_beta1 examples? ( !emulation? ( >=x11-drivers/nvidia-drivers-195.30 ) ) media-libs/freeglut
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=http://developer.download.nvidia.com/compute/cuda/3_0/sdk/gpucomputingsdk_3.0_linux.run
 _eclasses_=multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	unpacker	50e1227854e96469a19a63f053496328
 _md5_=03b464bd94753574d4839e963e180b7b
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-3.0_beta1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-3.0_beta1
@ -1,14 +0,0 @@
 DEFINED_PHASES=compile install setup unpack
 DEPEND=>=dev-util/nvidia-cuda-toolkit-3.0_beta1 examples? ( !emulation? ( >=x11-drivers/nvidia-drivers-195.30 ) ) media-libs/freeglut <sys-devel/gcc-4.4
 DESCRIPTION=NVIDIA CUDA Software Development Kit
 EAPI=2
 HOMEPAGE=http://developer.nvidia.com/cuda
 IUSE=debug +doc emulation +examples opencl +cuda
 KEYWORDS=~amd64 ~x86
 LICENSE=CUDPP
 RDEPEND=>=dev-util/nvidia-cuda-toolkit-3.0_beta1 examples? ( !emulation? ( >=x11-drivers/nvidia-drivers-195.30 ) ) media-libs/freeglut
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=http://developer.download.nvidia.com/compute/cuda/3_0-Beta1/sdk/gpucomputingsdk_3.0-beta1_linux.run
 _eclasses_=multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	unpacker	50e1227854e96469a19a63f053496328
 _md5_=b2b340f096a74da7c11b7850b115d226
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-3.1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-3.1
@ -1,14 +0,0 @@
 DEFINED_PHASES=compile install unpack
 DEPEND=>=dev-util/nvidia-cuda-toolkit-3.1 examples? ( >=x11-drivers/nvidia-drivers-256.35 ) media-libs/freeglut
 DESCRIPTION=NVIDIA CUDA Software Development Kit
 EAPI=2
 HOMEPAGE=http://developer.nvidia.com/cuda
 IUSE=debug +doc +examples opencl +cuda
 KEYWORDS=~amd64 ~x86
 LICENSE=CUDPP
 RDEPEND=>=dev-util/nvidia-cuda-toolkit-3.1 examples? ( >=x11-drivers/nvidia-drivers-256.35 ) media-libs/freeglut
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=http://developer.download.nvidia.com/compute/cuda/3_1/sdk/gpucomputingsdk_3.1_linux.run
 _eclasses_=multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	unpacker	50e1227854e96469a19a63f053496328
 _md5_=65ea158df320b9a819936fa4967a6494
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-3.2
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-3.2
@ -1,14 +0,0 @@
 DEFINED_PHASES=compile install setup unpack
 DEPEND=>=dev-util/nvidia-cuda-toolkit-3.2 examples? ( >=x11-drivers/nvidia-drivers-260.19.21 ) media-libs/freeglut
 DESCRIPTION=NVIDIA CUDA Software Development Kit
 EAPI=2
 HOMEPAGE=http://developer.nvidia.com/cuda
 IUSE=debug +doc +examples opencl +cuda
 KEYWORDS=~amd64 ~x86
 LICENSE=CUDPP
 RDEPEND=>=dev-util/nvidia-cuda-toolkit-3.2 examples? ( >=x11-drivers/nvidia-drivers-260.19.21 ) media-libs/freeglut
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=http://developer.download.nvidia.com/compute/cuda/3_2_prod/sdk/gpucomputingsdk_3.2.16_linux.run
 _eclasses_=multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	unpacker	50e1227854e96469a19a63f053496328
 _md5_=c5022d6878ce1d4133131a4ea3a12ea3
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-4.0
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-4.0
@ -1,14 +0,0 @@
 DEFINED_PHASES=compile install setup unpack
 DEPEND=>=dev-util/nvidia-cuda-toolkit-4.0 examples? ( >=x11-drivers/nvidia-drivers-260.19.21 ) media-libs/freeglut
 DESCRIPTION=NVIDIA CUDA Software Development Kit
 EAPI=2
 HOMEPAGE=http://developer.nvidia.com/cuda
 IUSE=debug +doc +examples opencl +cuda
 KEYWORDS=~amd64 ~x86
 LICENSE=CUDPP
 RDEPEND=>=dev-util/nvidia-cuda-toolkit-4.0 examples? ( >=x11-drivers/nvidia-drivers-260.19.21 ) media-libs/freeglut
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=http://developer.download.nvidia.com/compute/cuda/4_0/sdk/gpucomputingsdk_4.0.17_linux.run
 _eclasses_=multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	unpacker	50e1227854e96469a19a63f053496328
 _md5_=60f01a17b914c1b77150904f721f19d2
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-4.1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-4.1
@ -1,14 +0,0 @@
 DEFINED_PHASES=compile install setup unpack
 DEPEND=>=dev-util/nvidia-cuda-toolkit-4.1 examples? ( >=x11-drivers/nvidia-drivers-260.19.21 ) media-libs/freeglut
 DESCRIPTION=NVIDIA CUDA Software Development Kit
 EAPI=2
 HOMEPAGE=http://developer.nvidia.com/cuda
 IUSE=debug +doc +examples opencl +cuda
 KEYWORDS=~amd64 ~x86
 LICENSE=CUDPP
 RDEPEND=>=dev-util/nvidia-cuda-toolkit-4.1 examples? ( >=x11-drivers/nvidia-drivers-260.19.21 ) media-libs/freeglut
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=http://developer.download.nvidia.com/compute/cuda/4_1/rel/sdk/gpucomputingsdk_4.1.28_linux.run
 _eclasses_=multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	unpacker	50e1227854e96469a19a63f053496328
 _md5_=fd79707753deb2a6225380290bea0b54
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-4.2.9-r1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-4.2.9-r1
@ -0,0 +1,13 @@
 DEFINED_PHASES=compile install prepare setup unpack
 DEPEND=>=dev-util/nvidia-cuda-toolkit-4.2.9 media-libs/freeglut examples? ( >=x11-drivers/nvidia-drivers-296 media-libs/glew )
 DESCRIPTION=NVIDIA CUDA Software Development Kit
 EAPI=4
 HOMEPAGE=http://developer.nvidia.com/cuda
 IUSE=debug +doc +examples opencl +cuda
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=CUDPP
 RDEPEND=>=dev-util/nvidia-cuda-toolkit-4.2.9 media-libs/freeglut examples? ( >=x11-drivers/nvidia-drivers-296 media-libs/glew )
 SLOT=0
 SRC_URI=http://developer.download.nvidia.com/compute/cuda/4_2/rel/sdk/gpucomputingsdk_4.2.9_linux.run
 _eclasses_=cuda	c61985801c2bd258ba06cd958995c2ff	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	unpacker	50e1227854e96469a19a63f053496328	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a6ea79e127b4eb05ba0128261e4305b3
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-5.0.35
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-5.0.35
@ -0,0 +1,13 @@
 DEFINED_PHASES=compile install prepare setup unpack
 DEPEND=>=dev-util/nvidia-cuda-toolkit-5.0.35 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew >=x11-drivers/nvidia-drivers-304.54 )
 DESCRIPTION=NVIDIA CUDA Software Development Kit
 EAPI=4
 HOMEPAGE=http://developer.nvidia.com/cuda
 IUSE=debug +doc +examples opencl +cuda
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=CUDPP
 RDEPEND=>=dev-util/nvidia-cuda-toolkit-5.0.35 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew >=x11-drivers/nvidia-drivers-304.54 )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/nvidia-cuda-sdk-5.0.35-asneeded.patch.xz amd64? ( http://developer.download.nvidia.com/compute/cuda/5_0/rel-update-1/installers//cuda_5.0.35_linux_64_fedora16-1.run ) x86? ( http://developer.download.nvidia.com/compute/cuda/5_0/rel-update-1/installers//cuda_5.0.35_linux_32_fedora16-1.run )
 _eclasses_=cuda	c61985801c2bd258ba06cd958995c2ff	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	unpacker	50e1227854e96469a19a63f053496328	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9b46026e5dbd6f669aa465618346426d
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-3.2
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-3.2
@ -1,13 +0,0 @@
 DEFINED_PHASES=install postinst unpack
 DESCRIPTION=NVIDIA CUDA Toolkit
 EAPI=2
 HOMEPAGE=http://developer.nvidia.com/cuda
 IUSE=debugger doc profiler
 KEYWORDS=~amd64 ~x86
 LICENSE=NVIDIA
 RDEPEND=>=sys-devel/binutils-2.20 >=sys-devel/gcc-4.0 profiler? ( x86? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/qt-assistant:4 x11-libs/qt-sql:4[sqlite] ) media-libs/libpng:1.2 ) debugger? ( >=sys-libs/libtermcap-compat-2.0.8-r2 ) !<=x11-drivers/nvidia-drivers-256.53
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=amd64? ( http://developer.download.nvidia.com/compute/cuda/3_2_prod/toolkit/cudatoolkit_3.2.16_linux_64_ubuntu10.04.run ) x86? ( http://developer.download.nvidia.com/compute/cuda/3_2_prod/toolkit/cudatoolkit_3.2.16_linux_32_ubuntu10.04.run )
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	unpacker	50e1227854e96469a19a63f053496328	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5a28cd303bcb1353db6a784ff38a331b
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-4.2.9-r1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-4.2.9-r1
@ -0,0 +1,12 @@
 DEFINED_PHASES=install postinst prepare setup unpack
 DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
 EAPI=5
 HOMEPAGE=http://developer.nvidia.com/cuda
 IUSE=debugger doc eclipse profiler
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=NVIDIA
 RDEPEND=|| ( sys-devel/gcc:4.4 sys-devel/gcc:4.5 sys-devel/gcc:4.6 ) !<=x11-drivers/nvidia-drivers-270.41 debugger? ( sys-libs/libtermcap-compat ) profiler? ( >=virtual/jre-1.6 )
 SLOT=0
 SRC_URI=amd64? ( http://developer.download.nvidia.com/compute/cuda/4_2/rel/toolkit/cudatoolkit_4.2.9_linux_64_ubuntu11.04.run ) x86? ( http://developer.download.nvidia.com/compute/cuda/4_2/rel/toolkit/cudatoolkit_4.2.9_linux_32_ubuntu11.04.run )
 _eclasses_=cuda	c61985801c2bd258ba06cd958995c2ff	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	unpacker	50e1227854e96469a19a63f053496328	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8cdbd7093543967e1897907f1bee9d11
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-5.0.35
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-5.0.35
@ -0,0 +1,12 @@
 DEFINED_PHASES=install postinst prepare setup unpack
 DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
 EAPI=5
 HOMEPAGE=http://developer.nvidia.com/cuda
 IUSE=debugger doc eclipse profiler
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=NVIDIA
 RDEPEND=|| ( sys-devel/gcc:4.4 sys-devel/gcc:4.5 sys-devel/gcc:4.6 ) !<=x11-drivers/nvidia-drivers-270.41 debugger? ( sys-libs/libtermcap-compat ) profiler? ( >=virtual/jre-1.6 )
 SLOT=0
 SRC_URI=amd64? ( http://developer.download.nvidia.com/compute/cuda/5_0/rel-update-1/installers//cuda_5.0.35_linux_64_fedora16-1.run ) x86? ( http://developer.download.nvidia.com/compute/cuda/5_0/rel-update-1/installers//cuda_5.0.35_linux_32_fedora16-1.run )
 _eclasses_=cuda	c61985801c2bd258ba06cd958995c2ff	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	unpacker	50e1227854e96469a19a63f053496328	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=436a7a23aba19945e78b2b7033699eab
--- a/metadata/md5-cache/media-libs/jpeg-9
+++ b/metadata/md5-cache/media-libs/jpeg-9
@ -0,0 +1,10 @@
 DEFINED_PHASES=compile configure install postinst prepare
 DESCRIPTION=Library to load, handle and manipulate images in the JPEG format
 EAPI=5
 HOMEPAGE=http://jpegclub.org/ http://www.ijg.org/
 IUSE=static-libs
 LICENSE=IJG
 SLOT=0
 SRC_URI=http://www.ijg.org/files/jpegsrc.v9.tar.gz mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-1.debian.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4bad8e3d84c71eeed13eb2e4513e7cef
--- a/metadata/md5-cache/net-im/licq-1.7.0
+++ b/metadata/md5-cache/net-im/licq-1.7.0
@ -0,0 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=app-crypt/gpgme-1 jabber? ( net-libs/gloox ) qt4? ( x11-libs/qt-gui:4 ) ssl? ( >=dev-libs/openssl-0.9.5a ) ncurses? ( sys-libs/ncurses dev-libs/cdk ) xosd? ( x11-libs/xosd ) aosd? ( x11-libs/libaosd ) doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) dev-libs/boost >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=ICQ Client with v8 support
 EAPI=5
 HOMEPAGE=http://www.licq.org/
 IUSE=debug doc linguas_he nls socks5 ssl xosd aosd jabber qt4 msn ncurses
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-crypt/gpgme-1 jabber? ( net-libs/gloox ) qt4? ( x11-libs/qt-gui:4 ) ssl? ( >=dev-libs/openssl-0.9.5a ) ncurses? ( sys-libs/ncurses dev-libs/cdk ) xosd? ( x11-libs/xosd ) aosd? ( x11-libs/libaosd )
 SLOT=2
 SRC_URI=mirror://sourceforge/licq/licq-1.7.0.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=af0f6f13b87849d4130bc7b31b210276
--- a/metadata/md5-cache/net-irc/hexchat-2.9.3
+++ b/metadata/md5-cache/net-irc/hexchat-2.9.3
@ -8,6 +8,6 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/pango dbus? ( >=dev-libs/dbus-glib-0.98 ) gtk? ( x11-libs/gtk+:2 ) libnotify? ( x11-libs/libnotify ) ntlm? ( net-libs/libntlm ) perl? ( >=dev-lang/perl-5.8.0 ) python? ( =dev-lang/python-2* ) tcl? ( dev-lang/tcl ) spell? ( app-text/gtkspell:2 ) ssl? ( >=dev-libs/openssl-0.9.8u )
 SLOT=0
-SRC_URI=https://github.com/downloads/hexchat/hexchat/hexchat-2.9.3.tar.xz
+SRC_URI=mirror://github/hexchat/hexchat/hexchat-2.9.3.tar.xz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	ddf6065984ab0a6d09e8c2ec264d7921	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e66c15de35cdb1b2a033eec4aa4726a9
+_md5_=e11e324bbef1190224209ca23fe20e28
--- a/metadata/md5-cache/net-irc/hexchat-2.9.4
+++ b/metadata/md5-cache/net-irc/hexchat-2.9.4
@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/pango dbus? ( >=dev-libs/dbus-glib-0.98 ) gtk? ( x11-libs/gtk+:2 ) libnotify? ( x11-libs/libnotify ) ntlm? ( net-libs/libntlm ) perl? ( >=dev-lang/perl-5.8.0 ) python? ( =dev-lang/python-2* ) spell? ( dev-libs/libxml2 ) libproxy? ( net-libs/libproxy ) ssl? ( >=dev-libs/openssl-0.9.8u )
 SLOT=0
-SRC_URI=https://github.com/downloads/hexchat/hexchat/hexchat-2.9.4.tar.xz
+SRC_URI=mirror://github/hexchat/hexchat/hexchat-2.9.4.tar.xz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	ddf6065984ab0a6d09e8c2ec264d7921	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f1a2a03d1c313190a851f40fe84bf90e
+_md5_=ea842b32cdf4545b2c8d73ae8b2514de
--- a/metadata/md5-cache/net-misc/batctl-2013.0.0
+++ b/metadata/md5-cache/net-misc/batctl-2013.0.0
@ -0,0 +1,10 @@
 DEFINED_PHASES=compile install setup
 DESCRIPTION=BATMAN advanced control and management tool
 EAPI=4
 HOMEPAGE=http://www.open-mesh.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2013.0.0.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	linux-info	f01ffb28843e2de3ea571f80f07e5078	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=05c78cc9207ce6ca986d4ce644255272
--- a/metadata/md5-cache/net-misc/clusterssh-3.28
+++ b/metadata/md5-cache/net-misc/clusterssh-3.28
@ -1,11 +0,0 @@
 DEFINED_PHASES=install prepare
 DEPEND=>=dev-lang/perl-5.6.1 dev-perl/perl-tk dev-perl/Config-Simple dev-perl/X11-Protocol x11-apps/xlsfonts
 DESCRIPTION=Concurrent Multi-Server Terminal Access.
 EAPI=2
 HOMEPAGE=http://clusterssh.sourceforge.net
 KEYWORDS=amd64 ppc ~ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.6.1 dev-perl/perl-tk dev-perl/Config-Simple dev-perl/X11-Protocol x11-apps/xlsfonts
 SLOT=0
 SRC_URI=mirror://sourceforge/clusterssh/clusterssh-3.28.tar.gz
 _md5_=1b29f59b32cf8743b4468328a5de98a4
--- a/metadata/md5-cache/sci-biology/t-coffee-9.03.1318-r1
+++ b/metadata/md5-cache/sci-biology/t-coffee-9.03.1318-r1
@ -4,10 +4,10 @@ DESCRIPTION=A multiple sequence alignment package
 EAPI=5
 HOMEPAGE=http://www.tcoffee.org/Projects_home_page/t_coffee_home_page.html
 IUSE=examples
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=sci-biology/clustalw virtual/fortran
+RDEPEND=sci-biology/clustalw sci-chemistry/tm-align virtual/fortran
 SLOT=0
 SRC_URI=http://www.tcoffee.org/Packages/Stable/Version_9.03.r1318/T-COFFEE_distribution_Version_9.03.r1318.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	19652e219ec9b62d7d89735821d7afb6	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=5ca26eceb8329f52e353c9f0552f307b
+_md5_=e0e0180cfb52ffc3132963a2419dcf83
--- a/metadata/md5-cache/sci-libs/cln-1.3.1
+++ b/metadata/md5-cache/sci-libs/cln-1.3.1
@ -1,13 +0,0 @@
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=dev-libs/gmp doc? ( virtual/latex-base )
 DESCRIPTION=Class library (C++) for numbers
 EAPI=2
 HOMEPAGE=http://www.ginac.de/CLN/
 IUSE=doc examples
 KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp doc? ( virtual/latex-base )
 SLOT=1
 SRC_URI=ftp://ftpthep.physik.uni-mainz.de/pub/gnu/cln-1.3.1.tar.bz2
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2fa6694f6643b062208c7e3725a08713
--- a/metadata/md5-cache/sci-libs/cln-1.3.2
+++ b/metadata/md5-cache/sci-libs/cln-1.3.2
@ -1,13 +0,0 @@
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=dev-libs/gmp doc? ( virtual/latex-base )
 DESCRIPTION=Class library (C++) for numbers
 EAPI=4
 HOMEPAGE=http://www.ginac.de/CLN/
 IUSE=doc examples static-libs
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp doc? ( virtual/latex-base )
 SLOT=1
 SRC_URI=ftp://ftpthep.physik.uni-mainz.de/pub/gnu/cln-1.3.2.tar.bz2
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dd6b5ca8a41a7816732316cd2dcba77d
--- a/metadata/md5-cache/sci-libs/djbfft-0.76
+++ b/metadata/md5-cache/sci-libs/djbfft-0.76
@ -1,10 +0,0 @@
 DEFINED_PHASES=compile install unpack
 DESCRIPTION=extremely fast library for floating-point convolution
 HOMEPAGE=http://cr.yp.to/djbfft.html
 KEYWORDS=alpha amd64 arm ~hppa ppc ppc64 sh sparc x86 ~x86-fbsd
 LICENSE=public-domain
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cr.yp.to/djbfft/djbfft-0.76.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1c6de81224ce2b68fc7a8807091e254f
--- a/metadata/md5-cache/sci-libs/vtk-5.10.1
+++ b/metadata/md5-cache/sci-libs/vtk-5.10.1
@ -10,4 +10,4 @@ RDEPEND=dev-libs/expat dev-libs/libxml2:2 media-libs/freetype media-libs/libpng
 SLOT=0
 SRC_URI=http://www.vtk.org/files/release/5.10/vtk-5.10.1.tar.gz doc? ( http://www.vtk.org/files/release/5.10/vtkDocHtml-5.10.1.tar.gz ) examples? ( http://www.vtk.org/files/release/5.10/vtkdata-5.10.1.tar.gz )
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	qt4-r2	19af9102ca9b827213997cc636e7e33c	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b7b47f90bf43d28e7150ed0afe97e63f
+_md5_=1bf39c6fb520793f033a8d7e38d47244
--- a/metadata/md5-cache/sys-cluster/ceph-0.56.1
+++ b/metadata/md5-cache/sys-cluster/ceph-0.56.1
@ -0,0 +1,13 @@
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/boost dev-libs/fcgi dev-libs/libaio dev-libs/libedit dev-libs/crypto++ sys-apps/keyutils fuse? ( sys-fs/fuse ) libatomic? ( dev-libs/libatomic_ops ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) tcmalloc? ( dev-util/google-perftools ) virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Ceph distributed filesystem
 EAPI=5
 HOMEPAGE=http://ceph.com/
 IUSE=debug fuse gtk libatomic radosgw static-libs tcmalloc
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/boost dev-libs/fcgi dev-libs/libaio dev-libs/libedit dev-libs/crypto++ sys-apps/keyutils fuse? ( sys-fs/fuse ) libatomic? ( dev-libs/libatomic_ops ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) tcmalloc? ( dev-util/google-perftools ) sys-fs/btrfs-progs
 SLOT=0
 SRC_URI=http://ceph.com/download/ceph-0.56.1.tar.bz2
 _eclasses_=autotools	5116b10b2150724f41b564f1cc863e47	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2301609ee5cfaa684d3f65b6817cc48d
--- a/metadata/md5-cache/sys-cluster/ceph-9999
+++ b/metadata/md5-cache/sys-cluster/ceph-9999
@ -0,0 +1,11 @@
 DEFINED_PHASES=configure install prepare unpack
 DEPEND=dev-libs/boost dev-libs/fcgi dev-libs/libaio dev-libs/libedit dev-libs/crypto++ sys-apps/keyutils fuse? ( sys-fs/fuse ) libatomic? ( dev-libs/libatomic_ops ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) tcmalloc? ( dev-util/google-perftools ) virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=Ceph distributed filesystem
 EAPI=5
 HOMEPAGE=http://ceph.com/
 IUSE=debug fuse gtk libatomic radosgw static-libs tcmalloc
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/boost dev-libs/fcgi dev-libs/libaio dev-libs/libedit dev-libs/crypto++ sys-apps/keyutils fuse? ( sys-fs/fuse ) libatomic? ( dev-libs/libatomic_ops ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) tcmalloc? ( dev-util/google-perftools ) sys-fs/btrfs-progs
 SLOT=0
 _eclasses_=autotools	5116b10b2150724f41b564f1cc863e47	eutils	d40dc948067bd3db1c8ebf7d51897313	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=54bfe094f9d4ddffdba1458d14894c4d
--- a/metadata/md5-cache/sys-fs/aufs-util-3.6
+++ b/metadata/md5-cache/sys-fs/aufs-util-3.6
@ -9,4 +9,4 @@ RDEPEND=!sys-fs/aufs2 !sys-fs/aufs3 sys-kernel/aufs-sources
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs-util-3.6.tar.xz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	linux-info	f01ffb28843e2de3ea571f80f07e5078	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=8199a1eac332362185c41d9d55ec905b
+_md5_=337d034ecb93e9a37b1cdad93c4dd5de
--- a/metadata/md5-cache/sys-fs/aufs-util-3.7
+++ b/metadata/md5-cache/sys-fs/aufs-util-3.7
@ -0,0 +1,12 @@
 DEFINED_PHASES=prepare setup
 DEPEND=!sys-fs/aufs2 !sys-fs/aufs3 sys-kernel/aufs-sources
 DESCRIPTION=Utilities are always necessary for aufs
 EAPI=5
 HOMEPAGE=http://aufs.sourceforge.net/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-fs/aufs2 !sys-fs/aufs3 sys-kernel/aufs-sources
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs-util-3.7.tar.xz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	linux-info	f01ffb28843e2de3ea571f80f07e5078	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b16f11821ef4745564a8b0e91cfa36ff
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20121015
+++ b/metadata/md5-cache/sys-fs/aufs3-3_p20121015
@ -1,13 +0,0 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup
 DEPEND=dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 DESCRIPTION=An entirely re-designed and re-implemented Unionfs
 EAPI=4
 HOMEPAGE=http://aufs.sourceforge.net/
 IUSE=debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-fs/aufs !sys-fs/aufs2 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs3-3_p20121015.tar.xz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	linux-info	f01ffb28843e2de3ea571f80f07e5078	linux-mod	dbc722ed035721476f23ab7b0572985e	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=95b329128134ec8fed5b05dd83a69638
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20121015-r1
+++ b/metadata/md5-cache/sys-fs/aufs3-3_p20121015-r1
@ -1,13 +0,0 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup
 DEPEND=dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 DESCRIPTION=An entirely re-designed and re-implemented Unionfs
 EAPI=4
 HOMEPAGE=http://aufs.sourceforge.net/
 IUSE=debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-fs/aufs !sys-fs/aufs2 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs3-3_p20121015.tar.xz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	linux-info	f01ffb28843e2de3ea571f80f07e5078	linux-mod	dbc722ed035721476f23ab7b0572985e	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4452bb1b38ca6413d597cdd123986314
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20121112
+++ b/metadata/md5-cache/sys-fs/aufs3-3_p20121112
@ -1,13 +0,0 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup
 DEPEND=dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 DESCRIPTION=An entirely re-designed and re-implemented Unionfs
 EAPI=4
 HOMEPAGE=http://aufs.sourceforge.net/
 IUSE=debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-fs/aufs !sys-fs/aufs2 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs3-3_p20121112.tar.xz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	linux-info	f01ffb28843e2de3ea571f80f07e5078	linux-mod	dbc722ed035721476f23ab7b0572985e	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=659023a530146bcc96106e375af772f3
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20130114
+++ b/metadata/md5-cache/sys-fs/aufs3-3_p20130114
@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=4
+EAPI=5
 HOMEPAGE=http://aufs.sourceforge.net/
 IUSE=debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-fs/aufs !sys-fs/aufs2 kernel_linux? ( virtual/modutils )
 SLOT=0
-SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs3-3_p20121129.tar.xz
+SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs3-3_p20130114.tar.xz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	linux-info	f01ffb28843e2de3ea571f80f07e5078	linux-mod	dbc722ed035721476f23ab7b0572985e	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9a307fc81d7a988fa70d213d3e7c9200
+_md5_=589cd2183cc8bca59b601bb06d4aa9fc
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.6.10
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.6.10
@ -6,10 +6,10 @@ HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
 IUSE=deblob module symlink build deblob
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=sys-fs/aufs-util !build? ( virtual/dev-manager )
+PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.6.10
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.6.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.6.N/deblob-3.6 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.6.N/deblob-check -> deblob-check-3.6 ) mirror://gentoo/genpatches-3.6-10.base.tar.bz2 mirror://gentoo/genpatches-3.6-10.extras.tar.bz2 http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.6.10.tar.xz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	kernel-2	dd451098928ff900df7c254820871c00	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ab03a5549ba8cc34fdc4e66c09cd6a87
+_md5_=f35d47f31dd24c0ce13fbd0e45c8b0f6
--- a/Show More
+++ b/Show More
`@ -1 +1,2 @@`
		`DIST boxes-1.1.1.src.tar.gz 139140 SHA256 d8529840281618e75a4adf313f08291b89c8cf83928c2c1f4b0ddcd236fb2420 SHA512 bf4060a8db284b8785f0479803562df943dcd6f02584c77c1b28ee193c240d832d2736fe77dee140f2a57e8e9171bc17f418ab1a0c930a656e567b5464c0bdb6 WHIRLPOOL 634205ecebf1fec2b21ceb270b38d1ce664d18053815284a8be3060299a13229a0b40cb348fa80adf30628f9da14ce4d27c1183575d7ec19e6a85a1ff9f48181`
	`DIST boxes-1.1.src.tar.gz 138279 SHA256 c9f931fc9f8e0aeadb370518e3e66f1cbfa956ba7817bcb8f701630f70b711e3 SHA512 a2cad060fd0b673ae79f38e5bd8313df419408a80bda83324350211c0e82da5f46b28718bf15678c8b4dba15580e923f246081bbb10114d2f79d13bb9fc83acf WHIRLPOOL d305da5ba92553fd576ca111338015afcfb6d46257c2a18cba7ac7f52e23ec322692d67dd9867f724330cd35740285f2076043785d7c9fa9c9af7646d79ed195`	`DIST boxes-1.1.src.tar.gz 138279 SHA256 c9f931fc9f8e0aeadb370518e3e66f1cbfa956ba7817bcb8f701630f70b711e3 SHA512 a2cad060fd0b673ae79f38e5bd8313df419408a80bda83324350211c0e82da5f46b28718bf15678c8b4dba15580e923f246081bbb10114d2f79d13bb9fc83acf WHIRLPOOL d305da5ba92553fd576ca111338015afcfb6d46257c2a18cba7ac7f52e23ec322692d67dd9867f724330cd35740285f2076043785d7c9fa9c9af7646d79ed195`
`@ -1 +1,2 @@`
	`DIST gcal-3.6.1.tar.xz 1623788 SHA256 cfaed3fef4b037a4995ca1ec03d7ac2fce528079678287b2d067709768d3b9cf SHA512 73df9297d05e76c5bef1f6c2e85e1782c874dad4f0ff23bb8a57463f9ae6e0edd16543b0fc40d0f1ed3ca62d688ce01da4d05eb3c3785e28330a915d5062f8de WHIRLPOOL 180c7ca450f0a5ab6c510476afae0c7ca4e546460a56aad23849afcc1833a6bfb11ed65f9315dcf684ef2cc0043dbff674605c45528bde6d9b5fcbd871cfa80f`	`DIST gcal-3.6.1.tar.xz 1623788 SHA256 cfaed3fef4b037a4995ca1ec03d7ac2fce528079678287b2d067709768d3b9cf SHA512 73df9297d05e76c5bef1f6c2e85e1782c874dad4f0ff23bb8a57463f9ae6e0edd16543b0fc40d0f1ed3ca62d688ce01da4d05eb3c3785e28330a915d5062f8de WHIRLPOOL 180c7ca450f0a5ab6c510476afae0c7ca4e546460a56aad23849afcc1833a6bfb11ed65f9315dcf684ef2cc0043dbff674605c45528bde6d9b5fcbd871cfa80f`
		`DIST gcal-3.6.2.tar.xz 1638776 SHA256 1c3f20e81b7a0ceb3b80668704dfeb7b0e7fe309aa3d6bccb5743f23cff12cda SHA512 fd5954eeef82e5683115e8fde220c949ac87702c77bd7bec321337bd508dcd867b3c4f86c288c5c8e69240cb656d21eed47930a572aca1595d22521ed03cd458 WHIRLPOOL 4e3ec708c9cf22bbcf79011af0bc4b47ab61db0fc716ff3e6113f7d9bfdf2563ed8e9f2afbc2ba8c6d3e7cadb69c14a65292b38ce64aea6edd9b37325546537c`
`@ -1 +1 @@`
	`Mon, 14 Jan 2013 05:06:51 +0000`	`Mon, 14 Jan 2013 11:06:52 +0000`