Sync with portage [Fri Nov 29 22:51:56 MSK 2013].

2013-11-29 22:52:02 +04:00 · 2013-11-29 22:52:02 +04:00 · b899d467e4
commit b899d467e4
parent 7d2b925127
10035 changed files with 13809 additions and 13954 deletions
--- a/app-admin/conky/conky-1.9.0-r3.ebuild
+++ b/app-admin/conky/conky-1.9.0-r3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0-r3.ebuild,v 1.2 2013/10/25 14:38:33 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0-r3.ebuild,v 1.3 2013/11/29 15:27:13 billie Exp $

 EAPI=5

@ -64,7 +64,8 @@ src_prepare() {
 		"${FILESDIR}/${P}-lines-fix.patch" \
 		"${FILESDIR}/${P}-update-when-message-count-decreases.patch" \
 		"${FILESDIR}/${P}-apcupsd.patch" \
-		"${FILESDIR}/${P}-default-graph-size.patch"
+		"${FILESDIR}/${P}-default-graph-size.patch" \
+		"${FILESDIR}/${P}-diskio-dmmajor.patch"

 	# Allow user patches #478482
 	# Only run autotools if user patched something
--- a/app-admin/conky/files/conky-1.9.0-diskio-dmmajor.patch
+++ b/app-admin/conky/files/conky-1.9.0-diskio-dmmajor.patch
@ -0,0 +1,28 @@
+diff --git a/src/.linux.c.swp b/src/.linux.c.swp
+index 909d454..f6fc388 100644
+Binary files a/src/.linux.c.swp and b/src/.linux.c.swp differ
+diff --git a/src/linux.c b/src/linux.c
+index ce5f733..bbf8dc5 100644
+--- a/src/linux.c
+++ b/src/linux.c
+@@ -80,6 +80,10 @@
+ #define NBD_MAJOR 43
+ #endif
+ 
+#if !defined(DM_MAJOR)
+#define DM_MAJOR 253
+#endif
+
+ #ifdef HAVE_IWLIB
+ #include <iwlib.h>
+ #endif
+@@ -2336,7 +2340,8 @@ int update_diskio(void)
+ 		 *
+ 		 * XXX: ignore devices which are part of a SW RAID (MD_MAJOR) */
+ 		if (col_count == 5 && major != LVM_BLK_MAJOR && major != NBD_MAJOR
+-				&& major != RAMDISK_MAJOR && major != LOOP_MAJOR) {
+				&& major != RAMDISK_MAJOR && major != LOOP_MAJOR
+				&& major != DM_MAJOR ) {
+ 			/* check needed for kernel >= 2.6.31, see sf #2942117 */
+ 			if (is_disk(devbuf)) {
+ 				total_reads += reads;
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@ -1,2 +1,3 @@
 DIST syslog-ng_3.4.2.tar.gz 3354842 SHA256 f2585b42e7341bc53490aa59c5f405df506536bf0672bf71f9567ea78590f381 SHA512 94d1c8008c72a7fb82c86eb4ff666cacee26e2b1d7100f58a0ea5293e4efc74ad9608a7b1e72b217f9e6ead4b6ad82f5cf9e00dfcb230a03d3243f5c51fd5305 WHIRLPOOL ddb721e940e674a74079fb150213e7595f2a52eb8709f1a032bf6def93906b6f93c9a5131991946b1e19a026ca8162c40d7c7e537498f29a3d33b401c678611a
 DIST syslog-ng_3.4.5.tar.gz 3202771 SHA256 b8a69d8131efc2378d9149ff54e99f91ea1c47c69e0f4629395d910c7ff71bfb SHA512 41662ba0726a78fb55ffd08532c80b43cf8c06c6c207d9e2bc4558d5772531b602e20a6d8c0d2f0c453e757589b80d1942c533c6a5c6249092cfcb209fc94e4b WHIRLPOOL f52a95eaa9346fd383db2c7ca256a1226ceac0d59354f872ac5c047e234e4b3a379e13e18dc36bb91dbc1b6c43f1f916345c2ccde7cd421348bf21922d1767f6
+DIST syslog-ng_3.4.6.tar.gz 3202600 SHA256 9484abba03a91d093542996deef68b187186a037f4537606a35f548da0199133 SHA512 e21da2efd066f9bbbc7f058f94d6c974946c3017b07c52ce5b3a0631ddd3f470c24a91c2a89dbdd20797039516c5ac0f45dd3d7089d6902c7509679139dd75c1 WHIRLPOOL f121d682bb8f83b351323f087aa0f58c20352bb26057f9a388049a54e4563725708cae6bea3348e49531f5d0d16f2329e9c2ba396ae1d4de63164c10a75b2d58
--- a/app-admin/syslog-ng/syslog-ng-3.4.6.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.4.6.ebuild
@ -0,0 +1,99 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.4.6.ebuild,v 1.1 2013/11/29 02:25:01 mr_bones_ Exp $
+
+EAPI=5
+inherit eutils multilib systemd
+
+MY_PV=${PV/_/}
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="http://www.balabit.com/network-security/syslog-ng"
+SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${MY_PV}/source/syslog-ng_${MY_PV}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="caps dbi geoip ipv6 json mongodb +pcre smtp spoof-source ssl systemd tcpd"
+RESTRICT="test"
+
+RDEPEND="
+	pcre? ( dev-libs/libpcre )
+	spoof-source? ( net-libs/libnet:1.1 )
+	ssl? ( dev-libs/openssl:= )
+	smtp? ( net-libs/libesmtp )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	>=dev-libs/eventlog-0.2.12
+	>=dev-libs/glib-2.10.1:2
+	json? ( >=dev-libs/json-c-0.9 )
+	caps? ( sys-libs/libcap )
+	geoip? ( >=dev-libs/geoip-1.5.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/flex"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_configure() {
+	econf \
+		--with-ivykis=internal \
+		--with-libmongo-client=internal \
+		--sysconfdir=/etc/syslog-ng \
+		--localstatedir=/var/lib/syslog-ng \
+		--with-pidfile-dir=/var/run \
+		--with-module-dir=/usr/$(get_libdir)/syslog-ng \
+		$(systemd_with_unitdir) \
+		$(use_enable systemd) \
+		$(use_enable caps linux-caps) \
+		$(use_enable geoip) \
+		$(use_enable ipv6) \
+		$(use_enable json) \
+		$(use_enable mongodb) \
+		$(use_enable pcre) \
+		$(use_enable smtp) \
+		$(use_enable spoof-source) \
+		$(use_enable dbi sql) \
+		$(use_enable ssl) \
+		$(use_enable tcpd tcp-wrapper)
+}
+
+src_install() {
+	# -j1 for bug #484470
+	emake -j1 DESTDIR="${D}" install
+
+	dodoc AUTHORS NEWS contrib/syslog-ng.conf* contrib/syslog2ng \
+		"${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo.hardened" \
+		"${FILESDIR}/syslog-ng.logrotate.hardened" \
+		"${FILESDIR}/README.hardened"
+
+	# Install default configuration
+	insinto /etc/syslog-ng
+	if use userland_BSD ; then
+		newins "${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
+	else
+		newins "${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo" syslog-ng.conf
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng
+
+	newinitd "${FILESDIR}/${PV%.*}/syslog-ng.rc6" syslog-ng
+	newconfd "${FILESDIR}/${PV%.*}/syslog-ng.confd" syslog-ng
+	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	elog "For detailed documentation please see the upstream website:"
+	elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.4-guides/en/syslog-ng-ose-v3.4-guide-admin/html/index.html"
+
+	# bug #355257
+	if ! has_version app-admin/logrotate ; then
+		echo
+		elog "It is highly recommended that app-admin/logrotate be emerged to"
+		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
+		elog "for logrotate to use."
+		echo
+	fi
+}
--- a/app-antivirus/clamav/clamav-0.97.8.ebuild
+++ b/app-antivirus/clamav/clamav-0.97.8.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.8.ebuild,v 1.3 2013/10/09 11:28:32 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.8.ebuild,v 1.5 2013/11/29 09:06:23 pinkbyte Exp $

 EAPI=5

--- a/app-antivirus/clamav/clamav-0.98.ebuild
+++ b/app-antivirus/clamav/clamav-0.98.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.98.ebuild,v 1.5 2013/10/09 11:28:32 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.98.ebuild,v 1.7 2013/11/29 09:07:21 pinkbyte Exp $

 EAPI=5

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

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="bzip2 clamdtop iconv ipv6 milter selinux static-libs uclibc"

 CDEPEND="bzip2? ( app-arch/bzip2 )
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@ -1,4 +1,2 @@
-DIST gnupg-1.4.14.tar.bz2 3687929 SHA256 f2c4cd3ed6a5fb66cb369bf8160e53127712adfe41ebf965c0f02ab71d984413 SHA512 324b32807759c8a9c3587e1576ab1f5815918028f015dcff36e7ff1e8610996c89e4bc7af77385adc9359f21cc022642b971509698a81510a88085f5a268405f WHIRLPOOL c14a89171b2bf7a4b0934e67cf970325e394c38a05daa455c87327eaa13fea27e5cadbfcf693dedb5840b4a249b53457baf91ecd307ec66e11dfccbfe661e037
 DIST gnupg-1.4.15.tar.bz2 3654415 SHA256 b6bb40a8f96dc1227b69f8e3b35f0bc4c8276923147f6069cae2f6307c62795d SHA512 fe789e120dfc38be35c1eed1c9b105a83debaed59696085a356812df2b57ceb0ed6b94c491e5db23e31a7f5efaa4d5a17d6a54197bb347d74df3cc54dd8d4aed WHIRLPOOL 3b65e61344bf53aa329bff6092f3912fb6c2db11b14da03c9d7f3f1140c12cb82f7b7ed8c50477cf3ff23799cd393c682fb014c095d53d2bb91fbf5606acab87
-DIST gnupg-2.0.20.tar.bz2 4286191 SHA256 6e949b7f062cab8a3cf0910f91ecf04cabaad458c0aeeec66298651b8b04b79a SHA512 f4eec0ed3503f2aeecfa63af53b844b19ee4be596ea487dce69ec14189c8163652c932d0e657be147b1ca3d7dc8adf9cc1bc8067086fe0c51a3487d56df388c4 WHIRLPOOL a088aab347be7d2c83078eadc79387e705d048868800c8335574f0b0f7c7cd21d8dd620783f83c908075841144b6f8577db8838c99459edd2309fec836761f0d
 DIST gnupg-2.0.22.tar.bz2 4277117 SHA256 437d0ab259854359fc48aa8795af80cff4975e559c111c92c03d0bc91408e251 SHA512 de534b2f4b8d3c320e97519fe0834bc403c96c6dbb2e24fc24eb68f4ff80374360ef66d83ddc3d6fa096c5199d3782abc5d06b866203378cba130b42802cc855 WHIRLPOOL c45e7b2560ae31f013f732863db99f6e23d0de83d03371fe592192c2b5f800503f7a1e273c59e4c99f3aa0401e8cfb2bdbf1c5029534f642305e768009f15fef
--- a/app-crypt/gnupg/gnupg-1.4.14.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.14.ebuild
@ -1,124 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.14.ebuild,v 1.12 2013/08/08 12:37:13 ago Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-ECCVER="0.2.0"
-ECCVER_GNUPG="1.4.9"
-ECC_PATCH="${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff"
-MY_P=${P/_/}
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="bzip2 curl ldap mta nls readline selinux smartcard static usb zlib linguas_ru"
-
-COMMON_DEPEND="
-	ldap? ( net-nds/openldap )
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	curl? ( net-misc/curl )
-	mta? ( virtual/mta )
-	readline? ( sys-libs/readline )
-	smartcard? ( =virtual/libusb-0* )
-	usb? ( =virtual/libusb-0* )"
-
-RDEPEND="!static? ( ${COMMON_DEPEND} )
-	selinux? ( sec-policy/selinux-gpg )
-	nls? ( virtual/libintl )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Install RU man page in right location
-	sed -e "/^man_MANS =/s/ gpg\.ru\.1//" -i doc/Makefile.in || die "sed doc/Makefile.in failed"
-
-	# bug#469388
-	sed -i -e 's/--batch --dearmor/--homedir . --batch --dearmor/' checks/Makefile.in
-
-	# Fix PIC definitions
-	sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c \
-		|| die "sed PIC failed"
-	sed -i -e 's:if PIC:ifdef __PIC__:' mpi/sparc32v8/mpih-mul{1,2}.S || \
-		die "sed PIC failed"
-}
-
-src_configure() {
-	# Certain sparc32 machines seem to have trouble building correctly with
-	# -mcpu enabled.  While this is not a gnupg problem, it is a temporary
-	# fix until the gcc problem can be tracked down.
-	if [ "${ARCH}" == "sparc" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
-		filter-flags -mcpu=supersparc -mcpu=v8 -mcpu=v7
-	fi
-
-	# 'USE=static' support was requested in #29299
-	use static && append-ldflags -static
-
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable ldap) \
-		$(use_enable mta mailto) \
-		--enable-hkp \
-		--enable-finger \
-		$(use_with !zlib included-zlib) \
-		$(use_with curl libcurl /usr) \
-		$(use_enable nls) \
-		$(use_enable bzip2) \
-		$(use_enable smartcard card-support) \
-		$(use_enable selinux selinux-support) \
-		--without-capabilities \
-		$(use_with readline) \
-		$(use_with usb libusb /usr) \
-		--enable-static-rnd=linux \
-		--libexecdir="${EPREFIX}/usr/libexec" \
-		--enable-noexecstack \
-		CC_FOR_BUILD=$(tc-getBUILD_CC) \
-		${myconf}
-}
-
-src_install() {
-	default
-
-	# keep the documentation in /usr/share/doc/...
-	rm -rf "${ED}usr/share/gnupg/FAQ" "${ED}usr/share/gnupg/faq.html" || die
-
-	dodoc AUTHORS BUGS ChangeLog NEWS PROJECTS README THANKS \
-		TODO VERSION doc/{FAQ,HACKING,DETAILS,OpenPGP}
-
-	exeinto /usr/libexec/gnupg
-	doexe tools/make-dns-cert
-
-	# install RU documentation in right location
-	if use linguas_ru; then
-		cp doc/gpg.ru.1 "${T}/gpg.1" || die
-		doman -i18n=ru "${T}/gpg.1"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "If you are using a non-Linux system, or a kernel older than 2.6.9,"
-	ewarn "you MUST make the gpg binary setuid."
-	echo
-#	if use !bindist && use ecc; then
-#		ewarn
-#		ewarn "The elliptical curves patch is experimental"
-#		ewarn "Further info available at http://alumnes.eps.udl.es/%7Ed4372211/index.en.html"
-#	fi
-	elog
-	elog "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
-	elog
-	elog "If you wish to view images emerge:"
-	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
-	elog "Remember to use photo-viewer option in configuration file to activate the right viewer"
-}
--- a/app-crypt/gnupg/gnupg-2.0.20.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.20.ebuild
@ -1,151 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.20.ebuild,v 1.11 2013/06/30 18:08:20 ago Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-# SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns bzip2 doc ldap nls mta readline static selinux smartcard usb"
-
-COMMON_DEPEND_LIBS="
-	>=dev-libs/libassuan-2
-	>=dev-libs/libgcrypt-1.4
-	>=dev-libs/libgpg-error-1.7
-	>=dev-libs/libksba-1.0.7
-	>=dev-libs/pth-1.3.7
-	>=net-misc/curl-7.10
-	sys-libs/zlib
-	adns? ( >=net-libs/adns-1.4 )
-	bzip2? ( app-arch/bzip2 )
-	readline? ( sys-libs/readline )
-	smartcard? ( usb? ( virtual/libusb:0 ) )
-	ldap? ( net-nds/openldap )"
-COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )"
-
-# Existence of executables is checked during configuration.
-DEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	static? (
-		>=dev-libs/libassuan-2[static-libs]
-		>=dev-libs/libgcrypt-1.4[static-libs]
-		>=dev-libs/libgpg-error-1.7[static-libs]
-		>=dev-libs/libksba-1.0.7[static-libs]
-		>=dev-libs/pth-1.3.7[static-libs]
-		>=net-misc/curl-7.10[static-libs]
-		sys-libs/zlib[static-libs]
-		bzip2? ( app-arch/bzip2[static-libs] )
-	)
-	nls? ( sys-devel/gettext )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
-	${COMMON_DEPEND_BINS}
-	mta? ( virtual/mta )
-	!<=app-crypt/gnupg-2.0.1
-	selinux? ( sec-policy/selinux-gpg )
-	nls? ( virtual/libintl )"
-
-REQUIRED_USE="smartcard? ( !static )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.17-gpgsm-gencert.patch
-}
-
-src_configure() {
-	local myconf
-
-	# 'USE=static' support was requested:
-	# gnupg1: bug #29299
-	# gnupg2: bug #159623
-	use static && append-ldflags -static
-
-	if use smartcard; then
-		myconf+=" --enable-scdaemon $(use_enable usb ccid-driver)"
-	else
-		myconf+=" --disable-scdaemon"
-	fi
-
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-agent \
-		${myconf} \
-		$(use_with adns) \
-		$(use_enable bzip2) \
-		$(use_enable !elibc_SunOS symcryptrun) \
-		$(use_enable nls) \
-		$(use_enable mta mailto) \
-		$(use_enable ldap) \
-		$(use_with readline) \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_compile() {
-	emake
-
-	if use doc; then
-		cd doc
-		emake html
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
-	rm "${ED}"/usr/share/gnupg/help* || die
-
-	dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
-		doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
-
-	dosym gpg2 /usr/bin/gpg
-	dosym gpgv2 /usr/bin/gpgv
-	dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
-	dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
-	dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
-	if use ldap; then
-		dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
-	fi
-	echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
-	echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
-
-	if use doc; then
-		dohtml doc/gnupg.html/* doc/*.png
-	fi
-}
-
-pkg_postinst() {
-	elog "If you wish to view images emerge:"
-	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
-	elog "Remember to use photo-viewer option in configuration file to activate"
-	elog "the right viewer."
-	elog
-
-	if use smartcard; then
-		elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
-		use usb && elog " - a CCID-compatible reader, used directly through libusb;"
-		elog " - sys-apps/pcsc-lite and a compatible reader device;"
-		elog " - dev-libs/openct and a compatible reader device;"
-		elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
-		elog ""
-		elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
-		elog "app-crypt/ccid first."
-	fi
-
-	ewarn "Please remember to restart gpg-agent if a different version"
-	ewarn "of the agent is currently used. If you are unsure of the gpg"
-	ewarn "agent you are using please run 'killall gpg-agent',"
-	ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
-}
--- a/app-editors/nano/nano-2.3.2-r1.ebuild
+++ b/app-editors/nano/nano-2.3.2-r1.ebuild
@ -0,0 +1,79 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.3.2-r1.ebuild,v 1.1 2013/11/28 23:06:33 vapier Exp $
+
+EAPI="4"
+
+inherit eutils autotools
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano"
+	inherit subversion autotools
+else
+	MY_P=${PN}-${PV/_}
+	SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
+fi
+
+DESCRIPTION="GNU GPL'd Pico clone with more functionality"
+HOMEPAGE="http://www.nano-editor.org/ http://www.gentoo.org/doc/en/nano-basics-guide.xml"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug justify +magic minimal ncurses nls slang spell unicode"
+
+RDEPEND=">=sys-libs/ncurses-5.9-r1[unicode?]
+	magic? ( sys-apps/file )
+	nls? ( virtual/libintl )
+	!ncurses? ( slang? ( sys-libs/slang ) )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.3.1-ncurses-pkg-config.patch
+	epatch "${FILESDIR}"/${PN}-2.3.2-bind-unbind-docs.patch
+	epatch "${FILESDIR}"/${PN}-2.3.1-{shell,gentoo}-nanorc.patch
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	eval export ac_cv_{header_magic_h,lib_magic_magic_open}=$(usex magic)
+	local myconf=()
+	case ${CHOST} in
+	*-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
+	esac
+	econf \
+		--bindir="${EPREFIX}"/bin \
+		$(use_enable !minimal color) \
+		$(use_enable !minimal multibuffer) \
+		$(use_enable !minimal nanorc) \
+		--disable-wrapping-as-root \
+		$(use_enable spell speller) \
+		$(use_enable justify) \
+		$(use_enable debug) \
+		$(use_enable nls) \
+		$(use_enable unicode utf8) \
+		$(use_enable minimal tiny) \
+		$(usex ncurses --without-slang $(use_with slang)) \
+		"${myconf[@]}"
+}
+
+src_install() {
+	default
+	rm -rf "${ED}"/usr/share/nano/man-html
+
+	dodoc ChangeLog README doc/nanorc.sample AUTHORS BUGS NEWS TODO
+	dohtml doc/faq.html
+	insinto /etc
+	newins doc/nanorc.sample nanorc
+	if ! use minimal ; then
+		# Enable colorization by default.
+		sed -i \
+			-e '/^# include /s:# *::' \
+			"${ED}"/etc/nanorc || die
+	fi
+
+	dodir /usr/bin
+	dosym /bin/nano /usr/bin/nano
+}
--- a/app-emacs/evil/Manifest
+++ b/app-emacs/evil/Manifest
@ -1,2 +1,2 @@
-DIST evil-1.0.2.tar.xz 427592 SHA256 aeb47184ae90772582232b12ac5aef1ec852c5484a135fe6c3ef3ce19518f0ea SHA512 5d30c6b4c515342c2f2e563b829ef2d155b37a011364993b5bd398960cd87b4707e92d99008b4d26b9dbef4aab8c17c0bf6fe695db4242c592c3e823dca7cda5 WHIRLPOOL 625fb046578f9a7bc2774147c20f441377a38c4de5659c8233678b3ddd2e1101dd6c866f4df6dee821b7cb7254e5099b439c17d9ed3efca0795876e84e2dba6e
 DIST evil-1.0.5.tar.xz 427692 SHA256 7af98dc0f0bad92967fc4a537ad056cd669f5703a0334874a0505a031e59767b SHA512 c67ccb5de678a566fa317be72d0896cff82909cfb06cdccc148f68098d78ba7fc2f87f5d423774a7080f668fff8bb0d0b93c4b6695363dc89f15945e962f1768 WHIRLPOOL 13081ceaf9b2c13c5d7198df25aca118da7b14dbf007a2304937a5e92e0eeaa6040616fb1f125f5b28b9df300f7b6e8bffa7a655391c38b2628b01162fe548d0
+DIST evil-1.0.8.tar.xz 427884 SHA256 f88760b93fd9c918a1ed567e1ce23ce7fa6709b1f603137df3397a005c2800bf SHA512 d827ff8856c0240c334088f4c61226c93994a4c5afdd775a7170233add884af134b22cdc8bfa6432d3f44d3e6cf3cea89501a4ebfdc37ed5c70b3c712ad2ea86 WHIRLPOOL 81c8f6fc175103ab05e993fff516fa17c82d22ed5409eb59c8640f9bab1914746a47acba8f80d4a31482031086c7da70efa7977ea22b521469b95f9808f797c0
--- a/app-emacs/evil/evil-1.0.8.ebuild
+++ b/app-emacs/evil/evil-1.0.8.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/evil/evil-1.0.2.ebuild,v 1.1 2013/05/22 16:29:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/evil/evil-1.0.8.ebuild,v 1.1 2013/11/28 19:35:03 ulm Exp $

 EAPI=5

@ -8,13 +8,13 @@ inherit elisp

 DESCRIPTION="Extensible vi layer for Emacs"
 HOMEPAGE="http://gitorious.org/evil"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
+SRC_URI="http://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"

 LICENSE="GPL-3+ FDL-1.3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"

-DEPEND="app-emacs/undo-tree"
+DEPEND=">=app-emacs/undo-tree-0.6.3"
 RDEPEND="${DEPEND}"

 S="${WORKDIR}/${PN}"
--- a/app-emacs/sml-mode/sml-mode-6.4.ebuild
+++ b/app-emacs/sml-mode/sml-mode-6.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/sml-mode/sml-mode-6.4.ebuild,v 1.2 2013/11/27 10:29:44 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/sml-mode/sml-mode-6.4.ebuild,v 1.3 2013/11/28 21:02:52 ago Exp $

 EAPI=5
 NEED_EMACS=24
@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.el.xz"

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

 SITEFILE="50${PN}-gentoo-6.1.el"

--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@ -1,4 +1,5 @@
 DIST VBoxGuestAdditions_4.1.26.iso 52281344 SHA256 d824f920ce69cf3710b980b972f9158e27d081e89b114a597b181eca1842687d SHA512 f4fb80a61f36a22d7bbeacc0e342671e0a3aa18c12fe90c35edf29e586bcb43157f0c20ce19bcbf7a48a5cd8568337d35afc44ae35f2f55f4cdd077600cbe747 WHIRLPOOL 0f81aece690cce386fa21d8e109cf7730ad91becbce68be7df21839dbfbf52252f360f9530a4af1d5b15bf38551c1b53d141bd05fdc61cc0c5e5b87b529d0e34
 DIST VBoxGuestAdditions_4.2.18.iso 59656192 SHA256 f11a7f13dfe7bf9f246fb877144bb467fe6deadcd876568ec79b6ccd3b59d767 SHA512 2e5b0bc0d63e3b51f95fb5e6827088f130f07c2af1648c46282a3ae6af8150832f29724106b4d8335a0a51178f1ffdf069376cc46a964c24bbe06fea36d012a5 WHIRLPOOL 39afc0ce9f905f8fdac2aaa1db5f80e856ddd5f4229d21f31ce6684c93a4ec556632c8af605979461e3a1849531bcc771d6bbfb98a75a4c39fa430ecb08754d3
+DIST VBoxGuestAdditions_4.2.20.iso 59664384 SHA256 2fb3aa0f370d503b0e77725dbec76b989a251f613abee378f53c1fed9d6edf01 SHA512 7b157644ac5fbb0c881f8677d02b7510659b0a62424bcd32596ded19506f22d5e9877b325dd4671e1064eceea920b10d0f56ef5dac0a353ac261ec30e868698a WHIRLPOOL 830dc2ddd85bf3a420f8bac433c3bedb9191ccf826640cb3965ca89d09b098dfbbecf95e362e1bcc18d4c04bf183969cb6f5aa84c07238a7098258ef460ef913
 DIST VBoxGuestAdditions_4.3.0.iso 64145408 SHA256 eb6337ddd2d19d16ad7a9dafeea4fa49804e3d7ff217313250a5d14f34cefc97 SHA512 bb31bd07d7cb5c7c55b07f87ce54a1ad9f0bd5bf50d207452701c62b67bfa6b93a0c9550787d17511068273628e0e802d1f9a23c85a0926faec08bacf841be9d WHIRLPOOL ddad5d14bab35bed8d2a77675f22543ec818d936ba1d53f450d4557414499e1a12a25f518f5c02c348ecfcd1c3348ad149a402b9fce5e429aa0868e1af3389dc
 DIST VBoxGuestAdditions_4.3.2.iso 64153600 SHA256 f0b8fec99c65231641d5d01558abb53fe8b81f131dc71519cb7994c9e297300d SHA512 bf732076ce99883732bb33b5feba8f93c88dd493e6db603d0c327225dfe5ad71db44f4aa1efc26f7c2ed4dc27896a45cabb97dc98062176be3cb0d4531c776a9 WHIRLPOOL 00276a9f7449ab7ab97fe6625c26f7516da06e4d11b0ad0633f9e3ac000565a6568b90f067fe6da2098e179bf7c04794ab7ae65ca5e37ff28667d42eb6c4aaf3
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.2.20.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.2.20.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.2.20.ebuild,v 1.1 2013/11/29 08:14:42 polynomial-c Exp $
+
+EAPI=5
+
+inherit eutils
+
+MY_PN=VBoxGuestAdditions
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=${MY_PN}_${MY_PV}
+
+DESCRIPTION="CD image containing guest additions for VirtualBox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
+
+LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	!=app-emulation/virtualbox-9999"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	return 0
+}
+
+src_install() {
+	insinto /usr/share/${PN/-additions}
+	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
+}
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@ -1,16 +1,20 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.26-84997.tar.gz 10856343 SHA256 b392c2f8ed8d813a18597679a90eed9d76efd12d161373cbc5bd7de8165f5ce2 SHA512 581672dd46910cea77d0762d217f4e5afe28f5b45dcec68568885214e745af637a8588a96a85c5b8cb1b761ad68b05e8148d580f30ebf851228d34888c77998e WHIRLPOOL 6c9e3971259bfbf4f54ff6c7eb571f47bf78a51e5d1f4cce01529f7727444c366b70c343c1d0ebfc8fa1adb4bdd57ea4644f813f2991b6cb8f2d381a34f69372
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.18-88780.tar.gz 11665435 SHA256 1d1737b59d0f30f5d42beeabaff168bdc0a75b8b28df685979be6173e5adbbba SHA512 58d0990f8318a79da426c1390e6dd6df10639b5fc2b478044541d300c366881cba87ac0843e8524a7c489b95f0152e3942e6e28b178c85e582d70a1fb951bbdb WHIRLPOOL 33fc03dc5bcc0e5604aa9eb3d3c8fcc636a067d92a30689a98fd6d9ea16fa6b295e2f140af48b5747439b2ab3189bc645b0157848aed6d503d35e66232924714
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.20-90983.tar.gz 12385500 SHA256 fea7a89d4f5a250b1ff022620de37fff46d3d3c7549bd7bcf8b86af21c05cb1c SHA512 a5b04f177965d98e5561bc6517b90ee4d967027b211f14a47886ddde04ccf0c6a59e9ce8b9fe164961ac9560aa86d556079ff988293919e026bdea853cbe5db8 WHIRLPOOL a08f6627d3f78860e22399ce8683ee59a18808a7a89b29575e661abe20d0438e4d375db5ff59b62e29af49a3b4927e1ae8d1740eda04ba0228742fb4944e8f8f
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.0-89960.tar.gz 12735473 SHA256 718c822acedce96c6ab2af93ec8efdf1789bdd03b7cfabb2c9d2f94e2047b399 SHA512 6c7e6c0076ca9d7fd83a0f57a0138d4390fc6c05a862503f92c4ee7b0bf5435e7b9fe1cbcf7f66685252cfeead311bbf777ea9477331c839aa9fbb06c7454b44 WHIRLPOOL c5545101060d8350bb6332eb7ff86f4f015c15c90521c04679944b9175a238ed5914aa23c6656b780f0f9a4fc34b4e99ff1b3102342125c763c1c90d84d53188
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.2-90405.tar.gz 10417726 SHA256 c42f7ef2ac97138551f73db38180aa56f63dd44b3823156da470f7e9ee3dc8e5 SHA512 b04be4edb2e8794b79e3fe96dc416a9c4697a4ca0e41474c6f8563fc4d1fbb7fe784ec5d53545a873d1df06a93ea00f0bc64158db4553e2b9b2f679a97a220ed WHIRLPOOL f8bc92e44ecc4e8eedd657f5097e3b94823b223cc72db1143c5e1822cc01ca7d4e7f0302e8f85647989f445f56935711fa759a5f17eb84f218d5d7fa506a7948
 DIST VirtualBox-4.1.26-84997-Linux_amd64.run 78611922 SHA256 53d68de15bbdff02212e5f1fede92ce026817e6757079b6bfe19e170b780c096 SHA512 ab231749a2a7394d820032bab274dc2b66a0aaf3ff0e2ea069524191a80158410d1a5d3615094c5d185f214f402b4f5cf14474b3443c06dd4cc9a6b584329747 WHIRLPOOL de1b6ccb48af500e453fda213876d0da56b26cf9e86a068d3234a6d52cdeaf572399e0be0342a969ea1b2e7d7e21b392ec8f3bc40c4b5cb0ab96eeaa036dcfb5
 DIST VirtualBox-4.1.26-84997-Linux_x86.run 78489038 SHA256 67c690b9a419bae86eaf621ef05a7ba497d55adead4aa27c5d61412960b2f0c2 SHA512 0db76dac6b1fbb9a46cb37dc6b66647ab1658f41a8890ff4b4dbd84933aaaacc0a569e84a6f49e30c96fece3574bd29e4e921dbd1260ab3c7ddb4cbc17e9aeca WHIRLPOOL 4fea84cb7dcdb4bd4f2d5c20efd5d0ec9d1d665c16b6f4ba29ab10d18fc9d098fe3bdd782c41653476eeba42fcfd2cbb4be010eb45f04678798fc629e36e9ad0
 DIST VirtualBox-4.2.18-88781-Linux_amd64.run 85226961 SHA256 2fdc201bb24fe7268dd034b8f22f1d245ed7c9ea2fcbe34f512615e56590abc2 SHA512 e931eec1b7860b2413dd76852dee3c8d8dfada09d638ad9663e076774f238df8357f0265bdb89ad6c869c20e54be8b2b35cc6634d6d1e4ccb9642066374a80d9 WHIRLPOOL 8b2a7834f02c7e20874fb4744b634e9f234145a47fa13f8201d4b4ab765447cde772fd18e403373dc6b3913c40bdca71f85471b0471bc9c7ca1ba9858ecf8a54
 DIST VirtualBox-4.2.18-88781-Linux_x86.run 85052878 SHA256 edc36d7f86d10cb5e56c812e17a46fb78a39c85b5173c18e1b4ae6cd837caa4a SHA512 3a7b0a064f5c89ccfe719d5ef4885adda8bdedd9aee9663485abbf34fd5d0e2661feaf0630989dc97903538ff4adc00049b110bdb382b61ec591b74541fa5f85 WHIRLPOOL 2dce592ea0d59a3234660008791db2ad799c07b5a971eae530a0338d85827b9089546145bf4dff5c101d8974193892cf16118d98da1a19ad697629095a6c5726
+DIST VirtualBox-4.2.20-90983-Linux_amd64.run 85779921 SHA256 93916218614ea4a124e0e39207dcb03206d272d33b28d438bb9cae49187222e2 SHA512 0b988c841e3045a02e90e6793a686524d34abaf97bd4f5e33df46f6434e828b8fe2df55363818ba22796b3361ee49afa7ac04142013b4e35f009ff407e9784b2 WHIRLPOOL 919290dd90e63ac154454bb282745cd15c97aaf0469f34fdb6ae3a9aa6684211866c760123174bcee8ea1000b871b47befaa99fdd40bd4f2650f1853bd67a2ae
+DIST VirtualBox-4.2.20-90983-Linux_x86.run 85585357 SHA256 8cd5fee22a77bb4851f6da99a660284234271718f4c34c49434a8f4650157b97 SHA512 4f0fee3c887a77c666944ef7b9d4a68c0574409c5a1b8a0a270384aff9d5dd0b9245cedd17222d3eabff349b8f1bd35ae30da39e6fe5438e7331db20321a164d WHIRLPOOL 9651e1ff758493bc25098d0fa0d14e08392fbf248f38a74aebbf9031ef4912e277fa0bcf417a6953b0c9ebdbdb0f4acc435fb4a39c5b9ca1ddc66cedd3376aa6
 DIST VirtualBox-4.3.0-89960-Linux_amd64.run 90695121 SHA256 ee4357c07d83a8a4def25553ae725e46b9d6bd9debc4b26bfae8a39bb4f20899 SHA512 2b9a1f2e11d9f5780c9d23711174f091741d39f4c7f139724cfad9946514d18d3c7569fc67cce257a4f6429eaddda90ed8d3a69981fc5584a5d130ee513ad8d8 WHIRLPOOL bfb387e7efd0b79ac2c331ada9a31da3808671c6ad5050bc8140bafc7d0c501b9d30245538dbcf8b3d59d94ca33bdb714c49d5efd73c55564020090e959de642
 DIST VirtualBox-4.3.0-89960-Linux_x86.run 90070476 SHA256 b0a9fe944ef861732831722d8de16b0d77c01f5c9b11127e3fb5ec845db169c7 SHA512 61440d29e2c0bb868581855ab002e8b9d867ab6fc4feb8c49c92e65cca1cd97c8eb674b1c916d161830a5129f86505efe12ac1db6a54cc24c830202b922fa8e3 WHIRLPOOL 60ddfebf36b6a9e8e4899fd558208271bcff9a39bda8bf9d7a3c7a29475fb8d0799671d8af297e1b647fd9742c59328ef5168446cd2efc89eaa1a7a73ac79634
 DIST VirtualBox-4.3.2-90405-Linux_amd64.run 90633680 SHA256 b933ac5b08bec74004d005189e8d791defce878a2b1561ff99b3db58e5aefd49 SHA512 6b0d21a2a179b553644cf027f0c583069beb8fb08e26ce556194b36893830e1b06e2f2c83b6841868e623562042229b475e4f86b8268a4f8ead4218cb4129780 WHIRLPOOL 9e0988e167563e02c5ccdae45bbc6f5b5594279b3d617def357229019fd921447f609b027a6fc04dea633ee9d8c8dcee4e7f6ac19ff19131c8f08de4da8d638c
 DIST VirtualBox-4.3.2-90405-Linux_x86.run 90070475 SHA256 cc2a338e805cbb6503597665f811b546b347f79d80a44852a14da03022fd8299 SHA512 d1b0d05da634605e1c9f64ebc5b70575e17818669250015c50c6528d3345390692bf14148799d52bd7d76eee5794ecab9492ccccbdfc9502c37b8ec1a9c1b64d WHIRLPOOL 8165b0fb4f72deaa002b3f9799ad6ae7e685617013d04c998011b89c978867d82d8b2facf20f5d57f30d3d9d42f3c42833ab1bcacb32f774a99081bde61ca89e
 DIST VirtualBoxSDK-4.1.26-84997.zip 8805729 SHA256 5fbfd1773d0ef0bd72400b387cdf1b9a469499e442f400b98b22f9759c9f3026 SHA512 a888b622447a55157b5de23e7559ef9f45066bf55a4f082fdb1b4c313eecc84e908658239199c2b1f1c61bab2ab31ddb4ac597d648502cb28b9aa1053e2d954c WHIRLPOOL 4cb49c5041d50c068f2ae5d1772f4e1335c05a0fd6003aa54b9109536c090145e029e4c47c845f82ee7468cf262440ba15ee0bde7b9cc28d97f8ee25910a0756
 DIST VirtualBoxSDK-4.2.18-88780.zip 9736718 SHA256 d448607a416f0289334b7bb868522f6f92847c4ceaabe848b850fbb97126b58f SHA512 be96647826aa13d6780aec759121c4e297b0c6334b237e5e7194ff8bd05d0f8bada87de851aee4ef7bef11e9d676ce08207dbc8e19cf9b1c594dab5cf2d5a0ad WHIRLPOOL b712e93e503625d22dcfad6aa6c627243049ff557c68da816ac231f333dee1ccdb4a086a0e01940f1f77b1cae1ff738a49206ea1299a12b5ad6d23518435e406
+DIST VirtualBoxSDK-4.2.20-90983.zip 9736473 SHA256 47ee5e16efc56bff785d2c0a826c375a3429e49596bfe4ef8e0e76517f1dcec3 SHA512 c1114598057dfd1a562970ce0a8ac253e9955f23f69f4dfc07a7f4a0b76227e7dd40294719fd072e00fbb38ba3912acd5c665551fed1026ccad4ef01bd91e36a WHIRLPOOL a945a19fa6ad1e685c8861131ca0d7a34e7679260fa279c56e9fb150e7e731df01025c33f007d3b93fcb33052175e608180acae3070c31de28cd71100458164f
 DIST VirtualBoxSDK-4.3.0-89960.zip 11272314 SHA256 fcf2c55b00cc0e31789692c290e11787eadc490ccadfb172203ddfa46a373718 SHA512 b23d1ff91752f6174e268877ad8a4265161acf8dda7c7a81284df26487846261549d199859c6fb6676a5ecff56a65a4629c8b33fda9f2244a27e45ed15cdc895 WHIRLPOOL 573ff8590f090cb8371b88213c9b17da0e59bd4f2c3b845d1a1265e815649f3bdf303e4fac3dcab2188a9a626e4890d181bca3f162139363b8881fea133a4096
 DIST VirtualBoxSDK-4.3.2-90405.zip 11271777 SHA256 0922dd7606d681f3edade16a6f02bc86e3da87f84d4fb0d4ee3dc3b70e0c4b77 SHA512 b2675126dc768a76410fe9a72b53a0872c58c76df3484bd31cdffa8248807e99bc7674713046237f74f279bc314bc490a5dda7d84c0b346da224ad986dab8867 WHIRLPOOL 22f26f4d349d195e7a2c12f7bc6876d83374a399b38f7933d65175b370509d3a948b0372b1bdb045a40c4a2ac4dd6218fa1f1c56f7a805d66301421514f67774
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.2.20.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.2.20.ebuild
@ -0,0 +1,345 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.20.ebuild,v 1.1 2013/11/29 08:14:19 polynomial-c Exp $
+
+EAPI=5
+
+inherit eutils unpacker fdo-mime gnome2 pax-utils udev
+
+MY_PV=${PV/beta/BETA}
+MY_PV=${MY_PV/rc/RC}
+VBOX_PV=${MY_PV}-90983
+SDK_PV=${VBOX_PV}
+EXTP_PV=${SDK_PV}
+MY_P=VirtualBox-${VBOX_PV}-Linux
+EXTP_PN=Oracle_VM_VirtualBox_Extension_Pack
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
+	x86? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
+	sdk? ( http://download.virtualbox.org/virtualbox/${MY_PV}/VirtualBoxSDK-${SDK_PV}.zip )
+	http://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_PN}-${EXTP_PV}.vbox-extpack -> ${EXTP_PN}-${EXTP_PV}.tar.gz"
+
+LICENSE="GPL-2 PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+additions +chm headless python sdk vboxwebsrv rdesktop-vrdp"
+RESTRICT="mirror"
+
+DEPEND="app-arch/unzip"
+
+RDEPEND="!!app-emulation/virtualbox
+	!app-emulation/virtualbox-additions
+	~app-emulation/virtualbox-modules-${PV}
+	!headless? (
+		x11-libs/libXcursor
+		media-libs/libsdl[X]
+		x11-libs/libXrender
+		x11-libs/libXfixes
+		media-libs/libpng
+		x11-libs/libXi
+		x11-libs/libXrandr
+		x11-libs/libXinerama
+		x11-libs/libXft
+		media-libs/freetype
+		media-libs/fontconfig
+		x11-libs/libXext
+		dev-libs/glib
+		chm? ( dev-libs/expat )
+	)
+	x11-libs/libXt
+	dev-libs/libxml2
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXdmcp
+	python? ( || (
+			dev-lang/python:2.7
+			dev-lang/python:2.6
+		) )"
+
+S=${WORKDIR}
+
+QA_TEXTRELS_amd64="opt/VirtualBox/VBoxVMM.so"
+QA_TEXTRELS_x86="opt/VirtualBox/VBoxGuestPropSvc.so
+	opt/VirtualBox/VBoxSDL.so
+	opt/VirtualBox/VBoxDbg.so
+	opt/VirtualBox/VBoxSharedFolders.so
+	opt/VirtualBox/VBoxDD2.so
+	opt/VirtualBox/VBoxOGLrenderspu.so
+	opt/VirtualBox/VBoxPython.so
+	opt/VirtualBox/VBoxPython2_6.so
+	opt/VirtualBox/VBoxPython2_7.so
+	opt/VirtualBox/VBoxDD.so
+	opt/VirtualBox/VBoxVRDP.so
+	opt/VirtualBox/VBoxDDU.so
+	opt/VirtualBox/VBoxREM64.so
+	opt/VirtualBox/VBoxSharedClipboard.so
+	opt/VirtualBox/VBoxHeadless.so
+	opt/VirtualBox/VBoxRT.so
+	opt/VirtualBox/VRDPAuth.so
+	opt/VirtualBox/VBoxREM.so
+	opt/VirtualBox/VBoxSettings.so
+	opt/VirtualBox/VBoxKeyboard.so
+	opt/VirtualBox/VBoxSharedCrOpenGL.so
+	opt/VirtualBox/VBoxVMM.so
+	opt/VirtualBox/VirtualBox.so
+	opt/VirtualBox/VBoxOGLhosterrorspu.so
+	opt/VirtualBox/components/VBoxC.so
+	opt/VirtualBox/components/VBoxSVCM.so
+	opt/VirtualBox/VBoxREM32.so
+	opt/VirtualBox/VBoxXPCOMC.so
+	opt/VirtualBox/VBoxOGLhostcrutil.so
+	opt/VirtualBox/VBoxNetDHCP.so
+	opt/VirtualBox/VBoxGuestControlSvc.so"
+QA_PRESTRIPPED="opt/VirtualBox/VBoxDD.so
+	opt/VirtualBox/VBoxDD2.so
+	opt/VirtualBox/VBoxDDU.so
+	opt/VirtualBox/VBoxDbg.so
+	opt/VirtualBox/VBoxGuestControlSvc.so
+	opt/VirtualBox/VBoxGuestPropSvc.so
+	opt/VirtualBox/VBoxHeadless
+	opt/VirtualBox/VBoxHeadless.so
+	opt/VirtualBox/VBoxKeyboard.so
+	opt/VirtualBox/VBoxManage
+	opt/VirtualBox/VBoxNetAdpCtl
+	opt/VirtualBox/VBoxNetDHCP
+	opt/VirtualBox/VBoxNetDHCP.so
+	opt/VirtualBox/VBoxOGLhostcrutil.so
+	opt/VirtualBox/VBoxOGLhosterrorspu.so
+	opt/VirtualBox/VBoxOGLrenderspu.so
+	opt/VirtualBox/VBoxPython.so
+	opt/VirtualBox/VBoxPython2_6.so
+	opt/VirtualBox/VBoxPython2_7.so
+	opt/VirtualBox/VBoxREM.so
+	opt/VirtualBox/VBoxREM32.so
+	opt/VirtualBox/VBoxREM64.so
+	opt/VirtualBox/VBoxRT.so
+	opt/VirtualBox/VBoxSDL
+	opt/VirtualBox/VBoxSDL.so
+	opt/VirtualBox/VBoxSVC
+	opt/VirtualBox/VBoxSettings.so
+	opt/VirtualBox/VBoxSharedClipboard.so
+	opt/VirtualBox/VBoxSharedCrOpenGL.so
+	opt/VirtualBox/VBoxSharedFolders.so
+	opt/VirtualBox/VBoxTestOGL
+	opt/VirtualBox/VBoxTunctl
+	opt/VirtualBox/VBoxVMM.so
+	opt/VirtualBox/VBoxVRDP.so
+	opt/VirtualBox/VBoxXPCOM.so
+	opt/VirtualBox/VBoxXPCOMC.so
+	opt/VirtualBox/VBoxXPCOMIPCD
+	opt/VirtualBox/VRDPAuth.so
+	opt/VirtualBox/VirtualBox
+	opt/VirtualBox/VirtualBox.so
+	opt/VirtualBox/accessible/libqtaccessiblewidgets.so
+	opt/VirtualBox/components/VBoxC.so
+	opt/VirtualBox/components/VBoxSVCM.so
+	opt/VirtualBox/components/VBoxXPCOMIPCC.so
+	opt/VirtualBox/kchmviewer
+	opt/VirtualBox/libQtCoreVBox.so.4
+	opt/VirtualBox/libQtGuiVBox.so.4
+	opt/VirtualBox/libQtNetworkVBox.so.4
+	opt/VirtualBox/libQtOpenGLVBox.so.4
+	opt/VirtualBox/vboxwebsrv"
+
+PYTHON_UPDATER_IGNORE="1"
+
+src_unpack() {
+	unpack_makeself ${MY_P}_${ARCH}.run
+	unpack ./VirtualBox.tar.bz2
+
+	mkdir "${S}"/${EXTP_PN} || die
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	unpack ${EXTP_PN}-${EXTP_PV}.tar.gz
+	popd &>/dev/null || die
+
+	if use sdk; then
+		unpack VirtualBoxSDK-${SDK_PV}.zip
+	fi
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# create virtualbox configurations files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-config" vbox.cfg
+
+	if ! use headless ; then
+		pushd "${S}"/icons &>/dev/null || die
+		for size in * ; do
+			if [ -f "${size}/virtualbox.png" ] ; then
+				insinto "/usr/share/icons/hicolor/${size}/apps"
+				newins "${size}/virtualbox.png" ${PN}.png
+			fi
+		done
+		dodir /usr/share/pixmaps
+		cp "48x48/virtualbox.png" "${D}/usr/share/pixmaps/${PN}.png" \
+			|| die
+		popd &>/dev/null || die
+
+		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
+	fi
+
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+	popd &>/dev/null || die
+	rm -rf "${S}"/${EXTP_PN}
+
+	insinto /opt/VirtualBox
+	dodir /opt/bin
+
+	doins UserManual.pdf
+
+	if use sdk ; then
+		doins -r sdk
+	fi
+
+	if use additions; then
+		doins -r additions
+	fi
+
+	if use vboxwebsrv; then
+		doins vboxwebsrv
+		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
+		fperms 0750 /opt/VirtualBox/vboxwebsrv
+		dosym /opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	if use rdesktop-vrdp; then
+		doins rdesktop-vrdp
+		doins -r rdesktop-vrdp-keymaps
+		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
+		dosym /opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
+	fi
+
+	if ! use headless && use chm; then
+		doins kchmviewer VirtualBox.chm
+		fowners root:vboxusers /opt/VirtualBox/kchmviewer
+		fperms 0750 /opt/VirtualBox/kchmviewer
+	fi
+
+	if use python; then
+		local pyslot
+		for pyslot in 2.6 2.7; do
+			if has_version "dev-lang/python:${pyslot}" && [ -f "${S}/VBoxPython${pyslot/./_}.so" ] ; then
+				doins VBoxPython${pyslot/./_}.so
+			fi
+		done
+	fi
+
+	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
+		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
+		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
+		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
+		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
+		VBoxPython?_*.so
+
+	if use headless ; then
+		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
+	fi
+
+	doins -r * || die
+
+	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
+	dosym /opt/VirtualBox/VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
+	dosym /opt/VirtualBox/VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
+	dosym /opt/VirtualBox/VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
+	dosym /opt/VirtualBox/VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
+	dosym /opt/VirtualBox/VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
+
+	local each
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,TestOGL,ExtPackHelperApp}; do
+		fowners root:vboxusers /opt/VirtualBox/${each}
+		fperms 0750 /opt/VirtualBox/${each}
+		pax-mark -m "${D}"/opt/VirtualBox/${each}
+	done
+	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
+	fperms 4750 /opt/VirtualBox/VBoxNetDHCP
+
+	if ! use headless ; then
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		for each in VBox{SDL,Headless} VirtualBox; do
+			fowners root:vboxusers /opt/VirtualBox/${each}
+			fperms 4510 /opt/VirtualBox/${each}
+			pax-mark -m "${D}"/opt/VirtualBox/${each}
+		done
+
+		dosym /opt/VirtualBox/VBox.sh /opt/bin/VirtualBox
+		dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxSDL
+	else
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
+		fperms 4510 /opt/VirtualBox/VBoxHeadless
+		pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
+	fi
+
+	exeinto /opt/VirtualBox
+	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
+	fowners root:vboxusers /opt/VirtualBox/VBox.sh
+	fperms 0750 /opt/VirtualBox/VBox.sh
+
+	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxManage
+	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxVRDP
+	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxHeadless
+	dosym /opt/VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	local udevdir="$(udev_get_udevdir)"
+	insinto ${udevdir}/rules.d
+	doins "${FILESDIR}"/10-virtualbox.rules
+	sed "s@%UDEVDIR%@${udevdir}@" \
+		-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+	# move udev scripts into ${udevdir} (bug #372491)
+	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
+	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	gnome2_icon_cache_update
+
+	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
+
+	elog ""
+	if ! use headless ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\""
+		elog ""
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
+	elog "an overview about the different features of ${PN}"
+	elog "and virtualbox-ose"
+	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@ -1,4 +1,5 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.26-84997.tar.gz 10856343 SHA256 b392c2f8ed8d813a18597679a90eed9d76efd12d161373cbc5bd7de8165f5ce2 SHA512 581672dd46910cea77d0762d217f4e5afe28f5b45dcec68568885214e745af637a8588a96a85c5b8cb1b761ad68b05e8148d580f30ebf851228d34888c77998e WHIRLPOOL 6c9e3971259bfbf4f54ff6c7eb571f47bf78a51e5d1f4cce01529f7727444c366b70c343c1d0ebfc8fa1adb4bdd57ea4644f813f2991b6cb8f2d381a34f69372
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.18-88780.tar.gz 11665435 SHA256 1d1737b59d0f30f5d42beeabaff168bdc0a75b8b28df685979be6173e5adbbba SHA512 58d0990f8318a79da426c1390e6dd6df10639b5fc2b478044541d300c366881cba87ac0843e8524a7c489b95f0152e3942e6e28b178c85e582d70a1fb951bbdb WHIRLPOOL 33fc03dc5bcc0e5604aa9eb3d3c8fcc636a067d92a30689a98fd6d9ea16fa6b295e2f140af48b5747439b2ab3189bc645b0157848aed6d503d35e66232924714
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.20-90983.tar.gz 12385500 SHA256 fea7a89d4f5a250b1ff022620de37fff46d3d3c7549bd7bcf8b86af21c05cb1c SHA512 a5b04f177965d98e5561bc6517b90ee4d967027b211f14a47886ddde04ccf0c6a59e9ce8b9fe164961ac9560aa86d556079ff988293919e026bdea853cbe5db8 WHIRLPOOL a08f6627d3f78860e22399ce8683ee59a18808a7a89b29575e661abe20d0438e4d375db5ff59b62e29af49a3b4927e1ae8d1740eda04ba0228742fb4944e8f8f
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.0-89960.tar.gz 12735473 SHA256 718c822acedce96c6ab2af93ec8efdf1789bdd03b7cfabb2c9d2f94e2047b399 SHA512 6c7e6c0076ca9d7fd83a0f57a0138d4390fc6c05a862503f92c4ee7b0bf5435e7b9fe1cbcf7f66685252cfeead311bbf777ea9477331c839aa9fbb06c7454b44 WHIRLPOOL c5545101060d8350bb6332eb7ff86f4f015c15c90521c04679944b9175a238ed5914aa23c6656b780f0f9a4fc34b4e99ff1b3102342125c763c1c90d84d53188
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.2-90405.tar.gz 10417726 SHA256 c42f7ef2ac97138551f73db38180aa56f63dd44b3823156da470f7e9ee3dc8e5 SHA512 b04be4edb2e8794b79e3fe96dc416a9c4697a4ca0e41474c6f8563fc4d1fbb7fe784ec5d53545a873d1df06a93ea00f0bc64158db4553e2b9b2f679a97a220ed WHIRLPOOL f8bc92e44ecc4e8eedd657f5097e3b94823b223cc72db1143c5e1822cc01ca7d4e7f0302e8f85647989f445f56935711fa759a5f17eb84f218d5d7fa506a7948
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.20.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.20.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.20.ebuild,v 1.1 2013/11/29 08:15:11 polynomial-c Exp $
+
+EAPI=5
+
+inherit eutils multilib
+
+MY_BUILD="90983"
+MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P="${MY_PN}-${MY_PV}-${MY_BUILD}"
+
+DESCRIPTION="PUEL extensions for VirtualBox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
+
+LICENSE="PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror strip"
+
+RDEPEND="~app-emulation/virtualbox-${PV}"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}/.*"
+
+src_install() {
+	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+}
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@ -1,4 +1,5 @@
 DIST VirtualBox-4.1.26.tar.bz2 74552384 SHA256 229773b45bb18374aa091d4ef585f3893307fb4ccb6f489055b048c0f93c36ab SHA512 da3dc07a390f423446190ba68221a9389423381def888a6eb754dc02fed75f0b99e41263ffc6d36f955b6018b8f7e928da55397bb544eae16cd5b0cbcc66ed89 WHIRLPOOL 9f5d74e44950d41887955250307bc1af99ca0007e3d4b0f6549b35ff3fb9a48d546f9b7dab6d346ac5a0e88bbb1af092665024d1e792aa9befdc04b6017c62bf
 DIST VirtualBox-4.2.18.tar.bz2 76893031 SHA256 9dbddf393b029c549249f627d12040c1d257972bc09292969b8819a31ab78d74 SHA512 c267cef156476992773135b5a154164f30841c4f2d4afa5e6c7c74a320384f621d141bff5f7164968767c3d86035befcb59e34b7a912a8a5ae3bede2d24e9c60 WHIRLPOOL 665e4895db5c0fd623fd08c6b9f4df69e5e5d27ebd3063a4216721460782691d2936567be68a4af7bed57b88fd5b2a41805df76551b1aac200ccff0101055a56
+DIST VirtualBox-4.2.20.tar.bz2 77050211 SHA256 193aa3ce7c0e700fe6a12b64bf462ce633a856f1e831ee4a337cc3439b21df61 SHA512 53cd847490e74ed7255a63a0e15b5de424d10c32934212b9aa50ef5beae69194895195991f4c58a5baf4ad9645bf90473e0474c287c395c3c064fc217ea7957e WHIRLPOOL 0177201a63978fdd75ebe65a8567d561bcb12609d936c8e9f98fef61ecafd2630235d988e17a38c82d39de9a729a32d5b0c493833cf88a35f88b3f8b7e558498
 DIST VirtualBox-4.3.0.tar.bz2 89452701 SHA256 8ea8988a041163c34bff1da6b278d7729cecd4596f5eb778575c5ac9ac95bc12 SHA512 455907296efa9fed98efd435554a00c168f5b3b1c2b237dfb41281a2cfa6da76e4f6d8cd763db15dbe8be20b145ba30690f61e4f4dd4efafd31b3014752da3f1 WHIRLPOOL 728613d31bf0dadcb45d4a55886afb617648e76ed41e3094a6fd750e5a98ce70b21df3188174fefb4b8db5f3c688697ee07830c0a0a0c0c4307163ac457726e1
 DIST VirtualBox-4.3.2.tar.bz2 89709005 SHA256 137ee464dcf3ec81fd74793022ecb53d7f4399682759e00cafd322b0dc92967e SHA512 5a622636ab5f25ebd18a51c07ce16a98aac5a020d356060321a7433682e110983442ed3c17c4d70e40dca343caeedb5f15bc34a924c95c29239c2e5b1ba6bd6e WHIRLPOOL 34b34f5cc9b495d8a67c0a41db205aeed1b9bd514586261ec6acaff652192832c04993df8867ec8f886ff4d56e0500225800449d3b1684c90fc93ec5dc5ac4a7
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.20.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.20.ebuild
@ -0,0 +1,207 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.20.ebuild,v 1.1 2013/11/29 08:16:24 polynomial-c Exp $
+
+EAPI=5
+
+inherit eutils linux-mod systemd user
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
+			 x11-apps/xrandr
+			 x11-apps/xrefresh
+			 x11-libs/libXmu
+			 x11-libs/libX11
+			 x11-libs/libXt
+			 x11-libs/libXext
+			 x11-libs/libXau
+			 x11-libs/libXdmcp
+			 x11-libs/libSM
+			 x11-libs/libICE )
+	sys-apps/dbus
+	!!x11-drivers/xf86-input-virtualbox"
+DEPEND="${RDEPEND}
+		>=dev-util/kbuild-0.1.9998_pre20120806
+		>=dev-lang/yasm-0.6.2
+		sys-devel/bin86
+		sys-libs/pam
+		sys-power/iasl
+		X? ( x11-proto/renderproto )
+		!X? ( x11-proto/xproto )"
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
+			vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+		linux-mod_pkg_setup
+		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+		enewgroup vboxguest
+		enewuser vboxguest -1 /bin/sh /dev/null vboxguest
+		# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
+		enewgroup vboxsf
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Create and unpack a tarball with the sources of the Linux guest
+	# kernel modules, to include all the needed files
+	"${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
+	unpack ./vbox-kmod.tar.gz
+
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	cd "${S}"
+	rm -rf kBuild/bin tools
+}
+
+src_prepare() {
+	# PaX fixes (see bug #298988)
+	pushd "${WORKDIR}" &>/dev/null || die
+	epatch "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
+	popd &>/dev/null || die
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
+
+	# stupid new header references...
+	for vboxheader in {product,revision}-generated.h ; do
+		for mdir in vbox{guest,sf} ; do
+			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+				"${WORKDIR}/${mdir}/${vboxheader}"
+		done
+	done
+}
+
+src_configure() {
+		# build the user-space tools, warnings are harmless
+		./configure --nofatal \
+		--disable-xpcom \
+		--disable-sdl-ttf \
+		--disable-pulse \
+		--disable-alsa \
+		--build-headless || die "configure failed"
+}
+
+src_compile() {
+		source ./env.sh
+
+		for each in /src/VBox/{Runtime,Additions/common} \
+		/src/VBox/Additions/linux/{sharedfolders,daemon} ; do
+				cd "${S}"${each}
+				MAKE="kmk" emake TOOL_YASM_AS=yasm \
+				KBUILD_PATH="${S}/kBuild" \
+				KBUILD_VERBOSE=2
+		done
+
+		if use X; then
+				cd "${S}"/src/VBox/Additions/x11/VBoxClient
+				MAKE="kmk" emake TOOL_YASM_AS=yasm \
+				KBUILD_PATH="${S}/kBuild"
+		fi
+
+		# Now creating the kernel modules. We must do this _after_
+		# we compiled the user-space tools as we need two of the
+		# automatically generated header files. (>=3.2.0)
+		linux-mod_src_compile
+}
+
+src_install() {
+		linux-mod_src_install
+
+		cd "${S}"/out/linux.${ARCH}/release/bin/additions
+
+		insinto /sbin
+		newins mount.vboxsf mount.vboxsf
+		fperms 4755 /sbin/mount.vboxsf
+
+		newinitd "${FILESDIR}"/${PN}-8.initd ${PN}
+
+		insinto /usr/sbin/
+		newins VBoxService vboxguest-service
+		fperms 0755 /usr/sbin/vboxguest-service
+
+		insinto /usr/bin
+		doins VBoxControl
+		fperms 0755 /usr/bin/VBoxControl
+
+		# VBoxClient user service and xrandr wrapper
+		if use X; then
+			doins VBoxClient
+			fperms 0755 /usr/bin/VBoxClient
+
+			cd "${S}"/src/VBox/Additions/x11/Installer
+			newins 98vboxadd-xclient VBoxClient-all
+			fperms 0755 /usr/bin/VBoxClient-all
+		fi
+
+		# udev rule for vboxdrv
+		dodir /lib/udev/rules.d
+		echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
+			|| die
+		echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
+			|| die
+
+		# VBoxClient autostart file
+		insinto /etc/xdg/autostart
+		doins "${FILESDIR}"/vboxclient.desktop
+
+		# sample xorg.conf
+		insinto /usr/share/doc/${PF}
+		doins "${FILESDIR}"/xorg.conf.vbox
+
+		systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+		linux-mod_pkg_postinst
+		if ! use X ; then
+			elog "use flag X is off, enable it to install the"
+			elog "X Window System video driver."
+		fi
+		elog ""
+		elog "Please add users to the \"vboxguest\" group so they can"
+		elog "benefit from seamless mode, auto-resize and clipboard."
+		elog ""
+		elog "The vboxsf group has been added to make automount services work."
+		elog "These services are part of the shared folders support."
+		elog ""
+		elog "Please add:"
+		elog "/etc/init.d/${PN}"
+		elog "to the default runlevel in order to start"
+		elog "needed services."
+		elog "To use the VirtualBox X driver, use the following"
+		elog "file as your /etc/X11/xorg.conf:"
+		elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
+		elog ""
+		elog "Also make sure you use the Mesa library for OpenGL:"
+		elog "    eselect opengl set xorg-x11"
+		elog ""
+		elog "An autostart .desktop file has been installed to start"
+		elog "VBoxClient in desktop sessions."
+		elog ""
+		elog "You can mount shared folders with:"
+		elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
+		elog ""
+		elog "Warning:"
+		elog "this ebuild is only needed if you are running gentoo"
+		elog "inside a VirtualBox Virtual Machine, you don't need"
+		elog "it to run VirtualBox itself."
+		elog ""
+}
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@ -1,4 +1,5 @@
 DIST vbox-kernel-module-src-4.1.26.tar.xz 460260 SHA256 69f7397a23b0a0fb55e2b9337d0770a4a1b2d11c2e53d9bc620f7629952bac8f SHA512 5b0312ddf71979d86ecb052e09efb6c19ae6c42a2f86c4cfd14f0b66e71d8e635713fd67f160f44195b77b350408d36ccd794bbbb6e3815cfdd174c4c29dbd00 WHIRLPOOL c1a351d1d5ba5b8bc50dc7a791ac3526aa1fc1fb12f1f8db412c774778eae010abab7d3cfdb3ba4e56dd72120c25ccc40d3b775fd14c67eeca71353110bf7291
 DIST vbox-kernel-module-src-4.2.18.tar.xz 493892 SHA256 2ff5bb1ba83dc45b15877305be6c36226f861fd0b0056812040237db1ef1158e SHA512 d8d5a188905b4fc94ff293620c1a92723846f88dd86c0aa34990a385280e78463333c777f67e656e5a363a0b981d6000fb6df1dc927da4c8854c3a9e94576979 WHIRLPOOL 946473710a7fa550afceb961967dd619ca224ad4dbb59c738975aaccbeb142dbd50daa6b652fcebe15769516d7edd1eca311b75fa082753b02b31b470c7a86dc
+DIST vbox-kernel-module-src-4.2.20.tar.xz 493908 SHA256 20e4b4f8c245342de33a7aac6cab44d6ddfcb4e36f341fa46a513ccd7d2683c2 SHA512 75b4af6d6e35438525f895c6f297fb5cb62b8d179c454b5928661031371c12ef665eae81d0d99c2f9cbc9b0bf4248c723176a4cbe9ccbb17d27a60c585f0249c WHIRLPOOL 4d852e4abd545bdac8411b934e9f93b30cc816c44b2f7c2a2b3d7fcdf7c44131383e6983529c97e007b68b11b24041733f7b73f11b93216f2548fe3aa6e1a5d6
 DIST vbox-kernel-module-src-4.3.0.tar.xz 515512 SHA256 802362abd5e7429b6c8aa7604da650aec6d094dc9b49f07bc1a818f86d542ff5 SHA512 3e968a43991cc2de4e07f394504b64fbfda9f82aaeb84f0a3de419b2e46c6b18e20df8c7dfa0acf5bb1d57f8e6840d1385970eed91e634fda41288f5fbd74c3d WHIRLPOOL 59839e26ca557e5d9e6bfcd4d78276ad6eeafe80c921588db7d5721a39af7b4c6810ba77218ef8eb0a2de4957227ad337a9d3287eb79ef877229d9058748fad6
 DIST vbox-kernel-module-src-4.3.2.tar.xz 515836 SHA256 d8336c68d8fb899eaaf2774770e082f3227fa6cbb9fdd7f755cbd952e28a5677 SHA512 6b077da50ce98c13cbbd1c9d625950c97a7c64ee7e1ac2b5158e8bb47b59aa560bc28ed34c92f4ddb956b779a566150757307e066563db2c3898149b146d4f43 WHIRLPOOL 3675097a4844ade76e2187edcfddf3755dc8b72b57160c575d3baf4f5bb8c6a95e5f003483dd2254e8c19db6f60273b32ad54166f7699d5923a23be5b64a81b2
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.2.20.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.2.20.ebuild
@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.2.20.ebuild,v 1.1 2013/11/29 08:13:48 polynomial-c Exp $
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from virtualbox-bin
+
+EAPI=5
+
+inherit eutils linux-mod user
+
+MY_P=vbox-kernel-module-src-${PV}
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel"
+
+RDEPEND="!=app-emulation/virtualbox-9999"
+
+S=${WORKDIR}
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+	enewgroup vboxusers
+}
+
+src_prepare() {
+	if kernel_is -ge 2 6 33 ; then
+		# evil patch for new kernels - header moved
+		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
+	fi
+
+	if use pax_kernel && kernel_is -ge 3 0 0 ; then
+		epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	elog "Starting with the 3.x release new kernel modules were added,"
+	elog "be sure to load all the needed modules."
+	elog ""
+	elog "Please add \"vboxdrv\", \"vboxnetflt\" and \"vboxnetadp\" to:"
+	elog "/etc/conf.d/modules"
+}
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@ -1,5 +1,6 @@
 DIST VirtualBox-4.1.26.tar.bz2 74552384 SHA256 229773b45bb18374aa091d4ef585f3893307fb4ccb6f489055b048c0f93c36ab SHA512 da3dc07a390f423446190ba68221a9389423381def888a6eb754dc02fed75f0b99e41263ffc6d36f955b6018b8f7e928da55397bb544eae16cd5b0cbcc66ed89 WHIRLPOOL 9f5d74e44950d41887955250307bc1af99ca0007e3d4b0f6549b35ff3fb9a48d546f9b7dab6d346ac5a0e88bbb1af092665024d1e792aa9befdc04b6017c62bf
 DIST VirtualBox-4.2.18.tar.bz2 76893031 SHA256 9dbddf393b029c549249f627d12040c1d257972bc09292969b8819a31ab78d74 SHA512 c267cef156476992773135b5a154164f30841c4f2d4afa5e6c7c74a320384f621d141bff5f7164968767c3d86035befcb59e34b7a912a8a5ae3bede2d24e9c60 WHIRLPOOL 665e4895db5c0fd623fd08c6b9f4df69e5e5d27ebd3063a4216721460782691d2936567be68a4af7bed57b88fd5b2a41805df76551b1aac200ccff0101055a56
+DIST VirtualBox-4.2.20.tar.bz2 77050211 SHA256 193aa3ce7c0e700fe6a12b64bf462ce633a856f1e831ee4a337cc3439b21df61 SHA512 53cd847490e74ed7255a63a0e15b5de424d10c32934212b9aa50ef5beae69194895195991f4c58a5baf4ad9645bf90473e0474c287c395c3c064fc217ea7957e WHIRLPOOL 0177201a63978fdd75ebe65a8567d561bcb12609d936c8e9f98fef61ecafd2630235d988e17a38c82d39de9a729a32d5b0c493833cf88a35f88b3f8b7e558498
 DIST VirtualBox-4.3.0.tar.bz2 89452701 SHA256 8ea8988a041163c34bff1da6b278d7729cecd4596f5eb778575c5ac9ac95bc12 SHA512 455907296efa9fed98efd435554a00c168f5b3b1c2b237dfb41281a2cfa6da76e4f6d8cd763db15dbe8be20b145ba30690f61e4f4dd4efafd31b3014752da3f1 WHIRLPOOL 728613d31bf0dadcb45d4a55886afb617648e76ed41e3094a6fd750e5a98ce70b21df3188174fefb4b8db5f3c688697ee07830c0a0a0c0c4307163ac457726e1
 DIST VirtualBox-4.3.2.tar.bz2 89709005 SHA256 137ee464dcf3ec81fd74793022ecb53d7f4399682759e00cafd322b0dc92967e SHA512 5a622636ab5f25ebd18a51c07ce16a98aac5a020d356060321a7433682e110983442ed3c17c4d70e40dca343caeedb5f15bc34a924c95c29239c2e5b1ba6bd6e WHIRLPOOL 34b34f5cc9b495d8a67c0a41db205aeed1b9bd514586261ec6acaff652192832c04993df8867ec8f886ff4d56e0500225800449d3b1684c90fc93ec5dc5ac4a7
 DIST virtualbox-4.1.22-patches-01.tar.xz 3752 SHA256 2ff58f8d2bdfdcbf1ae4bbe9f68ad1256f1ae37091fd4b392582a062d206962f SHA512 9bba2a4352d52cddd27f55b4ad0e9de250c1d29359a8859f61fc413e53ac62206321c5e347391ca478b942967bd7974a3a469eb3bb133c79d7033692afe559dd WHIRLPOOL 1aa98913e7d4e1ddf5f775db200cddc18a7ed4d7dd915dda0dab6bffbf33bfd63a785cc7381bca74e4780e7dce21f18314dc093b9c6ba02addfd1330f3b61aa9
--- a/app-emulation/virtualbox/virtualbox-4.2.20.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.2.20.ebuild
@ -0,0 +1,394 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.20.ebuild,v 1.1 2013/11/29 08:15:34 polynomial-c Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils fdo-mime flag-o-matic linux-info multilib pax-utils python-single-r1 qt4-r2 toolchain-funcs java-pkg-opt-2 udev
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-4.2.18-patches-01.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
+HOMEPAGE="http://www.virtualbox.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	dev-libs/openssl
+	dev-libs/libxml2
+	media-libs/libpng
+	sys-libs/zlib
+	>=virtual/udev-171
+	!headless? (
+		qt4? (
+			dev-qt/qtgui:4
+			dev-qt/qtcore:4
+			opengl? ( dev-qt/qtopengl:4 )
+			x11-libs/libXinerama
+		)
+		opengl? ( virtual/opengl media-libs/freeglut )
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		media-libs/libsdl:0[X,video]
+	)
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+	java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) )"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998_pre20120806
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-power/iasl
+	pam? ( sys-libs/pam )
+	sys-libs/libcap
+	doc? (
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	java? ( || ( virtual/jdk:1.7 virtual/jdk:1.6 ) )
+	virtual/pkgconfig
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	!headless? ( x11-libs/libXinerama )
+	pulseaudio? ( media-sound/pulseaudio )
+	vboxwebsrv? ( <net-libs/gsoap-2.8.13 )
+	${PYTHON_DEPS}"
+PDEPEND="additions? ( ~app-emulation/virtualbox-additions-${PV} )
+	extensions? ( ~app-emulation/virtualbox-extpack-oracle-${PV} )"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+	usr/lib/virtualbox/VBoxSDL.so
+	usr/lib/virtualbox/VBoxSharedFolders.so
+	usr/lib/virtualbox/VBoxDD2.so
+	usr/lib/virtualbox/VBoxOGLrenderspu.so
+	usr/lib/virtualbox/VBoxPython.so
+	usr/lib/virtualbox/VBoxDD.so
+	usr/lib/virtualbox/VBoxDDU.so
+	usr/lib/virtualbox/VBoxREM64.so
+	usr/lib/virtualbox/VBoxSharedClipboard.so
+	usr/lib/virtualbox/VBoxHeadless.so
+	usr/lib/virtualbox/VBoxRT.so
+	usr/lib/virtualbox/VBoxREM.so
+	usr/lib/virtualbox/VBoxSettings.so
+	usr/lib/virtualbox/VBoxKeyboard.so
+	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
+	usr/lib/virtualbox/VBoxVMM.so
+	usr/lib/virtualbox/VirtualBox.so
+	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
+	usr/lib/virtualbox/components/VBoxC.so
+	usr/lib/virtualbox/components/VBoxSVCM.so
+	usr/lib/virtualbox/components/VBoxDDU.so
+	usr/lib/virtualbox/components/VBoxRT.so
+	usr/lib/virtualbox/components/VBoxREM.so
+	usr/lib/virtualbox/components/VBoxVMM.so
+	usr/lib/virtualbox/VBoxREM32.so
+	usr/lib/virtualbox/VBoxPython2_4.so
+	usr/lib/virtualbox/VBoxPython2_5.so
+	usr/lib/virtualbox/VBoxPython2_6.so
+	usr/lib/virtualbox/VBoxPython2_7.so
+	usr/lib/virtualbox/VBoxXPCOMC.so
+	usr/lib/virtualbox/VBoxOGLhostcrutil.so
+	usr/lib/virtualbox/VBoxNetDHCP.so"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? (
+		( sdk )
+	)
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+pkg_setup() {
+	if ! use headless && ! use qt4 ; then
+		einfo "No USE=\"qt4\" selected, this build will not include"
+		einfo "any Qt frontend."
+	elif use headless && use qt4 ; then
+		einfo "You selected USE=\"headless qt4\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -rf kBuild/bin tools
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-4-localconfig > LocalConfig.kmk || die
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		elog "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	if ! gcc-specs-pie ; then
+		EPATCH_EXCLUDE="050_${PN}-4.2.0-nopie.patch"
+	fi
+
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/patches"
+
+	# fix location of ifconfig binary (bug #455902)
+	local ifcfg="$(type -p ifconfig)"
+	if [ "${ifcfg}" != "/sbin/ifconfig" ] ; then
+		sed "/VBOXADPCTL_IFCONFIG_PATH/s@/sbin/ifconfig@${ifcfg}@" \
+			-i "${S}"/src/apps/adpctl/VBoxNetAdpCtl.cpp \
+			|| die
+	fi
+}
+
+src_configure() {
+	local myconf
+	use alsa       || myconf+=" --disable-alsa"
+	use opengl     || myconf+=" --disable-opengl"
+	use pulseaudio || myconf+=" --disable-pulse"
+	use python     || myconf+=" --disable-python"
+	use java       || myconf+=" --disable-java"
+	use vboxwebsrv && myconf+=" --enable-webservice"
+	use vnc        && myconf+=" --enable-vnc"
+	use doc        || myconf+=" --disable-docs"
+	if ! use headless ; then
+		use qt4 || myconf+=" --disable-qt4"
+	else
+		myconf+=" --build-headless --disable-opengl"
+	fi
+	# not an autoconf script
+	./configure \
+		--with-gcc="$(tc-getCC)" \
+		--with-g++="$(tc-getCXX)" \
+		--disable-kmods \
+		--disable-dbus \
+		--disable-devmapper \
+		${myconf} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	source ./env.sh
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	# and strip all flags
+	# strip-flags
+
+	MAKE="kmk" emake \
+		VBOX_BUILD_PUBLISHER=_Gentoo \
+		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
+		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
+		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
+		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
+		VBOX_GCC_OPT="${CXXFLAGS}" \
+		TOOL_YASM_AS=yasm KBUILD_PATH="${S}/kBuild" \
+		KBUILD_VERBOSE=2 \
+		all
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/release/bin || die
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the right libdir
+	sed -i \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Symlink binaries to the shipped wrapper
+	exeinto /usr/$(get_libdir)/${PN}
+	newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox"
+	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
+	fperms 0750 /usr/$(get_libdir)/${PN}/VBox
+
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
+	dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
+
+	# Install binaries and libraries
+	insinto /usr/$(get_libdir)/${PN}
+	doins -r components
+
+	if use sdk ; then
+		doins -r sdk
+	fi
+
+	if use vboxwebsrv ; then
+		doins vboxwebsrv
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
+		fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
+		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,ExtPackHelperApp} *so *r0 *gc ; do
+		doins $each
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+		fperms 0750 /usr/$(get_libdir)/${PN}/${each}
+	done
+	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetAdpCtl
+	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetDHCP
+
+	# VBoxSVC needs to be pax-marked (bug #403453)
+	pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxSVC || die
+
+	if ! use headless ; then
+		for each in VBox{SDL,Headless} ; do
+			doins $each
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+			fperms 4750 /usr/$(get_libdir)/${PN}/${each}
+			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
+		done
+
+		if use opengl && use qt4 ; then
+			doins VBoxTestOGL
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
+			fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
+		fi
+
+		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
+
+		if use qt4 ; then
+			doins VirtualBox
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
+			fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
+			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox
+
+			dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
+
+			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Resources/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		popd &>/dev/null || die
+	else
+		doins VBoxHeadless
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
+		fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
+		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless
+	fi
+
+	insinto /usr/$(get_libdir)/${PN}
+	# Install EFI Firmware files (bug #320757)
+	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
+	for fwfile in VBoxEFI{32,64}.fd ; do
+		doins ${fwfile}
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile}
+	done
+	popd &>/dev/null || die
+
+	# New way of handling USB device nodes for VBox (bug #356215)
+	local udevdir="$(udev_get_udevdir)"
+	insinto ${udevdir}
+	doins VBoxCreateUSBNode.sh
+	fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
+	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+	insinto ${udevdir}/rules.d
+	doins "${FILESDIR}"/10-virtualbox.rules
+	sed "s@%UDEVDIR%@${udevdir}@" \
+		-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+
+	insinto /usr/share/${PN}
+	if ! use headless && use qt4 ; then
+		doins -r nls
+	fi
+
+	# VRDPAuth only works with this (bug #351949)
+	dosym VBoxAuth.so  /usr/$(get_libdir)/${PN}/VRDPAuth.so
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if use java ; then
+		java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+		java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
+
+	if ! use headless && use qt4 ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\"."
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "IMPORTANT!"
+	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
+	elog "\"env-update\" as root and logout and relogin as the user you wish"
+	elog "to run ${PN} as."
+	elog ""
+	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
+	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	elog "package."
+	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
--- a/dev-libs/expat/expat-2.1.0-r3.ebuild
+++ b/dev-libs/expat/expat-2.1.0-r3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.1.0-r3.ebuild,v 1.2 2013/08/07 13:21:55 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.1.0-r3.ebuild,v 1.3 2013/11/28 17:17:22 jer Exp $

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

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="elibc_FreeBSD examples static-libs unicode"
 RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
--- a/dev-perl/Class-Mix/Class-Mix-0.5.0.ebuild
+++ b/dev-perl/Class-Mix/Class-Mix-0.5.0.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Class-Mix/Class-Mix-0.5.0.ebuild,v 1.1 2013/11/28 14:46:08 chainsaw Exp $
+
+EAPI=4
+MODULE_AUTHOR=ZEFRAM
+MODULE_VERSION=0.005
+inherit perl-module
+
+DESCRIPTION='dynamic class mixing'
+LICENSE=" || ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Params-Classify
+	virtual/perl-Exporter
+	virtual/perl-parent
+"
+DEPEND="
+	${RDEPEND}
+	virtual/perl-Module-Build
+	virtual/perl-Test-Simple
+"
+
+SRC_TEST="do"
--- a/dev-perl/Class-Mix/Manifest
+++ b/dev-perl/Class-Mix/Manifest
@ -0,0 +1 @@
+DIST Class-Mix-0.005.tar.gz 8676 SHA256 054d0db62df90f22601f2a18fc84e9ca026d81601f5940b2fcc543e39d69b36b SHA512 9486a8ec4f6b1a5483610cdac110eed219bb849e8895a350309167206f8caef4209abbbc340a467f4c3b2ca3afc6e2b49b66601110517b66684689f4d88d20c9 WHIRLPOOL c7f798fa3435374809b1f5c68db167e2af5a972569b131ee28925aba8168abd0705a03087306c412197efaa6b31de9ffbf2a61226aec4912ffde4a91ef6781a4
--- a/dev-perl/Class-Mix/metadata.xml
+++ b/dev-perl/Class-Mix/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>perl</herd>
+  <maintainer>
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">Class-Mix</remote-id>
+    <remote-id type="cpan-module">Class::Mix</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/dev-perl/Crypt-Eksblowfish/Crypt-Eksblowfish-0.9.0-r1.ebuild
+++ b/dev-perl/Crypt-Eksblowfish/Crypt-Eksblowfish-0.9.0-r1.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Crypt-Eksblowfish/Crypt-Eksblowfish-0.9.0-r1.ebuild,v 1.1 2013/11/28 14:50:24 chainsaw Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=ZEFRAM
+MODULE_VERSION=0.009
+inherit perl-module
+
+DESCRIPTION="the Eksblowfish block cipher"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RDEPEND="
+	>=dev-perl/Class-Mix-0.1.0
+	>=virtual/perl-MIME-Base64-2.21
+	virtual/perl-XSLoader
+	virtual/perl-parent
+"
+DEPEND="${RDEPEND}
+	virtual/perl-Module-Build
+	>=virtual/perl-ExtUtils-CBuilder-0.15
+	virtual/perl-Module-Build
+	virtual/perl-Test-Simple
+"
+
+SRC_TEST="do"
--- a/dev-perl/Crypt-Eksblowfish/Manifest
+++ b/dev-perl/Crypt-Eksblowfish/Manifest
@ -0,0 +1 @@
+DIST Crypt-Eksblowfish-0.009.tar.gz 36302 SHA256 3cc7126d5841107237a9be2dc5c7fbc167cf3c4b4ce34678a8448b850757014c SHA512 ca66a1ca4fd71388f25dc77c943e2416ed8534576309dd75f19a7219457418140c1bd21887d61918c34d3d6f9e11ea822b4661d30c6edf7f3673bbcd9a00a51b WHIRLPOOL 7a686f36322cbb086263305cb94e3b1749932f9666ad747b61c3de428e20536894b1cba3dfd6c80f6cb90ac71b783d07cafd7d341b88a45f02956b8ee4232a94
--- a/dev-perl/Crypt-Eksblowfish/metadata.xml
+++ b/dev-perl/Crypt-Eksblowfish/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>perl</herd>
+  <maintainer>
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">Crypt-Eksblowfish</remote-id>
+    <remote-id type="cpan-module">Crypt::Eksblowfish</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/dev-python/cement/cement-2.0.2.ebuild
+++ b/dev-python/cement/cement-2.0.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cement/cement-2.0.2.ebuild,v 1.4 2013/09/05 18:47:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cement/cement-2.0.2.ebuild,v 1.5 2013/11/28 13:10:34 yac Exp $

 EAPI=5

@ -16,7 +16,7 @@ SRC_URI="http://builtoncement.com/${PN}/${PV_MAJOR_MINOR}/source/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test doc"

 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
--- a/dev-python/python-glanceclient/metadata.xml
+++ b/dev-python/python-glanceclient/metadata.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <herd>openstack</herd>
  <maintainer>
    <email>prometheanfire@gentoo.org</email>
    <name>Matthew Thode</name>
--- a/dev-python/python-glanceclient/python-glanceclient-0.10.0-r1.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-0.10.0-r1.ebuild
@ -0,0 +1,67 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-glanceclient/python-glanceclient-0.10.0-r1.ebuild,v 1.1 2013/11/28 13:03:45 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Glance API"
+HOMEPAGE="https://github.com/openstack/python-glanceclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/mox[${PYTHON_USEDEP}]
+				dev-python/coverage[${PYTHON_USEDEP}]
+				>=dev-python/pep8-1.3.3[${PYTHON_USEDEP}]
+				>=dev-python/setuptools-git-0.4[${PYTHON_USEDEP}]
+				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+				>=dev-python/testrepository-0.0.13[${PYTHON_USEDEP}]
+				>=dev-python/testtools-0.9.22[${PYTHON_USEDEP}]
+				=dev-python/pyflakes-0.7.2[${PYTHON_USEDEP}]
+				>=dev-python/flake8-2.0[${PYTHON_USEDEP}]
+				>=dev-python/hacking-0.5.3[${PYTHON_USEDEP}]
+				<dev-python/hacking-0.6[${PYTHON_USEDEP}]
+				dev-python/mox[${PYTHON_USEDEP}]
+				>=dev-python/mock-0.8.0[${PYTHON_USEDEP}]
+			)
+		doc? ( dev-python/sphinx )
+	"
+RDEPEND="virtual/python-argparse[${PYTHON_USEDEP}]
+		>=dev-python/d2to1-0.2.10[${PYTHON_USEDEP}]
+		<dev-python/d2to1-0.3[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.5[${PYTHON_USEDEP}]
+		<dev-python/pbr-0.6[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-0.2.1[${PYTHON_USEDEP}]
+		<dev-python/python-keystoneclient-1[${PYTHON_USEDEP}]
+		>=dev-python/prettytable-0.6[${PYTHON_USEDEP}]
+		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		>=dev-python/warlock-0.7.0[${PYTHON_USEDEP}]
+		<dev-python/warlock-2[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -e 's:intersphinx_mapping:_&:' -i doc/source/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	testr init
+	testr run || die "testsuite failed under python2.7"
+	flake8 tests && einfo "run flake8 over tests folder passed" || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
--- a/dev-python/python-swiftclient/python-swiftclient-1.8.0.ebuild
+++ b/dev-python/python-swiftclient/python-swiftclient-1.8.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-swiftclient/python-swiftclient-1.8.0.ebuild,v 1.1 2013/11/15 06:51:33 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-swiftclient/python-swiftclient-1.8.0.ebuild,v 1.2 2013/11/28 06:32:32 idella4 Exp $

 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@ -46,8 +46,10 @@ python_compile_all() {
 }

 python_test() {
-	# https://bugs.launchpad.net/python-swiftclient/+bug/1251507
-	nosetests tests -e test_instantiation || die "testsuite failed"
+	testr init
+	testr run || die "tests failed under python2_7"
+	flake8 tests && einfo "run of tests folder by flake8 passed"
+	flake8 bin/swift && einfo "run of ./bin/swift by flake8 passed"
 }

 python_install_all() {
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@ -1,4 +1,3 @@
 DIST actionmailer-2.3.18.gem 273920 SHA256 cbb44db58ca8ef03d9758af5ea80229317db678bb4a6b8bfe65a7c6f32b563d9 SHA512 93ac7d613faa80d083e13094aa7a9e9abf2a89461964a3dabb9ac5ba828eb91458fc7d7056c928ed6fae2ee75c18f5078620e1e43e1300a264ab28b0e5bfb27a WHIRLPOOL 039eb1b19bb840c80b1da8aeb9d96de8b73edb12ed07c432f12d3112a422d34ff6ff802c6aa028e11d895eee2dc614ce8c073fbf5c76e44308f229ebb2380e7a
-DIST rails-3.1.12.tgz 3394369 SHA256 2321d18cd5b5c4929f09472d17fd05e21cc6470d7efd2886bfcf52bb89dbdfcc SHA512 49b886bf05c1c51b67cdf4a7ad688e633bdd0b180ef328f18c942cd13095668ed70cfe3b40ed2d77a2c8ca8c3d8474413dfa25c282afabe21ce790567874716f WHIRLPOOL 66e9d9709b7e8b00b096c43a5c5703fd20addf020c10df5764457ebf6ac515451f9e6db93a4925da9ab88e6942427f5a7fc0d20cf6381e8530f830605db7503e
 DIST rails-3.2.15.tgz 3566493 SHA256 6fc98f28742e6423efd151d4a0005c10cdf83bf1cef3350042f305d15474b286 SHA512 c2fa25a81b5c77a9054fc8b42a9fdc0733ef175a981ccdbff77eb33a08aa299c3a3ca9469ab80234b01fbc4eef7ccf09c4b3f55dd04e81bf4f8cbfc7eaf58719 WHIRLPOOL 18e8f8b2b90886bca4572efe24508fb77f5a227fd3f3d4732da68f52baea9a2fdf7b620023c8cf229354e4fca85eb9f28886b7b27f862693dbd383a063e961cd
 DIST rails-4.0.0.tgz 3705371 SHA256 644601ae66881313346ffeacd9ea372d249df55aa7abe853acdcb231fffe6bbf SHA512 3e03f25de83ff894a7affdebe948fd151cff81c8ec906692119036633d891c9ba5cbb312e3ab32f1e62f4a383fcfc2e878daeb62fc04336e932b2e2bda63f7cf WHIRLPOOL 792513f2fdfcbc2a57633e3ef344943948e5614c638b06cae1245fd84716d84b5391a7906123a94a1a325ad789bdc465a4f7e2b774924bd0f18d341c29109a82
--- a/dev-ruby/actionmailer/actionmailer-3.1.12.ebuild
+++ b/dev-ruby/actionmailer/actionmailer-3.1.12.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/actionmailer-3.1.12.ebuild,v 1.1 2013/03/30 13:17:30 graaff Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="http://rubyforge.org/projects/actionmailer/"
-SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="rails-rails-*/actionmailer"
-
-ruby_add_rdepend "~dev-ruby/actionpack-${PV}
-	>=dev-ruby/mail-2.3.3:2.3"
-ruby_add_bdepend "test? (
-	>=dev-ruby/mocha-0.9.5
-	virtual/ruby-test-unit
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	sed -i -e '/dependency.*mail/s:~>:>=:' "${RUBY_FAKEGEM_GEMSPEC}" || die
-}
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@ -1,4 +1,3 @@
 DIST actionpack-2.3.18.gem 749568 SHA256 304a9759801fe00928c14991e6ab252dbbbfa560e41ff9e5fdc66a65a2cf2ebd SHA512 d08af1e8a15b4b16f2160fe431b41b081f9442d0680bd30af20075186cec07febff85ac467924fd65cf8ed4f2fb808c5dd2e8f7d50c9e24d12e177659f30c3ce WHIRLPOOL 8d8aade452b5e715060ef327f41f78677624134ec0a9953a61dbf26ed0ab54bfdc7ed4f43e19f5ea190038c997cf25146912349bd35a1840c635d7713bfdfd1e
-DIST rails-3.1.12.tgz 3394369 SHA256 2321d18cd5b5c4929f09472d17fd05e21cc6470d7efd2886bfcf52bb89dbdfcc SHA512 49b886bf05c1c51b67cdf4a7ad688e633bdd0b180ef328f18c942cd13095668ed70cfe3b40ed2d77a2c8ca8c3d8474413dfa25c282afabe21ce790567874716f WHIRLPOOL 66e9d9709b7e8b00b096c43a5c5703fd20addf020c10df5764457ebf6ac515451f9e6db93a4925da9ab88e6942427f5a7fc0d20cf6381e8530f830605db7503e
 DIST rails-3.2.15.tgz 3566493 SHA256 6fc98f28742e6423efd151d4a0005c10cdf83bf1cef3350042f305d15474b286 SHA512 c2fa25a81b5c77a9054fc8b42a9fdc0733ef175a981ccdbff77eb33a08aa299c3a3ca9469ab80234b01fbc4eef7ccf09c4b3f55dd04e81bf4f8cbfc7eaf58719 WHIRLPOOL 18e8f8b2b90886bca4572efe24508fb77f5a227fd3f3d4732da68f52baea9a2fdf7b620023c8cf229354e4fca85eb9f28886b7b27f862693dbd383a063e961cd
 DIST rails-4.0.0.tgz 3705371 SHA256 644601ae66881313346ffeacd9ea372d249df55aa7abe853acdcb231fffe6bbf SHA512 3e03f25de83ff894a7affdebe948fd151cff81c8ec906692119036633d891c9ba5cbb312e3ab32f1e62f4a383fcfc2e878daeb62fc04336e932b2e2bda63f7cf WHIRLPOOL 792513f2fdfcbc2a57633e3ef344943948e5614c638b06cae1245fd84716d84b5391a7906123a94a1a325ad789bdc465a4f7e2b774924bd0f18d341c29109a82
--- a/dev-ruby/actionpack/actionpack-3.1.12.ebuild
+++ b/dev-ruby/actionpack/actionpack-3.1.12.ebuild
@ -1,70 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/actionpack-3.1.12.ebuild,v 1.2 2013/10/13 16:02:43 graaff Exp $
-
-EAPI=4
-
-USE_RUBY="ruby18 ruby19"
-
-# The default test task tries to test activerecord with SQLite as well.
-RUBY_FAKEGEM_TASK_TEST="test_action_pack"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Eases web-request routing, handling, and response."
-HOMEPAGE="http://rubyforge.org/projects/actionpack/"
-SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="rails-rails-*/actionpack"
-
-ruby_add_rdepend "
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/rack-cache-1.2
-	>=dev-ruby/builder-3.0.0:3
-	>=dev-ruby/erubis-2.7.0
-	>=dev-ruby/i18n-0.6:0.6
-	>=dev-ruby/rack-1.3.6:1.3
-	>=dev-ruby/rack-mount-0.8.2:0.8
-	>=dev-ruby/rack-test-0.6.1:0.6
-	>=dev-ruby/sprockets-2.0.4:2.0"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		dev-ruby/bundler
-		~dev-ruby/activerecord-${PV}
-		~dev-ruby/actionmailer-${PV}
-		>=dev-ruby/tzinfo-0.3.29:0
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e '/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|"mysql"\|ruby-prof\|benchmark-ips\)/d' ../Gemfile || die
-
-	sed -i -e '/\(rack-ssl\|thor\)/d' ../railties/railties.gemspec || die
-	sed -i -e '/mail/d' ../actionmailer/actionmailer.gemspec || die
-	sed -i -e "s/, '< 1.3'//" ../activesupport/activesupport.gemspec || die
-
-	# Loosen mocha version restriction
-	sed -i -e 's/0.10.5/>= 0.10.5/' ../Gemfile || die
-
-	# Avoid fragile tests depending on hash ordering
-	sed -i -e '/cookie_3=chocolate/ s:^:#:' test/controller/integration_test.rb || die
-	sed -i -e '/test_to_s/,/end/ s:^:#:' test/template/html-scanner/tag_node_test.rb || die
-	sed -i -e '/"name":"david"/ s:^:#:' test/controller/mime_responds_test.rb || die
-	sed -i -e '/test_option_html_attributes_with_multiple_element_hash/, / end/ s:^:#:' test/template/form_options_helper_test.rb || die
-	sed -i -e '/test_option_html_attributes_with_multiple_hashes/, / end/ s:^:#:' test/template/form_options_helper_test.rb || die
-}
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@ -1,3 +1,2 @@
-DIST rails-3.1.12.tgz 3394369 SHA256 2321d18cd5b5c4929f09472d17fd05e21cc6470d7efd2886bfcf52bb89dbdfcc SHA512 49b886bf05c1c51b67cdf4a7ad688e633bdd0b180ef328f18c942cd13095668ed70cfe3b40ed2d77a2c8ca8c3d8474413dfa25c282afabe21ce790567874716f WHIRLPOOL 66e9d9709b7e8b00b096c43a5c5703fd20addf020c10df5764457ebf6ac515451f9e6db93a4925da9ab88e6942427f5a7fc0d20cf6381e8530f830605db7503e
 DIST rails-3.2.15.tgz 3566493 SHA256 6fc98f28742e6423efd151d4a0005c10cdf83bf1cef3350042f305d15474b286 SHA512 c2fa25a81b5c77a9054fc8b42a9fdc0733ef175a981ccdbff77eb33a08aa299c3a3ca9469ab80234b01fbc4eef7ccf09c4b3f55dd04e81bf4f8cbfc7eaf58719 WHIRLPOOL 18e8f8b2b90886bca4572efe24508fb77f5a227fd3f3d4732da68f52baea9a2fdf7b620023c8cf229354e4fca85eb9f28886b7b27f862693dbd383a063e961cd
 DIST rails-4.0.0.tgz 3705371 SHA256 644601ae66881313346ffeacd9ea372d249df55aa7abe853acdcb231fffe6bbf SHA512 3e03f25de83ff894a7affdebe948fd151cff81c8ec906692119036633d891c9ba5cbb312e3ab32f1e62f4a383fcfc2e878daeb62fc04336e932b2e2bda63f7cf WHIRLPOOL 792513f2fdfcbc2a57633e3ef344943948e5614c638b06cae1245fd84716d84b5391a7906123a94a1a325ad789bdc465a4f7e2b774924bd0f18d341c29109a82
--- a/dev-ruby/activemodel/activemodel-3.1.12.ebuild
+++ b/dev-ruby/activemodel/activemodel-3.1.12.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activemodel/activemodel-3.1.12.ebuild,v 1.1 2013/03/30 13:16:29 graaff Exp $
-
-EAPI=4
-
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A toolkit for building modeling frameworks like Active Record and Active Resource."
-HOMEPAGE="http://github.com/rails/rails"
-SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="rails-rails-*/activemodel"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.0.0
-	>=dev-ruby/i18n-0.6.0:0.6
-	>=dev-ruby/bcrypt-ruby-3.0.0"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/mocha-0.9.5
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@ -1,4 +1,3 @@
 DIST activerecord-2.3.18.gem 541696 SHA256 09aec34a541e01c53b3e9bf0057a4306fa6ad394753cc21a7cbd3e8b8ab969bb SHA512 4446ff38d0dbbae4e01ca043f5fcf2facd7907946cfca17b2043557c9cb8cad7ca41c17f9b3de7e5a764315c6ab3a53a8c56781927a057e1ee69531574c34719 WHIRLPOOL ecb741c39efa23f1e0f29386471b81475e0581378e48bd70eb3ffd4a0ba9726358d6fc6cf11cb76057d9210e95654468a1cef40d4daf0900b11558aa06a25224
-DIST rails-3.1.12.tgz 3394369 SHA256 2321d18cd5b5c4929f09472d17fd05e21cc6470d7efd2886bfcf52bb89dbdfcc SHA512 49b886bf05c1c51b67cdf4a7ad688e633bdd0b180ef328f18c942cd13095668ed70cfe3b40ed2d77a2c8ca8c3d8474413dfa25c282afabe21ce790567874716f WHIRLPOOL 66e9d9709b7e8b00b096c43a5c5703fd20addf020c10df5764457ebf6ac515451f9e6db93a4925da9ab88e6942427f5a7fc0d20cf6381e8530f830605db7503e
 DIST rails-3.2.15.tgz 3566493 SHA256 6fc98f28742e6423efd151d4a0005c10cdf83bf1cef3350042f305d15474b286 SHA512 c2fa25a81b5c77a9054fc8b42a9fdc0733ef175a981ccdbff77eb33a08aa299c3a3ca9469ab80234b01fbc4eef7ccf09c4b3f55dd04e81bf4f8cbfc7eaf58719 WHIRLPOOL 18e8f8b2b90886bca4572efe24508fb77f5a227fd3f3d4732da68f52baea9a2fdf7b620023c8cf229354e4fca85eb9f28886b7b27f862693dbd383a063e961cd
 DIST rails-4.0.0.tgz 3705371 SHA256 644601ae66881313346ffeacd9ea372d249df55aa7abe853acdcb231fffe6bbf SHA512 3e03f25de83ff894a7affdebe948fd151cff81c8ec906692119036633d891c9ba5cbb312e3ab32f1e62f4a383fcfc2e878daeb62fc04336e932b2e2bda63f7cf WHIRLPOOL 792513f2fdfcbc2a57633e3ef344943948e5614c638b06cae1245fd84716d84b5391a7906123a94a1a325ad789bdc465a4f7e2b774924bd0f18d341c29109a82
--- a/dev-ruby/activerecord/activerecord-3.1.12.ebuild
+++ b/dev-ruby/activerecord/activerecord-3.1.12.ebuild
@ -1,65 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-3.1.12.ebuild,v 1.2 2013/10/13 16:04:35 graaff Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ruby19"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="http://rubyforge.org/projects/activerecord/"
-SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="mysql postgres sqlite3"
-
-RUBY_S="rails-rails-*/activerecord"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	>=dev-ruby/arel-2.2.3:2.1
-	>=dev-ruby/tzinfo-0.3.29:0
-	sqlite3? ( >=dev-ruby/sqlite3-1.3.4 )
-	mysql? ( >=dev-ruby/mysql2-0.3.6:0.3 )
-	postgres? ( >=dev-ruby/pg-0.11.0 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-1.3.3
-		>=dev-ruby/mocha-0.13.0
-		virtual/ruby-test-unit
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e '/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|"mysql"\|ruby-prof\|benchmark-ips\)/d' ../Gemfile || die
-	sed -i -e '/\(rack-ssl\|thor\)/d' ../railties/railties.gemspec || die
-	sed -i -e '/mail/d' ../actionmailer/actionmailer.gemspec || die
-	sed -i -e "s/, '< 1.3'//" ../activesupport/activesupport.gemspec || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*jruby)
-			;;
-		*)
-			if use sqlite3; then
-				TRAVIS=true ${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-			fi
-			;;
-	esac
-}
--- a/dev-ruby/activeresource/Manifest
+++ b/dev-ruby/activeresource/Manifest
@ -1,3 +1,2 @@
 DIST activeresource-2.3.18.gem 47104 SHA256 f0a7db71e592f721dd33867b104a5f6e60f11671ac8c7dafa9786b5256514812 SHA512 aae382f2057c4491fe1ba229fa7a9470c8fe36374cb83741aae2e2f4a86149937b046e620f8d901d4f3b2db80db024137e32587d984fa91a6626048bb390d8de WHIRLPOOL 58d675e0883d4ff91e5b603a6f1e8f62919fe899bf0d70715c126876d6576d7518972d9ecc62eaed0c536ef213d8dd76b9ecb7caec909af98a648973d1cfb1cc
-DIST rails-3.1.12.tgz 3394369 SHA256 2321d18cd5b5c4929f09472d17fd05e21cc6470d7efd2886bfcf52bb89dbdfcc SHA512 49b886bf05c1c51b67cdf4a7ad688e633bdd0b180ef328f18c942cd13095668ed70cfe3b40ed2d77a2c8ca8c3d8474413dfa25c282afabe21ce790567874716f WHIRLPOOL 66e9d9709b7e8b00b096c43a5c5703fd20addf020c10df5764457ebf6ac515451f9e6db93a4925da9ab88e6942427f5a7fc0d20cf6381e8530f830605db7503e
 DIST rails-3.2.15.tgz 3566493 SHA256 6fc98f28742e6423efd151d4a0005c10cdf83bf1cef3350042f305d15474b286 SHA512 c2fa25a81b5c77a9054fc8b42a9fdc0733ef175a981ccdbff77eb33a08aa299c3a3ca9469ab80234b01fbc4eef7ccf09c4b3f55dd04e81bf4f8cbfc7eaf58719 WHIRLPOOL 18e8f8b2b90886bca4572efe24508fb77f5a227fd3f3d4732da68f52baea9a2fdf7b620023c8cf229354e4fca85eb9f28886b7b27f862693dbd383a063e961cd
--- a/dev-ruby/activeresource/activeresource-3.1.12.ebuild
+++ b/dev-ruby/activeresource/activeresource-3.1.12.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activeresource/activeresource-3.1.12.ebuild,v 1.1 2013/03/30 13:16:48 graaff Exp $
-
-EAPI=4
-
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activeresource.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Think Active Record for web resources.."
-HOMEPAGE="http://rubyforge.org/projects/activeresource/"
-SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="3.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="rails-rails-*/activeresource"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}"
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/mocha-0.9.5
-		virtual/ruby-test-unit
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid test broken by security fixes.
-	sed -i -e '/test_load_yaml_array/,/^  end/ s:^:#:' test/cases/base_test.rb || die
-}
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@ -1,4 +1,3 @@
 DIST activesupport-2.3.18.gem 434688 SHA256 65b009c10c9c1fe298b04dfc428db7311f1dfbdcafc6c9429517651a679dd36b SHA512 47fa41bb13b8c1bc34133c0adcce5275f977a2148964f3c81da83dc69fea8cd81f3af181606a2a9c047107f2ce7cc6dd6290efa66acf68f6573d482bc6359fa4 WHIRLPOOL 34317e22696d29fe2389a66161dcb7348ea1528f82f120b39a1a7ce1f5d6135c50c0a7ea82ce90c9fd4bc8a8ed3e257efd7ed31fb7b5afce94d0323f28509eea
-DIST rails-3.1.12.tgz 3394369 SHA256 2321d18cd5b5c4929f09472d17fd05e21cc6470d7efd2886bfcf52bb89dbdfcc SHA512 49b886bf05c1c51b67cdf4a7ad688e633bdd0b180ef328f18c942cd13095668ed70cfe3b40ed2d77a2c8ca8c3d8474413dfa25c282afabe21ce790567874716f WHIRLPOOL 66e9d9709b7e8b00b096c43a5c5703fd20addf020c10df5764457ebf6ac515451f9e6db93a4925da9ab88e6942427f5a7fc0d20cf6381e8530f830605db7503e
 DIST rails-3.2.15.tgz 3566493 SHA256 6fc98f28742e6423efd151d4a0005c10cdf83bf1cef3350042f305d15474b286 SHA512 c2fa25a81b5c77a9054fc8b42a9fdc0733ef175a981ccdbff77eb33a08aa299c3a3ca9469ab80234b01fbc4eef7ccf09c4b3f55dd04e81bf4f8cbfc7eaf58719 WHIRLPOOL 18e8f8b2b90886bca4572efe24508fb77f5a227fd3f3d4732da68f52baea9a2fdf7b620023c8cf229354e4fca85eb9f28886b7b27f862693dbd383a063e961cd
 DIST rails-4.0.0.tgz 3705371 SHA256 644601ae66881313346ffeacd9ea372d249df55aa7abe853acdcb231fffe6bbf SHA512 3e03f25de83ff894a7affdebe948fd151cff81c8ec906692119036633d891c9ba5cbb312e3ab32f1e62f4a383fcfc2e878daeb62fc04336e932b2e2bda63f7cf WHIRLPOOL 792513f2fdfcbc2a57633e3ef344943948e5614c638b06cae1245fd84716d84b5391a7906123a94a1a325ad789bdc465a4f7e2b774924bd0f18d341c29109a82
--- a/dev-ruby/activesupport/activesupport-3.1.12.ebuild
+++ b/dev-ruby/activesupport/activesupport-3.1.12.ebuild
@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/activesupport-3.1.12.ebuild,v 1.1 2013/03/30 13:15:56 graaff Exp $
-
-EAPI=4
-
-# jruby fails tests.
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="http://rubyforge.org/projects/activesupport/"
-SRC_URI="https://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="rails-rails-*/${PN}"
-
-ruby_add_rdepend ">=dev-ruby/memcache-client-1.5.8
-	>=dev-ruby/multi_json-1.0
-	dev-ruby/i18n:0.6
-	!!<dev-ruby/activesupport-3.0.11-r1:3.0"
-
-# libxml-ruby, nokogiri, and builder are not strictly needed, but there
-# are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/libxml-2.0.0
-	dev-ruby/nokogiri
-	dev-ruby/builder:0
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-#	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-}
--- a/dev-ruby/arel/Manifest
+++ b/dev-ruby/arel/Manifest
@ -1,4 +1,3 @@
-DIST arel-2.2.3.gem 46080 SHA256 ce8a0efef467948a6a3a2fa35f99bee097c52a567ea862395850dd48ee4f9438 SHA512 e094e2f56ec3b0a6b8627533240dc5c0dc8fa99eec52c4c656c6d7778a9fb23338c70a4603ff1135526a59fd0cd42f59d6c415d8aade372717771079cbda31e4 WHIRLPOOL 9250803e2cafa59cfc8217f28973c0c17c1d4fb30d4307919bd846f7f5c5ebfe8b1d5e671b429ec3c1c1551075a68e4446d79a73c2425ebad3c08f7e07764871
 DIST arel-3.0.2.gem 46080 SHA256 7d5e9c081444fa4d6a0bba70d3ddf56d9592658dafa59ffca4ebd6aa60de0b95 SHA512 be4b4109a17681c928ae3134f632a0c3e8a4180a2340ae272b989d163eb82e9aab3e8bba9ab78f117113091920f1b749370df8469b6e3d2941dff826dcda6625 WHIRLPOOL 40d156966c8d9dc52741a9088e3e0aa75a8b595ccc87ddf89a0bffb7663f1d92c4d4c297e02101b8914b6942f1deafb9ad60ab0eb5d7213b4decfe720f805d31
 DIST arel-4.0.0.gem 51712 SHA256 93c5b7f3a994cd489fb143548a281cecb66d1cf4e46ae36847e1920b257abfa7 SHA512 c66f5483d6f41b7d8074f47a8a6b94000f92fe5bfe0f0e648a55bebab9c28f7109c311da3730fbd0a240463a2deed495f572a1ca5179a20496a4327af32fda25 WHIRLPOOL 12ba41fea51b9ee85e20144fa96c5524afc291ca78d7f4bbddb9bc9e7c78f7ff4337f13d7038c18d56cdc8de4d7afb081030d37c67f1a2bd2d1b8180f25bdea9
 DIST arel-4.0.1.gem 52736 SHA256 d40aaac9e7c557847b27d527687dba5a57229da2d1d283ad324891c4cdf32194 SHA512 faf3366cffcb2c9b98a5e8fcf156d93576ff08eeb4888a557ccece20fb30d872738a7d1b067a1d808ec4cef56b204eb5f917ec9fe17a291f86eef81baf55a156 WHIRLPOOL 6cfff128817f8f1262d809beafe0c12ecd40241cd46a029d24b6403919b8c29c06b0ddeb80f3b840e13781197cbab50aefeac61ae9a473ab9374edd07c18271e
--- a/dev-ruby/arel/arel-2.2.3.ebuild
+++ b/dev-ruby/arel/arel-2.2.3.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/arel/arel-2.2.3.ebuild,v 1.3 2013/01/15 02:39:40 zerochaos Exp $
-
-EAPI="2"
-USE_RUBY="ruby18 ruby19 ree18 jruby"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.txt README.markdown"
-
-# Generating the gemspec from metadata causes a crash in jruby
-RUBY_FAKEGEM_GEMSPEC="arel.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Arel is a Relational Algebra for Ruby."
-HOMEPAGE="http://github.com/rails/arel"
-LICENSE="MIT"
-SLOT="2.1"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	doc? ( >=dev-ruby/hoe-2.10 )
-	test? (
-		>=dev-ruby/hoe-2.10
-		virtual/ruby-minitest
-	)"
-
-all_ruby_prepare() {
-	# Put the proper version number in the gemspec.
-	sed -i -e 's/2.2.3.20120221150435/2.2.3/' arel.gemspec || die
-}
--- a/dev-ruby/coffee-rails/Manifest
+++ b/dev-ruby/coffee-rails/Manifest
@ -1,3 +1,2 @@
-DIST coffee-rails-3.1.1.gem 6656 SHA256 8448caaad3fe3330715e1b4f5c044ff0f3b9fd86d72de1e02fab984d45b02fd9 SHA512 9e5336067b09300e79d594aeea0040fdd38d59a54e6bca778419c96cc1f551cef8bdb90ea95fd946aa1026bafb8391e2f19c42d260ac2c49908f331c49d7f7ed WHIRLPOOL 5ba1aad3b6d846ffcc5ef1cee3f55db404a07b19919690506814f664bf083e1ff6cbfa8b76a4c7f5788916a1bfd746b083ad78073926cc60b2a58700bf388062
 DIST coffee-rails-3.2.2.gem 7168 SHA256 75f06d71060999044fbc6ac199b91f1fc0bd075d8dd8acde04e02431396b463a SHA512 b4c6a6d0658f50fcd7632260bbddb25e619a9dfb45c0bab8fd60cbfaf32480875fc4b90bd0e77eef5cf25b84b1de08b1bf335454b2c828340ea20a0986373244 WHIRLPOOL 629fde6c30f1288146284dff0b53e2cc6f5469a8c51a625628435b88bf7e9087352da1a7bf5711b4496c92084272aebfa254ddd41b009157646f062738cc3d95
 DIST coffee-rails-4.0.0.gem 8704 SHA256 0bdc9af067458446ccb64c4840d85dbf3e058b0775560f477c34d09528cbbd4f SHA512 8e6b0d69f31936860be2343fc326e7a4c03cbb32b09e3817185ebd1f34e7b67478b86d2f8febac57e9480709c5cc551112afd9b26c87bd81a051fd3b1a011ec1 WHIRLPOOL ac0e1e136118bd4c76bdac76e0fd9d20df0a2e076a6af61a024031f7e41c6bfc9fc7a5f734000e4ea3381fa9a97f942d0b12ab6cf96d3637f59e02f9cff500fb
--- a/dev-ruby/coffee-rails/coffee-rails-3.1.1.ebuild
+++ b/dev-ruby/coffee-rails/coffee-rails-3.1.1.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/coffee-rails/coffee-rails-3.1.1.ebuild,v 1.4 2013/01/16 00:50:10 zerochaos Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ruby19 ree18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Coffee Script adapter for the Rails asset pipeline."
-HOMEPAGE="https://github.com/rails/coffee-rails"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
-
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/coffee-script-2.2.0
-	dev-ruby/railties:3.1"
-
-all_ruby_prepare() {
-	# Test fails on whitespace differences:
-	# https://github.com/rails/coffee-rails/issues/20
-	rm test/template_handler_test.rb || die
-}
--- a/dev-ruby/diff-lcs/Manifest
+++ b/dev-ruby/diff-lcs/Manifest
@ -1,3 +1,4 @@
 DIST diff-lcs-1.1.3.gem 41472 SHA256 fb8291deabeaacf9adbdcaf988db176ae461f833770ff2947191ead4ead09897 SHA512 672c59f8d14d8612e9fc60b55c69bcbc5c817a11e84da13b9b06e43a41ac9a87ae0c1ea095897bcb65aa92efa60b3f02a4ef75010980c2553f05546ac50e4a51 WHIRLPOOL cbb0dc7a07f39670e8f2e03bff29611c0d421e8c6c632e95de9e7d737d30a45562e3d786d0b7dea97cec796ccd1700a3db13c4d7927c82ca546853d101e96370
 DIST diff-lcs-1.2.1.gem 46080 SHA256 925817b66ebd98a7f71c6e7ef9bbe79e64b96041ac48ce88e3382fa62f65db2f SHA512 913c73066f9d94b6b63557330d1671188517cd8e3ce52a805313f9bf16aeab394200b683c0c657cde06a687056310e684c60627bf1edb755d4b3de043404c9dd WHIRLPOOL 3fb930f68521d597d71774e7df8454e598a12f586162490b92512d30a2186d3da04972a5c5bbf05cca0836aace9f60c268b4f46ee2d2de4e039769e774a7b6f8
 DIST diff-lcs-1.2.4.gem 47104 SHA256 ad87b8b5892d3c275674d57e8398d83b2152419c08dd3f88453e0df3a473ab27 SHA512 45419ad81e48e04da6525389717fde280f1bc48ebec7438aefbd535fcb15586dbd7ae8bc3c1a9baf1639992c9fb5b362db5d9a02d79b9b0aa9115bc40366d3d1 WHIRLPOOL 7901a2a9e843222955952aacdf6e8b3fdf65b94f423b7133bc048fa94f82a1a41a3947e5aa728bb61cd6e3cf74217d1d95a8e2035a6013005c3b6253cef650d7
+DIST diff-lcs-1.2.5.gem 49152 SHA256 a1d3dde665292317a883d319066792e3f0e6a24cade4bc4cc47605d27664c9ed SHA512 ce15cb794a97f9af8585c46b7a2404e1ad6e24e4910b6aa6c5126ef5996d86700979a54a154bab1c0602f19021b287dc865db3eebdc901fb42056f1e2180d0fe WHIRLPOOL 10076561d9895a3cc3c880f21e34e17aacdfcb790dbad44eedf48644eef5e9e04e65d3e4e8c16353f8bbfaa4a1d848a827cd5c2e2d57b8b58eeea3441bce1d7d
--- a/dev-ruby/diff-lcs/diff-lcs-1.2.5.ebuild
+++ b/dev-ruby/diff-lcs/diff-lcs-1.2.5.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/diff-lcs/diff-lcs-1.2.5.ebuild,v 1.1 2013/11/29 07:29:34 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19 ruby20 jruby"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Use the McIlroy-Hunt LCS algorithm to compute differences"
+HOMEPAGE="https://github.com/halostatue/diff-lcs"
+
+LICENSE="|| ( MIT Ruby GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
--- a/dev-ruby/flickraw/Manifest
+++ b/dev-ruby/flickraw/Manifest
@ -1 +1,2 @@
 DIST flickraw-0.9.6.gem 17920 SHA256 42024981ee5a5439b252f53b401513beaa222d1da0a5b23c9b56954beb989e5b SHA512 a1c161827150e206e0f51f153a9d6f515aa24b5889ff75c2f340145885657687409725b80c33a623a8ababb860bf8c270d54ebc24cac061395c2f38060f16301 WHIRLPOOL 4d88d687f1e9a2ace410afbc4c3de3e2dae97e6366af016b18a7428ea7e4188d9666fbae8ee49b8331c5b400c39a889681b4dbd528a5ccd33d5dbf384515cd50
+DIST flickraw-0.9.7.gem 18944 SHA256 212c4cc3647935c0a569e7a79b98ddd6111c51b16b1e07008329e00d035c4f86 SHA512 830f9938dafe18b96cfa6feb05bc6d211f0ce3e653c0f2c618a55f8e581c5f75819b27baabfd7f3be4ff02a2b478118df0a0737790d5d19b29b9f9f1539d54a8 WHIRLPOOL a8d937fdac41d6eea38160879fc44619e786ca599ee82a193bb175276eef6d1c85efafd2ca27443a07400de0870ccc484d7307f99c76945088e00528b9d5f1bd
--- a/dev-ruby/flickraw/flickraw-0.9.7.ebuild
+++ b/dev-ruby/flickraw/flickraw-0.9.7.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/flickraw/flickraw-0.9.7.ebuild,v 1.1 2013/11/29 07:55:17 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19 ruby20"
+
+# Tests are against the Flickr API and require an API key.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_EXTRADOC="-r README.rdoc examples"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library to access flickr api in a simple way."
+HOMEPAGE="http://github.com/hanklords/flickraw"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
--- a/dev-ruby/mail/Manifest
+++ b/dev-ruby/mail/Manifest
@ -1,4 +1,3 @@
-DIST mail-2.3.3-git.tar.gz 668618 SHA256 1adb276d2de312bd95fbe5552b9df2c3b802eedbdaaf25dbbbcd4cf45b5951e0 SHA512 b6478f9b63fe6855ff857443aab718ff9a66b6b603aa203f6cf6cc2a32ccd3c3b52d0ce8697c84285a209fd2cf30c31e12addffe1b7eb5326c806553817f0523 WHIRLPOOL 7a8f020c89d38343ce6305a6f926f709298093198a285dd5d7ae1d9f7bd728e19c3119abc293ede81aee63dde254cfa387972cffdc5df48c887fe7102a0585e1
 DIST mail-2.4.4.tar.gz 677102 SHA256 2195c789c5178388f3ed5094ddad93683bac601fe3d9ecb13a3a9f9e7d97ba87 SHA512 aeb0075950d5938e1a972c9195ec836160c6c9f600aaa2c0e78c715aabf4000074bde311cc0c87a1f3edf237e5a6835299c23f3b903541a043134139472eae82 WHIRLPOOL e75e9e62602ca13658e16d096cc48921307c9035e1b42700eaee77d38c4f10891731d34e0984c8eb98d2d30320ac87fb64b5cf03bc1c88eeb11be5d172a594d8
 DIST mail-2.5.3-git.tar.gz 828104 SHA256 6608c1c5dd9fc58f8a167c834d14d272dfb721eac7356983cb9f64ce934048ab SHA512 210e8eb7c10b8636747980fbaef09a444a80fdba38fced326e6f9fcab6dc41e99a685c3a1472f887f22d875f4a5691364246e4975efe2a608cec657e3ad67bcf WHIRLPOOL 38ebe1ed453c2e01d22e170bf24f527aab65ef6a65c74448e6d9888d0b49a10bde406a1f9824806b42569c118b9efcc1f1a2ab598c4517f665ca21fb40de725f
 DIST mail-2.5.4-git.tar.gz 833881 SHA256 d618fab11e0f4d308535a21bd6c59c2ab81a4ac864db830cc1817ad131512bb9 SHA512 5e042b9bff41e75af76b7d21275488f79b4c5e1821827b114bfc0d09b12b8c487189e4732e58a642621609fad48af381ae7cd5507f4fc5cb620f54a2288a6dda WHIRLPOOL 5013a057fd1cadd2f3ef5b1c4f8c62e476f36309ca6de935041b03986525a42969d4a7d57907eba4c6a5622d96cca269c3dfc37c14e1a45e4167a9b3d9d6ab50
--- a/dev-ruby/mail/mail-2.3.3.ebuild
+++ b/dev-ruby/mail/mail-2.3.3.ebuild
@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mail/mail-2.3.3.ebuild,v 1.4 2013/01/16 00:21:20 zerochaos Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ruby19 ree18"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc TODO.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="mail.gemspec"
-
-inherit ruby-fakegem
-
-GITHUB_USER="mikel"
-
-DESCRIPTION="An email handling library"
-HOMEPAGE="https://github.com/mikel/mail"
-SRC_URI="https://github.com/${GITHUB_USER}/mail/tarball/${PV} -> ${P}-git.tar.gz"
-
-LICENSE="MIT"
-SLOT="2.3"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="${GITHUB_USER}-${PN}-*"
-
-ruby_add_rdepend "
-	>=dev-ruby/activesupport-2.3.6
-	>=dev-ruby/i18n-0.4.0
-	>=dev-ruby/mime-types-1.16
-	>=dev-ruby/treetop-1.4.8"
-
-ruby_add_bdepend "doc? ( dev-ruby/rspec:0 )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undle/d' -e '6d' Rakefile || die "Unable to remove Bundler code."
-
-	# Fix up dependencies to match our own.
-	sed -i -e 's/~>/>=/' mail.gemspec || die "Unable to fix up dependencies."
-}
-
-each_ruby_prepare() {
-	# Comment out failing specs on ruby19. Reported upstream:
-	# https://github.com/mikel/mail/issues/318
-	case ${RUBY} in
-		*ruby19)
-			sed -i -e '/should return itself on sort/,/end/ s:^:#:' spec/mail/parts_list_spec.rb || die
-			sed -i -e '/should encode a non us-ascii filename/,/^    end/ s:^:#:' spec/mail/fields/content_type_field_spec.rb || die
-			;;
-	esac
-}
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@ -1,4 +1,3 @@
 DIST rails-2.3.18.gem 211968 SHA256 f92ee63fdb481d5d0758db6a955f850d44f525558ccc5ad7ce4367220a72314d SHA512 c7eeeeba60473cae3cf06410745ca5f24758bb4b0bf449a8fc80310299957af572cce4e781390aa92953169f907c0fafe8b2a31c83d6494d3a98c35eb5654365 WHIRLPOOL 31d89ff9a115355f1d3fc55183228dafccf2afe95a62478392e57adb2f50c52465439a95433f167459474319f8ed5a636defdad2820fc24c2d50c12d6455e071
-DIST rails-3.1.12.gem 4608 SHA256 8e6ce8ddb8b69051ec8109d0439c622a986aa4da47f5156141e7a936656f958c SHA512 75c04002215b4d8fd031533dde9bfdd8b0884e5a42b5944d52669b27eff1224c38e6c318cb03bfaba2c2da1eb65d59f50059b743dae425abc813b7b13b69f928 WHIRLPOOL c524b9b0c8ccc02fa43c8e023b688bbd726b80cb98f07dc4f768123ae57a6cfa62882177841cfb0be2b141884c1837a29477daca0f7cd16401e087064eaab9b4
 DIST rails-3.2.15.gem 4608 SHA256 9ed01092cb939f8c9be82138a8ba83df45260d544f86a0465893491dbdc2794c SHA512 e2f4267a4e64fdddde1932ad9e8fd71653ffb03dceb9a291756dd497636ab4cec104e829ad8142acf524d6155f3a11c6d691f35b97625e0e9888d246f09cd6f3 WHIRLPOOL 5b95313a1d733e2868061c8d0a56c5ff97974eeede20552713001c39d843d6ff8cfcb384d3f8eb35ddcc3eb4391b88e1e2d5e860736b8538eec8095b691ff559
 DIST rails-4.0.0.gem 1542656 SHA256 6eabebfbe7dcdabeddf69356f84cec3d78e395b08aa1de700e265f7cbff8028b SHA512 0ba7cff750ba6c1b307f58e3ec45f097a46a6fd4f96b8619e7ad9d7db39f20a6693b93aff56a3f36493daa39103cc5091fa0262b77e93445e6556044e6c0a7ce WHIRLPOOL cd743bf0b6e04a37c851cdcce8638b62fe91dd00220c558e24f2702e8ebb6905117762c05b50dbb07e071653cc71c36e0387c7dff42df9f0f82ba7ebc1867381
--- a/dev-ruby/rails/rails-3.1.12.ebuild
+++ b/dev-ruby/rails/rails-3.1.12.ebuild
@ -1,56 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-3.1.12.ebuild,v 1.1 2013/03/30 13:18:33 graaff Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="http://www.rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="3.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="+asset-pipeline"
-
-RDEPEND=">=app-admin/eselect-rails-0.18"
-
-ruby_add_rdepend "
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activeresource-${PV}
-	~dev-ruby/activesupport-${PV}
-	=dev-ruby/bundler-1*
-	~dev-ruby/railties-${PV}
-	asset-pipeline? (
-		dev-ruby/jquery-rails:0
-		dev-ruby/sass-rails
-		dev-ruby/uglifier
-		dev-ruby/coffee-rails
-	)"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@ -1,3 +1,2 @@
-DIST rails-3.1.12.tgz 3394369 SHA256 2321d18cd5b5c4929f09472d17fd05e21cc6470d7efd2886bfcf52bb89dbdfcc SHA512 49b886bf05c1c51b67cdf4a7ad688e633bdd0b180ef328f18c942cd13095668ed70cfe3b40ed2d77a2c8ca8c3d8474413dfa25c282afabe21ce790567874716f WHIRLPOOL 66e9d9709b7e8b00b096c43a5c5703fd20addf020c10df5764457ebf6ac515451f9e6db93a4925da9ab88e6942427f5a7fc0d20cf6381e8530f830605db7503e
 DIST rails-3.2.15.tgz 3566493 SHA256 6fc98f28742e6423efd151d4a0005c10cdf83bf1cef3350042f305d15474b286 SHA512 c2fa25a81b5c77a9054fc8b42a9fdc0733ef175a981ccdbff77eb33a08aa299c3a3ca9469ab80234b01fbc4eef7ccf09c4b3f55dd04e81bf4f8cbfc7eaf58719 WHIRLPOOL 18e8f8b2b90886bca4572efe24508fb77f5a227fd3f3d4732da68f52baea9a2fdf7b620023c8cf229354e4fca85eb9f28886b7b27f862693dbd383a063e961cd
 DIST rails-4.0.0.tgz 3705371 SHA256 644601ae66881313346ffeacd9ea372d249df55aa7abe853acdcb231fffe6bbf SHA512 3e03f25de83ff894a7affdebe948fd151cff81c8ec906692119036633d891c9ba5cbb312e3ab32f1e62f4a383fcfc2e878daeb62fc04336e932b2e2bda63f7cf WHIRLPOOL 792513f2fdfcbc2a57633e3ef344943948e5614c638b06cae1245fd84716d84b5391a7906123a94a1a325ad789bdc465a4f7e2b774924bd0f18d341c29109a82
--- a/dev-ruby/railties/railties-3.1.12.ebuild
+++ b/dev-ruby/railties/railties-3.1.12.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-3.1.12.ebuild,v 1.1 2013/03/30 13:18:13 graaff Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ruby19 ree18"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_TASK_DOC="generate_guides"
-RUBY_FAKEGEM_DOCDIR="guides/output"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications."
-HOMEPAGE="http://github.com/rails/rails"
-SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="rails-rails-*/railties"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	>=dev-ruby/rdoc-3.4
-	>=dev-ruby/thor-0.14.6
-	>=dev-ruby/rack-ssl-1.3.2:1.3
-	>=dev-ruby/rake-0.8.7"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/mocha-0.9.5
-		virtual/ruby-test-unit
-	)
-	doc? (
-		>=dev-ruby/redcloth-4.1.1
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e '/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\)/d' ../Gemfile || die
-
-	# allow newer thor
-	sed -i -e '/dependency.*thor/s:~>:>=:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
--- a/dev-ruby/sass-rails/Manifest
+++ b/dev-ruby/sass-rails/Manifest
@ -1,4 +1,3 @@
-DIST sass-rails-3.1.5.gem 64512 SHA256 48632765f6d3548998d9f410e20bd5201da4e83ae7b6e3d59dc03229b4da6d4d SHA512 975a2dd8c34c183943814d96e8af51a700b8bf364393f8a655d5b365ef23c3ddc1efbf2ac62e1bcf4b1626a39fc649994f48c8c8413b842edd09450ef6a1cbc8 WHIRLPOOL c0172eb66c6888e9f664afe47a1af58f285dc93f9c3a99e3c65e880fb14fdc79afa3e59920aa19dcdd27bb8a837b3405b4e4ca9e1e1d3c731b88a5c7247a5ad9
 DIST sass-rails-3.2.5.gem 65536 SHA256 ebc9632dc11dba92867540d4329c0c958478714108ed42bd7a91c4b2a717719c SHA512 4c8bf95a672ecd1a2b000f7319230bb3274945d7abe7e211e05f480c708e3cbbe3e770a6bd25cddc9859ba1b4345c931d17e5ebac2964bc9cc3f6b714ee81835 WHIRLPOOL f3364b63df353a226a7dd5886c75bda99c152759e86c6456ec4c85267efb16252440ab79a8247a3dc17ef525df8497aa55a239e98dadd463272a10d789f82376
 DIST sass-rails-3.2.6.gem 88576 SHA256 a8e5618ecbc88b1b1678d3f7ccf5639d70da8e421b599546c3cef5c9627f67ed SHA512 ebbc9b3901176871dce8cdce3f3896fe726bfa7a826420ec6e313d6573119585a70d10cc008aec5e58888f60bc4794c08327c3e2743b11cfe3cd6305cf6e942e WHIRLPOOL 3432ab8c4f02d1a4b1421c04ab90682e4dc5060df67c3d86ee8c30363974a81ea10c98fb56ebacf1e1be505fa466dc5d295fec920908f83f3a8ba721b9344ebd
 DIST sass-rails-4.0.0.gem 91648 SHA256 e4212e52447bbdcacf236f3bbdfe5ebb4652c0529b9c9289bdc5bb0e0e6c90b4 SHA512 28f3e3cb54371ae5743f2e40e20abdb53a0f77bc9645b7a17bcc78c5cf6201200b20e242b3f4a44d6d8c609bd5e514e79e35e27a89b11b737c25e08cdefb20d4 WHIRLPOOL 973814972657485bd5e1b539204a93a5479e4a9ad81d519be684f7d2e6fb963c6ea6cdc89d4e9455ce688bdcdbedb08ab3d1e5eaab4bfe7e94233d4d6eb25e24
--- a/dev-ruby/sass-rails/sass-rails-3.1.5.ebuild
+++ b/dev-ruby/sass-rails/sass-rails-3.1.5.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sass-rails/sass-rails-3.1.5.ebuild,v 1.6 2012/09/17 19:24:21 grobian Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ruby19 ree18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Official Ruby-on-Rails Integration with Sass"
-HOMEPAGE="https://github.com/rails/sass-rails"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos ~x86-solaris"
-
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/sfl dev-ruby/bundler )"
-
-ruby_add_rdepend ">=dev-ruby/sass-3.1.10
-	dev-ruby/railties:3.1
-	dev-ruby/actionpack:3.1
-	>=dev-ruby/tilt-1.3.2"
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rake test || die
-}
--- a/dev-ruby/shoulda-context/Manifest
+++ b/dev-ruby/shoulda-context/Manifest
@ -1 +1,2 @@
 DIST shoulda-context-1.1.4.gem 20992 SHA256 894875f73ad73a87c04016f589b7b1e6099a3e59ad3a69135501a8078d621303 SHA512 2627582e14661c531747d491dcf9af2fb6727034e4badd149e750d0449e80c0eeab0fb1cc102f6c258cf85b9f2279f578724f68873400ab0c651b2076f503d0a WHIRLPOOL a81d1d63267925f2429c0dc6690a055d8394bbab93d4ac21543e60c01ca01bd457f81f879f89f55eee371d62aec6f111d0dd852d90d3a9c664c021f05c4d45cf
+DIST shoulda-context-1.1.6.gem 21504 SHA256 6fef28c38b63b39ae761c6f73dd1c11a6184dd5f36e2080cc3e6bdabf6845ed7 SHA512 71c6a567c807f8eda0b7b619f092326a928bb9df181ca18424f2fbbef8e7fdf8bac5990e22f68d936e7bebcab569d9c32ede5264108e914cc84e2ce40908572f WHIRLPOOL 6194f644a6d0da7cefe643c46c05a4399e21f27df72a45a19500c8128add12be7d156cd1b92a52be26d795e77d2ff1b301db0d891817911b2373fdf6039fc234
--- a/dev-ruby/shoulda-context/shoulda-context-1.1.6.ebuild
+++ b/dev-ruby/shoulda-context/shoulda-context-1.1.6.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/dev-ruby/shoulda-context/shoulda-context-1.1.6.ebuild,v 1.1 2013/11/28 07:25:42 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 jruby"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="init.rb rails tasks"
+
+# Don't install the conversion script to avoid collisions with older
+# shoulda.
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Context framework extracted from Shoulda"
+HOMEPAGE="http://thoughtbot.com/projects/shoulda"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 dev-ruby/mocha )"
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Itest test/shoulda/*_test.rb || die
+}
--- a/dev-ruby/sprockets/Manifest
+++ b/dev-ruby/sprockets/Manifest
@ -1,4 +1,3 @@
-DIST sprockets-2.0.4.tgz 135008 SHA256 735f88d4952f397188f8ae163acf36fca43c34777d52a4e33555ef358eda4bb0 SHA512 b8e04bb298860f2a88636ca380550349d9bd9fe8888561e2fc3a0a07e560195d4963a78f4be2d99f92fdf1af7e2cc55e1d9f8e7e38e08a09f8218b065b494c5a WHIRLPOOL 67c8178a515116d19f30bad9c9797f3da46afc0ad521c86cd1e3e93f36adc11602f751393785d30cb525a8ee020353bfea15421f3c15720a46164c50ad7be955
 DIST sprockets-2.1.3.tgz 135907 SHA256 87528fbb3fdb9ce250cc9587d5d65f0c2d5e85023600a8cab1fa4992612c0c9e SHA512 57df6ab9dfe3a19bb2c834f7bcb598f63e24b57165733eee82c927f296b402ec252fc860b902ec63485ffb1b747702a57fb87a05d7e3d5710c7e67083f1b1c1e WHIRLPOOL eb8b64ff6793c8ae1f141b8f73aba6f559c8f3fc193ae813dbd12d99bf947e52b1bd8b46f32d9ba00a9e9279110f4a64bd203b6838203a49a56b649d32645d93
 DIST sprockets-2.10.0-git.tgz 195247 SHA256 dbbae10d96abb1dda02b27c5e416542c03dfd8b3a0fddb3977ae82fac5781745 SHA512 c49b3296ce60eca26b9b2a16f6fd4c05e449ab3db8274dbaa9322d97362118944ee0743276bc6f0f0b34a18433547d7b6411548bb0f66e66b05a277fb234a99e WHIRLPOOL 1d8d16c77835c8a2a4b155e56216d3cc47f4347b801cd749caec79d888bd54a7ebd1f9752c4d22ce3533043924541783a5295a5f216e916e41c71618ff47c2a3
 DIST sprockets-2.10.1-git.tgz 195309 SHA256 bb6ff791369b47a748aa6158255aaf647aa3308816cb2d094f8b222a4abf7e27 SHA512 f5b929b3ffd7bc23f8bf9ee6e5e0c465c34585b7a9bdb0204ca04f1268cb353a1cf23c7420baa4dd53970e538e55d4215971969f9e4cd36c58e8c9029a134c4b WHIRLPOOL 026cd9d9d9448d09141a0d9e020df9c7897332cd337934f521842f795685d845420587907b2717157e0660071a2e2dec0b0b795be30f1dce5752f4b738395e2f
--- a/dev-ruby/sprockets/sprockets-2.0.4.ebuild
+++ b/dev-ruby/sprockets/sprockets-2.0.4.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sprockets/sprockets-2.0.4.ebuild,v 1.2 2013/01/16 00:32:50 zerochaos Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ruby19 ree18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Ruby library for compiling and serving web assets."
-HOMEPAGE="https://github.com/sstephenson/sprockets"
-SRC_URI="https://github.com/sstephenson/sprockets/tarball/v${PV} -> ${P}.tgz"
-RUBY_S="sstephenson-sprockets-*"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-
-ruby_add_rdepend "
-	=dev-ruby/hike-1* >=dev-ruby/hike-1.2
-	=dev-ruby/rack-1*
-	>=dev-ruby/tilt-1.3.1"
-
-ruby_add_bdepend "test? (
-		dev-ruby/json
-		dev-ruby/rack-test
-	)"
-
-# Restrict tests for now since they require quite lot of new
-# dependencies related to javascript. To be revisited later.
-RESTRICT="test"
-#  s.add_development_dependency "coffee-script", "~> 2.0"
-#  s.add_development_dependency "eco", "~> 1.0"
-#  s.add_development_dependency "ejs", "~> 1.0"
-#  s.add_development_dependency "execjs", "~> 1.0"
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@ -3,3 +3,4 @@ DIST debhelper_9.20130720.tar.gz 471494 SHA256 4128575e19c2a6dbe8bfe2af591976b6b
 DIST debhelper_9.20130921.tar.gz 471484 SHA256 c97315ee9781122ab1ed0fe247b7fc75067c2c31c24fda6f9cb6ef78e243a139 SHA512 f2daef5e6fcc1babc135a8375bef256ddbd78ce70a2a063d5c863469067b36f8210c5ac099d6778b0f5113c6916250e71beb067b25b80ee51c381bd95c2a55c0 WHIRLPOOL 897d00398c122c18876b853f479b57a747fd0ac2ed8f45c0ff0e898dd53a1f42e53966d71b958fb050252c4118f9458151d4103d3ef96d351f843e846eb4d8d9
 DIST debhelper_9.20131105.tar.gz 472348 SHA256 ddd0571a96db08dee1f8e624f8919d3487cc901eec25dbdec5c954ca3b8b5921 SHA512 6cb818d33b97e7fe625e3ecabf7ce8223b962474bd964d6a454d9350621d669f8952a47672b6a62e2cc7c0261191f1b5d536ff8944d4571e8bd891d2f3eec4f3 WHIRLPOOL d6f3e850fd6647b8584d703ba23d48d7addb06945729d1bb8423555137b0f99873659c995e55be0cbae381c21782e02108ed1b4f120879038349406feb3397be
 DIST debhelper_9.20131110.tar.gz 472583 SHA256 f331baa25763ac768a6994bf55e8c018225e89431913ffc91adc78845b960d3e SHA512 00ef78ac0c7c96469346bb182b83d39495dfeda66c30c4cf3c5814ffcf3a3bd65e34a183389c33aea6c72bf3d65a807478fb03727fd00f8f8077280c017f2d53 WHIRLPOOL 57b20895b73fd3a3e353dc721e7d57efabaec6e923726d97783af3b335a9c778855e9791e420c991b4fb7c76ff0c7942ec39fe7855512e1e1bd20c5cd20ca399
+DIST debhelper_9.20131127.tar.gz 472736 SHA256 21e7b953f14a6c6e5b8d6959af16638e030894555eda6e26fbd6549e3cf9118c SHA512 fc5f1e5e27a43ef64f39e97a6ff20c5513c35ab43a0cae6895ff786af7861ac4affd9a6668b3328f2242ca3817d925d0d291b226c79e3e00280b4ecb3817a029 WHIRLPOOL 069a05ab6239e963c6415da67f7265a0c2ba91d4de52a0c5bf4dc10da1206e7b388229a9ae99f46a8acf22288b5ea0db30ce458bfdb3e985899a74594400f89b
--- a/dev-util/debhelper/debhelper-9.20131127.ebuild
+++ b/dev-util/debhelper/debhelper-9.20131127.ebuild
@ -0,0 +1,70 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20131127.ebuild,v 1.1 2013/11/28 11:42:58 jer Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
+HOMEPAGE="http://packages.qa.debian.org/d/debhelper.html http://joeyh.name/code/debhelper/"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+IUSE="test"
+DH_LINGUAS=( de es fr )
+IUSE+=" ${DH_LINGUAS[@]/#/linguas_}"
+
+NLS_DEPEND=$(
+	printf "linguas_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LINGUAS[@]}
+)
+
+RDEPEND="
+	>=dev-lang/perl-5.10
+	app-arch/dpkg
+	dev-perl/TimeDate
+	virtual/perl-Getopt-Long
+"
+DEPEND="${RDEPEND}
+	${NLS_DEPEND}
+	test? ( dev-perl/Test-Pod )
+"
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	tc-export CC
+
+	local LANGS="" USE_NLS=no lingua
+	for lingua in ${DH_LINGUAS[@]}; do
+		if use linguas_${lingua}; then
+			LANGS+=" ${lingua}"
+			USE_NLS=yes
+		fi
+	done
+
+	emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	dodoc doc/* debian/changelog
+	docinto examples
+	dodoc examples/*
+	local lingua
+	for manfile in *.1 *.7 ; do
+		for lingua in ${DH_LINGUAS[@]}; do
+			case ${manfile} in
+				*.${lingua}.?)
+					use linguas_${lingua} \
+						&& cp ${manfile} "${T}"/${manfile/.${lingua}/} \
+						&& doman -i18n=${lingua} "${T}"/${manfile/.${lingua}/}
+					;;
+				*)
+					doman ${manfile}
+					;;
+			esac
+		done
+	done
+}
--- a/dev-util/strace/strace-4.8.ebuild
+++ b/dev-util/strace/strace-4.8.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.8.ebuild,v 1.1 2013/06/09 23:48:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.8.ebuild,v 1.3 2013/11/29 14:04:14 vapier Exp $

 EAPI="4"

@ -19,7 +19,7 @@ HOMEPAGE="http://sourceforge.net/projects/strace/"

 LICENSE="BSD"
 SLOT="0"
-IUSE="static aio"
+IUSE="aio +perl static"

 # strace only uses the header from libaio to decode structs
 DEPEND="aio? ( >=dev-libs/libaio-0.3.106 )
@ -41,5 +41,6 @@ src_prepare() {

 src_install() {
 	default
+	use perl || rm "${ED}"/usr/bin/strace-graph
 	dodoc CREDITS
 }
--- a/dev-util/strace/strace-9999.ebuild
+++ b/dev-util/strace/strace-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-9999.ebuild,v 1.4 2013/05/02 17:28:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-9999.ebuild,v 1.6 2013/11/29 14:04:14 vapier Exp $

 EAPI="4"

@ -19,7 +19,7 @@ HOMEPAGE="http://sourceforge.net/projects/strace/"

 LICENSE="BSD"
 SLOT="0"
-IUSE="static aio"
+IUSE="aio +perl static"

 # strace only uses the header from libaio to decode structs
 DEPEND="aio? ( >=dev-libs/libaio-0.3.106 )
@ -41,5 +41,6 @@ src_prepare() {

 src_install() {
 	default
+	use perl || rm "${ED}"/usr/bin/strace-graph
 	dodoc CREDITS
 }
--- a/dev-vcs/subversion/subversion-1.7.14.ebuild
+++ b/dev-vcs/subversion/subversion-1.7.14.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-vcs/subversion/subversion-1.7.14.ebuild,v 1.1 2013/11/26 20:47:54 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.14.ebuild,v 1.2 2013/11/28 13:34:07 jer Exp $

 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"

 LICENSE="Subversion GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring java kde nls perl python ruby sasl test vim-syntax +webdav-neon webdav-serf"

 COMMON_DEPEND=">=dev-db/sqlite-3.6.18[threadsafe(+)]
--- a/eclass/multiprocessing.eclass
+++ b/eclass/multiprocessing.eclass
@ -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/eclass/multiprocessing.eclass,v 1.3 2013/10/12 21:12:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multiprocessing.eclass,v 1.4 2013/11/28 20:49:14 vapier Exp $

 # @ECLASS: multiprocessing.eclass
 # @MAINTAINER:
@ -55,6 +55,25 @@ makeopts_jobs() {
 	echo ${jobs:-1}
 }

+# @FUNCTION: makeopts_loadavg
+# @USAGE: [${MAKEOPTS}]
+# @DESCRIPTION:
+# Searches the arguments (defaults to ${MAKEOPTS}) and extracts the value set
+# for load-average. For make and ninja based builds this will mean new jobs are
+# not only limited by the jobs-value, but also by the current load - which might
+# get excessive due to I/O and not just due to CPU load.
+# Be aware that the returned number might be a floating-point number. Test
+# whether your software supports that.
+makeopts_loadavg() {
+	[[ $# -eq 0 ]] && set -- ${MAKEOPTS}
+	# This assumes the first .* will be more greedy than the second .*
+	# since POSIX doesn't specify a non-greedy match (i.e. ".*?").
+	local lavg=$(echo " $* " | sed -r -n \
+		-e 's:.*[[:space:]](-l|--load-average[=[:space:]])[[:space:]]*([0-9]+|[0-9]+\.[0-9]+)[^0-9.]*:\2:p' \
+		-e 's:.*[[:space:]](-l|--load-average)[[:space:]].*:999:p')
+	echo ${lavg:-1}
+}
+
 # @FUNCTION: multijob_init
 # @USAGE: [${MAKEOPTS}]
 # @DESCRIPTION:
--- a/kde-misc/networkmanagement/Manifest
+++ b/kde-misc/networkmanagement/Manifest
@ -1,2 +1,3 @@
+DIST networkmanagement-0.9.0.10.tar.xz 1184588 SHA256 dce8d080256f1c2a6b70d61cb46e623839f6c0a0f260a6901d9ad68746ce7dfc SHA512 936f155d7edb47b6d4852b2d87eb32c99a45e61b0083d74dc599e231febc233f4f3b50aa330d852b97227f0427db681290efa657818e056a659689a1dd4baccb WHIRLPOOL d39947fb97ebc07bbd1cab214d231f07ef1a2f0c4e4fbc7d719b73a6ac206cd2aa9979516adf4041678c197d3d37f01ec63b0bbb571c31401a639ae88e7d5e0e
 DIST networkmanagement-0.9.0.8.tar.bz2 1459535 SHA256 c3b4458faf3bea75c5952ffe20b55724246c9cc3cd751a484b3e1832240d3ad6 SHA512 0b015cf42dba61b0726a896070085d8aab95ae9f14c2cece0afe14fb0a660d1b7d9e292aad56afb8db69499965fd055d3627aa835cc809519fc4c41ae9a6b839 WHIRLPOOL 4b403ff88a0493674169364c272a117d5bf23341241b73bfe3645ec2826bda67f362041facd90b67ac873ec2dec6f5b276c1d3a2011fcf7985f9ccbc1fe4af79
 DIST networkmanagement-0.9.0.9.tar.bz2 1513075 SHA256 d6a7603df2a48e14cef4c44dcaee5773d7ed3cad5b8780307b356df4639231ca SHA512 e8207effc5477b059c4332957cacc3874253372bf43ac115f91a3af3aa6de3792e73c980eab7c74a36f9da1e5a764523a7e5f49e1b957cfef9fc06e1e627fefd WHIRLPOOL 04166982735c238f744dbffc5967b84bd4174a385aabac5a0f04286a9fb5e188f7d7624275d55b30cf9f22a3006ae0182ff993c5e6e25fb0b8193d533eec2312
--- a/kde-misc/networkmanagement/networkmanagement-0.9.0.10.ebuild
+++ b/kde-misc/networkmanagement/networkmanagement-0.9.0.10.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/networkmanagement/networkmanagement-0.9.0.10.ebuild,v 1.1 2013/11/29 16:12:06 johu Exp $
+
+EAPI=5
+
+KDE_LINGUAS="ar bs ca cs da de el es et fa fi fr ga gl hu ia it ja kk km ko lt
+mr nb nds nl nn pl pt pt_BR ro ru se sk sl sr sr@ijekavian sr@ijekavianlatin
+sr@Latn sv tr uk zh_CN zh_TW"
+KDE_SCM="git"
+KDE_MINIMAL="4.11"
+inherit kde4-base
+
+DESCRIPTION="KDE frontend for NetworkManager"
+HOMEPAGE="https://projects.kde.org/projects/extragear/base/networkmanagement"
+[[ ${PV} = 9999* ]] || SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="debug openconnect"
+
+DEPEND="
+	net-misc/mobile-broadband-provider-info
+	>=net-misc/networkmanager-0.9.6
+	openconnect? ( net-misc/openconnect )
+"
+RDEPEND="${DEPEND}
+	!kde-base/solid
+	!kde-misc/plasma-nm
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with openconnect)
+	)
+	kde4-base_src_configure
+}
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@ -1,13 +1,11 @@
-DIST MesaLib-10.0.0-rc1.tar.bz2 6725918 SHA256 ab9b5763708b27b2dd0d12ab605c28995851f7df041e7f8738d8afa74a413ccc SHA512 e3aed3c7e6c55f5ad6e011bca04288f6661f94a814b7c649264544c042e505cd337248a20779e397d860009375eddb8b5f10204caa6589a2e08151a263f181be WHIRLPOOL 8c46fc25f6174c1116f38f3b4e654c85c97761a51a9d8ae289360e692f9ad115b9d28a6b0adf6e83a196ca1459208a911a3f02a367e5d73c59d3f6c1d2505db7
+DIST MesaLib-10.0.0-rc2.tar.bz2 6729682 SHA256 de9c68f61d5207ac9f3c00af0fa8de27a1acfd99d06d51dd5717b2454ced9733 SHA512 2f39f7e0f3fa18d2cbf9693dd5881697697758ba6ec05bd2893ea4805b2ebe8ba09a28edc9857f601c8c36fd0d24b2111cf447feed5826fbe9bc99f09b525789 WHIRLPOOL 316956d9c910d178354fa32e11cfaff2d51c7e83cc482448b894d7cc56e5eeb6c00a1f93b359c854ea8b6fc60ea08fb3f3eba95e5f689331faa7a9dd55abd446
 DIST MesaLib-7.10.3.tar.bz2 6056837 SHA256 1e701fc839b872677ddca9ed8784d754c9da1fbeda98173980e06aa7df0e85c0 SHA512 aa1f5f068b305fae5519e11cad2db9c6dc647d3122252bbcb210f13ac6ef1b667ae750344898bca7c5bfae94934db05eff915cb7417a59590e6d3ba230817aa8 WHIRLPOOL 5c2adda647936ed4163a4e4d5afad8344eb576712f9432f697aa0fc22ca17d7aaf0aeb6ad2d4e7e0825dc27cae570660332450778f8091e9b27aad2865c9b5fc
 DIST MesaLib-7.11.2.tar.bz2 6257280 SHA256 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357 SHA512 f9f93aeb5ba3e4f0cdd7041a7bba6cd18dd8f58446b796849f43c6037297011df826017c32e03f03c8527d4afd3b9096e9ae3cbfb3c86b4ad145c66867198c21 WHIRLPOOL 0cf1b328b95e4f09e549c8adb2f6dc67e36c48ef570c1a5fda73efad54b8327cbec896d67bd01838be8bba7274f32704feca3fde8bb68bf1141563d17e8be707
 DIST MesaLib-8.0.4.tar.bz2 5737052 SHA256 02ed19f4f5f6535dda03a9932a81438aa78ea723ebba1f39a3d49a70a4e1d07e SHA512 b7e8879e92252d0588d9eeeed904fd502ce1f48551b9a97f52aeb1318c79a80fab27504521107d61fbb5d986b2d778d89023a892baf9f1c5a5d2ee3746fefa57 WHIRLPOOL 5371a13e93e2d43264e2580e1e5e28ed85b6bfbdda9dd89104b1c18e62d35417e20b0ed8f13d8c54f58b83875fac9348d57f14ba08e4a88599e5fc0202502173
 DIST MesaLib-9.0.3.tar.bz2 6137208 SHA256 ea940005b2c379f83527b5ba6d7fb69c533c2c17b561dc3b8469237ac75606a5 SHA512 2685706670356ca82c36a9fc30bfdabe9429e37ba670ece4a44634222430f828dfd5f15b116d78e3a9a6c432cf6ee3cf3a44bd132f896b81cc0bf1e1076dfdc5 WHIRLPOOL e0e4d867de8bd8c97f25e10cd6aed6c5490224e25cc6413b0de0c7bfa4112e5f63d2aa135a3d3ea028257d1ad0340e1a69f38c270eb148ce68c8fb7cd4317f58
 DIST MesaLib-9.1.6.tar.bz2 6134267 SHA256 e632dff0acafad0a59dc208d16dedb37f7bd58f94c5d58c4b51912e41d005e3d SHA512 b23d0cc3515b56636f73c4d3247212f8c731c967f5ecf8c247a3bd359038ed374c23eb1bb0da17a9152f8b8d984acd134fa9823d9349285287e58676419b4d40 WHIRLPOOL 4e3c07c893060f77cade242d904c1ec4c1c2982b6b3d9ff188b3d809ad8592408c34bd71276f0e8dfa38bce58a82e146b25064cfa50d3ce6d52a7b69a694690a
-DIST MesaLib-9.2.0.tar.bz2 6643026 SHA256 75e6a9bf59fb402f5fbed846be4effafa8a5809229579cd41023b906223a9187 SHA512 26c4b41b7e1d5284b87e2997a14424c1ee0713e11fd9dd65932987832e43b96986ed5e88c06fad4616fc912ffb8e17a2314b282cbf38a2640d76c39724965910 WHIRLPOOL 45ecde95b3130e53cf9dede8622b6fd96fbdbf44e561eae7283f01915cf97ce49adb51ac117c3704f17f04b0a721502282f567ef51cebbb3ad567fd1c425048a
-DIST MesaLib-9.2.1.tar.bz2 6645464 SHA256 e8b47e6ab5779e9fb05e262571ef01d28c96b51e9b5b85db6750c6a32afda6d0 SHA512 1dbc59b348618dde85e00b318fa5bbc58c29c3f56f8f77260569f155e5e787e56a2b5efff6b0e8cafedc915ccb465c547a10501f39e3d20a57c4e654968de62e WHIRLPOOL 8006a58d4b581b8bbdee3d1931c41988f4c5ffca4a6e875471c31df4437fff16931e0bed0082a20e7f5e5db63332610895f40665df5afdcc205e0725d0c1200e
-DIST MesaLib-9.2.2.tar.bz2 6664280 SHA256 c78a5035233672844cf2492fe82dc10877e12026be227d04469d6ca6ac656a3d SHA512 6b1ac41f28a81bf920fd4ea80586192f6465863992ec13b718c61fb7d4a41ac3bbb146bfa4a81c48189092e7b59a9452d11d675d628a6098dd8fc48a5aa304ca WHIRLPOOL 68b12343a736297a57921ac8cf11b556d8eeea5e411f04024fba62c40c2ee8f5b2237ed6616d62a21ad5b41ed9fab851f22c5605f123e73f9670e70f2e9f4cab
-DIST MesaLib-9.2.3.tar.bz2 6665764 SHA256 e06d4c0d9f93391be7944e5f063fc70226a273a797934ff6602ee6cd5719175d SHA512 f0569f59402233b1f4b1aebeb0bbe557256be5e7d127b8bd3b464506753b8fa62c51c749f03bf2398c6d28c47ccc0bc24c75a2a69ecd16b401da58a22c9d7b0d WHIRLPOOL 0b3c3ddd0d51261679b635e87be6852967dcb872d14ddcc1f143241a3a2bcd7f65afbeed81ca0d5d0c90eab60185f6c6a453c13ba81ddd568d268f9b1436ecc5
+DIST MesaLib-9.2.4.tar.bz2 6675532 SHA256 fdde10c3d17a1de1fa9afcf5dc40d72eef84d3ad77e7d631b8b442772957b937 SHA512 c250789ee15fc0c68370d532e19c2111179a7dffe9a8f9af1e4de7c8ee6ad0840266189d7dd701c1c23ce956884a862b8695a18c7ecf04472799de4ac9e591e4 WHIRLPOOL 7b379e9f449dedeff576b29cd54f6b5a50fd44b82c6542b68a9d923ddbe96ca58b4d3d8811af1e27975c82c4b57162784c54cd1029c799f8166bbe219afeefaa
 DIST mesa-7.10.1-gentoo-patches-01.tar.bz2 5488 SHA256 31cd4f6d1a0a70249c40452919074856d120cd473a01a8457e3dc147a1b622d8 SHA512 c62b45b32e396e67f629003fc5242b7b4df054b8e20b5237489212bc4f0171534915a02fc9efa68965068121d10660b5cd92a419efabe33fd4596a97a39249c2 WHIRLPOOL 5f171959e3a31f5c38438b4806ce371bb8fdf1c7a87501865e4ed5d5ab284cda9568b7773005997d7a1cff151f95e64c027b36c0be48a4dd288a7ab8b5f69b97
 DIST mesa-7.11.2-gentoo-patches-01.tar.bz2 4021 SHA256 e1e29d335f7e0c69824041a92b1815cd4e2defa4689285c86ea59d47a7ef407b SHA512 0dcd60bd40efa25c9895150b6c0230e6582ff42ba0bafae49290e170948ee99ff25be321e7d3d503b3f465eeedcd145fc46b312a54d9bc4d3577fd5e61c3439b WHIRLPOOL 8a4a5c250430ebc08d7081158c6cc41ea7b5718662ef0327e5829c2f26069be0bed7a0df12c82434c58d364926404c929ca9881847554b74906db195b12d6576
 DIST mesa-8.0.4-gentoo-patches-01.tar.bz2 2380 SHA256 bad7443e7163b87b3c14f8f56568551300fe190f58531fdba4fdabd36c2db842 SHA512 855834bc13decb46ab0b81e75002d873d2f40f67c9b1770b2d33e892beffffb32c229db71df72bea24d74ec515a0890a89dc9221cb22bba59c50182c654be676 WHIRLPOOL c78b4fe32d6b3246c7dffa2b7b9c216e13323ece677129618b2333d620f81777e8a23f13c956f88cd3aa0ae790d0a102d4f1c1e96c9ca5a13b3583a14cb2288b
+DIST mesa-9.2-gentoo-patches-01.tar.xz 2260 SHA256 2caf9dd7d1c3b9869d8b90b56f5ec9c653a208f403abed706997e392cdcc26c7 SHA512 8182f258dbfb2e87db044abd86c9c7e57656eb08f320ec51f012689d88ffc321d27aee0efdd7d3b9c117d12c949f5560b53917835e0b8f4a610dacec6bd2c483 WHIRLPOOL b5953ac84760967ff81d87847898d9c74f3476baf0fe596951458983e7751e8ed75ce91e7f63c6536ce5baddbe1bdd239b1c112788890c1dcb25ca74ce909cb8
--- a/media-libs/mesa/mesa-10.0.0_rc2.ebuild
+++ b/media-libs/mesa/mesa-10.0.0_rc2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.0.0_rc1.ebuild,v 1.2 2013/11/19 01:08:18 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.0.0_rc2.ebuild,v 1.2 2013/11/29 16:28:49 chithanh Exp $

 EAPI=5

@ -49,9 +49,9 @@ for card in ${VIDEO_CARDS}; do
 done

 IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl opencl
-	openvg osmesa pax_kernel pic r600-llvm-compiler selinux vdpau
-	wayland xvmc xa kernel_FreeBSD"
+	bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl
+	llvm-shared-libs opencl openvg osmesa pax_kernel pic r600-llvm-compiler
+	selinux vdpau wayland xvmc xa kernel_FreeBSD"

 REQUIRED_USE="
 	llvm?   ( gallium )
@ -293,9 +293,9 @@ multilib_src_configure() {
 		$(use_enable nptl glx-tls) \
 		$(use_enable osmesa) \
 		$(use_enable !pic asm) \
+		$(use_with llvm-shared-libs) \
 		--with-dri-drivers=${DRI_DRIVERS} \
 		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		--with-llvm-shared-libs \
 		PYTHON2="${PYTHON}" \
 		${myconf}
 }
--- a/media-libs/mesa/mesa-9.2.0-r1.ebuild
+++ b/media-libs/mesa/mesa-9.2.0-r1.ebuild
@ -1,474 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.2.0-r1.ebuild,v 1.4 2013/10/13 20:44:10 mgorny Exp $
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-2"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit base autotools multilib multilib-minimal flag-o-matic \
-	python-single-r1 toolchain-funcs ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_PN="${PN/m/M}"
-MY_P="${MY_PN}-${PV/_/-}"
-MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
-
-FOLDER="${PV/.0/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_SRC_P}.tar.bz2
-		${SRC_PATCHES}"
-fi
-
-# The code is MIT/X11.
-# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl opencl
-	openvg osmesa pax_kernel pic r600-llvm-compiler selinux vdpau
-	wayland xvmc xa xorg kernel_FreeBSD"
-
-REQUIRED_USE="
-	llvm?   ( gallium )
-	openvg? ( egl gallium )
-	opencl? (
-		gallium
-		video_cards_r600? ( r600-llvm-compiler )
-		video_cards_radeon? ( r600-llvm-compiler )
-		video_cards_radeonsi? ( r600-llvm-compiler )
-	)
-	gles1?  ( egl )
-	gles2?  ( egl )
-	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) )
-	wayland? ( egl )
-	xa?  ( gallium )
-	xorg?  ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( || ( classic gallium ) )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_ilo?    ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.46"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
-	!<x11-base/xorg-server-1.7
-	!<=x11-proto/xf86driproto-2.0.3
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-	classic? ( app-admin/eselect-mesa )
-	gallium? ( app-admin/eselect-mesa )
-	>=app-admin/eselect-opengl-1.2.7
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	gbm? ( virtual/udev[${MULTILIB_USEDEP}] )
-	>=x11-libs/libX11-1.3.99.901[${MULTILIB_USEDEP}]
-	x11-libs/libXdamage[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.8.1[${MULTILIB_USEDEP}]
-	opencl? (
-				app-admin/eselect-opencl
-				>=dev-libs/libclc-0.0.1_pre20130819-r1
-			)
-	vdpau? ( >=x11-libs/libvdpau-0.4.1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.3[${MULTILIB_USEDEP}] )
-	xorg? (
-		x11-base/xorg-server:=
-		x11-libs/libdrm[libkms]
-	)
-	xvmc? ( >=x11-libs/libXvMC-1.0.6[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	"
-done
-
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-
-DEPEND="${RDEPEND}
-	llvm? (
-		~sys-devel/llvm-3.3[${MULTILIB_USEDEP}]
-		r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] )
-		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
-	)
-	opencl? (
-				~sys-devel/llvm-3.3[video_cards_radeon,${MULTILIB_USEDEP}]
-				~sys-devel/clang-3.3[${MULTILIB_USEDEP}]
-				>=sys-devel/gcc-4.6
-	)
-	${PYTHON_DEPS}
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	>=x11-proto/dri2proto-2.6[${MULTILIB_USEDEP}]
-	>=x11-proto/glproto-1.4.15-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.0.99.1[${MULTILIB_USEDEP}]
-	x11-proto/xf86driproto[${MULTILIB_USEDEP}]
-	x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-
-# It is slow without texrels, if someone wants slow
-# mesa without texrels +pic use is worth the shot
-QA_EXECSTACK="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
-QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
-
-# Think about: ggi, fbcon, no-X configs
-
-pkg_setup() {
-	# workaround toc-issue wrt #386545
-	use ppc64 && append-flags -mminimal-toc
-
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-2_src_unpack
-}
-
-src_prepare() {
-	# apply patches
-	if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
-		EPATCH_FORCE="yes" \
-		EPATCH_SOURCE="${WORKDIR}/patches" \
-		EPATCH_SUFFIX="patch" \
-		epatch
-	fi
-
-	# relax the requirement that r300 must have llvm, bug 380303
-	epatch "${FILESDIR}"/${PN}-9.2-dont-require-llvm-for-r300.patch
-
-	# fix for hardened pax_kernel, bug 240956
-	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
-
-	# Solaris needs some recent POSIX stuff in our case
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die
-	fi
-
-	base_src_prepare
-
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use classic; then
-	# Configurable DRI drivers
-		driver_enable swrast
-
-	# Intel code
-		driver_enable video_cards_i915 i915
-		driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		driver_enable video_cards_r100 radeon
-		driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-				! use video_cards_r200; then
-			driver_enable video_cards_radeon radeon r200
-		fi
-	fi
-
-	if use egl; then
-		myconf+="
-			--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")
-			$(use_enable gallium gallium-egl)
-		"
-	fi
-
-	if use gallium; then
-		myconf+="
-			$(use_enable llvm gallium-llvm)
-			$(use_enable openvg)
-			$(use_enable r600-llvm-compiler)
-			$(use_enable vdpau)
-			$(use_enable xvmc)
-		"
-		gallium_enable swrast
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_i915 i915
-		gallium_enable video_cards_ilo ilo
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			gallium_enable video_cards_intel i915
-		fi
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-				! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		# opencl stuff
-		if use opencl; then
-			myconf+="
-				$(use_enable opencl)
-				--with-opencl-libdir="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/mesa"
-				--with-clang-libdir="${EPREFIX}/usr/lib"
-				"
-		fi
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if use pax_kernel; then
-		myconf+="
-			$(use_enable x86 glx-rts)
-		"
-	fi
-
-	# build fails with BSD indent, bug #428112
-	use userland_GNU || export INDENT=cat
-
-	if ! multilib_is_native_abi; then
-		myconf+="--disable-xorg
-			LLVM_CONFIG=${EPREFIX}/usr/bin/llvm-config.${ABI}"
-	fi
-
-	econf \
-		--enable-dri \
-		--enable-glx \
-		--enable-shared-glapi \
-		$(use_enable !bindist texture-float) \
-		$(use_enable debug) \
-		$(use_enable egl) \
-		$(use_enable gbm) \
-		$(use_enable gles1) \
-		$(use_enable gles2) \
-		$(use_enable nptl glx-tls) \
-		$(use_enable osmesa) \
-		$(use_enable !pic asm) \
-		$(use_enable xa) \
-		$(use_enable xorg) \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		PYTHON2="${PYTHON}" \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	# Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
-	# because user can eselect desired GL provider.
-	ebegin "Moving libGL and friends for dynamic switching"
-		local x
-		local gl_dir="/usr/$(get_libdir)/opengl/${OPENGL_DIR}/"
-		dodir ${gl_dir}/{lib,extensions,include/GL}
-		for x in "${ED}"/usr/$(get_libdir)/lib{EGL,GL*,OpenVG}.{la,a,so*}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/lib \
-					|| die "Failed to move ${x}"
-			fi
-		done
-		for x in "${ED}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/include/GL \
-					|| die "Failed to move ${x}"
-			fi
-		done
-		for x in "${ED}"/usr/include/{EGL,GLES*,VG,KHR}; do
-			if [ -d ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/include \
-					|| die "Failed to move ${x}"
-			fi
-		done
-	eend $?
-
-	if use classic || use gallium; then
-			ebegin "Moving DRI/Gallium drivers for dynamic switching"
-			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
-			keepdir /usr/$(get_libdir)/dri
-			dodir /usr/$(get_libdir)/mesa
-			for x in ${gallium_drivers[@]}; do
-				if [ -f "$(get_libdir)/gallium/${x}" ]; then
-					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-						|| die "Failed to move ${x}"
-					insinto "/usr/$(get_libdir)/dri/"
-					if [ -f "$(get_libdir)/${x}" ]; then
-						insopts -m0755
-						doins "$(get_libdir)/${x}"
-					fi
-				fi
-			done
-			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-				if [ -f ${x} -o -L ${x} ]; then
-					mv -f "${x}" "${x/dri/mesa}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
-			ln -s ../mesa/*.so . || die "Creating symlink failed"
-			# remove symlinks to drivers known to eselect
-			for x in ${gallium_drivers[@]}; do
-				if [ -f ${x} -o -L ${x} ]; then
-					rm "${x}" || die "Failed to remove ${x}"
-				fi
-			done
-			popd
-		eend $?
-	fi
-	if use opencl; then
-		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
-		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-		dodir ${cl_dir}/{lib,include}
-		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-			"${ED}"${cl_dir}
-		fi
-		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-			mv -f "${ED}"/usr/include/CL \
-			"${ED}"${cl_dir}/include
-		fi
-		eend $?
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-
-	if use !bindist; then
-		dodoc docs/patents.txt
-	fi
-
-	# Install config file for eselect mesa
-	insinto /usr/share/mesa
-	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# switch to xorg-x11 and back if necessary, bug #374647 comment 11
-	OLD_IMPLEM="$(eselect opengl show)"
-	if [[ ${OPENGL_DIR}x != ${OLD_IMPLEM}x ]]; then
-		eselect opengl set ${OPENGL_DIR}
-		eselect opengl set ${OLD_IMPLEM}
-	fi
-
-	# Select classic/gallium drivers
-	if use classic || use gallium; then
-		eselect mesa set --auto
-	fi
-
-	# Switch to mesa opencl
-	if use opencl; then
-		eselect opencl set --use-old ${PN}
-	fi
-
-	# warn about patent encumbered texture-float
-	if use !bindist; then
-		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
-		elog "enabled. Please see patents.txt for an explanation."
-	fi
-
-	local using_radeon r_flag
-	for r_flag in ${RADEON_CARDS}; do
-		if use video_cards_${r_flag}; then
-			using_radeon=1
-			break
-		fi
-	done
-
-	if [[ ${using_radeon} = 1 ]] && ! has_version media-libs/libtxc_dxtn; then
-		elog "Note that in order to have full S3TC support, it is necessary to install"
-		elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
-		elog "textures in some apps, and some others even require this to run."
-	fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			DRI_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					DRI_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
-
-gallium_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			GALLIUM_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					GALLIUM_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
--- a/media-libs/mesa/mesa-9.2.0.ebuild
+++ b/media-libs/mesa/mesa-9.2.0.ebuild
@ -1,466 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.2.0.ebuild,v 1.1 2013/08/27 23:49:10 mattst88 Exp $
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-2"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit base autotools multilib flag-o-matic python-single-r1 toolchain-funcs ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_PN="${PN/m/M}"
-MY_P="${MY_PN}-${PV/_/-}"
-MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
-
-FOLDER="${PV/.0/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_SRC_P}.tar.bz2
-		${SRC_PATCHES}"
-fi
-
-# The code is MIT/X11.
-# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl opencl
-	openvg osmesa pax_kernel pic r600-llvm-compiler selinux vdpau
-	wayland xvmc xa xorg kernel_FreeBSD"
-
-REQUIRED_USE="
-	llvm?   ( gallium )
-	openvg? ( egl gallium )
-	opencl? (
-		gallium
-		video_cards_r600? ( r600-llvm-compiler )
-		video_cards_radeon? ( r600-llvm-compiler )
-		video_cards_radeonsi? ( r600-llvm-compiler )
-	)
-	gles1?  ( egl )
-	gles2?  ( egl )
-	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) )
-	wayland? ( egl )
-	xa?  ( gallium )
-	xorg?  ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( || ( classic gallium ) )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_ilo?    ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.46"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
-	!<x11-base/xorg-server-1.7
-	!<=x11-proto/xf86driproto-2.0.3
-	classic? ( app-admin/eselect-mesa )
-	gallium? ( app-admin/eselect-mesa )
-	>=app-admin/eselect-opengl-1.2.7
-	dev-libs/expat
-	gbm? ( virtual/udev )
-	>=x11-libs/libX11-1.3.99.901
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	>=x11-libs/libxcb-1.8.1
-	opencl? (
-				app-admin/eselect-opencl
-				dev-libs/libclc
-			)
-	vdpau? ( >=x11-libs/libvdpau-0.4.1 )
-	wayland? ( >=dev-libs/wayland-1.0.3 )
-	xorg? (
-		x11-base/xorg-server:=
-		x11-libs/libdrm[libkms]
-	)
-	xvmc? ( >=x11-libs/libXvMC-1.0.6 )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?]
-"
-for card in ${INTEL_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	"
-done
-
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-
-DEPEND="${RDEPEND}
-	llvm? (
-		>=sys-devel/llvm-2.9
-		r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] )
-		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
-	)
-	opencl? (
-				>=sys-devel/llvm-3.3-r1[video_cards_radeon]
-				>=sys-devel/clang-3.3
-				>=sys-devel/gcc-4.6
-	)
-	${PYTHON_DEPS}
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	>=x11-proto/dri2proto-2.6
-	>=x11-proto/glproto-1.4.15-r1
-	>=x11-proto/xextproto-7.0.99.1
-	x11-proto/xf86driproto
-	x11-proto/xf86vidmodeproto
-"
-
-S="${WORKDIR}/${MY_P}"
-
-# It is slow without texrels, if someone wants slow
-# mesa without texrels +pic use is worth the shot
-QA_EXECSTACK="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
-QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
-
-# Think about: ggi, fbcon, no-X configs
-
-pkg_setup() {
-	# workaround toc-issue wrt #386545
-	use ppc64 && append-flags -mminimal-toc
-
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-2_src_unpack
-}
-
-src_prepare() {
-	# apply patches
-	if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
-		EPATCH_FORCE="yes" \
-		EPATCH_SOURCE="${WORKDIR}/patches" \
-		EPATCH_SUFFIX="patch" \
-		epatch
-	fi
-
-	# relax the requirement that r300 must have llvm, bug 380303
-	epatch "${FILESDIR}"/${PN}-9.2-dont-require-llvm-for-r300.patch
-
-	# fix for hardened pax_kernel, bug 240956
-	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
-
-	# Solaris needs some recent POSIX stuff in our case
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die
-	fi
-
-	# Tests fail against python-3, bug #407887
-	sed -i 's|/usr/bin/env python|/usr/bin/env python2|' src/glsl/tests/compare_ir || die
-
-	base_src_prepare
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use classic; then
-	# Configurable DRI drivers
-		driver_enable swrast
-
-	# Intel code
-		driver_enable video_cards_i915 i915
-		driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		driver_enable video_cards_r100 radeon
-		driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-				! use video_cards_r200; then
-			driver_enable video_cards_radeon radeon r200
-		fi
-	fi
-
-	if use egl; then
-		myconf+="
-			--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")
-			$(use_enable gallium gallium-egl)
-		"
-	fi
-
-	if use gallium; then
-		myconf+="
-			$(use_enable llvm gallium-llvm)
-			$(use_enable openvg)
-			$(use_enable r600-llvm-compiler)
-			$(use_enable vdpau)
-			$(use_enable xvmc)
-		"
-		gallium_enable swrast
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_i915 i915
-		gallium_enable video_cards_ilo ilo
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			gallium_enable video_cards_intel i915
-		fi
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-				! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		# opencl stuff
-		if use opencl; then
-			myconf+="
-				$(use_enable opencl)
-				--with-opencl-libdir="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/mesa"
-				--with-clang-libdir="${EPREFIX}/usr/$(get_libdir)"
-				"
-		fi
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if use pax_kernel; then
-		myconf+="
-			$(use_enable x86 glx-rts)
-		"
-	fi
-
-	# build fails with BSD indent, bug #428112
-	use userland_GNU || export INDENT=cat
-
-	econf \
-		--enable-dri \
-		--enable-glx \
-		--enable-shared-glapi \
-		$(use_enable !bindist texture-float) \
-		$(use_enable debug) \
-		$(use_enable egl) \
-		$(use_enable gbm) \
-		$(use_enable gles1) \
-		$(use_enable gles2) \
-		$(use_enable nptl glx-tls) \
-		$(use_enable osmesa) \
-		$(use_enable !pic asm) \
-		$(use_enable xa) \
-		$(use_enable xorg) \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		PYTHON2="${PYTHON}" \
-		${myconf}
-}
-
-src_install() {
-	base_src_install
-
-	find "${ED}" -name '*.la' -exec rm -f {} + || die
-
-	if use !bindist; then
-		dodoc docs/patents.txt
-	fi
-
-	# Install config file for eselect mesa
-	insinto /usr/share/mesa
-	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-
-	# Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
-	# because user can eselect desired GL provider.
-	ebegin "Moving libGL and friends for dynamic switching"
-		local x
-		local gl_dir="/usr/$(get_libdir)/opengl/${OPENGL_DIR}/"
-		dodir ${gl_dir}/{lib,extensions,include/GL}
-		for x in "${ED}"/usr/$(get_libdir)/lib{EGL,GL*,OpenVG}.{la,a,so*}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/lib \
-					|| die "Failed to move ${x}"
-			fi
-		done
-		for x in "${ED}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/include/GL \
-					|| die "Failed to move ${x}"
-			fi
-		done
-		for x in "${ED}"/usr/include/{EGL,GLES*,VG,KHR}; do
-			if [ -d ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/include \
-					|| die "Failed to move ${x}"
-			fi
-		done
-	eend $?
-
-	if use classic || use gallium; then
-			ebegin "Moving DRI/Gallium drivers for dynamic switching"
-			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
-			keepdir /usr/$(get_libdir)/dri
-			dodir /usr/$(get_libdir)/mesa
-			for x in ${gallium_drivers[@]}; do
-				if [ -f "${S}/$(get_libdir)/gallium/${x}" ]; then
-					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-						|| die "Failed to move ${x}"
-					insinto "/usr/$(get_libdir)/dri/"
-					if [ -f "${S}/$(get_libdir)/${x}" ]; then
-						insopts -m0755
-						doins "${S}/$(get_libdir)/${x}"
-					fi
-				fi
-			done
-			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-				if [ -f ${x} -o -L ${x} ]; then
-					mv -f "${x}" "${x/dri/mesa}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
-			ln -s ../mesa/*.so . || die "Creating symlink failed"
-			# remove symlinks to drivers known to eselect
-			for x in ${gallium_drivers[@]}; do
-				if [ -f ${x} -o -L ${x} ]; then
-					rm "${x}" || die "Failed to remove ${x}"
-				fi
-			done
-			popd
-		eend $?
-	fi
-	if use opencl; then
-		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
-		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-		dodir ${cl_dir}/{lib,include}
-		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-			"${ED}"${cl_dir}
-		fi
-		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-			mv -f "${ED}"/usr/include/CL \
-			"${ED}"${cl_dir}/include
-		fi
-		eend $?
-	fi
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# switch to xorg-x11 and back if necessary, bug #374647 comment 11
-	OLD_IMPLEM="$(eselect opengl show)"
-	if [[ ${OPENGL_DIR}x != ${OLD_IMPLEM}x ]]; then
-		eselect opengl set ${OPENGL_DIR}
-		eselect opengl set ${OLD_IMPLEM}
-	fi
-
-	# Select classic/gallium drivers
-	if use classic || use gallium; then
-		eselect mesa set --auto
-	fi
-
-	# Switch to mesa opencl
-	if use opencl; then
-		eselect opencl set --use-old ${PN}
-	fi
-
-	# warn about patent encumbered texture-float
-	if use !bindist; then
-		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
-		elog "enabled. Please see patents.txt for an explanation."
-	fi
-
-	local using_radeon r_flag
-	for r_flag in ${RADEON_CARDS}; do
-		if use video_cards_${r_flag}; then
-			using_radeon=1
-			break
-		fi
-	done
-
-	if [[ ${using_radeon} = 1 ]] && ! has_version media-libs/libtxc_dxtn; then
-		elog "Note that in order to have full S3TC support, it is necessary to install"
-		elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
-		elog "textures in some apps, and some others even require this to run."
-	fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			DRI_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					DRI_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
-
-gallium_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			GALLIUM_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					GALLIUM_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
--- a/media-libs/mesa/mesa-9.2.1.ebuild
+++ b/media-libs/mesa/mesa-9.2.1.ebuild
@ -1,478 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.2.1.ebuild,v 1.1 2013/10/13 23:46:04 chithanh Exp $
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-2"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit base autotools multilib multilib-minimal flag-o-matic \
-	python-any-r1 toolchain-funcs ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_PN="${PN/m/M}"
-MY_P="${MY_PN}-${PV/_/-}"
-MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
-
-FOLDER="${PV/_rc*/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_SRC_P}.tar.bz2
-		${SRC_PATCHES}"
-fi
-
-# The code is MIT/X11.
-# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl opencl
-	openvg osmesa pax_kernel pic r600-llvm-compiler selinux vdpau
-	wayland xvmc xa xorg kernel_FreeBSD"
-
-REQUIRED_USE="
-	llvm?   ( gallium )
-	openvg? ( egl gallium )
-	opencl? (
-		gallium
-		video_cards_r600? ( r600-llvm-compiler )
-		video_cards_radeon? ( r600-llvm-compiler )
-		video_cards_radeonsi? ( r600-llvm-compiler )
-	)
-	gles1?  ( egl )
-	gles2?  ( egl )
-	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi video_cards_radeon ) )
-	wayland? ( egl )
-	xa?  ( gallium )
-	xorg?  ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( || ( classic gallium ) )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_ilo?    ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.46"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
-	!<x11-base/xorg-server-1.7
-	!<=x11-proto/xf86driproto-2.0.3
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-	classic? ( app-admin/eselect-mesa )
-	gallium? ( app-admin/eselect-mesa )
-	>=app-admin/eselect-opengl-1.2.7
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	gbm? ( virtual/udev[${MULTILIB_USEDEP}] )
-	>=x11-libs/libX11-1.3.99.901[${MULTILIB_USEDEP}]
-	x11-libs/libXdamage[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.8.1[${MULTILIB_USEDEP}]
-	opencl? (
-				app-admin/eselect-opencl
-				dev-libs/libclc
-			)
-	vdpau? ( >=x11-libs/libvdpau-0.4.1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.3[${MULTILIB_USEDEP}] )
-	xorg? (
-		x11-base/xorg-server:=
-		x11-libs/libdrm[libkms]
-	)
-	xvmc? ( >=x11-libs/libXvMC-1.0.6[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	"
-done
-
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-
-DEPEND="${RDEPEND}
-	llvm? (
-		>=sys-devel/llvm-2.9[${MULTILIB_USEDEP}]
-		r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] )
-		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
-	)
-	opencl? (
-				>=sys-devel/llvm-3.3-r1[video_cards_radeon,${MULTILIB_USEDEP}]
-				>=sys-devel/clang-3.3[${MULTILIB_USEDEP}]
-				>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	>=x11-proto/dri2proto-2.6[${MULTILIB_USEDEP}]
-	>=x11-proto/glproto-1.4.15-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.0.99.1[${MULTILIB_USEDEP}]
-	x11-proto/xf86driproto[${MULTILIB_USEDEP}]
-	x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
-	$(python_gen_any_dep 'dev-libs/libxml2[python,${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	has_version "dev-libs/libxml2[python,${PYTHON_USEDEP}]"
-}
-
-S="${WORKDIR}/${MY_P}"
-
-# It is slow without texrels, if someone wants slow
-# mesa without texrels +pic use is worth the shot
-QA_EXECSTACK="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
-QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
-
-# Think about: ggi, fbcon, no-X configs
-
-pkg_setup() {
-	# workaround toc-issue wrt #386545
-	use ppc64 && append-flags -mminimal-toc
-
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-2_src_unpack
-}
-
-src_prepare() {
-	# apply patches
-	if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
-		EPATCH_FORCE="yes" \
-		EPATCH_SOURCE="${WORKDIR}/patches" \
-		EPATCH_SUFFIX="patch" \
-		epatch
-	fi
-
-	# relax the requirement that r300 must have llvm, bug 380303
-	epatch "${FILESDIR}"/${PN}-9.2-dont-require-llvm-for-r300.patch
-
-	# fix for hardened pax_kernel, bug 240956
-	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
-
-	# Solaris needs some recent POSIX stuff in our case
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die
-	fi
-
-	base_src_prepare
-
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use classic; then
-	# Configurable DRI drivers
-		driver_enable swrast
-
-	# Intel code
-		driver_enable video_cards_i915 i915
-		driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		driver_enable video_cards_r100 radeon
-		driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-				! use video_cards_r200; then
-			driver_enable video_cards_radeon radeon r200
-		fi
-	fi
-
-	if use egl; then
-		myconf+="
-			--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")
-			$(use_enable gallium gallium-egl)
-		"
-	fi
-
-	if use gallium; then
-		myconf+="
-			$(use_enable llvm gallium-llvm)
-			$(use_enable openvg)
-			$(use_enable r600-llvm-compiler)
-			$(use_enable vdpau)
-			$(use_enable xvmc)
-		"
-		gallium_enable swrast
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_i915 i915
-		gallium_enable video_cards_ilo ilo
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			gallium_enable video_cards_intel i915
-		fi
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-				! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		# opencl stuff
-		if use opencl; then
-			myconf+="
-				$(use_enable opencl)
-				--with-opencl-libdir="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/mesa"
-				--with-clang-libdir="${EPREFIX}/usr/lib"
-				"
-		fi
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if use pax_kernel; then
-		myconf+="
-			$(use_enable x86 glx-rts)
-		"
-	fi
-
-	# build fails with BSD indent, bug #428112
-	use userland_GNU || export INDENT=cat
-
-	if ! multilib_is_native_abi; then
-		myconf+="--disable-xorg
-			LLVM_CONFIG=${EPREFIX}/usr/bin/llvm-config.${ABI}"
-	fi
-
-	econf \
-		--enable-dri \
-		--enable-glx \
-		--enable-shared-glapi \
-		$(use_enable !bindist texture-float) \
-		$(use_enable debug) \
-		$(use_enable egl) \
-		$(use_enable gbm) \
-		$(use_enable gles1) \
-		$(use_enable gles2) \
-		$(use_enable nptl glx-tls) \
-		$(use_enable osmesa) \
-		$(use_enable !pic asm) \
-		$(use_enable xa) \
-		$(use_enable xorg) \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		--with-llvm-shared-libs \
-		PYTHON2="${PYTHON}" \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	# Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
-	# because user can eselect desired GL provider.
-	ebegin "Moving libGL and friends for dynamic switching"
-		local x
-		local gl_dir="/usr/$(get_libdir)/opengl/${OPENGL_DIR}/"
-		dodir ${gl_dir}/{lib,extensions,include/GL}
-		for x in "${ED}"/usr/$(get_libdir)/lib{EGL,GL*,OpenVG}.{la,a,so*}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/lib \
-					|| die "Failed to move ${x}"
-			fi
-		done
-		for x in "${ED}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/include/GL \
-					|| die "Failed to move ${x}"
-			fi
-		done
-		for x in "${ED}"/usr/include/{EGL,GLES*,VG,KHR}; do
-			if [ -d ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/include \
-					|| die "Failed to move ${x}"
-			fi
-		done
-	eend $?
-
-	if use classic || use gallium; then
-			ebegin "Moving DRI/Gallium drivers for dynamic switching"
-			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
-			keepdir /usr/$(get_libdir)/dri
-			dodir /usr/$(get_libdir)/mesa
-			for x in ${gallium_drivers[@]}; do
-				if [ -f "$(get_libdir)/gallium/${x}" ]; then
-					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-						|| die "Failed to move ${x}"
-					insinto "/usr/$(get_libdir)/dri/"
-					if [ -f "$(get_libdir)/${x}" ]; then
-						insopts -m0755
-						doins "$(get_libdir)/${x}"
-					fi
-				fi
-			done
-			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-				if [ -f ${x} -o -L ${x} ]; then
-					mv -f "${x}" "${x/dri/mesa}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
-			ln -s ../mesa/*.so . || die "Creating symlink failed"
-			# remove symlinks to drivers known to eselect
-			for x in ${gallium_drivers[@]}; do
-				if [ -f ${x} -o -L ${x} ]; then
-					rm "${x}" || die "Failed to remove ${x}"
-				fi
-			done
-			popd
-		eend $?
-	fi
-	if use opencl; then
-		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
-		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-		dodir ${cl_dir}/{lib,include}
-		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-			"${ED}"${cl_dir}
-		fi
-		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-			mv -f "${ED}"/usr/include/CL \
-			"${ED}"${cl_dir}/include
-		fi
-		eend $?
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-
-	if use !bindist; then
-		dodoc docs/patents.txt
-	fi
-
-	# Install config file for eselect mesa
-	insinto /usr/share/mesa
-	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# switch to xorg-x11 and back if necessary, bug #374647 comment 11
-	OLD_IMPLEM="$(eselect opengl show)"
-	if [[ ${OPENGL_DIR}x != ${OLD_IMPLEM}x ]]; then
-		eselect opengl set ${OPENGL_DIR}
-		eselect opengl set ${OLD_IMPLEM}
-	fi
-
-	# Select classic/gallium drivers
-	if use classic || use gallium; then
-		eselect mesa set --auto
-	fi
-
-	# Switch to mesa opencl
-	if use opencl; then
-		eselect opencl set --use-old ${PN}
-	fi
-
-	# warn about patent encumbered texture-float
-	if use !bindist; then
-		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
-		elog "enabled. Please see patents.txt for an explanation."
-	fi
-
-	local using_radeon r_flag
-	for r_flag in ${RADEON_CARDS}; do
-		if use video_cards_${r_flag}; then
-			using_radeon=1
-			break
-		fi
-	done
-
-	if [[ ${using_radeon} = 1 ]] && ! has_version media-libs/libtxc_dxtn; then
-		elog "Note that in order to have full S3TC support, it is necessary to install"
-		elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
-		elog "textures in some apps, and some others even require this to run."
-	fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			DRI_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					DRI_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
-
-gallium_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			GALLIUM_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					GALLIUM_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
--- a/media-libs/mesa/mesa-9.2.2.ebuild
+++ b/media-libs/mesa/mesa-9.2.2.ebuild
@ -1,478 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.2.2.ebuild,v 1.1 2013/11/03 07:01:59 mattst88 Exp $
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-2"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit base autotools multilib multilib-minimal flag-o-matic \
-	python-any-r1 toolchain-funcs ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_PN="${PN/m/M}"
-MY_P="${MY_PN}-${PV/_/-}"
-MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
-
-FOLDER="${PV/_rc*/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_SRC_P}.tar.bz2
-		${SRC_PATCHES}"
-fi
-
-# The code is MIT/X11.
-# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl opencl
-	openvg osmesa pax_kernel pic r600-llvm-compiler selinux vdpau
-	wayland xvmc xa xorg kernel_FreeBSD"
-
-REQUIRED_USE="
-	llvm?   ( gallium )
-	openvg? ( egl gallium )
-	opencl? (
-		gallium
-		video_cards_r600? ( r600-llvm-compiler )
-		video_cards_radeon? ( r600-llvm-compiler )
-		video_cards_radeonsi? ( r600-llvm-compiler )
-	)
-	gles1?  ( egl )
-	gles2?  ( egl )
-	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi video_cards_radeon ) )
-	wayland? ( egl )
-	xa?  ( gallium )
-	xorg?  ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( || ( classic gallium ) )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_ilo?    ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.46"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
-	!<x11-base/xorg-server-1.7
-	!<=x11-proto/xf86driproto-2.0.3
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-	classic? ( app-admin/eselect-mesa )
-	gallium? ( app-admin/eselect-mesa )
-	>=app-admin/eselect-opengl-1.2.7
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	gbm? ( virtual/udev[${MULTILIB_USEDEP}] )
-	>=x11-libs/libX11-1.3.99.901[${MULTILIB_USEDEP}]
-	x11-libs/libXdamage[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.8.1[${MULTILIB_USEDEP}]
-	opencl? (
-				app-admin/eselect-opencl
-				dev-libs/libclc
-			)
-	vdpau? ( >=x11-libs/libvdpau-0.4.1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.3[${MULTILIB_USEDEP}] )
-	xorg? (
-		x11-base/xorg-server:=
-		x11-libs/libdrm[libkms]
-	)
-	xvmc? ( >=x11-libs/libXvMC-1.0.6[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	"
-done
-
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-
-DEPEND="${RDEPEND}
-	llvm? (
-		>=sys-devel/llvm-2.9[${MULTILIB_USEDEP}]
-		r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] )
-		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
-	)
-	opencl? (
-				>=sys-devel/llvm-3.3-r1[video_cards_radeon,${MULTILIB_USEDEP}]
-				>=sys-devel/clang-3.3[${MULTILIB_USEDEP}]
-				>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	>=x11-proto/dri2proto-2.6[${MULTILIB_USEDEP}]
-	>=x11-proto/glproto-1.4.15-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.0.99.1[${MULTILIB_USEDEP}]
-	x11-proto/xf86driproto[${MULTILIB_USEDEP}]
-	x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
-	$(python_gen_any_dep 'dev-libs/libxml2[python,${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	has_version "dev-libs/libxml2[python,${PYTHON_USEDEP}]"
-}
-
-S="${WORKDIR}/${MY_P}"
-
-# It is slow without texrels, if someone wants slow
-# mesa without texrels +pic use is worth the shot
-QA_EXECSTACK="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
-QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
-
-# Think about: ggi, fbcon, no-X configs
-
-pkg_setup() {
-	# workaround toc-issue wrt #386545
-	use ppc64 && append-flags -mminimal-toc
-
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-2_src_unpack
-}
-
-src_prepare() {
-	# apply patches
-	if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
-		EPATCH_FORCE="yes" \
-		EPATCH_SOURCE="${WORKDIR}/patches" \
-		EPATCH_SUFFIX="patch" \
-		epatch
-	fi
-
-	# relax the requirement that r300 must have llvm, bug 380303
-	epatch "${FILESDIR}"/${PN}-9.2-dont-require-llvm-for-r300.patch
-
-	# fix for hardened pax_kernel, bug 240956
-	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
-
-	# Solaris needs some recent POSIX stuff in our case
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die
-	fi
-
-	base_src_prepare
-
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use classic; then
-	# Configurable DRI drivers
-		driver_enable swrast
-
-	# Intel code
-		driver_enable video_cards_i915 i915
-		driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		driver_enable video_cards_r100 radeon
-		driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-				! use video_cards_r200; then
-			driver_enable video_cards_radeon radeon r200
-		fi
-	fi
-
-	if use egl; then
-		myconf+="
-			--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")
-			$(use_enable gallium gallium-egl)
-		"
-	fi
-
-	if use gallium; then
-		myconf+="
-			$(use_enable llvm gallium-llvm)
-			$(use_enable openvg)
-			$(use_enable r600-llvm-compiler)
-			$(use_enable vdpau)
-			$(use_enable xvmc)
-		"
-		gallium_enable swrast
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_i915 i915
-		gallium_enable video_cards_ilo ilo
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			gallium_enable video_cards_intel i915
-		fi
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-				! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		# opencl stuff
-		if use opencl; then
-			myconf+="
-				$(use_enable opencl)
-				--with-opencl-libdir="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/mesa"
-				--with-clang-libdir="${EPREFIX}/usr/lib"
-				"
-		fi
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if use pax_kernel; then
-		myconf+="
-			$(use_enable x86 glx-rts)
-		"
-	fi
-
-	# build fails with BSD indent, bug #428112
-	use userland_GNU || export INDENT=cat
-
-	if ! multilib_is_native_abi; then
-		myconf+="--disable-xorg
-			LLVM_CONFIG=${EPREFIX}/usr/bin/llvm-config.${ABI}"
-	fi
-
-	econf \
-		--enable-dri \
-		--enable-glx \
-		--enable-shared-glapi \
-		$(use_enable !bindist texture-float) \
-		$(use_enable debug) \
-		$(use_enable egl) \
-		$(use_enable gbm) \
-		$(use_enable gles1) \
-		$(use_enable gles2) \
-		$(use_enable nptl glx-tls) \
-		$(use_enable osmesa) \
-		$(use_enable !pic asm) \
-		$(use_enable xa) \
-		$(use_enable xorg) \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		--with-llvm-shared-libs \
-		PYTHON2="${PYTHON}" \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	# Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
-	# because user can eselect desired GL provider.
-	ebegin "Moving libGL and friends for dynamic switching"
-		local x
-		local gl_dir="/usr/$(get_libdir)/opengl/${OPENGL_DIR}/"
-		dodir ${gl_dir}/{lib,extensions,include/GL}
-		for x in "${ED}"/usr/$(get_libdir)/lib{EGL,GL*,OpenVG}.{la,a,so*}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/lib \
-					|| die "Failed to move ${x}"
-			fi
-		done
-		for x in "${ED}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/include/GL \
-					|| die "Failed to move ${x}"
-			fi
-		done
-		for x in "${ED}"/usr/include/{EGL,GLES*,VG,KHR}; do
-			if [ -d ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/include \
-					|| die "Failed to move ${x}"
-			fi
-		done
-	eend $?
-
-	if use classic || use gallium; then
-			ebegin "Moving DRI/Gallium drivers for dynamic switching"
-			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
-			keepdir /usr/$(get_libdir)/dri
-			dodir /usr/$(get_libdir)/mesa
-			for x in ${gallium_drivers[@]}; do
-				if [ -f "$(get_libdir)/gallium/${x}" ]; then
-					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-						|| die "Failed to move ${x}"
-					insinto "/usr/$(get_libdir)/dri/"
-					if [ -f "$(get_libdir)/${x}" ]; then
-						insopts -m0755
-						doins "$(get_libdir)/${x}"
-					fi
-				fi
-			done
-			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-				if [ -f ${x} -o -L ${x} ]; then
-					mv -f "${x}" "${x/dri/mesa}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
-			ln -s ../mesa/*.so . || die "Creating symlink failed"
-			# remove symlinks to drivers known to eselect
-			for x in ${gallium_drivers[@]}; do
-				if [ -f ${x} -o -L ${x} ]; then
-					rm "${x}" || die "Failed to remove ${x}"
-				fi
-			done
-			popd
-		eend $?
-	fi
-	if use opencl; then
-		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
-		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-		dodir ${cl_dir}/{lib,include}
-		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-			"${ED}"${cl_dir}
-		fi
-		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-			mv -f "${ED}"/usr/include/CL \
-			"${ED}"${cl_dir}/include
-		fi
-		eend $?
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-
-	if use !bindist; then
-		dodoc docs/patents.txt
-	fi
-
-	# Install config file for eselect mesa
-	insinto /usr/share/mesa
-	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# switch to xorg-x11 and back if necessary, bug #374647 comment 11
-	OLD_IMPLEM="$(eselect opengl show)"
-	if [[ ${OPENGL_DIR}x != ${OLD_IMPLEM}x ]]; then
-		eselect opengl set ${OPENGL_DIR}
-		eselect opengl set ${OLD_IMPLEM}
-	fi
-
-	# Select classic/gallium drivers
-	if use classic || use gallium; then
-		eselect mesa set --auto
-	fi
-
-	# Switch to mesa opencl
-	if use opencl; then
-		eselect opencl set --use-old ${PN}
-	fi
-
-	# warn about patent encumbered texture-float
-	if use !bindist; then
-		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
-		elog "enabled. Please see patents.txt for an explanation."
-	fi
-
-	local using_radeon r_flag
-	for r_flag in ${RADEON_CARDS}; do
-		if use video_cards_${r_flag}; then
-			using_radeon=1
-			break
-		fi
-	done
-
-	if [[ ${using_radeon} = 1 ]] && ! has_version media-libs/libtxc_dxtn; then
-		elog "Note that in order to have full S3TC support, it is necessary to install"
-		elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
-		elog "textures in some apps, and some others even require this to run."
-	fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			DRI_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					DRI_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
-
-gallium_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			GALLIUM_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					GALLIUM_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
--- a/media-libs/mesa/mesa-9.2.4.ebuild
+++ b/media-libs/mesa/mesa-9.2.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.2.3.ebuild,v 1.1 2013/11/18 23:11:25 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.2.4.ebuild,v 1.2 2013/11/29 16:36:09 chithanh Exp $

 EAPI=5

@ -27,7 +27,7 @@ FOLDER="${PV/_rc*/}"
 DESCRIPTION="OpenGL-like graphic library for Linux"
 HOMEPAGE="http://mesa3d.sourceforge.net/"

-#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
+SRC_PATCHES="mirror://gentoo/${PN}-9.2-gentoo-patches-01.tar.xz"
 if [[ $PV = 9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 else
@ -49,15 +49,16 @@ for card in ${VIDEO_CARDS}; do
 done

 IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl opencl
-	openvg osmesa pax_kernel pic r600-llvm-compiler selinux vdpau
-	wayland xvmc xa xorg kernel_FreeBSD"
+	bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl
+	llvm-shared-libs opencl	openvg osmesa pax_kernel pic r600-llvm-compiler
+	selinux vdpau wayland xvmc xa xorg kernel_FreeBSD"

 REQUIRED_USE="
 	llvm?   ( gallium )
 	openvg? ( egl gallium )
 	opencl? (
 		gallium
+		llvm-shared-libs
 		video_cards_r600? ( r600-llvm-compiler )
 		video_cards_radeon? ( r600-llvm-compiler )
 		video_cards_radeonsi? ( r600-llvm-compiler )
@ -299,9 +300,9 @@ multilib_src_configure() {
 		$(use_enable !pic asm) \
 		$(use_enable xa) \
 		$(use_enable xorg) \
+		$(use_with llvm-shared-libs) \
 		--with-dri-drivers=${DRI_DRIVERS} \
 		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		--with-llvm-shared-libs \
 		PYTHON2="${PYTHON}" \
 		${myconf}
 }
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@ -13,6 +13,7 @@
 	<flag name='gles1'>Enable GLESv1 support.</flag>
 	<flag name='gles2'>Enable GLESv2 support.</flag>
 	<flag name='llvm'>Enable LLVM backend for Gallium3D.</flag>
+	<flag name='llvm-shared-libs'>Dynamically link Gallium3D drivers against LLVM.</flag>
 	<flag name='opencl'>Enable the Clover Gallium OpenCL state tracker.</flag>
 	<flag name='openvg'>Enable the OpenVG 2D acceleration API for Gallium3D.</flag>
 	<flag name='osmesa'>Build the Mesa library for off-screen rendering.</flag>
--- a/media-libs/opusfile/Manifest
+++ b/media-libs/opusfile/Manifest
@ -1 +1,2 @@
 DIST opusfile-0.2.tar.gz 399527 SHA256 b4a678b3b6c4adfb6aff1f67ef658becfe146ea7c7ff228e99543762171557f9 SHA512 bfcd50d6e7700c7defaa7b45254f587754f815175ecd217d3bee218e14f17150e0b267602110075db7b81b1d907a6d1559faa77824336e424ccf1d38b0139ac6 WHIRLPOOL c508d48c40f2e8806df6902caa0192adb51c84a93e077cff892cee2b72b19262e6a0c13395b6db8a0b27c6186eddbb2c083426c8de04a177b5d011ff0ceab3e5
+DIST opusfile-0.4.tar.gz 427366 SHA256 9836ea11706c44f36de92c4c9b1248e03a4c521e7fb2cff18a0cb4f8b0e79140 SHA512 af13e3c6301f303abc67ae45f0675ace04e902eb1cd72fc448893efb3a40588c3a2f10442f80d26456af13b51764d03a0a0d5841c538487b82aebca30c0270ce WHIRLPOOL 1354bf245a77e01b822351f4ddcb1aa9646c8a49c7a52bfc01b0c3445bc51fd6af4c39d1e975b65b08c465e2c5e60ebb32601dc092c006470ec6f6d6980fb655
--- a/media-libs/opusfile/opusfile-0.2.ebuild
+++ b/media-libs/opusfile/opusfile-0.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opusfile/opusfile-0.2.ebuild,v 1.2 2013/04/19 19:25:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opusfile/opusfile-0.2.ebuild,v 1.3 2013/11/29 14:01:18 polynomial-c Exp $

 EAPI=5

@ -24,6 +24,7 @@ REQUIRED_USE="^^ ( fixed-point float )"

 src_configure() {
 	econf \
+		--docdir=/usr/share/doc/${PF} \
 		$(use_enable doc) \
 		$(use_enable fixed-point)\
 		$(use_enable float) \
--- a/media-libs/opusfile/opusfile-0.4.ebuild
+++ b/media-libs/opusfile/opusfile-0.4.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/media-libs/opusfile/opusfile-0.4.ebuild,v 1.1 2013/11/29 14:01:18 polynomial-c Exp $
+
+EAPI=5
+
+DESCRIPTION="A high-level decoding and seeking API for .opus files"
+HOMEPAGE="http://www.opus-codec.org/"
+SRC_URI="http://downloads.xiph.org/releases/opus/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc fixed-point +float +http static-libs"
+
+RDEPEND="media-libs/libogg
+	media-libs/opus
+	http? ( dev-libs/openssl )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+REQUIRED_USE="^^ ( fixed-point float )"
+
+src_configure() {
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable doc) \
+		$(use_enable fixed-point)\
+		$(use_enable float) \
+		$(use_enable http) \
+		$(use_enable static-libs static)
+}
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.29 2013/11/27 08:07:23 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.30 2013/11/29 10:39:40 pinkbyte Exp $

 EAPI=5

@ -21,9 +21,9 @@ SLOT="0"
 [[ ${PV} == *9999* ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE="+alsa bluray bs2b +cdio -doc-pdf dvb +dvd +enca encode +iconv jack -joystick
-jpeg ladspa lcms +libass libcaca libguess lirc lua luajit +mpg123 -openal +opengl oss
-portaudio +postproc pulseaudio pvr +quvi -radio samba +shm +threads v4l vaapi
-vcd vdpau vf-dlopen wayland +X xinerama +xscreensaver +xv"
+jpeg ladspa lcms +libass libcaca libguess lirc lua luajit +mpg123 -openal +opengl
+oss portaudio +postproc pulseaudio pvr +quvi -radio samba +shm v4l vaapi vcd vdpau
+vf-dlopen wayland +X xinerama +xscreensaver +xv"

 REQUIRED_USE="
 	enca? ( iconv )
@ -31,10 +31,8 @@ REQUIRED_USE="
 	libguess? ( iconv )
 	luajit? ( lua )
 	opengl? ( || ( wayland X ) )
-	portaudio? ( threads )
 	pvr? ( v4l )
 	radio? ( v4l || ( alsa oss ) )
-	v4l? ( threads )
 	vaapi? ( X )
 	vdpau? ( X )
 	wayland? ( opengl )
@ -45,8 +43,8 @@ REQUIRED_USE="

 RDEPEND+="
 	|| (
-		>=media-video/libav-9:=[encode?,threads?,vaapi?,vdpau?]
-		>=media-video/ffmpeg-1.2:0=[encode?,threads?,vaapi?,vdpau?]
+		>=media-video/libav-9:=[encode?,threads,vaapi?,vdpau?]
+		>=media-video/ffmpeg-1.2:0=[encode?,threads,vaapi?,vdpau?]
 	)
 	sys-libs/ncurses
 	sys-libs/zlib
@ -94,7 +92,7 @@ RDEPEND+="
 	postproc? (
 		|| (
 			media-libs/libpostproc
-			>=media-video/ffmpeg-1.2:0[encode?,threads?,vaapi?,vdpau?]
+			>=media-video/ffmpeg-1.2:0[encode?,threads,vaapi?,vdpau?]
 		)
 	)
 	pulseaudio? ( media-sound/pulseaudio )
@ -212,7 +210,6 @@ src_configure() {
 		$(use_enable openal) \
 		$(use_enable oss oss-audio) \
 		$(use_enable pulseaudio pulse) \
-		$(use_enable threads pthreads) \
 		$(use_enable shm) \
 		$(use_enable X x11) \
 		$(use_enable vaapi) \
--- a/media-video/nvidia-settings/nvidia-settings-325.15.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-325.15.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-325.15.ebuild,v 1.1 2013/08/08 07:03:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-325.15.ebuild,v 1.2 2013/11/28 11:16:52 nimiux Exp $

 EAPI=5

@ -12,7 +12,7 @@ SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="-* amd64 ~x86 ~x86-fbsd"
 IUSE="examples"

 COMMON_DEPEND="x11-libs/libX11
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Thu, 28 Nov 2013 06:36:59 +0000
+Fri, 29 Nov 2013 17:06:59 +0000
--- a/metadata/glsa/glsa-201311-17.xml
+++ b/metadata/glsa/glsa-201311-17.xml
@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="/xsl/glsa.xsl" type="text/xsl"?>
+<?xml-stylesheet href="/xsl/guide.xsl" type="text/xsl"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201311-17">
+  <title>Perl: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities were found in Perl, the worst of which
+    could allow a local attacker to cause a Denial of Service condition.
+  </synopsis>
+  <product type="ebuild">perl</product>
+  <announced>November 28, 2013</announced>
+  <revised>November 28, 2013: 1</revised>
+  <bug>249629</bug>
+  <bug>313565</bug>
+  <bug>362025</bug>
+  <bug>386357</bug>
+  <access>local, remote</access>
+  <affected>
+    <package name="dev-lang/perl" auto="yes" arch="*">
+      <unaffected range="ge">5.12.3-r1</unaffected>
+      <vulnerable range="lt">5.12.3-r1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Perl is Larry Wall’s Practical Extraction and Report Language.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Perl. Please review the
+      CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="high">
+    <p>A local attacker could cause a Denial of Service condition or perform
+      symlink attacks to overwrite arbitrary files with the privileges of the
+      user running the application. A context-dependent attacker could cause a
+      Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Perl users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-lang/perl-5.12.3-r1"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2008-5302">CVE-2008-5302</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2008-5303">CVE-2008-5303</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2010-1158">CVE-2010-1158</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0761">CVE-2011-0761</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-1487">CVE-2011-1487</uri>
+  </references>
+  <metadata tag="requester" timestamp="Fri, 07 Oct 2011 23:37:30 +0000">
+    underling
+  </metadata>
+  <metadata tag="submitter" timestamp="Thu, 28 Nov 2013 08:18:07 +0000">craig</metadata>
+</glsa>
--- a/metadata/glsa/glsa-201311-18.xml
+++ b/metadata/glsa/glsa-201311-18.xml
@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="/xsl/glsa.xsl" type="text/xsl"?>
+<?xml-stylesheet href="/xsl/guide.xsl" type="text/xsl"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201311-18">
+  <title>Unbound: Denial of Service</title>
+  <synopsis>Multiple Denial of Service vulnerabilities have been found in
+    Unbound.
+  </synopsis>
+  <product type="ebuild">unbound</product>
+  <announced>November 28, 2013</announced>
+  <revised>November 28, 2013: 1</revised>
+  <bug>395287</bug>
+  <access>remote</access>
+  <affected>
+    <package name="net-dns/unbound" auto="yes" arch="*">
+      <unaffected range="ge">1.4.13_p2</unaffected>
+      <vulnerable range="lt">1.4.13_p2</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Unbound is a validating, recursive, and caching DNS resolver. </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Unbound. Please review
+      the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could possibly cause a Denial of Service condition via
+      a specially crafted response.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Unbound users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-dns/unbound-1.4.13_p2"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-4528">CVE-2011-4528</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-4869">CVE-2011-4869</uri>
+  </references>
+  <metadata tag="requester" timestamp="Tue, 06 Mar 2012 01:21:57 +0000">craig</metadata>
+  <metadata tag="submitter" timestamp="Thu, 28 Nov 2013 08:18:29 +0000">Zlogene</metadata>
+</glsa>
--- a/metadata/glsa/glsa-201311-19.xml
+++ b/metadata/glsa/glsa-201311-19.xml
@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="/xsl/glsa.xsl" type="text/xsl"?>
+<?xml-stylesheet href="/xsl/guide.xsl" type="text/xsl"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201311-19">
+  <title>rssh: Access restriction bypass</title>
+  <synopsis>Multiple vulnerabilities have been found in rssh, allowing local
+    attackers to bypass access restrictions.
+  </synopsis>
+  <product type="ebuild">rssh</product>
+  <announced>November 28, 2013</announced>
+  <revised>November 28, 2013: 1</revised>
+  <bug>415255</bug>
+  <bug>445166</bug>
+  <access>local</access>
+  <affected>
+    <package name="app-shells/rssh" auto="yes" arch="*">
+      <unaffected range="ge">2.3.4</unaffected>
+      <vulnerable range="lt">2.3.4</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>rssh is a restricted shell, allowing only a few commands like scp or
+      sftp. It is often used as a complement to OpenSSH to provide limited
+      access to users.
+    </p>
+  </background>
+  <description>
+    <p>Multiple command line parsing and validation vulnerabilities have been
+      discovered in rssh. Please review the CVE identifiers referenced below
+      for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>Multiple parsing and validation vulnerabilities can cause the
+      restrictions set up by rssh to be bypassed. 
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All rssh users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=app-shells/rssh-2.3.4"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-2252">
+      CVE-2012-2252
+    </uri>
+    <uri link="http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-3478">
+      CVE-2012-3478
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="Fri, 24 Aug 2012 14:16:31 +0000">
+    underling
+  </metadata>
+  <metadata tag="submitter" timestamp="Thu, 28 Nov 2013 08:18:46 +0000">
+    BlueKnight
+  </metadata>
+</glsa>
--- a/metadata/glsa/glsa-201311-20.xml
+++ b/metadata/glsa/glsa-201311-20.xml
@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="/xsl/glsa.xsl" type="text/xsl"?>
+<?xml-stylesheet href="/xsl/guide.xsl" type="text/xsl"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201311-20">
+  <title>Okular: Arbitrary code execution </title>
+  <synopsis>A heap-based buffer overflow in Okular might allow a remote
+    attacker to execute arbitrary code or cause a Denial of Service condition.
+  </synopsis>
+  <product type="ebuild">okular</product>
+  <announced>November 28, 2013</announced>
+  <revised>November 28, 2013: 1</revised>
+  <bug>334469</bug>
+  <access>remote</access>
+  <affected>
+    <package name="kde-base/okular" auto="yes" arch="*">
+      <unaffected range="ge">4.4.5-r2</unaffected>
+      <vulnerable range="lt">4.4.5-r2</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Okular is a universal document viewer based on KPDF for KDE 4.</p>
+  </background>
+  <description>
+    <p>Okular contains a heap-based buffer overflow  in the RLE decompression
+      functionality in the TranscribePalmImageToJPEG function in
+      generators/plucker/inplug/image.cpp.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could entice a user to open a specially crafted PBD
+      file using Okular, possibly resulting in execution of arbitrary code with
+      the privileges of the process, or a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Okular users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=kde-base/okular-4.4.5-r2"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2010-2575">
+      CVE-2010-2575
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="Fri, 07 Oct 2011 23:37:53 +0000">
+    underling
+  </metadata>
+  <metadata tag="submitter" timestamp="Thu, 28 Nov 2013 08:19:02 +0000">Zlogene</metadata>
+</glsa>
--- a/metadata/glsa/glsa-201311-21.xml
+++ b/metadata/glsa/glsa-201311-21.xml
@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="/xsl/glsa.xsl" type="text/xsl"?>
+<?xml-stylesheet href="/xsl/guide.xsl" type="text/xsl"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201311-21">
+  <title>cpio: Arbitrary code execution </title>
+  <synopsis>A heap-based buffer overflow in cpio might allow a remote rmt
+    server to execute arbitrary code or cause a Denial of Service condition.
+  </synopsis>
+  <product type="ebuild">cpio</product>
+  <announced>November 28, 2013</announced>
+  <revised>November 28, 2013: 1</revised>
+  <bug>314663</bug>
+  <access>remote</access>
+  <affected>
+    <package name="app-arch/cpio" auto="yes" arch="*">
+      <unaffected range="ge">2.11</unaffected>
+      <vulnerable range="lt">2.11</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>GNU cpio copies files into or out of a cpio or tar archive.</p>
+  </background>
+  <description>
+    <p>Cpio contains a heap-based buffer overflow in the rmt_read__ function in
+      lib/rtapelib.c.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote server could sending more data than was requested, related to
+      archive filenames that contain a : (colon) character, possibly resulting
+      in execution of arbitrary code or a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All cpio users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=app-arch/cpio-2.11"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2010-0624">
+      CVE-2010-0624
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="Fri, 07 Oct 2011 23:37:31 +0000">
+    underling
+  </metadata>
+  <metadata tag="submitter" timestamp="Thu, 28 Nov 2013 08:19:10 +0000">Zlogene</metadata>
+</glsa>
--- a/metadata/glsa/glsa-201311-22.xml
+++ b/metadata/glsa/glsa-201311-22.xml
@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="/xsl/glsa.xsl" type="text/xsl"?>
+<?xml-stylesheet href="/xsl/guide.xsl" type="text/xsl"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201311-22">
+  <title>Namazu: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Namazu, worst of which
+    allows remote attackers to cause a Denial of Service condition.
+  </synopsis>
+  <product type="ebuild">namazu</product>
+  <announced>November 28, 2013</announced>
+  <revised>November 28, 2013: 1</revised>
+  <bug>391259</bug>
+  <access>remote</access>
+  <affected>
+    <package name="app-text/namazu" auto="yes" arch="*">
+      <unaffected range="ge">2.0.21</unaffected>
+      <vulnerable range="lt">2.0.21</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Namazu is a full-text search engine intended for easy use.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Namazu. Please review
+      the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could execute arbitrary code or cause a Denial of
+      Service condition.
+      Furthermore, a remote attacker may be able to inject arbitrary web script
+      or HTML via a cookie.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Namazu users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=app-text/namazu-2.0.21"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2009-5028">CVE-2009-5028</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-4345">CVE-2011-4345</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-4711">CVE-2011-4711</uri>
+  </references>
+  <metadata tag="requester" timestamp="Tue, 06 Mar 2012 01:13:31 +0000">craig</metadata>
+  <metadata tag="submitter" timestamp="Thu, 28 Nov 2013 09:20:14 +0000">Zlogene</metadata>
+</glsa>
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Thu, 28 Nov 2013 06:37:00 +0000
+Fri, 29 Nov 2013 17:06:59 +0000
--- a/metadata/md5-cache/app-accessibility/accerciser-3.8.2
+++ b/metadata/md5-cache/app-accessibility/accerciser-3.8.2
@ -9,5 +9,5 @@ LICENSE=BSD CC-BY-SA-3.0
 RDEPEND=>=app-accessibility/at-spi2-core-2.5.2:2 >=dev-python/pygobject-2.90.3:3[python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=x11-libs/gtk+-3.1.13:3[introspection] dev-libs/atk[introspection] >=dev-libs/glib-2.28:2 dev-libs/gobject-introspection >=dev-python/ipython-0.11[python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/pyatspi-2.1.5[python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pycairo[python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)] x11-libs/gdk-pixbuf[introspection] x11-libs/libwnck:3[introspection] x11-libs/pango[introspection] python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) dev-lang/python-exec:=[python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 SLOT=0
 SRC_URI=mirror://gnome/sources/accerciser/3.8/accerciser-3.8.2.tar.xz
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	5932e418cf62147cad2d902718aacc56	multibuild	56d4120419072116417e8de1bd1040ff	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	python-r1	b81583006559e9b008883355c9889e29	python-utils-r1	49ee0ca5e1019d8f256a23692dad2642	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	5932e418cf62147cad2d902718aacc56	multibuild	56d4120419072116417e8de1bd1040ff	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	67154e3c80516dc77f9f56956f5beebe	python-r1	b81583006559e9b008883355c9889e29	python-utils-r1	49ee0ca5e1019d8f256a23692dad2642	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=18a90457ed95c014a35e057fc9773eea
--- a/metadata/md5-cache/app-accessibility/brltty-4.2
+++ b/metadata/md5-cache/app-accessibility/brltty-4.2
@ -10,5 +10,5 @@ RDEPEND=java? ( >=virtual/jre-1.4 ) bluetooth? ( net-wireless/bluez ) gpm? ( >=s
 REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api ) tcl? ( api )
 SLOT=0
 SRC_URI=http://mielke.cc/brltty/releases/brltty-4.2.tar.gz
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	4878e7f88afc0ba0866ac112190b0fd4	findlib	9cf6020ee5481f39f1aa566a323f9868	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	libtool	5932e418cf62147cad2d902718aacc56	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	4878e7f88afc0ba0866ac112190b0fd4	findlib	9cf6020ee5481f39f1aa566a323f9868	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	libtool	5932e418cf62147cad2d902718aacc56	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	67154e3c80516dc77f9f56956f5beebe	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e41f52e1d90d6d846af3cdf2ec49e9f2
--- a/metadata/md5-cache/app-accessibility/brltty-4.2-r1
+++ b/metadata/md5-cache/app-accessibility/brltty-4.2-r1
@ -10,5 +10,5 @@ RDEPEND=java? ( >=virtual/jre-1.4 ) bluetooth? ( net-wireless/bluez ) gpm? ( >=s
 REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api ) tcl? ( api )
 SLOT=0
 SRC_URI=http://mielke.cc/brltty/releases/brltty-4.2.tar.gz
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	4878e7f88afc0ba0866ac112190b0fd4	findlib	9cf6020ee5481f39f1aa566a323f9868	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	libtool	5932e418cf62147cad2d902718aacc56	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	4878e7f88afc0ba0866ac112190b0fd4	findlib	9cf6020ee5481f39f1aa566a323f9868	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	libtool	5932e418cf62147cad2d902718aacc56	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	67154e3c80516dc77f9f56956f5beebe	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=865fc36a4916c4c3dd66e846774502b2
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST Class-Mix-0.005.tar.gz 8676 SHA256 054d0db62df90f22601f2a18fc84e9ca026d81601f5940b2fcc543e39d69b36b SHA512 9486a8ec4f6b1a5483610cdac110eed219bb849e8895a350309167206f8caef4209abbbc340a467f4c3b2ca3afc6e2b49b66601110517b66684689f4d88d20c9 WHIRLPOOL c7f798fa3435374809b1f5c68db167e2af5a972569b131ee28925aba8168abd0705a03087306c412197efaa6b31de9ffbf2a61226aec4912ffde4a91ef6781a4`
				`@ -0,0 +1 @@`
				`DIST Crypt-Eksblowfish-0.009.tar.gz 36302 SHA256 3cc7126d5841107237a9be2dc5c7fbc167cf3c4b4ce34678a8448b850757014c SHA512 ca66a1ca4fd71388f25dc77c943e2416ed8534576309dd75f19a7219457418140c1bd21887d61918c34d3d6f9e11ea822b4661d30c6edf7f3673bbcd9a00a51b WHIRLPOOL 7a686f36322cbb086263305cb94e3b1749932f9666ad747b61c3de428e20536894b1cba3dfd6c80f6cb90ac71b783d07cafd7d341b88a45f02956b8ee4232a94`