Sync with portage [Sun Dec 23 01:04:33 MSK 2012].

12 years ago · 76bf75aee5
parent 2dd3f2eff2
commit 76bf75aee5
1506 changed files with 13393 additions and 5240 deletions
--- a/app-admin/gkrellm/files/gkrellm-2.3.5-dso.patch
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-dso.patch
@ -0,0 +1,32 @@
+From 2c839bf2703e99c3851b58695545fed90b6226fc Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 29 Aug 2012 22:28:47 -0400
+Subject: [PATCH] Explicitly link to libgmodule-2.0
+
+With >=gdk-pixbuf-2.24 and >=pango-1.30, libgmodule-2.0 is no longer
+provided by "pkg-config --libs gtk+-2.0 gthread-2.0", so link to it
+explicitly (as is already done in server/).
+
+Fixes build failure with gnu ld.gold in gkrellm-2.3.5.
+
+https://bugs.gentoo.org/show_bug.cgi?id=428532
+---
+ src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 6d482a7..19b0c29 100644
+--- a/src/Makefile
+++ b/src/Makefile
+@@ -69,7 +69,7 @@ STRIP ?= -s
+ GKRELLM_INCLUDES = gkrellm.h gkrellm-public-proto.h $(SHARED_PATH)/log.h
+ 
+ PKG_INCLUDE = `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0`
+-PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0`
+PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gmodule-2.0 gthread-2.0`
+ 
+ FLAGS = -O2 -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE) $(PTHREAD_INC)\
+  ${SSL_INCLUDE} ${NTLM_INCLUDE} -DGKRELLM_CLIENT
+-- 
+1.7.12
+
--- a/app-admin/gkrellm/gkrellm-2.3.5-r2.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.5-r2.ebuild
@ -0,0 +1,121 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.5-r2.ebuild,v 1.1 2012/12/22 18:32:52 ottxor Exp $
+
+EAPI=4
+
+inherit eutils multilib toolchain-funcs user
+
+DESCRIPTION="Single process stack of various system monitors"
+HOMEPAGE="http://www.gkrellm.net/"
+SRC_URI="http://members.dslextreme.com/users/billw/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="hddtemp gnutls lm_sensors nls ssl ntlm X kernel_FreeBSD"
+
+RDEPEND="dev-libs/glib:2
+	hddtemp? ( app-admin/hddtemp )
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( ssl? ( dev-libs/openssl ) )
+	lm_sensors? ( sys-apps/lm_sensors )
+	nls? ( virtual/libintl )
+	ntlm? ( net-libs/libntlm )
+	X? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	enewgroup gkrellmd
+	enewuser gkrellmd -1 -1 -1 gkrellmd
+	TARGET=
+	use kernel_FreeBSD && TARGET="freebsd"
+}
+
+src_prepare() {
+	sed -e 's:-O2 ::' \
+		-e 's:override CC:CFLAGS:' \
+		-e 's:-L/usr/X11R6/lib::' \
+		-i */Makefile || die "sed Makefile(s) failed"
+
+	sed -e 's:#user\tnobody:user\tgkrellmd:' \
+		-e 's:#group\tproc:group\tgkrellmd:' \
+		-i server/gkrellmd.conf || die "sed gkrellmd.conf failed"
+
+	sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
+		-e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
+		-i src/${PN}.h || die "sed ${PN}.h failed"
+
+	epatch "${FILESDIR}/${P}-autofs.patch"
+	epatch "${FILESDIR}/${P}-cifs.patch"
+	epatch "${FILESDIR}/${P}-dso.patch"
+}
+
+src_compile() {
+	if use X ; then
+		local sslopt=""
+		if use gnutls; then
+			sslopt="without-ssl=yes"
+		elif use ssl; then
+			sslopt="without-gnutls=yes"
+		else
+			sslopt="without-ssl=yes without-gnutls=yes"
+		fi
+
+		emake ${TARGET} \
+			CC="$(tc-getCC)" \
+			STRIP="" \
+			INSTALLROOT="${EPREFIX}/usr" \
+			INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
+			LOCALEDIR="${EPREFIX}/usr/share/locale" \
+			$(use nls || echo enable_nls=0) \
+			$(use lm_sensors || echo without-libsensors=yes) \
+			$(use ntlm || echo without-ntlm=yes) \
+			${sslopt} \
+		|| die "emake failed"
+	else
+		cd server
+		emake ${TARGET} \
+			CC="$(tc-getCC)" \
+			LINK_FLAGS="$LDFLAGS -Wl,-E" \
+			STRIP="" \
+			$(use nls || echo enable_nls=0) \
+			$(use lm_sensors || echo without-libsensors=yes) \
+		|| die "emake failed"
+	fi
+}
+
+src_install() {
+	if use X ; then
+		emake install${TARGET:+_}${TARGET} \
+			$(use nls || echo enable_nls=0) \
+			STRIP="" \
+			INSTALLDIR="${ED}/usr/bin" \
+			INCLUDEDIR="${ED}/usr/include" \
+			LOCALEDIR="${ED}/usr/share/locale" \
+			PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
+			MANDIR="${ED}/usr/share/man/man1" \
+		|| die "emake install failed"
+
+		dohtml *.html
+
+		newicon src/icon.xpm ${PN}.xpm
+		make_desktop_entry ${PN} GKrellM ${PN}
+	else
+		dobin server/gkrellmd || die "dobin failed"
+
+		insinto /usr/include/gkrellm2
+		doins server/gkrellmd.h || die "doins failed"
+		doins shared/log.h || die "doins failed"
+	fi
+
+	doinitd "${FILESDIR}"/gkrellmd || die "doinitd failed"
+	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd || die "newconfd failed"
+
+	insinto /etc
+	doins server/gkrellmd.conf || die "doins failed"
+
+	dodoc Changelog CREDITS README
+}
--- a/app-admin/logrotate/logrotate-3.8.3.ebuild
+++ b/app-admin/logrotate/logrotate-3.8.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.3.ebuild,v 1.4 2012/12/18 17:14:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.3.ebuild,v 1.5 2012/12/22 13:50:57 ago Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="https://fedorahosted.org/releases/l/o/logrotate/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="acl selinux"

 RDEPEND="
--- a/app-admin/webalizer/webalizer-2.23.05.ebuild
+++ b/app-admin/webalizer/webalizer-2.23.05.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.23.05.ebuild,v 1.4 2012/12/19 14:30:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.23.05.ebuild,v 1.5 2012/12/22 13:53:40 ago Exp $

 # uses webapp.eclass to create directories with right permissions
 # probably slight overkill but works well
@ -24,7 +24,7 @@ SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2
 	mirror://gentoo/${PN}.conf.gz"

 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ~ppc64 ~sparc ~x86"
 IUSE="geoip nls xtended"
 SLOT="0"

--- a/app-backup/bacula/bacula-5.0.3-r3.ebuild
+++ b/app-backup/bacula/bacula-5.0.3-r3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.3-r3.ebuild,v 1.15 2012/12/21 06:45:20 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.3-r3.ebuild,v 1.16 2012/12/22 14:07:05 ago Exp $

 EAPI="5"
 PYTHON_DEPEND="python? 2"
@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"

 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 hppa ppc ~sparc ~x86"
 IUSE="acl bacula-clientonly bacula-nodir bacula-nosd ipv6 logwatch mysql postgres python qt4 readline +sqlite3 ssl static tcpd vim-syntax X"

 # maintainer comment:
--- a/app-benchmarks/expedite/Manifest
+++ b/app-benchmarks/expedite/Manifest
@ -0,0 +1 @@
+DIST expedite-1.7.4.tar.bz2 5792836 SHA256 8d547b2cae69045c01765ea5903be17f7174c31133b3309ffc2a9a8409f8c330 SHA512 9085b409e21bb6c9d5d4335c30aad4ffba0bcadacc05c630e6f9719db76d3c2ebfe0e16d7a6ab7da8fd4c5128c8d3b9031f06ef23e3f62ebf9b7a28d28ef3167 WHIRLPOOL 9a23abd516f18f140cb9358028349f4edbe859ff9a5f5d8b2612434498aaaddd89271e5fc7f3556646bc65adc6b2b48c7c64ad2df34aeabf6cf22e74976b8361
--- a/app-benchmarks/expedite/expedite-1.7.4.ebuild
+++ b/app-benchmarks/expedite/expedite-1.7.4.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/expedite/expedite-1.7.4.ebuild,v 1.1 2012/12/21 21:08:52 tommy Exp $
+
+EAPI=2
+
+inherit enlightenment
+
+DESCRIPTION="Performance and correctness test suite for Evas"
+SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="directfb fbcon opengl X xcb"
+
+RDEPEND="dev-libs/eina
+	media-libs/evas[directfb?,fbcon?,opengl?,X?,xcb?]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	if use X ; then
+		if use xcb ; then
+			ewarn "You have enabled both 'X' and 'xcb', so we will use"
+			ewarn "X as it's considered the most stable for evas"
+		fi
+		MY_ECONF="
+			--disable-xrender-xcb
+			$(use_enable opengl opengl-x11)
+		"
+	elif use xcb ; then
+		MY_ECONF="
+			--enable-xrender-xcb
+		"
+	else
+		MY_ECONF="
+			--disable-gl-xlib
+			--disable-software-xcb
+			--disable-gl-xcb
+		"
+	fi
+	MY_ECONF+="
+		$(use_enable directfb)
+		$(use_enable fbcon fb)
+		$(use_enable X simple-x11)
+		$(use_enable X software-x11)
+		$(use_enable X xrender-x11)
+	"
+	enlightenment_src_configure
+}
--- a/app-benchmarks/expedite/metadata.xml
+++ b/app-benchmarks/expedite/metadata.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>enlightenment</herd>
+</pkgmetadata>
--- a/app-crypt/coolkey/Manifest
+++ b/app-crypt/coolkey/Manifest
@ -1,3 +1,4 @@
+DIST coolkey-1.1.0-patches-001.tar.gz 19336 SHA256 324977ba41f8eec4490aaeb22f91c74d207cf820deb3264f5cf0941aae65e88c SHA512 530a49094177fd598a104a341b837a377ec3559546a92ecc8602b8d8b92c52968d81039c7f87488852c8df70936c3fd42961b29c6ffb50bd3fc71017dd2eb22f WHIRLPOOL 0f5728191ee98044d593903b346929cdea9bbd4ff6dcefee6a6e2ac9020f94ae0da01eac49ae8ce8e6a58a1cfb154f54ff52d67d8909411faa3669cb5f508418
 DIST coolkey-1.1.0.tar.gz 432808 SHA256 8448e3abb81bffc593c96b577dcfbc05b40e8684188456c31be15fae73d730f7 SHA512 4b61de9b40abcf620fbb519d5e3cf1e93ebdd0470854cb63a597fc91e0182998217353014327f7bc4f255d22515d8ea2b08d36b3a831f5f09134fdcd418bc08b WHIRLPOOL 60408f606a5cf5d9ec1ba3938a96a6f938c8d9f4b7ace2677ff35ce125104995675bf0decae92575e82dfc1a2eeaa26c4197ad174a4d3901250c43d906976c24
 DIST coolkey-patches-20110419.tar.gz 18966 SHA256 717827b73f704ae46b07e4835d0f1428b4d83efc5c35f501b495c00b0afe2627 SHA512 fa3ad205437a9a385141c2176efcf45079d711c6c2ebcdd3e336bcb45123e2628d8d9eef47769509241b22e7b8f73aad2181bd071ce80e99746a34ee4d90fb45 WHIRLPOOL 56721bf4ece4e527480edfde5a7b37ab82f0f7d39967522d6f8e3b63ebf525c22cfce1b569f7608a402dddfa8fb5d503f6d1e431f4219a227a143a8f42fce73b
 DIST coolkey-patches.tar.gz 19457 SHA256 441abc27412c41a3fd36a60569734b3aba4f35b3e9c85e34a93ec9acc62e98f4 SHA512 657867323eb6555da0a00f20bfadc4a07883bc748dfcdf82ee650ff0e9179a05ffd1297102741e87d328d1500dc7a6695e64451d6f33f6d95bb60277be6fa5a9 WHIRLPOOL cdf6f9de2ffda869fb2532ab679074f64566769607d05d0f9222b2edeab557192579763583c5f7d44e19066d0188acc616edc7027ccbd0f11f337247762513fb
--- a/app-crypt/coolkey/coolkey-1.1.0-r5.ebuild
+++ b/app-crypt/coolkey/coolkey-1.1.0-r5.ebuild
@ -0,0 +1,86 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/coolkey/coolkey-1.1.0-r5.ebuild,v 1.1 2012/12/22 00:34:06 alonbl Exp $
+
+EAPI=3
+
+inherit eutils
+
+PATCHVER="001"
+
+DESCRIPTION="Linux Driver support for the CoolKey and CAC products"
+HOMEPAGE="http://directory.fedora.redhat.com/wiki/CoolKey"
+SRC_URI="http://directory.fedora.redhat.com/download/coolkey/${P}.tar.gz
+	mirror://gentoo/${P}-patches-${PATCHVER}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.6.4
+	dev-libs/nss[utils]
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND}
+	>=app-crypt/ccid-1.4.0
+	virtual/pkgconfig"
+
+pkg_setup() {
+	pk="pk11install"
+	dbdir="/etc/pki/nssdb"
+	ck_mod_name="CoolKey PKCS #11 Module"
+
+	if ! [[ -x $dbdir ]]; then
+		ewarn "No /etc/pki/nssdb found; check under \$HOME/.pki and"
+		ewarn "follow the suggested commands using the correct path."
+	fi
+}
+
+src_prepare() {
+	epatch "${WORKDIR}/${PN}-patches"/*
+}
+
+src_configure() {
+	econf --enable-pk11install $(use_enable debug) \
+		|| die "configure failed"
+}
+
+src_compile() {
+	emake CFLAGS+="-fno-strict-aliasing" -j1 || die "make failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	diropts -m 1777
+	keepdir /var/cache/coolkey
+}
+
+pkg_postinst() {
+	if [[ -x $dbdir ]]; then
+		if ! $(modutil -rawlist -dbdir $dbdir | grep libcoolkeypk11); then
+			elog "You still need to install libcoolkey in your PKCS11 library:"
+			elog "$pk -p $dbdir 'name=$ck_mod_name library=libcoolkeypk11.so'"
+
+		fi
+	else
+		elog ""
+		elog "You still need to setup your PKCS11 library, or at least"
+		elog "find where it is (perhaps \$HOME/.pki/nssdb).  Once you"
+		elog "find it, use 'modutil -rawlist -dbdir \$db' to look for"
+		elog "libcoolkeypk11.so, and if not found, add it using:"
+		elog ""
+		elog "$pk -p \$db 'name=$ck_mod_name library=libcoolkeypk11.so'"
+		elog ""
+		elog "where \$db is the full path to your pki/nssdb directory."
+		elog ""
+	fi
+}
+
+pkg_postrm() {
+	if [[ -x $dbdir ]]; then
+		if $(modutil -rawlist -dbdir $dbdir | grep libcoolkeypk11); then
+			elog "You should remove libcoolkey from your PKCS11 library."
+		fi
+	fi
+}
--- a/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
+++ b/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild,v 1.1 2012/12/22 00:55:28 alonbl Exp $
+
+EAPI="4"
+inherit toolchain-funcs
+
+DESCRIPTION="PkZip cipher breaker"
+HOMEPAGE="http://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack.html"
+SRC_URI="http://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack/${P}.tar.gz"
+
+LICENSE="pkcrack"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+
+DEPEND="test? ( app-arch/zip[crypt] )"
+RDEPEND="!<app-text/html-xml-utils-5.3"
+
+src_prepare() {
+	cd "${S}/src"
+	sed -i -e "s/^CC=.*/CC=$(tc-getCC)/" \
+		-e "/^CFLAGS=.*/d" \
+		-e "s/CFLAGS/LDFLAGS/" \
+		Makefile
+	sed -i -e "s:void main:int main:" *.c
+}
+
+src_compile() {
+	cd "${S}/src"
+	emake
+}
+
+src_test() {
+	cd "${S}/test"
+	make CC="$(tc-getCC)" all
+}
+
+src_install() {
+	cd "${S}/src"
+	dobin pkcrack zipdecrypt findkey makekey
+	newbin extract "$PN-extract"
+	dodoc "${S}/doc/"*
+}
+
+pkg_postinst() {
+	elog "Author DEMANDS :-) a postcard be sent to:"
+	elog
+	elog "    Peter Conrad"
+	elog "    Am Heckenberg 1"
+	elog "    56727 Mayen"
+	elog "    Germany"
+	elog
+	elog "See: http://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack/pkcrack-readme.html"
+
+	ewarn
+	ewarn "Due to file collision, extract utility was renamed to $PN-extract,"
+	ewarn "see bug#247394"
+}
--- a/app-crypt/truecrypt/metadata.xml
+++ b/app-crypt/truecrypt/metadata.xml
@ -6,4 +6,7 @@
 		<email>c1pher@gentoo.org</email>
 		<name>Dane Smith</name>
 	</maintainer>
+	<use>
+		<flag name='asm'>Enable assembly for optimization</flag>
+	</use>
 </pkgmetadata>
--- a/app-crypt/truecrypt/truecrypt-7.1a.ebuild
+++ b/app-crypt/truecrypt/truecrypt-7.1a.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-7.1a.ebuild,v 1.4 2012/12/14 22:26:47 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-7.1a.ebuild,v 1.5 2012/12/22 00:10:44 alonbl Exp $

 EAPI="4"

@ -14,7 +14,7 @@ SRC_URI="${P}.tar.gz
 LICENSE="truecrypt-3.0"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~ppc ~x86"
-IUSE="X"
+IUSE="X +asm"
 RESTRICT="mirror fetch bindist"

 RDEPEND="|| ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper )
@ -66,6 +66,7 @@ src_compile() {
 	local EXTRA

 	use X || EXTRA+=" NOGUI=1"
+	use asm  || EXTRA+=" NOASM=1"
 	append-flags -DCKR_NEW_PIN_MODE=0x000001B0 -DCKR_NEXT_OTP=0x000001B1

 	emake \
--- a/app-editors/hteditor/Manifest
+++ b/app-editors/hteditor/Manifest
@ -1 +1,2 @@
 DIST ht-2.0.20.tar.bz2 900575 SHA256 4aa162f10a13e60859bef1f04c6529f967fdfd660ae421ee25eab1fbabcd1ed0 SHA512 ac6cf153783bde37a4cc0c1c087a1b284239c9ac20f0ad34d3389c4bdea0866f2a4a03fbd6ef3871d8c9312c005ad3ab9cc8f0de84134aa94103ae1c1768183d WHIRLPOOL 8955f3a7c448f7a45a7945a0667388068febac04f1e9ec9363cf544e0d6beaddc3874cd01eebf2882bafd2b6426f95d613b8e49cd6010b32da1b69c16ac70a2a
+DIST ht-2.0.21.tar.bz2 897891 SHA256 f9c04f2074d6a774bae0d7fdc3f8b2c579db39aad0761b33b4884949fc378934 SHA512 317abb86fbd05b48ef0e52e5f6e3bbaaa558d909bfec99b3005a8119c5bf3c825e5fe63df5c97d7858cedef1e6c333f45d6b246f14f0d5c54fef43eb8fcf9ca0 WHIRLPOOL bcc29454bfc33b9d665195ebf486bd7a9fa9ed9a359dfadb3b1cad20a3a82e5a3d793d8a5fb088315229e46edc0c1aba9d4d9f354ecf261da1e07402d304638b
--- a/app-editors/hteditor/hteditor-2.0.21.ebuild
+++ b/app-editors/hteditor/hteditor-2.0.21.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/hteditor/hteditor-2.0.21.ebuild,v 1.2 2012/12/22 06:26:55 radhermit Exp $
+
+EAPI=5
+
+inherit toolchain-funcs
+
+MY_P=${P/editor}
+
+DESCRIPTION="A file viewer, editor and analyzer for text, binary, and executable files"
+HOMEPAGE="http://hte.sourceforge.net/"
+SRC_URI="mirror://sourceforge/hte/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="X"
+
+RDEPEND="sys-libs/ncurses
+	X? ( x11-libs/libX11 )
+	>=dev-libs/lzo-2"
+DEPEND="${RDEPEND}
+	virtual/yacc
+	sys-devel/flex"
+
+DOCS=( AUTHORS ChangeLog KNOWNBUGS README TODO )
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	econf \
+		$(use_enable X x11-textmode) \
+		--enable-maintainermode
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	#For prefix
+	chmod u+x "${S}/install-sh"
+
+	default
+
+	dohtml doc/*.html
+	doinfo doc/*.info
+}
--- a/app-editors/hteditor/metadata.xml
+++ b/app-editors/hteditor/metadata.xml
@ -2,7 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">hte</remote-id>
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@ -1,3 +1,4 @@
 DIST VBoxGuestAdditions_4.1.22.iso 52207616 SHA256 5c7d9a4a31c8a926ba6dbae2b9704a561638e94ea0fc4f805a9231dd4f932d46 SHA512 529e5f236a1c4bad9123941d8fc3b0d73f93309d42656bf72090282bd970843457af548323079e36ea95d14b8320b3aaafb3ae790da5694d22f538ff8aa1fcf3 WHIRLPOOL f826dd334cfcc25b64b0ecdfb6a5e15bed60d3ceb398710a1787ea43f154b72e1117840f448ba398dcfe149ce0897799b57f0cf1e1e8b070cc055bc9e98896f9
-DIST VBoxGuestAdditions_4.2.2.iso 56872960 SHA256 26f5390b36a3bb9855846d194dcd287b8e53613b599c6ffd7aff1b451cc7f1f1 SHA512 f82e3c4705140cd33737c0819b541bb7c8613ca03bf13fc8d7baeba7f0425b29f04beea7d1e0235080023ef2e23521f458c2a208ddc36736db791955f5c12780 WHIRLPOOL b58f0cead91e291abe61168caef4405884f625c93fd593abe6995abacb9fb078908f11289604c016c5293ff5d557975ebb368fb3e763bf11c31390913cabcf73
+DIST VBoxGuestAdditions_4.1.24.iso 53532672 SHA256 6db32584eb4e2ace0fd5fbbd9d63bdb8f50f0c28821d03dafd0ed1018d133cc7 SHA512 7c327b98468e2309084c34a9f3ce99391027f5aa9637cd07d1118c7079e00433e8ea0284884cabb1bc1e7dc6d8292eef4a7051842cbb96ff6d0f3d3ea19c756e WHIRLPOOL 23c98108f5ef7ec052965057c6be140bb553ddc10ca200339d53035ccd403133d18b222cfd0b7b00b08010d82c1a216c0cd8c194c6236e17ec8ee7149090b64b
 DIST VBoxGuestAdditions_4.2.4.iso 55379968 SHA256 3d7d909a0fe9ac5ffcca6afdd4142b88bad116d2ffed6e95588dbfbcf00ca5e9 SHA512 650c570a6cb1631546070ba5166a049ec7273632e5e02b4ada399c3efdb9b8da658b67197df9c20ef0f838cc05b570d61773d1b17244bcba1e9f8e83e9591ce5 WHIRLPOOL ab0497b69c540e1b9a1c6ce8a18a8885d3e62b9dc89d721fd5f63a315976b53cd71debbd15499c28531169b942e277f6998863b76d237d5f0e3257fee1b4f7f2
+DIST VBoxGuestAdditions_4.2.6.iso 57401344 SHA256 b9afd356d85fe6822fd28009fd63faddd2ac7cbd75c415ea4ce6a22925243ed3 SHA512 336c17b271df5650f1e1af9f4d1e79b982efd56eb0d98a0aec97e0823e53a3ee54d9843235e1825aad01f012c6e1cf1cf99255fef896877ec31c208362cb9fb9 WHIRLPOOL ad201a7c8e816a654f54e1d35be2b09e21d152d8236190395c379f184f092a85b789b8ad1db60d045387574afb4ff11b9f97921a9565d82442ab7dc56185da82
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.24.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.1.24.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2012 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.1.24.ebuild,v 1.1 2012/12/22 12:25:44 polynomial-c Exp $
+
+EAPI=2
+
+inherit eutils
+
+MY_PN=VBoxGuestAdditions
+MY_P=${MY_PN}_${PV}
+
+DESCRIPTION="CD image containing guest additions for VirtualBox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"
+
+LICENSE="PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	!=app-emulation/virtualbox-9999"
+
+src_unpack() {
+	return 0
+}
+
+src_install() {
+	insinto /usr/share/${PN/-additions}
+	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
+}
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.2.6.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.2.6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.2.2.ebuild,v 1.1 2012/10/24 04:40:47 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.2.6.ebuild,v 1.1 2012/12/22 12:25:44 polynomial-c Exp $

 EAPI=2

--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@ -1,12 +1,16 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.22-80657.tar.gz 10778079 SHA256 837ea30834b7c80e2ae114bb62becac4745ad2878658239cc8eb13ff54cea75f SHA512 1dc1aa1d57a51b05e01004cabbdd40b2b5ff410d3f514cb499c50d847f8830610108bde225a6156a0d9c0c03a7ab96c4d767a7c7a6a5616191cbc1fb46486cca WHIRLPOOL 6758b41ac4d2169b618fbaff6f759ba0b5a3595c77025f61c74ef57ee180ba49c31a9d7ce2b65d37de3e921c2d734878a6deaa00741603e3d5717d203510838d
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.2-81494.tar.gz 11008309 SHA256 2a0824a7f6b93842feb13fe15de16a1bb33c9221116d62ce759eed6878169c2b SHA512 1f1ef106959d342303abbc5e15f07e63ce01335c3f05d525e1d9ba1e21309f2d51bf855b3f7bb0dac62a1d9b57bb8422425a45c313e232795b2e342f0c9ffe7e WHIRLPOOL 071053f6337da7a749c49c945d383b852e6d8d669e59c36e528966d278c2f99b58760977d6c59eaa41965472a2a787268492dfdea9f8321ef4370cdff2a37359
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.24-82872.tar.gz 10785167 SHA256 3e392eb6ca11558b339183ca1e94af66239b05f4b33892ad74576da9ea650941 SHA512 3b6810ec8c208c092e25d262701ea5b263dcdb3d152d57145d99da566e4ef9585688cdac787539466fdbb235662f735cd94ca8859abad22d726b5cd0c9ac28f4 WHIRLPOOL 275380721ad2c0b57c377bf8afb5966f2df6753674ea2f3f3a5970b3fd1badc58a9facc2c09a0dcfc9fa84f28bfc26e2c835998d7782acda1febde647bfc30d5
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.4-81684.tar.gz 11010592 SHA256 62078e057a4ab56aec5ac086746522b3d94787333d0444169471fa5152c609ed SHA512 4e9bcd949e115e8b1f3e268dd933e2fed000d564cfd48408e304a167a2167f85240a7bb4c845c01a7c965e4ff5a60783cc3a8ff40a0246611cf5cc2ac5d0c580 WHIRLPOOL 1e9f6dbd22c917eb9b983e39ad4321ce23741ef8c5a357c3900954194bb5280051ebc29cc5b0d6f2efa98024412ce50d0a61dc793a7bb23a9561873100675c65
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.6-82870.tar.gz 11018821 SHA256 f0113688a76efa0426c27c5541c78506b18637025c35aa682ecc6eeed5d56582 SHA512 a063aa27e1ff727fc90a388b9239bec54064060ef0b51b20b014f0bee1feeb79ca974ae69fc73a22cd41617f330e51492e953e5724b21c2896a5a275c64944f6 WHIRLPOOL e9c2c5fc3e987f3b3b685dfe5cededef995fcc213399f4937d501e739e81da113b0408878d5edbbb5ae24d60fc8b34e9c394b64038a9eb3b10d0f05f6e5aec20
 DIST VirtualBox-4.1.22-80657-Linux_amd64.run 78693841 SHA256 d53a5cc2d1b9431d4f9443462b84549678e943be1d8b4a714d7844c741507c76 SHA512 cdd2920099c0c0349bc6750ab7cad67f23cfba109db62297ad8bede1e7a5658781a29ea1111c8ae1b07cf1eeaf2394baf419be1b9b174575f3c10c13aa9d9b68 WHIRLPOOL c532b3b48c9a0b8057c65db4cbd6e31f17e93a88a4bb5842f9b8c821e8f102d4e2b1bcbfd081ec6a1ecc95b697d8f7914542e8aefcebeb9b2137ad8edf267696
 DIST VirtualBox-4.1.22-80657-Linux_x86.run 78632398 SHA256 a18a2b7723bc8c325149b5581ae36208211c7d8651269516d366db9cdafcd0ae SHA512 0f9dd4fc25828cec3ac3d2961b925a57dd88e0af1c3cf75c9199428b4090790ebd439015700b63def6c53b5acc94135e7766f36f29d6befcb03339d563fac054 WHIRLPOOL 76d06e577f2ee3d9ec0eea0b9800b618af97205ac9b036fe3f1c73b7ecccfbf6f57e49ddc224e9963eb048c5fe6e88cfedf9743b8af2df97137feb03e89fac36
-DIST VirtualBox-4.2.2-81494-Linux_amd64.run 81960401 SHA256 a4d1d1f3047fb3e242338dbaa59d781b189d58021a04d29aac0a3f8ab7b54733 SHA512 8d807c05e3e47ff5613c76356a50a522b1a8dc3d665ed0f7c7f24db47f0495278e5877aa8a0057a50f0c7dac14d5b1f4aa18fb54dc61b2f4dc9d9f91b99320b0 WHIRLPOOL df48a91e981f0edc34b3e1e52691a8efe768107a02459423c740b977aae90f55e1540ee17b40f696b3d325a589eba29feeed7ef69a517b256e9a8f270298e84b
-DIST VirtualBox-4.2.2-81494-Linux_x86.run 81694157 SHA256 c9f1609d9df2f467e1b79ce483e21a912dc3a1431219d5e7528815517de1c175 SHA512 2a593d6ab7d77c60ce1743e86edc6a5d50ec6e07a65dada1bb13c8a3dd7c2e5c2f454f94f32502297746615a09b08f3ffdf27b3e362ac3762fed80dfcdfe556a WHIRLPOOL 15ccffe8ebf00c8acc811911b84d1413c74b36cff1893772aa1cdaac9627c8bbefe84162b6175956bf365dc88a5efc54b924a2acaff953ff3bbc154d3410e98b
+DIST VirtualBox-4.1.24-82872-Linux_amd64.run 79789520 SHA256 feecdc800fa799f49048ddc7a4af14770cf31591e4ffc420e5295208c35541df SHA512 3b741cae8af4ad16cb653551ac8173f6b719f987abae3a5adb2ca85b1c572f9ae8eb4e68713819295749ecd2f5cf15e0ac995c25e2e483de01e554e9effeac8e WHIRLPOOL 5d44db906533287efd13f57ebe93e9b68ebb84f2d1bb2dc6dcd0b2c2b955c36c234b5de56150570c071b0fc6da0192e54f870dcf7c1a8c0137f8a2647aac939b
+DIST VirtualBox-4.1.24-82872-Linux_x86.run 79769035 SHA256 ae3ca9389e1940daf432d8853621ee7e383405f922e924aac42927bdd1257744 SHA512 eeefa5acb674b2d6aa39fffe39bf6a008c57d30e133e0e6d639fa2e224d174f9afa2e827f7d78bdcd6487bcab6f2b2eef12747d566bfd471a9c5e89aa09e4b79 WHIRLPOOL 128aad99482a47e950282b4817c6be0f48d5a3df867202b836f44ca132cb8226d10aae5ebba560263da50efd132e0791cf2f84478e2df26af5084406bd2089a1
 DIST VirtualBox-4.2.4-81684-Linux_amd64.run 80362961 SHA256 4dcd1609dc26c978e7d61e52ae166005e2220acaed159ad5af24c14c3051d51b SHA512 c2aea9bdd9aa5e67331e07104231386093a819304d36c602f1400c92251ea343a00899d3bf3e2cafadd3bcc1965ea1c7851c3571b01887027e74edda0f1e5256 WHIRLPOOL cdca20c6be233767f604325bb561247aa7104a702088a591db169a3c1bd32c28d75f609ea19892b3046cb92e799481ea8ab824173789b5b5283a59b1af9bcd11
 DIST VirtualBox-4.2.4-81684-Linux_x86.run 80106957 SHA256 e691b5ca67d625463c6337ec491a6752f0784a85e3c0f9a6550cd02b508e3f5c SHA512 49c88a29de3fc1d70daf3410d6aef64a60db65e36271778623a265a50680f1847232d6dbb701b3bfe778cb8ba014701c8040287ddb9a4e61314be14f863201fe WHIRLPOOL 68a9b2299ff6f033d48a3c4b22c32a2f75edb27092de75a1afc7e3a3d5b329fe2611b3074fd0a6659b8e20ce8cff46acb7f180c8cf77689a2586b2b2f9fa424e
+DIST VirtualBox-4.2.6-82870-Linux_amd64.run 83527120 SHA256 7e8a85289934d243682f500e42799d0409440ef5380225fba45850851d0df893 SHA512 82df231433653abb6f0128d78442c24b21cc603f6f3eb7160eaf75e1e009d69a84f9a5d93d083244959c97562454059c30f211cd021dd7472f79fe5e642861e4 WHIRLPOOL 2b884f49a05aad0edbbdd641b47b0014469feb0528db9d8e555421ac93f5209ba59d24b81882bc17641f46ff264f8e65a2c4a336d5a6da7b72102098e830be3f
+DIST VirtualBox-4.2.6-82870-Linux_x86.run 83178956 SHA256 ecdf5eb76e469521dfa633b31a4798550232f345d2fbf676fa7d9ead8218446b SHA512 9dd664d72bc6cf2e5e4cb6b04dd06ac2f031ef08d1b48be4b1c360c16fe4707dd61648e42d6d8165a08f1d6af0163fba9c74bc6dd885cec5b1415a61ad2c44a2 WHIRLPOOL 795eefde34c07499b1fba045dd129336a403787cc332e2d454c5cf43da5fc03f150ad57408e8304b3efbcc7d4564e9caa9d6c1c071b29482ecc0385260da1016
 DIST VirtualBoxSDK-4.1.22-80657.zip 8805310 SHA256 89f221ae08863342e7a8da3186135796430614e5792d7f8eae284b1360f669d2 SHA512 e488f6099f814174555112bccb06710d1dd782943c01ae4afb6f907328f28b198caf992f6c142751223b71cff02cdaca206fddd5f61b00c4c010ed84f922f94d WHIRLPOOL 69d9c3c1e44e5657d88b1d6b6da0deb8b65d0f88656eea895249fb610bdc0c0539b0c6daadaf04185296fbc2553873acf86308d26725d3292760ff395bf3390d
-DIST VirtualBoxSDK-4.2.2-81494.zip 9714925 SHA256 694fe0bef149e4f0802d2415f914e77e49f897b69316d608f4d7c4ef62acfbb9 SHA512 169982667582534cf160d6049ca8bd9a0f62b1c33c2e4037747eedafecd999218084fb85d8d4af3fca00b8126eb64a6b845e3d5590cd0ab24e0dfbd394ff6e53 WHIRLPOOL 96673147e0a9fa35ded2c84a6e36f1884ac91584824daef0b90f1b137db115cc0dce9837ae15aa5d8a1f6b424db1fc1f24cbf99c25fb55fc68714e64a1519f7f
+DIST VirtualBoxSDK-4.1.24-82872.zip 8804758 SHA256 b4b516f01a9f8c1290b6875dd9ac07aeaf8a9c13bff4b837345a8dbb4539ce19 SHA512 ffab25cd1bd2c550e2c208d91cfd013ad12e47346be1db392f72e5f20e70c6fd6abaf760b2741ad3371bb4c50a2d3947c1bb5614edca03d6aa0a70e8248b3c33 WHIRLPOOL be4a300aaf24268b615b16a0f23c86ac5230bb0ba41e45d5c131983880ab4dcff98ca7958d7b017e35dcb431200129f9857d01fcc4674d6175265dd1b9da3df6
 DIST VirtualBoxSDK-4.2.4-81684.zip 9715854 SHA256 eb42fd92692746094a03e5bd468e1a87670f3d6806b8d645ecb3d78d2cb80e7e SHA512 e777fdd95bccd23abbd2abcb53bb7fd70221fa82ac875493e87430e3a549f374846de84dbba30874cfbc0021604ff440faec897e3a7415707d3a633ae88e7f52 WHIRLPOOL 1f8eec48ee0c67e3d36352a5e1259dd273b240374b5b5514149dae675c320218d21142195c23e6329edfc44f5d0e413abf4d402591a95dae9fbac731e8234c5f
+DIST VirtualBoxSDK-4.2.6-82870.zip 9716413 SHA256 e4a0192f27b5e2d18d642fdb3d5d46d06a9139120d18cea1f37e8078e4292ede SHA512 b9c1eae0ea29e6930c65db69389b6a3089bd5452e52587f12ff2252e3ac7b6a9b21550e00bbad618ca82242f2421d525a3a00e0df7141150a00c1728d6d6c863 WHIRLPOOL 6ad866128bb2188cfddb3466762c125fe8bf18c849dc6381ae345167155bd0e6531ef3c405ce06ee6c0ce5c0777524c9b8fb930a04926cfe1988574620e712a9
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.24.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.24.ebuild
@ -0,0 +1,344 @@
+# Copyright 1999-2012 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.1.24.ebuild,v 1.1 2012/12/22 12:25:14 polynomial-c Exp $
+
+EAPI=2
+
+inherit eutils unpacker fdo-mime gnome2 pax-utils
+
+MY_PV=${PV}-82872
+SDK_PV=${MY_PV}
+EXTP_PV=${SDK_PV}
+MY_P=VirtualBox-${MY_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/${PV}/${MY_P}_amd64.run )
+	x86? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_x86.run )
+	sdk? ( http://download.virtualbox.org/virtualbox/${PV}/VirtualBoxSDK-${SDK_PV}.zip )
+	http://download.virtualbox.org/virtualbox/${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
+			dev-lang/python:2.5
+		) )"
+
+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_5.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/VBoxPython2_5.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_5.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 || die
+	fi
+
+	if use additions; then
+		doins -r additions || die
+	fi
+
+	if use vboxwebsrv; then
+		doins vboxwebsrv || die
+		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 || die
+		doins -r rdesktop-vrdp-keymaps || die
+		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 || die
+		fowners root:vboxusers /opt/VirtualBox/kchmviewer
+		fperms 0750 /opt/VirtualBox/kchmviewer
+	fi
+
+	if use python; then
+		local pyver
+		for pyver in 2.5 2.6 2.7; do
+			if has_version "=dev-lang/python-${pyver}*" && [ -f "${S}/VBoxPython${pyver/./_}.so" ] ; then
+				doins VBoxPython${pyver/./_}.so || die
+			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" || die
+	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"
+
+	insinto /lib/udev/rules.d
+	doins "${FILESDIR}"/10-virtualbox.rules
+	# move udev scripts into /lib/udev (bug #372491)
+	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"/lib/udev
+	fperms 0750 /lib/udev/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-bin/virtualbox-bin-4.2.6.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.2.6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild,v 1.2 2012/12/04 09:40:13 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.6.ebuild,v 1.1 2012/12/22 12:25:14 polynomial-c Exp $

 EAPI=2

@ -8,7 +8,7 @@ inherit eutils unpacker fdo-mime gnome2 pax-utils udev

 MY_PV=${PV/beta/BETA}
 MY_PV=${MY_PV/rc/RC}
-VBOX_PV=${MY_PV}-81494
+VBOX_PV=${MY_PV}-82870
 SDK_PV=${VBOX_PV}
 EXTP_PV=${SDK_PV}
 MY_P=VirtualBox-${VBOX_PV}-Linux
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@ -1,3 +1,4 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.22-80657.tar.gz 10778079 SHA256 837ea30834b7c80e2ae114bb62becac4745ad2878658239cc8eb13ff54cea75f SHA512 1dc1aa1d57a51b05e01004cabbdd40b2b5ff410d3f514cb499c50d847f8830610108bde225a6156a0d9c0c03a7ab96c4d767a7c7a6a5616191cbc1fb46486cca WHIRLPOOL 6758b41ac4d2169b618fbaff6f759ba0b5a3595c77025f61c74ef57ee180ba49c31a9d7ce2b65d37de3e921c2d734878a6deaa00741603e3d5717d203510838d
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.2-81494.tar.gz 11008309 SHA256 2a0824a7f6b93842feb13fe15de16a1bb33c9221116d62ce759eed6878169c2b SHA512 1f1ef106959d342303abbc5e15f07e63ce01335c3f05d525e1d9ba1e21309f2d51bf855b3f7bb0dac62a1d9b57bb8422425a45c313e232795b2e342f0c9ffe7e WHIRLPOOL 071053f6337da7a749c49c945d383b852e6d8d669e59c36e528966d278c2f99b58760977d6c59eaa41965472a2a787268492dfdea9f8321ef4370cdff2a37359
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.24-82872.tar.gz 10785167 SHA256 3e392eb6ca11558b339183ca1e94af66239b05f4b33892ad74576da9ea650941 SHA512 3b6810ec8c208c092e25d262701ea5b263dcdb3d152d57145d99da566e4ef9585688cdac787539466fdbb235662f735cd94ca8859abad22d726b5cd0c9ac28f4 WHIRLPOOL 275380721ad2c0b57c377bf8afb5966f2df6753674ea2f3f3a5970b3fd1badc58a9facc2c09a0dcfc9fa84f28bfc26e2c835998d7782acda1febde647bfc30d5
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.4-81684.tar.gz 11010592 SHA256 62078e057a4ab56aec5ac086746522b3d94787333d0444169471fa5152c609ed SHA512 4e9bcd949e115e8b1f3e268dd933e2fed000d564cfd48408e304a167a2167f85240a7bb4c845c01a7c965e4ff5a60783cc3a8ff40a0246611cf5cc2ac5d0c580 WHIRLPOOL 1e9f6dbd22c917eb9b983e39ad4321ce23741ef8c5a357c3900954194bb5280051ebc29cc5b0d6f2efa98024412ce50d0a61dc793a7bb23a9561873100675c65
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.6-82870.tar.gz 11018821 SHA256 f0113688a76efa0426c27c5541c78506b18637025c35aa682ecc6eeed5d56582 SHA512 a063aa27e1ff727fc90a388b9239bec54064060ef0b51b20b014f0bee1feeb79ca974ae69fc73a22cd41617f330e51492e953e5724b21c2896a5a275c64944f6 WHIRLPOOL e9c2c5fc3e987f3b3b685dfe5cededef995fcc213399f4937d501e739e81da113b0408878d5edbbb5ae24d60fc8b34e9c394b64038a9eb3b10d0f05f6e5aec20
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.24.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.24.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2012 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.1.24.ebuild,v 1.1 2012/12/22 12:26:14 polynomial-c Exp $
+
+EAPI=2
+
+inherit eutils multilib
+
+MY_BUILD="82872"
+MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
+MY_P="${MY_PN}-${PV}-${MY_BUILD}"
+
+DESCRIPTION="PUEL extensions for VirtualBox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${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}"
+
+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-extpack-oracle/virtualbox-extpack-oracle-4.2.6.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.6.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2012 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.2.ebuild,v 1.1 2012/10/24 04:42:36 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.6.ebuild,v 1.1 2012/12/22 12:26:14 polynomial-c Exp $

 EAPI=2

 inherit eutils multilib

-MY_BUILD="81494"
+MY_BUILD="82870"
 MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
 MY_PV="${PV/beta/BETA}"
 MY_PV="${MY_PV/rc/RC}"
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@ -1,3 +1,4 @@
 DIST VirtualBox-4.1.22.tar.bz2 73385514 SHA256 7abb506203dd0d69b4b408fd999b5b9a479a9adce5f80e9b5569641c053dd153 SHA512 1bc2e33f6ce1ab417887241ee95bc3042b5c6072b3babc221c349b36b923f0655e776e98468cc63f65662e5ae3819c974bc8b5c97bae531a2c4a0ebb1c1ebba6 WHIRLPOOL e52ee58fdf1b3d1e1323cb26df1791dbc4c9375061467191a73f12071ac99a5c2791ddb65eeff9af5a645ba39fe88d4f7bc4362c919c9c14ba10a99d1b6c3776
-DIST VirtualBox-4.2.2.tar.bz2 75655741 SHA256 943daa13694605d5d0a23ffef27c398b5e72ada669de89bad4b98f000f029700 SHA512 d6a85175e15d3dc49aab825aeb9aa4fb9b2640e6bb3c65dfeaaf492fe8589abe70ad5dbf8ed07d502f337c243b469a7da35d4bf23bb26f5ad3b0ee0a06a51a10 WHIRLPOOL ad45932ca5ea7e990af975a1c3823d58cc9b180a9f1e0c23576e1c6fb2aead39cdd2d0303b830f334d811c1f4b6b8b585d243a177253f13b53735303ae247c33
+DIST VirtualBox-4.1.24.tar.bz2 74612732 SHA256 74008b8e8942045668c1b7d06b0a4bb5fe8464066e343e3a2e1ba30b94ce8a7f SHA512 b4967621f848ff50d23e5f1afa63c2109cd10a602e6c742966ae7eef882417808cdc93edad67f55a0005fe3e4905034b08a1d21dcf242a9cc1e653ebef459174 WHIRLPOOL 0544cd637bfcc6cf7a502aa6fe27cb697ba4d570400ee2f7055406fca6deaed1b4b31e80de8e7d09a15152bfabe311d56a4ff256ae8f8f2940aa842c1701f941
 DIST VirtualBox-4.2.4.tar.bz2 75625513 SHA256 a7c607523c1c10b7b978ab39a92bb646517316548aa4a1a74b6e434ac2bf0adc SHA512 8238afd440e20842de27c8c68296c88bd18f561a45497ee97364d5720d73a9fe99eba9af3ad851d89e02540e304bcc3f48847704207ce2c8cdced8fa10dc4aa6 WHIRLPOOL 875184cc836ab65a368d1d9fea6eaed7deeea782d9d149a8f568ec372e190730e92ca13858fff51089bf0632136200909c49cf5ba1b9b5bb0fec3ec69293bade
+DIST VirtualBox-4.2.6.tar.bz2 76291326 SHA256 54526091bc2aa66b88ca878dd9ecc4466f96d607db2f6678a9d673ecf6646ae3 SHA512 b8b35f7777cc1386cb61720619a8df1b7adbc573da0bfa1e364887dd8680012ecabc57d7dd5848943be5e676430a66ae6d0ddf1654299891d89b82dadea3b78f WHIRLPOOL 1e95c4d1136e0c2e7740cb443a4effecf0b018a6c1492d13e61d81ae0a74f35d5f9b0adf89f52c0e36794512c6c001e01f775755c9a182581d0c36874b401be6
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.22.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.22.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.22.ebuild,v 1.4 2012/11/17 11:54:03 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.22.ebuild,v 1.5 2012/12/22 12:28:08 polynomial-c Exp $

 EAPI=2

@ -49,7 +49,7 @@ pkg_setup() {
 		linux-mod_pkg_setup
 		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
 		enewgroup vboxguest
-		enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest
+		enewuser vboxguest -1 /bin/sh /dev/null vboxguest
 }

 src_unpack() {
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.24.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.24.ebuild
@ -0,0 +1,199 @@
+# Copyright 1999-2012 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.1.24.ebuild,v 1.1 2012/12/22 12:28:08 polynomial-c Exp $
+
+EAPI=2
+
+inherit eutils linux-mod user
+
+MY_P=VirtualBox-${PV}
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${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 )
+	!!x11-drivers/xf86-input-virtualbox"
+DEPEND="${RDEPEND}
+		>=dev-util/kbuild-0.1.999
+		>=dev-lang/yasm-0.6.2
+		sys-devel/bin86
+		sys-devel/dev86
+		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
+}
+
+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" \
+				|| die "kmk VBoxControl failed"
+		done
+
+		if use X; then
+				cd "${S}"/src/VBox/Additions/x11/VBoxClient
+				MAKE="kmk" emake TOOL_YASM_AS=yasm \
+				KBUILD_PATH="${S}/kBuild" \
+				|| die "kmk VBoxClient failed"
+		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}-7.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
+}
+
+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 "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-guest-additions/virtualbox-guest-additions-4.2.4.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.4.ebuild,v 1.3 2012/12/01 11:28:40 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.4.ebuild,v 1.4 2012/12/22 12:28:08 polynomial-c Exp $

 EAPI=2

@ -50,7 +50,7 @@ pkg_setup() {
 		linux-mod_pkg_setup
 		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
 		enewgroup vboxguest
-		enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest
+		enewuser vboxguest -1 /bin/sh /dev/null vboxguest
 }

 src_unpack() {
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.6.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.2.ebuild,v 1.3 2012/12/01 11:28:40 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.6.ebuild,v 1.1 2012/12/22 12:28:08 polynomial-c Exp $

 EAPI=2

@ -50,7 +50,7 @@ pkg_setup() {
 		linux-mod_pkg_setup
 		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
 		enewgroup vboxguest
-		enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest
+		enewuser vboxguest -1 /bin/sh /dev/null vboxguest
 }

 src_unpack() {
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@ -1,3 +1,4 @@
 DIST vbox-kernel-module-src-4.1.22.tar.xz 459980 SHA256 8d37d4c4497fd1de9511af2eb1aea4959045b47ad623f04e76958dfabd0848e3 SHA512 3ac0e55b794468b7b4b204500334d86763c523a2dfac84d830153b3ca324883fdce996eeaa35fa0e36606b46c126c0ab77374d1d3d7df8b65cf1058335ece214 WHIRLPOOL 19b2bfa3be78a845af962c80a5dd1defc7bbba2d30f0641ff02d069d5d2e3fab53eb4ce42a450ff16d5ea40f2ec3b5b88af8f341a481a93c6fe2aad03eca09ce
-DIST vbox-kernel-module-src-4.2.2.tar.xz 492868 SHA256 66fc2716195292e831ecec44dd94ec2a980d4b105708af871903f6c77322eadb SHA512 5cb312e6e89c5103fd982d107f57a324d96b5698d6b622364552581220b34f62e06232a7e563c4643ce7747b3f466ad39bd89dbd5890e13ae259caab622b53da WHIRLPOOL 9c1ddd0eb5065d31b9a6800b05b98a8f4831b12fef47f44266c91d0a8cec22048c2b1e6cb2592217adf2831ac42ede73dc3550aef47bc8e2a0f1e8bf8177cd59
+DIST vbox-kernel-module-src-4.1.24.tar.xz 459852 SHA256 f0113fc453f2c599a0afeb07539646ec14008693502436fca78966eb440b903c SHA512 bc92e387d83ecdffcf1f0eb71d3b0fb0401d4441821eccb7650319916b6f3351839b177cc2a61f0f20273cfa57e073797adc5692eb42975748cb7d52feb4f427 WHIRLPOOL 9bb4dff9e1dfd694f23f4ce121d89fa3c2a77ef1718df9c7ebeb5f53e7d7adb6061084727c2cb9a7f1b34b2000c17252ccfc02e7c7edb8c05d2fb3d7bc8905b1
 DIST vbox-kernel-module-src-4.2.4.tar.xz 492268 SHA256 fe27db126b09cfb3b950c1d6cae94bc7aa290d800c2c934e6eeae7da45e4b494 SHA512 30377867ef8455f339789c5fa26d5ab1381dacef714508d89b99ce57aa0a4d233c0a7b0c796d3001fc0f4c4cac01dc1c37cffefad59df0d9443125033b4e8f33 WHIRLPOOL 0b27c21e13303db1da6fdf2961e42bfa43cf1b01bfb249e150a52d6669a9cc3bf5d66d9ee31dff14eca434c659e2908a4dda2331aac5748a66dbb8beecb9be11
+DIST vbox-kernel-module-src-4.2.6.tar.xz 492632 SHA256 bc0ea714a253834b42094322b9f8afcbbe6ea4aa4b4097eba0311b76d526a11a SHA512 04e9f0fa1541564097fb9760f3310a0b3c730dc43c515d0444c5baecd01d52c9fc952b76793369e7ee1835b8034d0cf5066bd2564107dcb4df34a4dcad40ae1d WHIRLPOOL b1ec4527543f88c678a1d9ab3c8e35478c6db3b2ab7871d61c0e4c078d89fb63f7bbe3bb013727cce2affd2b7309dbb45de4e221fe2265dfdf7c229254821247
--- a/app-emulation/virtualbox-modules/files/create_vbox_modules_tarball.sh
+++ b/app-emulation/virtualbox-modules/files/create_vbox_modules_tarball.sh
@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Create a virtualbox modules tarball from a VirtualBox binary package.
+# We cannot download the package by this script because of the unpredictable 
+# build number being in the filename.
+# 
+# usage: create_vbox_modules_tarball.sh VirtualBox-4.1.18-78361-Linux_amd64.run
+
+[ -f "$1" ] || exit 1
+
+VBOX_PACKAGE="$1"
+
+VBOX_VER="$(echo ${VBOX_PACKAGE} | sed 's@.*VirtualBox-\([[:digit:]\.]\+\).*@\1@')"
+
+sh ${VBOX_PACKAGE} --noexec --keep --nox11 || exit 2
+cd install || exit 3
+tar -xaf VirtualBox.tar.bz2 || exit 4
+cd src/vboxhost || exit 5
+tar -cvJf ../../../vbox-kernel-module-src-${VBOX_VER}.tar.xz . || exit 6
+cd ../../.. && rm install -rf
+
+exit 0
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.24.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.24.ebuild
@ -0,0 +1,59 @@
+# Copyright 1999-2012 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.1.24.ebuild,v 1.1 2012/12/22 12:24:43 polynomial-c Exp $
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from virtualbox-bin
+
+EAPI=4
+
+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-modules/virtualbox-modules-4.2.6.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.2.6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.2.2.ebuild,v 1.1 2012/10/24 04:44:17 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.2.6.ebuild,v 1.1 2012/12/22 12:24:43 polynomial-c Exp $

 # XXX: the tarball here is just the kernel modules split out of the binary
 #      package that comes from virtualbox-bin
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@ -1,8 +1,7 @@
 DIST VirtualBox-4.1.22.tar.bz2 73385514 SHA256 7abb506203dd0d69b4b408fd999b5b9a479a9adce5f80e9b5569641c053dd153 SHA512 1bc2e33f6ce1ab417887241ee95bc3042b5c6072b3babc221c349b36b923f0655e776e98468cc63f65662e5ae3819c974bc8b5c97bae531a2c4a0ebb1c1ebba6 WHIRLPOOL e52ee58fdf1b3d1e1323cb26df1791dbc4c9375061467191a73f12071ac99a5c2791ddb65eeff9af5a645ba39fe88d4f7bc4362c919c9c14ba10a99d1b6c3776
-DIST VirtualBox-4.2.2.tar.bz2 75655741 SHA256 943daa13694605d5d0a23ffef27c398b5e72ada669de89bad4b98f000f029700 SHA512 d6a85175e15d3dc49aab825aeb9aa4fb9b2640e6bb3c65dfeaaf492fe8589abe70ad5dbf8ed07d502f337c243b469a7da35d4bf23bb26f5ad3b0ee0a06a51a10 WHIRLPOOL ad45932ca5ea7e990af975a1c3823d58cc9b180a9f1e0c23576e1c6fb2aead39cdd2d0303b830f334d811c1f4b6b8b585d243a177253f13b53735303ae247c33
+DIST VirtualBox-4.1.24.tar.bz2 74612732 SHA256 74008b8e8942045668c1b7d06b0a4bb5fe8464066e343e3a2e1ba30b94ce8a7f SHA512 b4967621f848ff50d23e5f1afa63c2109cd10a602e6c742966ae7eef882417808cdc93edad67f55a0005fe3e4905034b08a1d21dcf242a9cc1e653ebef459174 WHIRLPOOL 0544cd637bfcc6cf7a502aa6fe27cb697ba4d570400ee2f7055406fca6deaed1b4b31e80de8e7d09a15152bfabe311d56a4ff256ae8f8f2940aa842c1701f941
 DIST VirtualBox-4.2.4.tar.bz2 75625513 SHA256 a7c607523c1c10b7b978ab39a92bb646517316548aa4a1a74b6e434ac2bf0adc SHA512 8238afd440e20842de27c8c68296c88bd18f561a45497ee97364d5720d73a9fe99eba9af3ad851d89e02540e304bcc3f48847704207ce2c8cdced8fa10dc4aa6 WHIRLPOOL 875184cc836ab65a368d1d9fea6eaed7deeea782d9d149a8f568ec372e190730e92ca13858fff51089bf0632136200909c49cf5ba1b9b5bb0fec3ec69293bade
-DIST VirtualBox_fa_IR.ts 424578 SHA256 4934fa27a2be76ee432a333b29a4ed8c0106821b88fc7057d3806270fed40b5c SHA512 fafb5e87c71bd22605ee4d11e8c9710a3f40adaf9a6dd2a530d3b0d1525fd36f3f18dfa5b50423f01bab0f49782b761934078ea9fcedebbfc0574c5b9c39beb6 WHIRLPOOL 63b258de9cc1411fdda7d8d991f55f767b187280752bc1379101c7541c19bac07ab64201c696357a6d2bbdfa00f1b5b785fc81380df4dfdd92f300d5eff89355
-DIST qt_fa_IR.ts 191494 SHA256 b2651c0329e53d3eecc78923905b9a7b68e3121b7b04fa3fd86499c940a5eb43 SHA512 3c6fdf2dac487bf72d4d85364e02c98f8366cecb85f46872aae689e02a83a22c99078c0296811e3f680275a10c8f30ba58ce52cc6d452d0b2d9b515163883aa7 WHIRLPOOL 50e8d14769f1659e9da51884f2475683ad6470a4b82d2a6f900f00e5e2643e11dfcb5b27f6188c75f25b51d8201da987b276f89eb1299ef7ac5c26cdfd97940c
+DIST VirtualBox-4.2.6.tar.bz2 76291326 SHA256 54526091bc2aa66b88ca878dd9ecc4466f96d607db2f6678a9d673ecf6646ae3 SHA512 b8b35f7777cc1386cb61720619a8df1b7adbc573da0bfa1e364887dd8680012ecabc57d7dd5848943be5e676430a66ae6d0ddf1654299891d89b82dadea3b78f WHIRLPOOL 1e95c4d1136e0c2e7740cb443a4effecf0b018a6c1492d13e61d81ae0a74f35d5f9b0adf89f52c0e36794512c6c001e01f775755c9a182581d0c36874b401be6
 DIST virtualbox-4.1.22-patches-01.tar.xz 3752 SHA256 2ff58f8d2bdfdcbf1ae4bbe9f68ad1256f1ae37091fd4b392582a062d206962f SHA512 9bba2a4352d52cddd27f55b4ad0e9de250c1d29359a8859f61fc413e53ac62206321c5e347391ca478b942967bd7974a3a469eb3bb133c79d7033692afe559dd WHIRLPOOL 1aa98913e7d4e1ddf5f775db200cddc18a7ed4d7dd915dda0dab6bffbf33bfd63a785cc7381bca74e4780e7dce21f18314dc093b9c6ba02addfd1330f3b61aa9
-DIST virtualbox-4.2.2-patches-01.tar.xz 3612 SHA256 5b844b3740bebfa0e7652cb6c5c89d94a333c7aa0873aa8a0aa653f7c9f3c06b SHA512 d12da10898c5bd440b6fd2211385bc223ff832fdce11b118cc56562903c8c87abcb1eeec3bbc2d4b5b22b1aa4a652e978277af7096a65276469be9e704a1aa69 WHIRLPOOL 58d43f0d2eeb30800b285c307871be64765301f7037d72752eb063286589fcccd12e6d8fd26610164701178fd497ca65127e91eb8f8d53db0889ccd7d7b988a9
 DIST virtualbox-4.2.4-patches-01.tar.xz 5388 SHA256 f69935ee8014af2d0badec799d2a9c3dea7db54bffeab00ac372cffe1ee84000 SHA512 6f339771e3fe3260ccabb3692999260cce71b30230a13bf637b11d08fe0ef5adca10402655a4b9ad44d8e89cc2621f8a491fdbb0bba9fe152719dc9176c2824d WHIRLPOOL 36ae0888cf9cdec4e85d5cd99d4741c58bfc7fbe024776f7ece4fa62d96b42053818b672bba56ea0ea4c6e24b1023b9f45510813287399282e506f73f0cc1c20
+DIST virtualbox-4.2.6-patches-01.tar.xz 3908 SHA256 0e548fc49e2367fcc04837670d145a4ae21221d06f028c6858db28f888edc100 SHA512 b542a81a2330db86fb8a890d4fc333d43e0f8b6e3bb2f1a6ec54dcc3a180d2a2395216324f30972f3997b2e42f2db8ba76f0bde3e8ac8796722d8dce53bbd359 WHIRLPOOL 17f5dbedea69d54c41614be86047ee557ec17dd9aea90aab635dc2d69ddb82ac40f11d77d127adb45563bfe463b1262cf3c669923e468ba78bff5c6df62a89df
--- a/app-emulation/virtualbox/virtualbox-4.1.24.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.24.ebuild
@ -0,0 +1,381 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.24.ebuild,v 1.1 2012/12/22 12:26:56 polynomial-c Exp $
+
+EAPI=4
+
+inherit eutils fdo-mime flag-o-matic linux-info multilib pax-utils python qt4-r2 toolchain-funcs java-pkg-opt-2 udev
+
+if [[ ${PV} == "9999" ]] ; then
+	# XXX: should finish merging the -9999 ebuild into this one ...
+	ESVN_REPO_URI="http://www.virtualbox.org/svn/vbox/trunk"
+	inherit linux-mod subversion
+else
+	MY_P=VirtualBox-${PV}
+	SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-4.1.22-patches-01.tar.xz"
+
+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
+	sys-libs/zlib
+	!headless? (
+		qt4? (
+			x11-libs/qt-gui:4
+			x11-libs/qt-core:4
+			opengl? ( x11-libs/qt-opengl: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[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.999
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-devel/dev86
+	sys-power/iasl
+	media-libs/libpng
+	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.7.13 )"
+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 )
+"
+
+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
+	java-pkg-opt-2_pkg_setup
+	python_set_active_version 2
+	python_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.1.20-nopie.patch"
+	fi
+
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"/patches
+}
+
+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 \
+		${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_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'_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" \
+		all || die "kmk failed"
+}
+
+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" || die
+	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 || die
+
+	if use sdk ; then
+		doins -r sdk || die
+	fi
+
+	if use vboxwebsrv ; then
+		doins vboxwebsrv || die
+		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 || die
+		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 || die
+			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 || die
+			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 || die
+			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 || die
+		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} || die
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile} || die
+	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/app-emulation/virtualbox/virtualbox-4.2.2-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.2.2-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.2-r1.ebuild,v 1.3 2012/12/02 22:48:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.6.ebuild,v 1.1 2012/12/22 12:26:56 polynomial-c Exp $

 EAPI=4

@ -21,9 +21,7 @@ fi
 DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
 HOMEPAGE="http://www.virtualbox.org/"
 SRC_URI="${SRC_URI}
-	http://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.2.2-patches-01.tar.xz
-	http://dev.gentoo.org/~patrick/qt_fa_IR.ts
-	http://dev.gentoo.org/~patrick/VirtualBox_fa_IR.ts"
+	http://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.2.6-patches-01.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
@ -173,11 +171,6 @@ src_prepare() {
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}/patches"
-
-	# missing files in 4.2.2 tarball
-	cp "${DISTDIR}"/{qt_fa_IR.ts,VirtualBox_fa_IR.ts} \
-		"${S}"/src/VBox/Frontends/VirtualBox/nls/ \
-			|| die "Failed to add missing files"
 }

 src_configure() {
@ -201,6 +194,7 @@ src_configure() {
 		--with-g++="$(tc-getCXX)" \
 		--disable-kmods \
 		--disable-dbus \
+		--disable-devmapper \
 		${myconf} \
 		|| die "configure failed"
 }
--- a/app-emulation/vmware-modules/vmware-modules-271.1-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-271.1-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-271.1-r1.ebuild,v 1.1 2012/12/16 14:19:07 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-271.1-r1.ebuild,v 1.2 2012/12/22 11:53:25 vadimk Exp $

 EAPI="4"

@ -64,7 +64,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
 	use pax_kernel && epatch "${FILESDIR}/hardened.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
-	kernel_is 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
+	kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
 }

 src_install() {
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@ -15,6 +15,7 @@ DIST wine-1.5.17.tar.bz2 20953751 SHA256 b15b4cbfab4b7f3d4cf80f88ea757e221feaefb
 DIST wine-1.5.18.tar.bz2 21043105 SHA256 a144900cc20e55623c8c9ab26e265eb2e76d88c9e21bd21a3bcfa030fdb3fbdf SHA512 35650828d0565669db6017f673319e9228eecb51a53afa64f6ea62546f35eb0aac6991d58f8dca26c49158befa17c1fa433613ef3ece745f14115600993c8e2e WHIRLPOOL a5fd90455ae6de41bee31f68554196c08f357012282557d8997a3e75ebe32764d03c291cc957ca04d4c4d2e8cdfe93aa03ab74bce963649ecda793ac385ff4d8
 DIST wine-1.5.19.tar.bz2 21013509 SHA256 51ad795ae62d8392ac6fbc3ad595ac57d44bcc779b716573a9d73ca122961023 SHA512 aefc05cb0ce6b41a7a70861fd85c5f5d30501f61923620837f3a8124b039e1eedaea75d261116b26770b64a21b27a4ee13133a07a36157bebd2cbeddd110de27 WHIRLPOOL 3ca550f2b0fb9d6b096f025e9f94b88648386c04d3a82350802fcd05d6b0604d6fe6aa4f6e68876abe523e60a8906438148613d4bdd8e7badd3a251d3c0e60e5
 DIST wine-1.5.2.tar.bz2 20104652 SHA256 8ee6fdaf716b5a1c7ccf9be9dc6d9b7546944e79351c4806b2fa596da418342f SHA512 da949f1943a1af1f4f9d75d41d35b5a968b4bb792f25c5d3202de5be944a04deac7116261d70b5b90f233e9fb526ae8d073e2cdd03304ac0f736926108fec7d7 WHIRLPOOL 947bff2ccda47e548e6eec4a1b7cc738b943fbbdf000e5686aa440c9d45962b5dee47e7060e93895cc398c2c82d7dce06c370091859bd46a6d09864c191d357c
+DIST wine-1.5.20.tar.bz2 21012282 SHA256 75e3073a62a933af5beaa8e8591298325edb57f255ca5b0de55a0f29a4ba2430 SHA512 25de10f4e3f94d79391e61bdadf00af0e6f191b064f61948911d0de4b1c71ab3a727510b7ec4a52882aed0c59e75bb0cd3fb46a0a4da3dc3707045a3af517754 WHIRLPOOL f85ed944dce117761b6509f090161e9d071027571c87675c03f0f78fb29679bf4d4fb382038c5512588e346f8a242ae4a66fa32992a3bacd48af63417158efe2
 DIST wine-1.5.3.tar.bz2 20171697 SHA256 d3e8e484cbc2c4888bc880d0b0c8b52299d36a5cecc96d9367b59142345a1206 SHA512 947c20100d02ec6d393f9bdc1899ddeda21be7fa75869f91953e0eec30f2083b2a7fd31ad92c44765b417e3023914db9cc9945fd241207d8189f20ae92da100a WHIRLPOOL a2e2752731feae4d2a44dd0db1edabadd8c7530abd6e988e5c8f862ba70e234874e1a21ad8a25f4dc68e965d4b5122431278b3ed7674145f7fa935e0c78dcca5
 DIST wine-1.5.4.tar.bz2 20187597 SHA256 90b10450b1afb4d54dfd20529e040daa4ee901c52b2f3bc452a86c2e06b4b759 SHA512 cb58358a2af9e15d7ebff21f9f834d521736eeaa44ce0c36d88400f3d3667c5432711bea64322e77c166e024d2ea03d47f64a4fd648d0a802bc44da80e1eb2fe WHIRLPOOL e007bc572181745c585bf24c6aa6a87830df17b57384d180e932b229f89b55d38f2b673243e8b5a5243afb303a18c52092bfbe61f0b49473c7c85edb0056a068
 DIST wine-1.5.5.tar.bz2 20158084 SHA256 e7d5ba716d2ac47193fa31eff66cc179145ddcb453c6923eaea70596a82b084e SHA512 f9d080cf3e17b73658222b95e15c353d40963aaaa9cbb4b6293ea69709e68715a97e89854c336288ba6a0a41cb0fc9e2713721705935835e4c9f53fa5b7a3e74 WHIRLPOOL 9f44bf75854410c142f94fe12e028ab120521ffd5b9de682c3eeb6690a35c8b4f5be2eecfd6e02e2bc28594f1524e2b6604035744d6b56a9c3d16d5c0cdc6d5d
@ -47,3 +48,4 @@ DIST winepulse-patches-1.5.16.tar.bz2 48482 SHA256 a186bb6bc07c11f03989c24159ffc
 DIST winepulse-patches-1.5.17.tar.bz2 48079 SHA256 8f82d47534c57e85db6502fdde394a4a44ab5f285250cc41439f2125e47f96f7 SHA512 150b9329e3382f3d08b33a8165e9738f23dab7ab942a931441c73d952449af6d7c33fc41b8f519e090706aa003accb1799b3cdeeebc8b9de3fea0c86cd1056cd WHIRLPOOL 9b9243ff47d9a713c4d40fe723e5c208c73d4ea0f208607422e34fcb679392a251050243ab818392065910729c550755a52625e50927e2660e892e36925f65ff
 DIST winepulse-patches-1.5.18.tar.bz2 45298 SHA256 803a3ef5c9223dbb3ded3a20309456efdf8dd2b3e3ac9c909f3de95e7a96f40e SHA512 ca8b90cfb1c5bab214c1d1afed6f50da3663f0de64c22b44b31e68e49059c92ab7226f2d94ca6a4079b763f4d2af21b1be7b5c0bbf877492c99c5c43c3961dcc WHIRLPOOL b4e6842e2ee025919213fa18746154ee398452c675d55cb736319def4d4a10e9b0589478ccb66c2e0fca5ad00fc0c54074ede38c962e7da67ed04d8106d41a0a
 DIST winepulse-patches-1.5.19.tar.bz2 47081 SHA256 7fc8e5964bcd4cdd8f14b6a5d6d66d474b958084fd80fb0f0531b08eb7fdfc2a SHA512 54b593ce75ce1ecc8015c85e7de713ddea1331a2701a1ec81fab88dce90f41470469f05b4f2d924da824fc99b1b9c52ed6795158291d7e8f15b5b3c4341cb13f WHIRLPOOL 56b1506b0ffc60a052c923334d21e111707443caf138ba05c6708e4d652a5c7ee2d22d8a82862b1a87a12b49dc1c9bdd8d89000f529ddd8f06685ebbc03dd7f4
+DIST winepulse-patches-1.5.20_pre20121207.tar.bz2 47206 SHA256 7ce845841d1c53f5d2bee3e09e901598321362f8cabc32ff7012c24e366a47e6 SHA512 e0b575231b19c2231ec9648d9e128a2439c672221d579fa40adbe49218db0e98b548f562151cdcbe75a6f018ff9a1c57dbd048de2374ad0cb5748fc3da8060b7 WHIRLPOOL b5511237bac951b39c1fc707348593adc8e5c5b0bf0543e4714cab3e153b2a653fa7ce809097d8dd376cad6c20b1d5b5a9c06d655e0a28c5e035ae5eec761803
--- a/app-emulation/wine/wine-1.5.20.ebuild
+++ b/app-emulation/wine/wine-1.5.20.ebuild
@ -0,0 +1,275 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.20.ebuild,v 1.2 2012/12/22 06:22:23 tetromino Exp $
+
+EAPI="5"
+
+inherit autotools eutils flag-o-matic gnome2-utils multilib pax-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
+	inherit git-2
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MY_P="${PN}-${PV/_/-}"
+	SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	S=${WORKDIR}/${MY_P}
+fi
+
+GV="1.8"
+MV="0.0.8"
+PULSE_PATCHES="winepulse-patches-1.5.20_pre20121207"
+WINE_GENTOO="wine-gentoo-2012.11.24"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	gecko? (
+		mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi
+		win64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+	)
+	mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
+	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2
+	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png pulseaudio samba scanner selinux ssl test +threads +truetype udisks vanilla v4l +win32 +win64 +X xcomposite xinerama xml"
+REQUIRED_USE="elibc_glibc? ( threads )
+	mono? ( || ( win32 !win64 ) )
+	osmesa? ( opengl )
+	vanilla? ( !pulseaudio )" #286560
+RESTRICT="test" #72375
+
+MLIB_DEPS="amd64? (
+	truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
+	X? (
+		>=app-emulation/emul-linux-x86-xlibs-2.1
+		>=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?]
+	)
+	mp3? ( app-emulation/emul-linux-x86-soundlibs )
+	odbc? ( app-emulation/emul-linux-x86-db )
+	openal? ( app-emulation/emul-linux-x86-sdl )
+	opengl? ( app-emulation/emul-linux-x86-opengl )
+	osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 )
+	scanner? ( app-emulation/emul-linux-x86-medialibs )
+	v4l? ( app-emulation/emul-linux-x86-medialibs )
+	app-emulation/emul-linux-x86-baselibs
+	>=sys-kernel/linux-headers-2.6
+	)"
+RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
+	perl? ( dev-lang/perl dev-perl/XML-Simple )
+	capi? ( net-dialup/capi4k-utils )
+	ncurses? ( >=sys-libs/ncurses-5.2 )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
+	udisks? (
+		sys-apps/dbus
+		sys-fs/udisks:2
+	)
+	gnutls? ( net-libs/gnutls:= )
+	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+	)
+	xinerama? ( x11-libs/libXinerama )
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups:= )
+	opencl? ( virtual/opencl )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
+	mp3? ( >=media-sound/mpg123-1.5.0 )
+	nls? ( sys-devel/gettext )
+	odbc? ( dev-db/unixODBC:= )
+	osmesa? ( media-libs/mesa[osmesa] )
+	pulseaudio? (
+		media-sound/pulseaudio
+		sys-auth/rtkit
+	)
+	samba? ( >=net-fs/samba-3.0.25 )
+	selinux? ( sec-policy/selinux-wine )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
+	v4l? ( media-libs/libv4l )
+	!win64? ( ${MLIB_DEPS} )
+	win32? ( ${MLIB_DEPS} )
+	xcomposite? ( x11-libs/libXcomposite )"
+DEPEND="${RDEPEND}
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	xinerama? ( x11-proto/xineramaproto )
+	!hardened? ( sys-devel/prelink )
+	virtual/pkgconfig
+	virtual/yacc
+	sys-devel/flex"
+
+src_unpack() {
+	if use win64 ; then
+		[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
+			&& die "you need gcc-4.4+ to build 64bit wine"
+	fi
+
+	if use win32 && use opencl; then
+		[[ x$(eselect opencl show) = "xintel" ]] &&
+			die "Cannot build wine[opencl,win32]: intel-ocl-sdk is 64-bit only" # 403947
+	fi
+
+	if [[ ${PV} == "9999" ]] ; then
+		git-2_src_unpack
+	else
+		unpack ${MY_P}.tar.bz2
+	fi
+
+	unpack "${PULSE_PATCHES}.tar.bz2"
+	unpack "${WINE_GENTOO}.tar.bz2"
+}
+
+src_prepare() {
+	local md5="$(md5sum server/protocol.def)"
+	# keep these even if USE=vanilla: they are needed to build
+	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+	epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
+	epatch "${FILESDIR}"/${PN}-1.5.17-osmesa-check.patch #429386
+	use vanilla || epatch "../${PULSE_PATCHES}"/*.patch #421365
+	epatch_user #282735
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	eautoreconf
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	use vanilla || sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+}
+
+do_configure() {
+	local builddir="${WORKDIR}/wine$1"
+	mkdir -p "${builddir}"
+	pushd "${builddir}" >/dev/null
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--sysconfdir=/etc/wine \
+		$(use_with alsa) \
+		$(use_with capi) \
+		$(use_with lcms cms) \
+		$(use_with cups) \
+		$(use_with ncurses curses) \
+		$(use_with udisks dbus) \
+		$(use_with fontconfig) \
+		$(use_with gnutls) \
+		$(use_with gphoto2 gphoto) \
+		$(use_with gsm) \
+		$(use_with gstreamer) \
+		--without-hal \
+		$(use_with jpeg) \
+		$(use_with ldap) \
+		$(use_with mp3 mpg123) \
+		$(use_with nls gettext) \
+		$(use_with openal) \
+		$(use_with opencl) \
+		$(use_with opengl) \
+		$(use_with ssl openssl) \
+		$(use_with osmesa) \
+		$(use_with oss) \
+		$(use_with png) \
+		$(use_with threads pthread) \
+		$(usex vanilla "" $(use_with pulseaudio pulse)) \
+		$(use_with scanner sane) \
+		$(use_enable test tests) \
+		$(use_with truetype freetype) \
+		$(use_with v4l) \
+		$(use_with X x) \
+		$(use_with xcomposite) \
+		$(use_with xinerama) \
+		$(use_with xml) \
+		$(use_with xml xslt) \
+		$2
+
+	emake -j1 depend
+
+	popd >/dev/null
+}
+
+src_configure() {
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	if use win64 ; then
+		do_configure 64 --enable-win64
+		use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
+	else
+		ABI=x86 do_configure 32 --disable-win64
+	fi
+}
+
+src_compile() {
+	local b
+	for b in 64 32 ; do
+		local builddir="${WORKDIR}/wine${b}"
+		[[ -d ${builddir} ]] || continue
+		emake -C "${builddir}" all
+	done
+}
+
+src_install() {
+	local b
+	for b in 64 32 ; do
+		local builddir="${WORKDIR}/wine${b}"
+		[[ -d ${builddir} ]] || continue
+		emake -C "${builddir}" install DESTDIR="${D}"
+	done
+	emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
+	dodoc ANNOUNCE AUTHORS README
+	if use gecko ; then
+		insinto /usr/share/wine/gecko
+		doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
+		use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+	fi
+	if use mono ; then
+		insinto /usr/share/wine/mono
+		doins "${DISTDIR}"/wine-mono-${MV}.msi
+	fi
+	if ! use perl ; then
+		rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
+	fi
+
+	if use win32 || ! use win64; then
+		pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
+	fi
+	use win64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
+
+	if use win64 && ! use win32; then
+		dosym /usr/bin/wine{64,} # 404331
+		dosym /usr/bin/wine{64,}-preloader
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.123 2012/12/08 05:11:36 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.125 2012/12/22 06:22:23 tetromino Exp $

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

 inherit autotools eutils flag-o-matic gnome2-utils multilib pax-utils

@ -20,7 +20,7 @@ fi

 GV="1.8"
 MV="0.0.8"
-PULSE_PATCHES="winepulse-patches-1.5.19"
+PULSE_PATCHES="winepulse-patches-1.5.20_pre20121207"
 WINE_GENTOO="wine-gentoo-2012.11.24"
 DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
@ -35,10 +35,11 @@ SRC_URI="${SRC_URI}

 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png pulseaudio samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
+IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png pulseaudio samba scanner selinux ssl test +threads +truetype udisks vanilla v4l +win32 +win64 +X xcomposite xinerama xml"
 REQUIRED_USE="elibc_glibc? ( threads )
 	mono? ( || ( win32 !win64 ) )
-	osmesa? ( opengl )" #286560
+	osmesa? ( opengl )
+	vanilla? ( !pulseaudio )" #286560
 RESTRICT="test" #72375

 MLIB_DEPS="amd64? (
@ -61,14 +62,14 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
 	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
 	udisks? (
 		sys-apps/dbus
 		sys-fs/udisks:2
 	)
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls:= )
 	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
 	X? (
 		x11-libs/libXcursor
@ -80,19 +81,19 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	)
 	xinerama? ( x11-libs/libXinerama )
 	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
+	cups? ( net-print/cups:= )
 	opencl? ( virtual/opencl )
 	opengl? (
 		virtual/glu
 		virtual/opengl
 	)
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
 	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
+	odbc? ( dev-db/unixODBC:= )
 	osmesa? ( media-libs/mesa[osmesa] )
 	pulseaudio? (
 		media-sound/pulseaudio
@ -101,9 +102,9 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
@ -143,10 +144,11 @@ src_unpack() {

 src_prepare() {
 	local md5="$(md5sum server/protocol.def)"
+	# keep these even if USE=vanilla: they are needed to build
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
 	epatch "${FILESDIR}"/${PN}-1.5.17-osmesa-check.patch #429386
-	epatch "../${PULSE_PATCHES}"/*.patch #421365
+	use vanilla || epatch "../${PULSE_PATCHES}"/*.patch #421365
 	epatch_user #282735
 	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
 		einfo "server/protocol.def was patched; running tools/make_requests"
@ -154,7 +156,7 @@ src_prepare() {
 	fi
 	eautoreconf
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+	use vanilla || sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 }

 do_configure() {
@ -189,7 +191,7 @@ do_configure() {
 		$(use_with oss) \
 		$(use_with png) \
 		$(use_with threads pthread) \
-		$(use_with pulseaudio pulse) \
+		$(usex vanilla "" $(use_with pulseaudio pulse)) \
 		$(use_with scanner sane) \
 		$(use_enable test tests) \
 		$(use_with truetype freetype) \
--- a/app-i18n/ibus-chewing/Manifest
+++ b/app-i18n/ibus-chewing/Manifest
@ -1,3 +1,4 @@
 DIST cmake-fedora-modules-only-latest.tar.gz 26660 SHA256 019b1d6727430e305996eb042410be83af9c780bcaf197501b16aca42ee68643 SHA512 cfde79db21ae7bc95b6437d227c243859b26f2dd1e7e8ad665a56d88d2dc0256d40a32309be982d72769413d51087f8547df15eeeb1170e09f4785dc3560c5eb WHIRLPOOL cac6892e322b218bf35820aa1782d966a0080addbd148da193e749284514b1a8b79c94136efa6ce06d96fe1fd823afe52c0aaadaf874645bb78a65612452376c
 DIST ibus-chewing-1.3.10-Source.tar.gz 75365 SHA256 171402a7d6d141d485454493e097746d73da7cef172d2ab5ec1a2c593a2ee1c8 SHA512 d9c326ef12a6e22cbfff5be1a0dd810e5c4be7ba426914ec832d50c9c2b54865fef020a3b81acad8d3a5d833365d78e4e7c53a751d4290214ae77280ba47737d WHIRLPOOL a2e35a3bd45b10ac3f09c46d4581e1c8f9450238651957c789fddd3c505b24b91806601593970db8da8b8553eb3cd673301d460b20f3a72902445a194f1ad714
 DIST ibus-chewing-1.4.2-Source.tar.gz 84351 SHA256 857f479ebd85ecc217550573f80e1bff91b6e9bca4d1c9189f790fa6a9e3f75f SHA512 7502abb553958bd6ea5a9bb8a9c600ee84f694aa2ff7d2c2733b74de088196f157f6023f26fe5307e3bec9dbb2c62cc46037355e2db9d90edb55feb89cb61d3c WHIRLPOOL dd90bb049d1d39c4bbc8f23fce5dbde2e923abc686715ea3ccd87fa6d8b57105c8b6d1dc0da89eb6ff48224386ce4a2bbdd0a53a4f1641bd04dc360b60fa6493
+DIST ibus-chewing-1.4.3-Source.tar.gz 84023 SHA256 3780fa780e8288934b35e4c321429ec6096273ebccff1511d801eb19398098af SHA512 b8aef1e39114bfd2a3440e1d04fa6ef355b30094abd86f696dcb523a39f122e01b0d07805c42cf786da99a614ed277c5c7fcc76eb6b28f308f8cceb81fb754ec WHIRLPOOL 1decbbf42db1b5aa507d340de13d7a64884ef65a8a528ae3789aac04ff353be981fc657ecc2b19832c2a4ba369aeccfc4e1de5644b82439bd386bc8029cef902
--- a/app-i18n/ibus-chewing/ibus-chewing-1.4.3.ebuild
+++ b/app-i18n/ibus-chewing/ibus-chewing-1.4.3.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-chewing/ibus-chewing-1.4.3.ebuild,v 1.1 2012/12/22 10:11:06 naota Exp $
+
+EAPI=4
+inherit cmake-utils
+
+MY_P=${P}-Source
+
+DESCRIPTION="The Chewing IMEngine for IBus Framework"
+HOMEPAGE="http://code.google.com/p/ibus/"
+SRC_URI="http://ibus.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="x11-libs/libXtst
+	>=app-i18n/ibus-1.3
+	>=dev-libs/libchewing-0.3.3
+	x11-libs/gtk+:2
+	dev-util/gob:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+CMAKE_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.10-cflags.patch
+	)
+
+DOCS="AUTHORS ChangeLog ChangeLog.prev README RELEASE-NOTES.txt USER-GUIDE"
+
+src_configure() {
+	local mycmakeargs=(
+		-DPRJ_DOC_DIR=/usr/share/doc/${PF}
+		)
+
+	cmake-utils_src_configure
+}
--- a/app-misc/abook/abook-0.6.0_pre2.ebuild
+++ b/app-misc/abook/abook-0.6.0_pre2.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/abook/abook-0.6.0_pre2.ebuild,v 1.1 2010/10/03 22:18:40 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/abook/abook-0.6.0_pre2.ebuild,v 1.4 2012/12/22 13:51:24 ago Exp $

 EAPI=3

@ -13,10 +13,12 @@ SRC_URI="http://abook.sourceforge.net/devel/${MY_P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls"

-RDEPEND="nls? ( virtual/libintl )"
+RDEPEND="sys-libs/ncurses
+	sys-libs/readline
+	nls? ( virtual/libintl )"
 DEPEND="nls? ( sys-devel/gettext )"

 S="${WORKDIR}/${MY_P}"
--- a/app-misc/anki/anki-2.0.3-r1.ebuild
+++ b/app-misc/anki/anki-2.0.3-r1.ebuild
@ -0,0 +1,74 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/anki-2.0.3-r1.ebuild,v 1.1 2012/12/22 05:09:55 radhermit Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.6"
+PYTHON_USE_WITH="sqlite"
+
+inherit eutils python
+
+DESCRIPTION="A spaced-repetition memory training program (flash cards)"
+HOMEPAGE="http://ichi2.net/anki/"
+SRC_URI="http://ankisrs.net/download/mirror/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="latex +recording +sound"
+
+RDEPEND="dev-python/PyQt4[X,svg,webkit]
+	 >=dev-python/httplib2-0.7.4
+	 dev-python/beautifulsoup:python-2
+	 recording? ( media-sound/lame
+				  >=dev-python/pyaudio-0.2.4 )
+	 sound? ( media-video/mplayer )
+	 latex? ( app-text/texlive
+			  app-text/dvipng )"
+DEPEND=""
+
+pkg_setup(){
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-httplib2-0.7.7.patch
+	rm -r libanki/thirdparty || die
+	python_convert_shebangs -r 2 .
+}
+
+# Nothing to configure or compile
+src_configure() {
+	true;
+}
+
+src_compile() {
+	true;
+}
+
+src_install() {
+	exeinto /usr/bin/
+	doexe anki
+
+	doicon ${PN}.png
+	domenu anki.desktop
+
+	doman anki.1
+
+	dodoc README README.development README.translating
+	insinto "$(python_get_sitedir)"
+	doins -r aqt libanki/anki
+}
+
+pkg_preinst() {
+	if has_version "<app-misc/anki-2" ; then
+		elog "Anki 2 is a rewrite of Anki with many new features and"
+		elog "a new database format.  On the first run your decks are"
+		elog "converted to the new format and a backup of your Anki-1"
+		elog "decks is created.  Please read the following:"
+		elog "http://ankisrs.net/anki2.html"
+		elog "The mobile clients for Anki 2 are still under development."
+	fi
+}
--- a/app-misc/anki/files/anki-2.0.3-httplib2-0.7.7.patch
+++ b/app-misc/anki/files/anki-2.0.3-httplib2-0.7.7.patch
@ -0,0 +1,38 @@
+https://github.com/dae/anki/issues/1
+
+--- libanki/anki/sync.py
+++ libanki/anki/sync.py
+@@ -16,6 +16,15 @@
+ HTTP_TIMEOUT = 30
+ HTTP_PROXY = None
+ 
+try:
+    # httplib2 >=0.7.7
+    _proxy_info_from_environment = httplib2.proxy_info_from_environment
+    _proxy_info_from_url = httplib2.proxy_info_from_url
+except AttributeError:
+    # httplib2 <0.7.7
+    _proxy_info_from_environment = httplib2.ProxyInfo.from_environment
+    _proxy_info_from_url = httplib2.ProxyInfo.from_url
+
+ # Httplib2 connection object
+ ######################################################################
+ 
+@@ -42,7 +51,7 @@
+ def _setupProxy():
+     global HTTP_PROXY
+     # set in env?
+-    p = httplib2.ProxyInfo.from_environment()
+    p = _proxy_info_from_environment()
+     if not p:
+         # platform-specific fetch
+         url = None
+@@ -59,7 +68,7 @@
+             elif 'http' in r:
+                 url = r['http']
+         if url:
+-            p = httplib2.ProxyInfo.from_url(url, _proxyMethod(url))
+            p = _proxy_info_from_url(url, _proxyMethod(url))
+     HTTP_PROXY = p
+ 
+ def _proxyMethod(url):
--- a/app-misc/basenji/Manifest
+++ b/app-misc/basenji/Manifest
@ -1,3 +1,4 @@
 DIST basenji-0.7.1.tar.gz 473336 SHA256 390a38489ef071beb8eceab52cdc209262fc5c574cfa83f47b12f922f0575623 SHA512 13bff0bbc16a525da9531ad6809e0d638398cfd2bcebebdd54669c7cf2bd9bf331bae78cf2a48e9520c294ab8ff6d59a670e6b587b30af4daed216bb2f084cbd WHIRLPOOL 8a5ec7420f44e7bb2727282b4dbabf2871fe0ca686ddf857d5b746b1965a2e1f12980bdfc1e603e8af951a2444247b8cd8c9ed79e71bd6349823c842b834f490
 DIST basenji-0.8.0.tar.gz 573262 SHA256 fe39be153901da8bfe4ef06b4fc9821c88b8b78981bb55eb0bf4690d39b7ae66 SHA512 f60a902e51754ac4a0d738802381a19201f40c97b31a66786dbdcf2d356c27b35f89a6477d19e561b189fbaa3665361a84f2ea344633613a52277c64675f9e8c WHIRLPOOL 50e634ddccf2e234686804de53997bef2c74ae39a5cb30eb8c0358ec6ae75d311a318b02f43745b2555a0ea7199007f2ce9a1d79a5ca91945d623b3151b376cd
-DIST basenji-0.9.0.tar.gz 582714 RMD160 eb3076a9c67287ab9ebb57fed95589f5e9b301c0 SHA1 ee93898113056d91a541d62aafed79d1bf1d0e09 SHA256 4e3b56ed783dfe669cff09c37dbde6e4a5a0151e5b2e67cfa249b2e5fb461478
+DIST basenji-0.9.0.tar.gz 582714 SHA256 4e3b56ed783dfe669cff09c37dbde6e4a5a0151e5b2e67cfa249b2e5fb461478
+DIST basenji-1.0.0.tar.gz 642763 SHA256 1a52c351a84ffe05801f1f440bfc9dbf4523136fad0da40d928e6e354c727c1e SHA512 9448545f345138cdef39f872a8bbd60d60a6e8f49a7ea518d58fa69c6711c5ca019d1d0257e26b80b95d5fe12d787ab9b2ed4bf5a76e4f6acccd904cc6fa6084 WHIRLPOOL 315ea82274acbb7e98ac44407fd10fa377940db7b47f37c54ad11806b2e7e0cc1a40568b12bb805316fb2d91cd550a568d305d9072194a7b5d94c392f8b28319
--- a/app-misc/basenji/basenji-1.0.0.ebuild
+++ b/app-misc/basenji/basenji-1.0.0.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/basenji/basenji-1.0.0.ebuild,v 1.1 2012/12/22 11:26:51 elvanor Exp $
+
+EAPI="4"
+
+inherit multilib versionator
+
+DESCRIPTION="Basenji is a volume indexing tool designed for easy and fast indexing of volume collections."
+HOMEPAGE="http://launchpad.net/basenji"
+SRC_URI="http://launchpad.net/basenji/trunk/$(get_version_component_range 1-2)/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-dotnet/dbus-sharp
+	dev-dotnet/dbus-sharp-glib
+	dev-dotnet/gio-sharp
+	dev-dotnet/gtk-sharp
+	dev-dotnet/gnome-sharp
+	dev-dotnet/taglib-sharp
+	media-libs/libextractor"
+
+DEPEND="${CDEPEND}"
+
+RDEPEND="${CDEPEND}
+	dev-dotnet/gnome-desktop-sharp
+	sys-fs/udisks"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	sed -i -e "s/-pkg:mono-cairo/-r:Mono.Cairo/" Basenji/Makefile || die "sed failed."
+}
+
+src_configure() {
+	./configure --prefix="${EPREFIX}/usr"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+}
--- a/app-misc/realpath/realpath-1.17.ebuild
+++ b/app-misc/realpath/realpath-1.17.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/realpath-1.17.ebuild,v 1.7 2012/12/19 06:39:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/realpath-1.17.ebuild,v 1.8 2012/12/22 16:06:58 ago Exp $

 EAPI=4
 inherit eutils toolchain-funcs flag-o-matic multilib prefix
@ -13,7 +13,7 @@ SRC_URI="

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

 RDEPEND="!sys-freebsd/freebsd-bin
--- a/app-misc/screen/screen-4.0.3-r8.ebuild
+++ b/app-misc/screen/screen-4.0.3-r8.ebuild
@ -0,0 +1,168 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r8.ebuild,v 1.1 2012/12/21 21:02:27 swegener Exp $
+
+EAPI=4
+
+WANT_AUTOCONF="2.5"
+
+inherit eutils flag-o-matic toolchain-funcs pam autotools user
+
+DESCRIPTION="Full-screen window manager that multiplexes physical terminals between several processes"
+HOMEPAGE="http://www.gnu.org/software/screen/"
+SRC_URI="ftp://ftp.uni-erlangen.de/pub/utilities/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug nethack pam selinux multiuser"
+
+RDEPEND=">=sys-libs/ncurses-5.2
+	pam? ( virtual/pam )
+	selinux? ( sec-policy/selinux-screen )"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	>=sys-apps/openrc-0.11.6"
+
+pkg_setup() {
+	# Make sure utmp group exists, as it's used later on.
+	enewgroup utmp 406
+}
+
+src_prepare() {
+	# Bug 34599: integer overflow in 4.0.1
+	# (Nov 29 2003 -solar)
+	epatch "${FILESDIR}"/screen-4.0.1-int-overflow-fix.patch
+
+	# Bug 31070: configure problem which affects alpha
+	# (13 Jan 2004 agriffis)
+	epatch "${FILESDIR}"/screen-4.0.1-vsprintf.patch
+
+	# uclibc doesnt have sys/stropts.h
+	if ! (echo '#include <sys/stropts.h>' | $(tc-getCC) -E - &>/dev/null) ; then
+		epatch "${FILESDIR}"/4.0.2-no-pty.patch
+	fi
+
+	# Don't use utempter even if it is found on the system
+	epatch "${FILESDIR}"/4.0.2-no-utempter.patch
+
+	# Don't link against libelf even if it is found on the system
+	epatch "${FILESDIR}"/4.0.2-no-libelf.patch
+
+	# Patch for time function on 64bit systems
+	epatch "${FILESDIR}"/4.0.2-64bit-time.patch
+
+	# Patch that makes %u work for windowlist -b formats
+	epatch "${FILESDIR}"/4.0.2-windowlist-multiuser-fix.patch
+
+	# Open tty in non-blocking mode
+	epatch "${FILESDIR}"/4.0.2-nonblock.patch
+
+	# compability for sys-devel/autoconf-2.62
+	epatch "${FILESDIR}"/screen-4.0.3-config.h-autoconf-2.62.patch
+
+	# crosscompile patch
+	epatch "${FILESDIR}"/"${P}"-crosscompile.patch
+
+	# sched.h is a system header and causes problems with some C libraries
+	mv sched.h _sched.h || die
+	sed -i '/include/s:sched.h:_sched.h:' screen.h || die
+
+	# Allow for more rendition (color/attribute) changes in status bars
+	sed -i \
+		-e "s:#define MAX_WINMSG_REND 16:#define MAX_WINMSG_REND 64:" \
+		screen.c \
+		|| die "sed screen.c failed"
+
+	# Fix manpage.
+	sed -i \
+		-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+		-e "s:/usr/local/screens:${EPREFIX}/run/screen:g" \
+		-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+		-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
+		-e "s:/local/screens/S-:${EPREFIX}/run/screen/S-:g" \
+		doc/screen.1 \
+		|| die "sed doc/screen.1 failed"
+
+	# proper setenv detection for Solaris
+	epatch "${FILESDIR}"/${P}-setenv_autoconf.patch
+
+	# Allow TERM string large enough to use with rxvt-unicode-256color
+	# Allow usernames up to 32 chars
+	epatch "${FILESDIR}"/${PV}-extend-d_termname-ng2.patch
+
+	# support CPPFLAGS
+	epatch "${FILESDIR}"/${P}-cppflags.patch
+
+	# reconfigure
+	eautoconf
+}
+
+src_configure() {
+	append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
+
+	[[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
+
+	use nethack || append-cppflags "-DNONETHACK"
+	use debug && append-cppflags "-DDEBUG"
+
+	econf \
+		--with-socket-dir="${EPREFIX}/run/screen" \
+		--with-sys-screenrc="${EPREFIX}/etc/screenrc" \
+		--with-pty-mode=0620 \
+		--with-pty-group=5 \
+		--enable-rxvt_osc \
+		--enable-telnet \
+		--enable-colors256 \
+		$(use_enable pam)
+
+	# Second try to fix bug 12683, this time without changing term.h
+	# The last try seemed to break screen at run-time.
+	# (16 Jan 2003 agriffis)
+	LC_ALL=POSIX make term.h || die "Failed making term.h"
+}
+
+src_install() {
+	local tmpfiles_perms tmpfiles_group
+
+	dobin screen
+
+	if use multiuser || use prefix
+	then
+		fperms 4755 /usr/bin/screen
+		tmpfiles_perms="0755"
+		tmpfiles_group="root"
+	else
+		fowners root:utmp /usr/bin/screen
+		fperms 2755 /usr/bin/screen
+		tmpfiles_perms="0775"
+		tmpfiles_group="utmp"
+	fi
+
+	dodir /etc/tmpfiles.d
+	echo "d /run/screen ${tmpfiles_perms} root ${tmpfiles_group}" >"${ED}"/etc/tmpfiles.d/screen.conf
+
+	insinto /usr/share/screen
+	doins terminfo/{screencap,screeninfo.src}
+	insinto /usr/share/screen/utf8encodings
+	doins utf8encodings/??
+	insinto /etc
+	doins "${FILESDIR}"/screenrc
+
+	pamd_mimic_system screen auth
+
+	dodoc \
+		README ChangeLog INSTALL TODO NEWS* patchlevel.h \
+		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
+
+	doman doc/screen.1
+	doinfo doc/screen.info*
+}
+
+pkg_postinst() {
+	elog "Some dangerous key bindings have been removed or changed to more safe values."
+	elog "We enable some xterm hacks in our default screenrc, which might break some"
+	elog "applications. Please check /etc/screenrc for information on these changes."
+
+	ewarn "This revision changes the screen socket location to /run/screen."
+}
--- a/app-misc/screen/screen-9999.ebuild
+++ b/app-misc/screen/screen-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-9999.ebuild,v 1.1 2012/12/02 22:48:41 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-9999.ebuild,v 1.2 2012/12/21 21:02:27 swegener Exp $

 EAPI=4

@ -25,6 +25,8 @@ RDEPEND=">=sys-libs/ncurses-5.2
 	selinux? ( sec-policy/selinux-screen )"
 DEPEND="${RDEPEND}
 	sys-apps/texinfo"
+RDEPEND="${RDEPEND}
+	>=sys-apps/openrc-0.11.6"

 S="${WORKDIR}"/${P}/src

@ -44,10 +46,10 @@ src_prepare() {
 	# Fix manpage.
 	sed -i \
 		-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
-		-e "s:/usr/local/screens:${EPREFIX}/var/run/screen:g" \
+		-e "s:/usr/local/screens:${EPREFIX}/run/screen:g" \
 		-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
 		-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
-		-e "s:/local/screens/S-:${EPREFIX}/var/run/screen/S-:g" \
+		-e "s:/local/screens/S-:${EPREFIX}/run/screen/S-:g" \
 		doc/screen.1 \
 		|| die "sed doc/screen.1 failed"

@ -64,15 +66,14 @@ src_configure() {
 	use debug && append-cppflags "-DDEBUG"

 	econf \
-		--with-socket-dir="${EPREFIX}/var/run/screen" \
+		--with-socket-dir="${EPREFIX}/run/screen" \
 		--with-sys-screenrc="${EPREFIX}/etc/screenrc" \
 		--with-pty-mode=0620 \
 		--with-pty-group=5 \
 		--enable-rxvt_osc \
 		--enable-telnet \
 		--enable-colors256 \
-		$(use_enable pam) \
-		$(use multiuser || echo --disable-socket-dir)
+		$(use_enable pam)

 	LC_ALL=POSIX emake term.h
 	emake osdef.h
@ -81,16 +82,25 @@ src_configure() {
 }

 src_install() {
+	local tmpfiles_perms tmpfiles_group
+
 	dobin screen

 	if use multiuser || use prefix
 	then
 		fperms 4755 /usr/bin/screen
+		tmpfiles_perms="0755"
+		tmpfiles_group="root"
 	else
 		fowners root:utmp /usr/bin/screen
 		fperms 2755 /usr/bin/screen
+		tmpfiles_perms="0775"
+		tmpfiles_group="utmp"
 	fi

+	dodir /etc/tmpfiles.d
+	echo "d /run/screen ${tmpfiles_perms} root ${tmpfiles_group}" >"${ED}"/etc/tmpfiles.d/screen.conf
+
 	insinto /usr/share/screen
 	doins terminfo/{screencap,screeninfo.src}
 	insinto /usr/share/screen/utf8encodings
@ -112,4 +122,6 @@ pkg_postinst() {
 	elog "Some dangerous key bindings have been removed or changed to more safe values."
 	elog "We enable some xterm hacks in our default screenrc, which might break some"
 	elog "applications. Please check /etc/screenrc for information on these changes."
+
+	ewarn "This revision changes the screen socket location to /run/screen."
 }
--- a/app-portage/eix/eix-0.27.6.ebuild
+++ b/app-portage/eix/eix-0.27.6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.27.6.ebuild,v 1.2 2012/12/17 20:22:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.27.6.ebuild,v 1.3 2012/12/22 16:42:43 ago Exp $

 EAPI=5

@ -13,7 +13,7 @@ SRC_URI="mirror://berlios/${PN}/${P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="clang debug +dep doc nls optimization security strong-optimization sqlite tools zsh-completion"

 RDEPEND="app-shells/push
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@ -1,6 +1,6 @@
-DIST zsh-4.3.15-doc.tar.bz2 2712215 SHA256 73b7ee1a737fbaf9be77cf6b55b27cca96bac39bc5ef25efa9ceb427cd1b5ad4 SHA512 cf7337d09a452d41f6ddc5fd29717e14208f3f1a27ac529ba3a23796ee0f6a1def2d215580761b20f623fcb17bcdf9a73b9566b28f9594685448020b58ece711 WHIRLPOOL ccc38e27bacd41acfef87be8be663373602c71b52e0d4cc558d1b67579cc010da2dd4a746f9aee9f2d3120af2680bb0fc599744a065cc69be7ba4e97f3953966
-DIST zsh-4.3.15.tar.bz2 2969951 SHA256 8708f485823fb7e51aa696776d0dfac7d3558485182672cf9311c12a50a95486 SHA512 1b8a9aba3c271349891b30da70955c414763aecab81f5843ad3ecb83a84091de07c72026d47283bc4398adaa425459cf4ac98a5876e57ec0f9ec1d78c1e848f8 WHIRLPOOL 7602f06d61b5cc892d19dacb90e109b476efcd651e87875b876dd0f3e752b08bcf7d62c4c8903d09fd386f865d3d47769c960d6b069e5754aae573859bed20f9
 DIST zsh-4.3.17-doc.tar.bz2 2719164 SHA256 68f71ba6ba0dc56bfdd93573c7f02dcc3a4f06fd8e24a5f9e17202cf5e68cb91 SHA512 1406ed031d8f95311efb2f1b17e3738aad58fded259cb2655f4cda3a68c9ffb37e48dcbd17ad7d583a8688c33048899cc3793eb30700b43d8a8d56b588f6a789 WHIRLPOOL 976ab384271b6c0fc079f2c149e2e033d3b5f9feb4c673f94c588036a33bcea824bda71697d53bf4779649fcf2be6e44105d1b2949bfba0a95d23ad732dfa29b
 DIST zsh-4.3.17.tar.bz2 2978903 SHA256 054e0452afd9c742c9f1489465175e1d4d7db50d88b602d132551d850cf7a704 SHA512 2849204c5633b3fbf4e61032fd81e20bc9275fa1f41316bf07c4ee482cf3fad070c228c6dd70a71fb63c31c4a34bd1b8e653e0f19649b4980510a278cdf97342 WHIRLPOOL ce599bb1fadacab49426a60625e47340f81978e57a753bc5b094440c201c10b5b0728c4b97f920f362dcc87ab23df2159be0440192daea6ce9e4baea281f7d30
 DIST zsh-5.0.0-doc.tar.bz2 2875712 SHA256 d2219eb3003c108af9d297ff055aa6df3cdb756ccf6b1b2ee3db8a72dbb2ef30 SHA512 9cacf1f77e44ab5c63f0826ed2f62a7fdcf27d96b39973e0e890689cd94773d9e3a5483d86224c48538cef1bfbecd1ad8e50cbf75c1e89f456f37c20e23d879d WHIRLPOOL 70504eae90a2b349c16c0868ee56321f5872afa660c16caf6b727060c197f9f979338d61ec94f358b396fbe9050a0603e697d4188856d844730be1a4cf2f9f71
 DIST zsh-5.0.0.tar.bz2 3014362 SHA256 cd014a8e09a3607c68369d1615db96d0fbb7279a125950b32032fd448c44a888 SHA512 59d8a0fdd58edc58b1d30e19ee3ce6c1a4a3129dd89aa11ed38b69ec75f0c13f91fc158dd5477c1d48092842807e34e07a5ce27e5d244c236405275131c811ae WHIRLPOOL 31c873e2e2c42e847659af568acb32da6625170c7207e28106fb0c2e7606c51779dfdf1b5733f73a7758043c955787f20b232d134f56af99b9a021c0566ee4e1
+DIST zsh-5.0.2-doc.tar.bz2 2902019 SHA256 99ee08cfc91935af8714bd98db652f016d6c7a8a71ba7c6d6223910cd0b7fbf1 SHA512 95a197b5220fccefce43b8cb3f868186a84db697de768d897a3a50f8eb74802e7974e9b9df15d39b897af54852f66d0af668cc8ab0e557412ea1a712ec1c601f WHIRLPOOL f13e09e71d51e769eec68910a155fcb036f0910adc87f357071dc78edf2c3a830d75e9d75a256aa2d6415c5aa0200721ddcbc7e590c84cf7d7febe92b0c513c3
+DIST zsh-5.0.2.tar.bz2 3025767 SHA256 eb220ae5a8076191ec6b4c6a5a2f18122d074a19f25b45f0320b44b8166c5a03 SHA512 096e9fee085bbcb88035984c28cc9d186ae549f9ab09d699f380438b82fcf09b03ac2e9635ddb3cef9d0f287403c10fd29d21ec18f79e8bfab63760db738a07d WHIRLPOOL ff5214ced2cebe50c3fd090a1d12727ee5672875f38fdda5f068ccdd260cc85336bb22fa445d028d6e8df8bdbe53605034e55c3f435cf5a11e981b8ae6821bf0
--- a/app-shells/zsh/zsh-4.3.15.ebuild
+++ b/app-shells/zsh/zsh-4.3.15.ebuild
@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.15.ebuild,v 1.8 2012/03/18 19:17:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-5.0.2.ebuild,v 1.1 2012/12/22 10:16:30 radhermit Exp $

-EAPI=4
+EAPI=5

 # doc package for -dev version exists?
 doc_available=true
@ -34,7 +34,7 @@ SRC_URI="${ZSH_URI}

 LICENSE="ZSH gdbm? ( GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug doc examples gdbm maildir pcre static unicode"

 RDEPEND="
@ -117,8 +117,6 @@ src_configure() {
 			sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
 				"${S}"/config.modules || die
 		fi
-#	else
-#		sed -i -e "/LIBS/s%-lpcre%${EPREFIX}/usr/$(get_libdir)/libpcre.a%" Makefile
 	fi
 }

--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@ -1,3 +1,3 @@
 DIST calibre-0.9.10.tar.xz 27775784 SHA256 4e269320f883a17c6c6d577f7e4947dcda47e73917f297b33e402d4c9da042d9 SHA512 9c5aeb32f2910d236961ca58e8f079656f6844f2cc2d6c511a1dda561fb4b9b0247c47e5a3fd8c52472c0424ca3f3a8a8567d091f30bf412669255c7541de3fb WHIRLPOOL 2c39cfad0696075a1b3641c909cc6bf05d58742dea3fbc2fa6ad8ac2f45101e6ed8d98b14779838d7698223f8ccf3cf21720798b839516490ed1d89d81a535c3
+DIST calibre-0.9.11.tar.xz 27869620 SHA256 e83d62db1f27c46e2865599d3e4c4d1ba8eeca539dee982dd9eb0a213a135a4a SHA512 91fa1b022ff0f828551344a61adeb8f34be897dada5d2ea06692872c640b1f826270bbbeec40d4a18fb54f4a7efb0c503941c662e5ca916578b5908e69550c26 WHIRLPOOL 9d10377d2906b443aaf716be32f4fc863429f82165297d6b610be8fb4b4017f8cda565aa78933dfd384d0f52d7de5510ea8cdde8e1fce4a6c7b625fbe99adabf
 DIST calibre-0.9.6.tar.xz 27346664 SHA256 d2cb83a8fc32b3258f3a491f33f4271bfd4020ac4fdbbf01131deb81bba9624f SHA512 6bbacc8ed9af318bdfc09807937ec5e3e2d99a9b1d408cbf4dd4976926b415736928a16ee8d712ae1b93e98ab612841123bb370440c78db9c350ebd6503f8e58 WHIRLPOOL 306662c0b7dae93ec0d5c63903e02fc6a9cdf6427290bd366464dca7c618f602380fec9767a23baafaf1257135f333553c345356bf06560785c0664f9d74cf36
-DIST calibre-0.9.9.tar.xz 27765504 SHA256 1fde798842c3ea22e04dbcb7e3d5e8f1a5a117e922dfd9e5ba762073feffae94 SHA512 eeaf8d4cc09933388f38b6caa2768e01a2255b8dfac9f4905b6fcda02d0d0bc4dd87553f706cff0419480c28adb02ea36b20a125ce82f90cdd853cc7afef93cd WHIRLPOOL 3cba05a9fe3ce535502b617b4cda76096685485c8c775c4f21b6264ed0bf255113a760f92711128e0708a7bc0f1e6f204784ebbff140996cf49e30d63bba40cf
--- a/app-text/calibre/calibre-0.9.11.ebuild
+++ b/app-text/calibre/calibre-0.9.11.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.9.ebuild,v 1.2 2012/12/12 10:25:59 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.11.ebuild,v 1.1 2012/12/21 20:52:27 zmedico Exp $

 EAPI=4
 PYTHON_DEPEND=2:2.7
@ -88,12 +88,6 @@ src_prepare() {
 '-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
 '-i', 'Makefile'])" \
 		-i setup/extensions.py || die "sed failed to patch extensions.py"
-
-	# Disable destructive regex for Bug #446790.
-	if has_version '>=dev-python/PyQt4-4.9.6' ; then
-		sed -e "s|dat = re\.compile(r'QtGui\.QApplication\.translate.*|#\\0|" \
-			-i src/calibre/gui2/__init__.py || die
-	fi
 }

 src_install() {
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@ -1,2 +1,3 @@
 DIST iso-codes-3.30.tar.bz2 6229897 SHA256 a4da396dc0f7c7ca85cfd4b99a1c2abc898453911c6594da0777e89bd75898bd SHA512 1ba44ac218b1c8f26984d198c734bba7061a5c4e78cc3f72ffef36c558f3c3c4760e11d99aa9d4f268561fd0326d183bd1b9089cf5a90867fdabb1b0f165453a WHIRLPOOL 28c471c848cc1578c8a18808dff01212567b0ef707c3f02ae638e09c6b8cbe9fad23dad9cc92fbeba6f9cff35e674e25c4c61897795c9f74f816aeb9cc9c8810
 DIST iso-codes-3.37.tar.bz2 10192736 SHA256 408d1b8bbbd0c496c70e1a94093bc1f88495a7c6f6135c65c1cd53bdb1c62d90 SHA512 5202b526f4cf03343780b30ec38dd0197b3ef0fa467822a9c3213bfbcf10556e435f0abf0a66793dc6bba82aec59dc5785a0d3029eac8ad9d73f1e87b13ce709 WHIRLPOOL 22220f1f4424f53b07032d13e00bf64cdb5d47a392b6aa6b55fc21847c4912c6349d56ece7a2b6c0c7de4193f0a7188f62ea83a068fd1f7b5ba5d57d57f80be0
+DIST iso-codes-3.40.tar.xz 3634056 SHA256 f98a7022e8b642c9d2a6c03e05cafb0e5e8b5985ff8bd75b8493c08dac49f046 SHA512 1393a406aca36e2a49b07e373cb424166742e343f135e9a73cb1a29875c1c6fba95a597093af1043b395ea603dc69c46ba9639409826920ebb81be8129c47424 WHIRLPOOL 3ec551bc84675cadb79cc2f0490e906acb57056c5e6f5a6307342b9b25aa2cc7d771f3b15f0012aa53c347abffee993e54a3e5c5424f9192cd51a482fbedb685
--- a/app-text/iso-codes/iso-codes-3.40.ebuild
+++ b/app-text/iso-codes/iso-codes-3.40.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/iso-codes/iso-codes-3.40.ebuild,v 1.1 2012/12/21 23:46:41 eva Exp $
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Provides the list of country and language names"
+HOMEPAGE="http://alioth.debian.org/projects/pkg-isocodes/"
+SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="sys-devel/gettext"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_prepare() {
+	local linguas_bak=${LINGUAS}
+	local mylinguas=""
+
+	for norm in iso_15924 iso_3166 iso_3166_2 iso_4217 iso_639 iso_639_3; do
+		einfo "Preparing ${norm}"
+
+		mylinguas=""
+		LINGUAS=${linguas_bak}
+		strip-linguas -i "${S}/${norm}"
+
+		for loc in ${LINGUAS}; do
+			mylinguas="${mylinguas} ${loc}.po"
+		done
+
+		if [ -n "${mylinguas}" ]; then
+			sed -e "s:pofiles =.*:pofiles = ${mylinguas}:" \
+				-e "s:mofiles =.*:mofiles = ${mylinguas//.po/.mo}:" \
+				-i "${S}/${norm}/Makefile.am" "${S}/${norm}/Makefile.in" \
+				|| die "sed in ${norm} folder failed"
+		fi
+	done
+}
--- a/app-vim/bufferexplorer/bufferexplorer-7.2.7.ebuild
+++ b/app-vim/bufferexplorer/bufferexplorer-7.2.7.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/bufferexplorer/bufferexplorer-7.2.7.ebuild,v 1.2 2010/10/27 05:49:21 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/bufferexplorer/bufferexplorer-7.2.7.ebuild,v 1.3 2012/12/22 08:14:53 ulm Exp $

 EAPI="2"

@ -10,7 +10,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: easily browse vim buffers"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=42"
 SRC_URI="http://www.vim.org/scripts/download_script.php?src_id=12904 -> ${P}.zip"
-LICENSE="as-is"
+LICENSE="bufexplorer.vim"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

--- a/app-vim/bufferexplorer/bufferexplorer-7.2.8.ebuild
+++ b/app-vim/bufferexplorer/bufferexplorer-7.2.8.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/bufferexplorer/bufferexplorer-7.2.8.ebuild,v 1.1 2010/11/11 22:18:29 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/bufferexplorer/bufferexplorer-7.2.8.ebuild,v 1.2 2012/12/22 08:14:53 ulm Exp $

 EAPI="2"

@ -10,7 +10,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: easily browse vim buffers"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=42"
 SRC_URI="http://www.vim.org/scripts/download_script.php?src_id=14208 -> ${P}.zip"
-LICENSE="as-is"
+LICENSE="bufexplorer.vim"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

--- a/app-vim/cctree/cctree-1.60.ebuild
+++ b/app-vim/cctree/cctree-1.60.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/cctree/cctree-1.60.ebuild,v 1.1 2011/07/15 18:48:09 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/cctree/cctree-1.60.ebuild,v 1.2 2012/12/22 08:16:16 ulm Exp $

 EAPI=4

@ -10,7 +10,7 @@ MY_PN="CCTree"
 DESCRIPTION="vim plugin: Cscope based source-code browser and code flow analysis tool"
 HOMEPAGE="http://sites.google.com/site/vimcctree/"
 SRC_URI="https://github.com/vim-scripts/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
-LICENSE="as-is"
+LICENSE="bufexplorer.vim"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

--- a/app-vim/cctree/cctree-1.61.ebuild
+++ b/app-vim/cctree/cctree-1.61.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/cctree/cctree-1.61.ebuild,v 1.1 2012/08/07 00:11:26 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/cctree/cctree-1.61.ebuild,v 1.2 2012/12/22 08:16:16 ulm Exp $

 EAPI=4

@ -8,7 +8,7 @@ inherit vim-plugin

 DESCRIPTION="vim plugin: Cscope based source-code browser and code flow analysis tool"
 HOMEPAGE="http://sites.google.com/site/vimcctree/"
-LICENSE="as-is"
+LICENSE="bufexplorer.vim"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

--- a/app-vim/lustyexplorer/lustyexplorer-4.1.ebuild
+++ b/app-vim/lustyexplorer/lustyexplorer-4.1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/lustyexplorer/lustyexplorer-4.1.ebuild,v 1.1 2011/05/20 10:01:11 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/lustyexplorer/lustyexplorer-4.1.ebuild,v 1.2 2012/12/22 08:17:37 ulm Exp $

 EAPI=4

@ -8,7 +8,7 @@ inherit vim-plugin

 DESCRIPTION="vim plugin: dynamic filesystem and buffer explorer"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1890"
-LICENSE="as-is"
+LICENSE="bufexplorer.vim"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

--- a/app-vim/lustyexplorer/lustyexplorer-4.3.ebuild
+++ b/app-vim/lustyexplorer/lustyexplorer-4.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/lustyexplorer/lustyexplorer-4.3.ebuild,v 1.1 2012/08/06 00:01:38 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/lustyexplorer/lustyexplorer-4.3.ebuild,v 1.2 2012/12/22 08:17:37 ulm Exp $

 EAPI=4

@ -8,7 +8,7 @@ inherit vim-plugin

 DESCRIPTION="vim plugin: dynamic filesystem and buffer explorer"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1890"
-LICENSE="as-is"
+LICENSE="bufexplorer.vim"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

--- a/app-vim/minibufexpl/minibufexpl-6.4.3.ebuild
+++ b/app-vim/minibufexpl/minibufexpl-6.4.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/minibufexpl/minibufexpl-6.4.3.ebuild,v 1.5 2012/04/17 16:04:29 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/minibufexpl/minibufexpl-6.4.3.ebuild,v 1.6 2012/12/22 08:18:38 ulm Exp $

 EAPI=4

@ -11,7 +11,7 @@ DESCRIPTION="vim plugin: easily switch between buffers"
 HOMEPAGE="https://github.com/fholgado/minibufexpl.vim"
 SRC_URI="https://github.com/fholgado/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"

-LICENSE="as-is"
+LICENSE="bufexplorer.vim"
 KEYWORDS="amd64 ~mips ppc x86"
 IUSE=""

--- a/app-vim/minibufexpl/minibufexpl-6.4.4.ebuild
+++ b/app-vim/minibufexpl/minibufexpl-6.4.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/minibufexpl/minibufexpl-6.4.4.ebuild,v 1.4 2012/12/04 11:22:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/minibufexpl/minibufexpl-6.4.4.ebuild,v 1.5 2012/12/22 08:18:38 ulm Exp $

 EAPI=4

@ -10,7 +10,7 @@ MY_PN="${PN}.vim"
 DESCRIPTION="vim plugin: easily switch between buffers"
 HOMEPAGE="https://github.com/fholgado/minibufexpl.vim"
 SRC_URI="https://github.com/fholgado/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
-LICENSE="as-is"
+LICENSE="bufexplorer.vim"
 KEYWORDS="amd64 ~mips ppc x86"
 IUSE=""

--- a/dev-cpp/tbb/tbb-4.1.20121003.ebuild
+++ b/dev-cpp/tbb/tbb-4.1.20121003.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.1.20121003.ebuild,v 1.1 2012/11/30 20:37:31 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.1.20121003.ebuild,v 1.2 2012/12/22 14:06:43 blueness Exp $

 EAPI=4
 inherit eutils flag-o-matic multilib versionator toolchain-funcs
@ -16,7 +16,7 @@ SRC_URI="http://threadingbuildingblocks.org/sites/default/files/software_release
 LICENSE="GPL-2-with-exceptions"

 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc examples"

 DEPEND=""
--- a/dev-db/sqldeveloper/Manifest
+++ b/dev-db/sqldeveloper/Manifest
@ -1,4 +1,5 @@
-DIST sqldeveloper-1.5.4.59.40-no-jre.zip 76430283 RMD160 5e4c76ca9bd173e99fb2bfb64d3694b65847f1a4 SHA1 635b34b87b058242694a797bc83ca655a56a924a SHA256 3849ea6560bc31a17f6c457ffdefde018041e8acb601426a027efd5fea62debc
-DIST sqldeveloper-2.1.1.64.45-no-jre.zip 98210855 RMD160 24747b7b10039bfa50dcd71357a5755b40f45d92 SHA1 56493e7eb40371d98c1a524ddeddad87511a56a3 SHA256 13ef31be293f48b1de809a19fbeebb99f41f708219065ab3b0a7b86e2f5d0864
-DIST sqldeveloper-3.0.04.34-no-jre.zip 154645376 RMD160 19ff1cbe56df6e8fa4565c48b914f844006762b1 SHA1 bf5e920fe183adecec47b447ff83aa3617af0e4e SHA256 fa31b31ead6120fe83ca27610345ad20124ff223ae27f4a8a47b5ef0f305f55e
-DIST sqldeveloper-3.1.07.42-no-jre.zip 179042620 RMD160 d88b4976c8a52bcc1965fc2139438f6b9815ab3a SHA1 bc367f35b09e49d070a85436d9c7600b3b65af1b SHA256 cfe14455abdd019543894f8841020708f6f5fc2ee4929b09b7cbb68890b25ada
+DIST sqldeveloper-1.5.4.59.40-no-jre.zip 76430283 SHA256 3849ea6560bc31a17f6c457ffdefde018041e8acb601426a027efd5fea62debc
+DIST sqldeveloper-2.1.1.64.45-no-jre.zip 98210855 SHA256 13ef31be293f48b1de809a19fbeebb99f41f708219065ab3b0a7b86e2f5d0864
+DIST sqldeveloper-3.0.04.34-no-jre.zip 154645376 SHA256 fa31b31ead6120fe83ca27610345ad20124ff223ae27f4a8a47b5ef0f305f55e
+DIST sqldeveloper-3.1.07.42-no-jre.zip 179042620 SHA256 cfe14455abdd019543894f8841020708f6f5fc2ee4929b09b7cbb68890b25ada
+DIST sqldeveloper-3.2.20.09.87-no-jre.zip 182052759 SHA256 787b703a3fa2d7969ae486b9f2f23bdafd31242b2af74257943cf826c535c8d4 SHA512 716e2f9584e192b8e72a0e9439ac3fb0aea297087640df7c7c5659170846376d8e44d0fbdc68c96e274b100aad3f26b0710691349bfc0092c86c42830e115efe WHIRLPOOL 1d9eb51cb263c14a89a44167a239f3be34b7ca9bd78eefc28a73c1b24e6f4e2f10a1665b0b4a03c6932f987fae375c95bfc310c485e179c76e9b7135bb9825e3
--- a/dev-db/sqldeveloper/sqldeveloper-3.2.20.09.87.ebuild
+++ b/dev-db/sqldeveloper/sqldeveloper-3.2.20.09.87.ebuild
@ -0,0 +1,99 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils java-pkg-2
+
+DESCRIPTION="Oracle SQL Developer is a graphical tool for database development"
+HOMEPAGE="http://www.oracle.com/technology/products/database/sql_developer/"
+SRC_URI="${P}-no-jre.zip"
+RESTRICT="fetch"
+
+LICENSE="OTN"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mssql mysql sybase"
+
+DEPEND="mssql? ( dev-java/jtds:1.2 )
+	mysql? ( dev-java/jdbc-mysql:0 )
+	sybase? ( dev-java/jtds:1.2 )"
+RDEPEND=">=virtual/jdk-1.6.0
+	${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+pkg_nofetch() {
+	eerror "Please go to"
+	eerror "	${HOMEPAGE}"
+	eerror "and download"
+	eerror "	Oracle SQL Developer for other platforms"
+	eerror "		${SRC_URI}"
+	eerror "and move it to ${DISTDIR}"
+}
+
+src_prepare() {
+	# we don't need these, do we?
+	find ./ \( -iname "*.exe" -or -iname "*.dll" -or -iname "*.bat" \) -exec rm {} \;
+
+	# they both use jtds, enabling one of them also enables the other one
+	if use mssql && ! use sybase; then
+		einfo "You requested MSSQL support, this also enables Sybase support."
+	fi
+	if use sybase && ! use mssql; then
+		einfo "You requested Sybase support, this also enables MSSQL support."
+	fi
+
+	if use mssql || use sybase; then
+		echo "AddJavaLibFile $(java-pkg_getjars jtds-1.2)" >> sqldeveloper/bin/sqldeveloper.conf
+	fi
+
+	if use mysql; then
+		echo "AddJavaLibFile $(java-pkg_getjars jdbc-mysql)" >> sqldeveloper/bin/sqldeveloper.conf
+	fi
+
+	# this fixes internal Classpath warning
+	cd "${T}"
+	unzip -q "${S}"/jdev/extensions/oracle.jdeveloper.runner.jar META-INF/extension.xml
+	sed -i 's@../../../oracle_common/modules/oracle.nlsrtl_11.1.0@../../jlib@' META-INF/extension.xml || die
+	zip -rq "${S}"/jdev/extensions/oracle.jdeveloper.runner.jar META-INF/extension.xml
+	rm -rf META-INF
+
+	# this fixes another internal Classpath warning
+	cd "${T}"
+	unzip -q "${S}"/sqldeveloper/extensions/oracle.datamodeler.jar META-INF/extension.xml
+	sed -i 's@<classpath>${ide.extension.install.home}/lib/ActiveQueryBuilder.jar</classpath>@<classpath>${ide.extension.install.home}/../../lib/ActiveQueryBuilder.jar</classpath>@' META-INF/extension.xml || die
+	zip -rq "${S}"/sqldeveloper/extensions/oracle.datamodeler.jar META-INF/extension.xml
+	rm -rf META-INF
+}
+
+src_install() {
+	dodir /opt/${PN}
+	cp -r {dataminer,ide,javavm,jdbc,jdev,jdev.label,jlib,jviews,modules,rdbms,readme.html,sleepycat,${PN},sqlj,timingframework} \
+		"${D}"/opt/${PN}/ || die "Install failed"
+
+	dobin "${FILESDIR}"/${PN} || die "Install failed"
+
+	mv icon.png ${PN}-32x32.png || die
+	doicon ${PN}-32x32.png || die
+	make_desktop_entry ${PN} "Oracle SQL Developer" ${PN}-32x32 || die
+}
+
+pkg_postinst() {
+	# this temporary fixes FileNotFoundException with datamodeler
+	# this is more like a workaround than permanent fix
+	test -d /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log \
+		|| mkdir /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log
+	touch /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log/datamodeler.log
+	chmod -R 1777 /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log/datamodeler.log
+
+	# this fixes another datamodeler FileNotFoundException
+	# also more like a workaround than permanent fix
+	chmod 1777 /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/types/dr_custom_scripts.xml
+
+	echo
+	einfo "If you want to use the TNS connection type you need to set up the"
+	einfo "TNS_ADMIN environment variable to point to the directory your"
+	einfo "tnsnames.ora resides in."
+	echo
+}
--- a/dev-games/etrophy/etrophy-0.5.1.ebuild
+++ b/dev-games/etrophy/etrophy-0.5.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/etrophy/etrophy-0.5.1.ebuild,v 1.1 2012/12/21 14:42:02 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/etrophy/etrophy-0.5.1.ebuild,v 1.2 2012/12/21 17:40:00 tommy Exp $

 EAPI=2

@ -9,7 +9,7 @@ inherit enlightenment
 DESCRIPTION="Library for managing scores, trophies and unlockables,stores them and provides views to display them"

 SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-LICENSE="LGPL-2.1"
+LICENSE="BSD-2"

 KEYWORDS="~amd64 ~x86"
 IUSE="doc static-libs"
--- a/dev-java/jnr-x86asm/jnr-x86asm-0.1.ebuild
+++ b/dev-java/jnr-x86asm/jnr-x86asm-0.1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-x86asm/jnr-x86asm-0.1.ebuild,v 1.4 2010/06/30 15:23:59 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-x86asm/jnr-x86asm-0.1.ebuild,v 1.5 2012/12/22 19:47:03 ago Exp $

 EAPI=3

@ -15,7 +15,7 @@ SRC_URI="http://github.com/wmeissner/${PN}/tarball/0.1 -> ${P}.tar.gz"

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

 IUSE=""

--- a/dev-java/maven-bin/maven-bin-1.1-r3.ebuild
+++ b/dev-java/maven-bin/maven-bin-1.1-r3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-1.1-r3.ebuild,v 1.4 2012/12/12 19:27:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-1.1-r3.ebuild,v 1.5 2012/12/22 15:39:57 ago Exp $

 EAPI="4"

@ -15,7 +15,7 @@ HOMEPAGE="http://maven.apache.org/"

 LICENSE="Apache-2.0"
 SLOT="1.1"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""

 DEPEND="|| ( app-admin/eselect-java app-admin/eselect-maven )"
--- a/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild
+++ b/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild,v 1.4 2012/12/12 19:27:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild,v 1.5 2012/12/22 15:39:57 ago Exp $

 EAPI="4"

@ -16,7 +16,7 @@ HOMEPAGE="http://maven.apache.org/"

 LICENSE="Apache-2.0"
 SLOT="2.0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""

 DEPEND="|| ( app-admin/eselect-java app-admin/eselect-maven )"
--- a/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild
+++ b/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild,v 1.4 2012/12/12 19:27:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild,v 1.5 2012/12/22 15:39:57 ago Exp $

 EAPI="4"

@ -16,7 +16,7 @@ HOMEPAGE="http://maven.apache.org/"

 LICENSE="Apache-2.0"
 SLOT="2.2"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""

 DEPEND="|| ( app-admin/eselect-java app-admin/eselect-maven )"
--- a/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild,v 1.4 2012/12/12 19:27:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild,v 1.5 2012/12/22 15:39:57 ago Exp $

 EAPI="4"

@ -16,7 +16,7 @@ HOMEPAGE="http://maven.apache.org/"

 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""

 DEPEND="|| ( app-admin/eselect-java app-admin/eselect-maven )"
--- a/dev-lang/php/php-5.3.18.ebuild
+++ b/dev-lang/php/php-5.3.18.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.18.ebuild,v 1.7 2012/12/18 20:20:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.18.ebuild,v 1.8 2012/12/22 13:52:40 ago Exp $

 EAPI=4

@ -10,7 +10,7 @@ SUHOSIN_VERSION=""
 FPM_VERSION="builtin"
 EXPECTED_TEST_FAILURES=""

-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"

 function php_get_uri ()
 {
--- a/dev-lang/php/php-5.4.8.ebuild
+++ b/dev-lang/php/php-5.4.8.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.8.ebuild,v 1.6 2012/12/18 20:39:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.8.ebuild,v 1.7 2012/12/22 15:19:02 ago Exp $

 EAPI=4

@ -10,7 +10,7 @@ SUHOSIN_VERSION=""
 FPM_VERSION="builtin"
 EXPECTED_TEST_FAILURES=""

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

 function php_get_uri ()
 {
--- a/dev-libs/e_dbus/Manifest
+++ b/dev-libs/e_dbus/Manifest
@ -1,2 +1 @@
-DIST e_dbus-1.7.0.tar.bz2 425360 SHA256 178dd09574dee20c453d11949549a9cde65c5964b8123473ea0755a21d45f693 SHA512 2b7926372e890e1f8c364863df05830fe4c74e3d5aa42e4698ec527e104141f45ed4936c412266a2af01ece7f9796f371c1b0e0c8a96fa9fd2ecbf019d25b0bf WHIRLPOOL fce503fbb6af2b9e0a872bccde5b8ddf9a936ea38c61974eaf5f25f503df9314641bdcc3a305a176b93bb2d046177140c56ba8f8cb84d23d6dc0259322b6875d
-DIST e_dbus-1.7.1.tar.bz2 410367 SHA256 d3a3e0b81f6bb69d2fc3886c9885dad27ebf14b60c4a0bbd5a2a510b5a5ff2d1 SHA512 f54295dcbfcaf81539871b1121dbea1d3ede1971e2e3df00d38916f6fcc086c45b1d40880ae6d6156d6ae7f02b0c8b7cb0602f859561c5662c927471b7af9ce6 WHIRLPOOL 29b5834d991d2ef5cb46db7cdc985ebcbce4ca59ffefa9b682ff1b30585e564f47c336bc7a2a70195d5add93480fde15b5ad2e3808dd5c0481fa2d8b541194d9
+DIST e_dbus-1.7.4.tar.bz2 440334 SHA256 c95cd50cbdad1a82bbd993cb6ca431cae8ce918ef38bc1288504da45f5ad733c SHA512 e4761338e0b5a1fa5e657d595895767bcc74312da6f53d016e1a75fedf999429c7cfe2db70489dbe7fd3518a4941bfed655189ab307aef737a61a2fb229d9216 WHIRLPOOL ebf4bc0af9f0e3dd776fffda49f604a0925398170f747c9b79fe840b634f369927f50494fdad77675948ada155cf739a5faf6aa5c93fae80bfc5c7f22dd5f6a6
--- a/dev-libs/e_dbus/e_dbus-1.7.1.ebuild
+++ b/dev-libs/e_dbus/e_dbus-1.7.1.ebuild
@ -1,55 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/e_dbus/e_dbus-1.7.1.ebuild,v 1.1 2012/10/22 14:34:47 tommy Exp $
-
-EAPI="2"
-
-inherit enlightenment
-
-DESCRIPTION="Enlightenment's (Ecore) integration to DBus"
-SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bluetooth +connman +libnotify ofono static-libs test-binaries +udev"
-
-RDEPEND=">=dev-libs/eina-1.7.0
-	>=dev-libs/ecore-1.7.0
-	sys-apps/dbus
-	connman? ( >=net-misc/connman-0.75 )
-	libnotify? ( >=media-libs/evas-1.7.0 )
-	udev? ( sys-power/upower sys-fs/udisks:0 )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	MY_ECONF="
-		$(use_enable bluetooth ebluez)
-		$(use_enable connman econnman0_7x)
-		$(use_enable doc)
-		--disable-ehal
-		$(use_enable libnotify enotify)
-		$(use_enable ofono eofono)
-		$(use_enable test-binaries edbus-test)
-		$(use_enable test-binaries edbus-test-client)
-		$(use_enable udev eukit)"
-	if use test-binaries ; then
-		MY_ECONF+="
-			 $(use_enable bluetooth edbus-bluez-test)
-			$(use_enable connman edbus-connman0_7x-test)
-			$(use_enable libnotify edbus-notification-daemon-test)
-			$(use_enable libnotify edbus-notify-test)
-			$(use_enable ofono edbus-ofono-test)
-			$(use_enable udev edbus-ukit-test)"
-	else
-		MY_ECONF+="
-			 --disable-edbus-bluez-test
-			--disable-edbus-connman0_7x-test
-			--disable-edbus-notification-daemon-test
-			--disable-edbus-notify-test
-			--disable-edbus-ofono-test
-			--disable-edbus-ukit-test
-			--disable-edbus-async-test
-			--disable-edbus-performance-test"
-	fi
-	enlightenment_src_configure
-}
--- a/dev-libs/e_dbus/e_dbus-1.7.4.ebuild
+++ b/dev-libs/e_dbus/e_dbus-1.7.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/e_dbus/e_dbus-1.7.0.ebuild,v 1.2 2012/09/10 23:30:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/e_dbus/e_dbus-1.7.4.ebuild,v 1.1 2012/12/21 20:22:28 tommy Exp $

 EAPI="2"

@ -9,6 +9,7 @@ inherit enlightenment
 DESCRIPTION="Enlightenment's (Ecore) integration to DBus"
 SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"

+LICENSE="BSD-2"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="bluetooth +connman +libnotify ofono static-libs test-binaries +udev"

--- a/dev-libs/ecore/Manifest
+++ b/dev-libs/ecore/Manifest
@ -1,2 +1 @@
-DIST ecore-1.7.1.tar.bz2 3419265 SHA256 fb5f547a0a6556b5f0e274b65cfbe42f4eb8371f20d00005cd4f5a78a6b6a5d8 SHA512 a63059cab63cf97a7407f92700261f04e1170106dbebfbf99770bce656e729b139195e3aa88d6b3f6c42865ae08ea2e1f21571ff8970522ea82c17949403101c WHIRLPOOL 87f5874d5f19bd73081676a893b98b31c2a8d7f07b19197e0362c46577daad5ded21f27299d13699087fee69cb3911bc918b0d176ec7cc41208b47b585ea1538
-DIST ecore-1.7.3.tar.bz2 3457305 SHA256 62dd56329e2d353070dcd8db2355cec85c0ea08733e76ed51a8e779dbf946c4f SHA512 b714497ee14d9bc0b4b0d9295a25e04089fd913d28a97ca357fc7b222967886eaf608851a1bcd616c7e6ac5bf5081cddeca9646e0735ab6ea5c64d4c3126d576 WHIRLPOOL 302d6cd980a48be8b4342177d4cd801fb07b42e5e5679ec78d87803dfae8c513c09de2ce7efe463f68e3f0caf6b16195b398ca02288538e4ca2b3ca1644c5847
+DIST ecore-1.7.4.tar.bz2 3421866 SHA256 4fa52dece3cfeeb61c89038391c5c25ff31911a6dd187229f8ddb0a1bd61a03d SHA512 a84943e5b74308b4a10393d48e0daa5cb043643fea2e47af6e9a6301911fb1019e7455ddbaf0dc9f8c111ac2ecab0a30fc30a946c05b53c246209571d412635b WHIRLPOOL c9d21a2cd98a159de15a734bff007e82731d1e1767fa570b3efb7ba9e5ff7a44273a69cbebc3813ae7a53b90dde90e5325844d0192855f1d1582ec9f1be766d2
--- a/dev-libs/ecore/ecore-1.7.1.ebuild
+++ b/dev-libs/ecore/ecore-1.7.1.ebuild
@ -1,195 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ecore/ecore-1.7.1.ebuild,v 1.1 2012/10/22 13:43:20 tommy Exp $
-
-EAPI=2
-
-inherit virtualx enlightenment eutils
-
-DESCRIPTION="Enlightenment's core event abstraction layer and OS abstraction layer"
-SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="ares curl directfb +evas fbcon glib gnutls +inotify ipv6 opengl sdl ssl static-libs +threads tslib +X xcb xinerama xprint xscreensaver"
-
-RDEPEND=">=dev-libs/eina-1.7.0
-	ares? ( net-dns/c-ares )
-	glib? ( dev-libs/glib )
-	curl? ( net-misc/curl )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( ssl? ( dev-libs/openssl ) )
-	evas? (
-		>=media-libs/evas-1.7.0[directfb?,fbcon?,opengl?,X?,xcb?]
-		opengl? ( virtual/opengl )
-	)
-	directfb? ( >=dev-libs/DirectFB-0.9.16 )
-	tslib? ( x11-libs/tslib )
-	sdl? ( media-libs/libsdl )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXcursor
-		x11-libs/libXdamage
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-		xinerama? ( x11-libs/libXinerama x11-libs/libXrandr )
-		xprint? ( x11-libs/libXp )
-		xscreensaver? ( x11-libs/libXScrnSaver )
-	)
-	!X? ( xcb? ( x11-libs/xcb-util ) )"
-DEPEND="${RDEPEND}"
-
-#tests depend on temp data from eina WORKDIR
-RESTRICT=test
-
-src_configure() {
-	local SSL_FLAGS="" EVAS_FLAGS="" X_FLAGS=""
-
-	if use gnutls; then
-		if use ssl; then
-			einfo "You have enabled both 'ssl' and 'gnutls', so we will use"
-			einfo "gnutls and not openssl for ecore-con support"
-		fi
-		SSL_FLAGS="
-		  --disable-openssl
-		  --enable-gnutls
-		"
-	elif use ssl; then
-		SSL_FLAGS="
-		  --enable-openssl
-		  --disable-gnutls
-		"
-	else
-		SSL_FLAGS="
-		  --disable-openssl
-		  --disable-gnutls
-		"
-	fi
-
-	local x_or_xcb=""
-	if use X; then
-		x_or_xcb="X"
-	elif use xcb; then
-		x_or_xcb="xcb"
-	fi
-
-	if use evas; then
-
-		if use opengl && [[ -z "$x_or_xcb" ]]; then
-			ewarn "Ecore/Evas usage of OpenGL requires X11."
-			ewarn "Compile dev-libs/ecore with USE=X or xcb."
-			ewarn "Compiling without opengl support."
-			EVAS_FLAGS+="
-				--disable-ecore-evas-software-x11
-				--disable-ecore-evas-software-16-x11
-			"
-		else
-			EVAS_FLAGS+="
-				--enable-ecore-evas-software-x11
-				--enable-ecore-evas-software-16-x11
-			"
-		fi
-		EVAS_FLAGS+="
-			$(use_enable directfb ecore-evas-directfb)
-			$(use_enable fbcon ecore-evas-fb)
-			$(use_enable opengl ecore-evas-opengl-x11)
-		"
-	else
-		EVAS_FLAGS+="
-			--disable-ecore-evas-directfb
-			--disable-ecore-evas-fb
-			--disable-ecore-evas-software-x11
-			--disable-ecore-evas-software-16-x11
-			--disable-ecore-evas-opengl-x11
-		"
-		if use opengl; then
-			ewarn "Ecore usage of OpenGL is dependent on media-libs/evas."
-			ewarn "Compile dev-libs/ecore with USE=evas."
-		fi
-	fi
-
-	if use X; then
-		if use xcb; then
-			ewarn "You have enabled both 'X' and 'xcb', so we will use"
-			ewarn "X as it's considered the most stable for ecore-x"
-		fi
-		X_FLAGS="
-		  --enable-ecore-x
-		  --disable-ecore-x-xcb
-		"
-
-	elif use xcb; then
-		X_FLAGS="
-		  --enable-ecore-x
-		  --enable-ecore-x-xcb
-		"
-	else
-		X_FLAGS="
-		  --disable-ecore-x
-		  --disable-ecore-x-xcb
-		"
-	fi
-
-	if [[ ! -z "$x_or_xcb" ]]; then
-		X_FLAGS+="
-			$(use_enable xinerama ecore-x-xinerama)
-			$(use_enable xprint ecore-x-xprint)
-			$(use_enable xscreensaver ecore-x-screensaver)
-		"
-	else
-		X_FLAGS+="
-			--disable-ecore-x-xinerama
-			--disable-ecore-x-xprint
-			--disable-ecore-x-screensaver
-		"
-	fi
-
-	if use tslib && ! use fbcon; then
-		ewarn "Ecore just uses tslib for framebuffer input."
-		ewarn "Compile dev-libs/ecore with USE=fbcon."
-	fi
-
-	MY_ECONF="
-	--enable-ecore-con
-	--enable-ecore-ipc
-	--enable-ecore-file
-	--enable-ecore-imf
-	--enable-ecore-input
-	--disable-ecore-win32
-	--disable-ecore-wince
-	--disable-ecore-evas-software-gdi
-	--disable-ecore-evas-software-ddraw
-	--disable-ecore-evas-direct3d
-	--disable-ecore-evas-opengl-glew
-	--disable-ecore-evas-software-16-ddraw
-	--disable-ecore-evas-software-16-wince
-	$(use_enable ares cares)
-	$(use_enable curl)
-	$(use_enable directfb ecore-directfb)
-	$(use_enable doc)
-	$(use_enable evas ecore-evas)
-	$(use_enable evas ecore-input-evas)
-	$(use_enable evas ecore-imf-evas)
-	$(use_enable evas ecore-evas-software-buffer)
-	$(use_enable fbcon ecore-fb)
-	$(use_enable glib)
-	$(use_enable inotify)
-	$(use_enable ipv6)
-	$(use_enable sdl ecore-sdl)
-	$(use_enable test tests)
-	$(use_enable threads posix-threads)
-	$(use_enable tslib)
-	$(use_enable X xim)
-	${SSL_FLAGS}
-	${EVAS_FLAGS}
-	${X_FLAGS}
-	"
-	enlightenment_src_configure
-}
-
-src_test() {
-	Xemake check
-}
--- a/dev-libs/ecore/ecore-1.7.4.ebuild
+++ b/dev-libs/ecore/ecore-1.7.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ecore/ecore-1.7.3.ebuild,v 1.1 2012/12/09 10:53:32 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ecore/ecore-1.7.4.ebuild,v 1.1 2012/12/21 19:56:14 tommy Exp $

 EAPI=2

@ -11,6 +11,7 @@ inherit enlightenment eutils
 DESCRIPTION="Enlightenment's core event abstraction layer and OS abstraction layer"
 SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"

+LICENSE="BSD-2"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="ares curl directfb +evas examples fbcon glib gnutls +inotify ipv6 opengl sdl ssl static-libs +threads tslib +X xcb xinerama xprint xscreensaver"

@ -47,12 +48,6 @@ DEPEND="${RDEPEND}"
 #tests depend on temp data from eina WORKDIR
 RESTRICT=test

-src_prepare() {
-	epatch "${FILESDIR}"/ecore-1.7_80526.patch
-
-	enlightenment_src_prepare
-}
-
 src_configure() {
 	local SSL_FLAGS="" EVAS_FLAGS="" X_FLAGS=""

--- a/dev-libs/ecore/files/ecore-1.7_80526.patch
+++ b/dev-libs/ecore/files/ecore-1.7_80526.patch
@ -1,37 +0,0 @@
-Index: branches/ecore-1.7/ChangeLog
-===================================================================
--- branches/ecore-1.7/ChangeLog	(revision 80479)
-+++ branches/ecore-1.7/ChangeLog	(revision 80526)
-@@ -1008,3 +1008,6 @@
- 	* 1.7.3 release
- 
-
-+2012-12-09  Cedric Bail
-+
-+	* Fix build without IPv6.
-+
-Index: branches/ecore-1.7/src/lib/ecore_con/ecore_con_info.c
-===================================================================
--- branches/ecore-1.7/src/lib/ecore_con/ecore_con_info.c	(revision 80479)
-+++ branches/ecore-1.7/src/lib/ecore_con/ecore_con_info.c	(revision 80526)
-@@ -39,4 +39,5 @@
- #include <sys/types.h>
- #include <unistd.h>
-+#include <fcntl.h>
- #include <ctype.h>
- #ifdef __OpenBSD__
-Index: branches/ecore-1.7/NEWS
-===================================================================
--- branches/ecore-1.7/NEWS	(revision 80479)
-+++ branches/ecore-1.7/NEWS	(revision 80526)
-@@ -1,2 +1,10 @@
-+Ecore 1.7.4
-+
-+Changes since Ecore 1.7.3:
-+--------------------------
-+
-+Fixes:
-+    * Fix build without IPv6.
-+
- Ecore 1.7.3
- 
--- a/dev-libs/eet/Manifest
+++ b/dev-libs/eet/Manifest
@ -1,2 +1 @@
-DIST eet-1.7.2.tar.bz2 577810 SHA256 e8ec6e02c3dbb050d23fa2e6985019c8e1005c7dde31a047ed193974d04bd86f SHA512 074b99d07f0e5326643390a8deded500ebd872ba73936247154b601b057c4ce577a543ebcb6dd2ec9fadfc13f76e62b106599b51efaef2a46687b8bc828d8f14 WHIRLPOOL f5d69cbaa065c07a163f9a739cbdab5b71f69cfddee8d6eab5c288b5ad4fc043df08251b2108fa59280c8d33f812fd3349b449fa495a889ad4b79c508478b241
-DIST eet-1.7.3.tar.bz2 576273 SHA256 30d90883131799cd33aa0328b496dea1c2412bf73c87e1840b31ae2ddf99a268 SHA512 d3a40ebe3ac01484d289f70ff928b6e3d8f6842b39a51d8c4457edbcc36dff03d42e83cd29616076b3b38d67876863b20b6a6afd73aa4269d8ab49df3a94e370 WHIRLPOOL 89400a0ed7e03f32824e4b2764bb01d67c36400d3ed09449deb58881a4d468b828d4617c4d6df01d31e04b20c43098dd9df545f3f2cdf97ca62b6bb5c0cd70b3
+DIST eet-1.7.4.tar.bz2 575676 SHA256 6fce549e89d5828fa70c7d67696932a0b40cf4061d0564eee84b6819f60650ef SHA512 ccf57b934aa6609d2696d4912fa3349fd3d3a144f5f8067d5aca910c7df11aa6753c1332fca17d2ca056c10b49b95a0637bb333baee0ebead23efaa698ede3d7 WHIRLPOOL bf8797e1224a543a18f31718136a88b2bd166821ce794bb456ab58fa558ea0918717b11092a2bf3156fce30fff8e31fdcb528cc59afcc58dc0adc515e23c63dc
--- a/dev-libs/eet/eet-1.7.2.ebuild
+++ b/dev-libs/eet/eet-1.7.2.ebuild
@ -1,67 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/eet/eet-1.7.2.ebuild,v 1.1 2012/11/23 14:49:03 tommy Exp $
-
-EAPI=2
-
-inherit enlightenment
-
-DESCRIPTION="E file chunk reading/writing library"
-HOMEPAGE="http://trac.enlightenment.org/e/wiki/Eet"
-SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug examples gnutls ssl static-libs test"
-
-RDEPEND=">=dev-libs/eina-1.7.0
-	virtual/jpeg
-	sys-libs/zlib
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( ssl? ( dev-libs/openssl ) )"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check
-		dev-util/lcov )"
-
-src_configure() {
-	local SSL_FLAGS=""
-
-	if use gnutls; then
-		if use ssl; then
-			ewarn "You have enabled both 'ssl' and 'gnutls', so we will use"
-			ewarn "gnutls and not openssl for cipher and signature support"
-		fi
-		SSL_FLAGS="
-			--enable-cipher
-			--enable-signature
-			--disable-openssl
-			--enable-gnutls"
-	elif use ssl; then
-		SSL_FLAGS="
-			--enable-cipher
-			--enable-signature
-			--enable-openssl
-			--disable-gnutls"
-	else
-		SSL_FLAGS="
-			--disable-cipher
-			--disable-signature
-			--disable-openssl
-			--disable-gnutls"
-	fi
-
-	export MY_ECONF="
-		$(use_enable debug assert)
-		$(use_enable doc)
-		$(use_enable test tests)
-		${SSL_FLAGS}
-		${MY_ECONF}"
-
-	enlightenment_src_configure
-}
-
-src_install() {
-	enlightenment_src_install
-	rm -r src/examples/Makefile* || die
-	docinto examples
-	dodoc src/examples/* || die
-}
--- a/dev-libs/eet/eet-1.7.4.ebuild
+++ b/dev-libs/eet/eet-1.7.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/eet/eet-1.7.3.ebuild,v 1.1 2012/12/08 13:03:53 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/eet/eet-1.7.4.ebuild,v 1.1 2012/12/21 19:41:59 tommy Exp $

 EAPI=2

@ -10,6 +10,7 @@ DESCRIPTION="E file chunk reading/writing library"
 HOMEPAGE="http://trac.enlightenment.org/e/wiki/Eet"
 SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"

+LICENSE="BSD-2"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="debug examples gnutls ssl static-libs test"

--- a/dev-libs/eeze/Manifest
+++ b/dev-libs/eeze/Manifest
@ -1 +1 @@
-DIST eeze-1.7.1.tar.bz2 518296 SHA256 6a696e2fe1ad14983ca7555eed2c50dd39f9a084e04475f0d25fd31d32e3cd58 SHA512 5d3afc9cd7aeb1b3bbd14a7fae7a66bd43c482e732b7b005fd405ad278722d8e7906552be812b729b116e48e7f5c8c6cd3bbba2b284726ba181f86910977ae40 WHIRLPOOL 0fa57760cc3ddd3e9519cce054c9ab9ed4e870918922645ce194878629f8b258df3bb9e872ee0879fb3be92d7f0fc247555a074f797527a7ce7265b23af2549c
+DIST eeze-1.7.4.tar.bz2 550280 SHA256 0598688498fcbd59a7747cb29f583418dc2717b821fb3ad2b1739af26e468e4f SHA512 5f736a6a5809b4b870f6403d80e06cd8785deaa59164c5222b420099036d9ff6fc68ddcfc4b76a568d3dc8e1b02e3be42acb0753caebe2a3c84bf3537ce9f8f0 WHIRLPOOL e544ec9329e7b6e111addc78702c206da40fa40e3390d08f9157e5a0b5f4dbff8276ad2ec14c404fb13f6395d2db27123543320a532c0f8d575d2150c4582c2e
--- a/dev-libs/eeze/eeze-1.7.4.ebuild
+++ b/dev-libs/eeze/eeze-1.7.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/eeze/eeze-1.7.1.ebuild,v 1.2 2012/11/23 22:12:13 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/eeze/eeze-1.7.4.ebuild,v 1.1 2012/12/21 20:19:07 tommy Exp $

 inherit enlightenment

@ -8,6 +8,7 @@ DESCRIPTION="library to simplify the use of devices"
 HOMEPAGE="http://trac.enlightenment.org/e/wiki/Eeze"
 SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"

+LICENSE="BSD-2"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="static-libs utilities"

@ -17,6 +18,7 @@ RDEPEND=${DEPEND}

 src_configure() {
 	MY_ECONF="
+	$(use_enable doc)
 	$(use_enable utilities eeze-disk-ls)
 	$(use_enable utilities eeze-mount)
 	$(use_enable utilities eeze-umount)
--- a/dev-libs/efreet/Manifest
+++ b/dev-libs/efreet/Manifest
@ -1,2 +1 @@
-DIST efreet-1.7.1.tar.bz2 423750 SHA256 c844ed545f1c9438c73af4e4d037401a653babaab0a4e4b69377a2de49431eea SHA512 cd041ad72542a968a346feb4627b193e67c006e06a66815ada144c83bedc15d1b235b0f3ce68a238a7a604f03728c26334de2769e4efa24eace7b76fec7e21e0 WHIRLPOOL 51bdde6e67a5c3a48e567ee8299bc175eca8d30116ca65abaa9eea04488005b3e365f5a1ba8181a76b473eab81b47752e0c389a53d6f4f46d9139b01f7862acb
-DIST efreet-1.7.3.tar.bz2 449922 SHA256 6bd1e5ac87d9d22471b642badaeb3926511eb848048c64a90f64379784eb4624 SHA512 3a80d16dfd95e658dc0cb8376d48a37e7725c3e490e391cc51b3642bfb58b5997776d9d4f2e7da3c5a48f80353c69c9be7738152cddd50ed1093f6b017d4599b WHIRLPOOL 141ad7437f01bb6cfb9adc785924fc0c9f52f38fb38d9dc09d5cc48d16c38bc1a5dc7025d40dbd41f54222cc16ac5ab918304b967338f29995f01c7a0587b3e9
+DIST efreet-1.7.4.tar.bz2 448678 SHA256 2253863223aa5b628cb47f0a7674df97d7893bc490e4b1ba88f2d1ea421dbb2e SHA512 2a4fbbffffdcb914457c16a1f646a25f6e2b1168ce83e5bd5bee133a688734f7efb82cab275548eb767d6ffa297ba944133028cf85b05eb9e3504e1c4eb2ffe6 WHIRLPOOL a2d0de209219a69569cd75dbed0b5a03c80c7e6587393cc63f1c04dccc20f8ed2ccf3792ba130f96b2de56c12c4db94f44c626f897a2fbb33a7ccc812f146448
--- a/dev-libs/efreet/efreet-1.7.1.ebuild
+++ b/dev-libs/efreet/efreet-1.7.1.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/efreet/efreet-1.7.1.ebuild,v 1.1 2012/10/22 14:27:32 tommy Exp $
-
-EAPI=2
-
-inherit enlightenment
-
-DESCRIPTION="library for handling of freedesktop.org specs (desktop/icon/theme/etc...)"
-SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/ecore-1.7.0
-	>=dev-libs/eet-1.7.0
-	>=dev-libs/eina-1.7.0
-	x11-misc/xdg-utils"
-DEPEND="${RDEPEND}"
--- a/dev-libs/efreet/efreet-1.7.4.ebuild
+++ b/dev-libs/efreet/efreet-1.7.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/efreet/efreet-1.7.3.ebuild,v 1.1 2012/12/08 14:32:10 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/efreet/efreet-1.7.4.ebuild,v 1.1 2012/12/21 20:12:04 tommy Exp $

 EAPI=2

@ -9,6 +9,7 @@ inherit enlightenment
 DESCRIPTION="library for handling of freedesktop.org specs (desktop/icon/theme/etc...)"
 SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"

+LICENSE="BSD-2"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="static-libs"

--- a/dev-libs/eina/Manifest
+++ b/dev-libs/eina/Manifest
@ -1,2 +1 @@
-DIST eina-1.7.1.tar.bz2 9749033 SHA256 af0b316734ba72d92fa7716005efd380f28677c76f0e0b6a3c5a9b524575a6ce SHA512 b0aafd2d278851b94384b81398b93f458965e9dc0c1ff344dd4c1a7ebf0d17bfa1551292e0172e367b9f781d3f71bf5086485885f3948a0799192a7e4cb82d67 WHIRLPOOL 599f29e5c16976ec60ea6f672922e9c2c52f6636f32cfad575ffe1db1cc62adb75f9e681a83fd2bdc8b49ee249246d5d8927a9e0ad9ac909b991d031d7ffc047
-DIST eina-1.7.3.tar.bz2 9805893 SHA256 638b57c4ff44ce2ce00b5be395d87deadc3810c5079ea4de608630363d6b54d7 SHA512 6a3c5ae63163fe1362b12133a4a68116c2a3081ff4b3847a52de10f4adc9c101647a2097976a1e3556287ade9045c4d6f374f599706d2f384b02a0f3425468cb WHIRLPOOL ddef4f32fa9771470c0cd95124b99039b1a9d95fdc8f41f7ccbcddf8dbc11a31a95983b5095e2ef4853365540fefae8de2131d4a0fe643b7a93b244ef8231255
+DIST eina-1.7.4.tar.bz2 9806158 SHA256 f16da871eabb9e2b34f1fa7d110a9040e07c458bc27ebc7b6b60f43801a78e54 SHA512 8bcc2a961050da9bffbb93483f653a7f633ce3f11b55b35084075f6482d9a95f8c8ed48204b8b6a75c0780fc7abac1c7fe028c1e5a37662b927392bbc5318d7c WHIRLPOOL 8f32707577cf1d14af9a2298966c911aa84dac00ee81876e540ce56cdea7e780ab19f1927b662392671ecaea8ce35cd1759c90945a013cba0e10e87ef3c0174f
--- a/dev-libs/eina/eina-1.7.3.ebuild
+++ b/dev-libs/eina/eina-1.7.3.ebuild
@ -1,67 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/eina/eina-1.7.3.ebuild,v 1.1 2012/12/08 14:01:55 tommy Exp $
-
-EAPI="2"
-
-inherit enlightenment
-
-DESCRIPTION="Enlightenment's data types library (List, hash, etc) in C"
-
-SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-LICENSE="LGPL-2.1"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="altivec debug default-mempool mempool-buddy +mempool-chained
-	mempool-fixed-bitmap +mempool-pass-through
-	mmx sse sse2 static-libs test"
-
-RDEPEND="debug? ( dev-util/valgrind )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? (
-		dev-libs/check
-		dev-libs/glib
-		dev-util/lcov
-	)"
-
-src_prepare() {
-	cp "${FILESDIR}"/city.h src/tests/ || die
-
-	enlightenment_src_prepare
-}
-
-src_configure() {
-	local MODULE_ARGUMENT="static"
-	if use debug ; then
-		MODULE_ARGUMENT="yes"
-	fi
-
-	# Evas benchmark is broken!
-	MY_ECONF="
-	$(use_enable altivec cpu-altivec)
-	$(use_enable !debug amalgamation)
-	$(use_enable debug stringshare-usage)
-	$(use_enable debug assert)
-	$(use_enable debug valgrind)
-	$(use debug || echo " --with-internal-maximum-log-level=2")
-	$(use_enable default-mempool)
-	$(use_enable doc)
-	$(use_enable mempool-buddy mempool-buddy $MODULE_ARGUMENT)
-	$(use_enable mempool-chained mempool-chained-pool $MODULE_ARGUMENT)
-	$(use_enable mempool-fixed-bitmap mempool-fixed-bitmap $MODULE_ARGUMENT)
-	$(use_enable mempool-pass-through mempool-pass-through $MODULE_ARGUMENT)
-	$(use_enable mmx cpu-mmx)
-	$(use_enable sse cpu-sse)
-	$(use_enable sse2 cpu-sse2)
-	$(use test && echo " --disable-amalgamation")
-	$(use_enable test e17)
-	$(use_enable test tests)
-	$(use_enable test benchmark)
-	$(use test && echo " --with-internal-maximum-log-level=6")
-	--enable-magic-debug
-	--enable-safety-checks
-	"
-
-	enlightenment_src_configure
-}
--- a/dev-libs/eina/eina-1.7.4.ebuild
+++ b/dev-libs/eina/eina-1.7.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/eina/eina-1.7.1.ebuild,v 1.2 2012/10/25 11:41:40 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/eina/eina-1.7.4.ebuild,v 1.1 2012/12/21 19:27:50 tommy Exp $

 EAPI="2"

@ -25,12 +25,6 @@ DEPEND="${RDEPEND}
 		dev-util/lcov
 	)"

-src_prepare() {
-	cp "${FILESDIR}"/city.h src/tests/ || die
-
-	enlightenment_src_prepare
-}
-
 src_configure() {
 	local MODULE_ARGUMENT="static"
 	if use debug ; then
--- a/dev-libs/eina/files/city.h
+++ b/dev-libs/eina/files/city.h
@ -1,96 +0,0 @@
-// Copyright (c) 2011 Google, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-// CityHash Version 1, by Geoff Pike and Jyrki Alakuijala
-//
-// This file provides a few functions for hashing strings. On x86-64
-// hardware in 2011, CityHash64() is faster than other high-quality
-// hash functions, such as Murmur.  This is largely due to higher
-// instruction-level parallelism.  CityHash64() and CityHash128() also perform
-// well on hash-quality tests.
-//
-// CityHash128() is optimized for relatively long strings and returns
-// a 128-bit hash.  For strings more than about 2000 bytes it can be
-// faster than CityHash64().
-//
-// Functions in the CityHash family are not suitable for cryptography.
-//
-// WARNING: This code has not been tested on big-endian platforms!
-// It is known to work well on little-endian platforms that have a small penalty
-// for unaligned reads, such as current Intel and AMD moderate-to-high-end CPUs.
-//
-// By the way, for some hash functions, given strings a and b, the hash
-// of a+b is easily derived from the hashes of a and b.  This property
-// doesn't hold for any hash functions in this file.
-
-#ifndef CITY_HASH_H_
-#define CITY_HASH_H_
-
-#include <stdlib.h>  // for size_t.
-#include <stdint.h>
-#include <utility>
-
-typedef uint8_t uint8;
-typedef uint32_t uint32;
-typedef uint64_t uint64;
-typedef std::pair<uint64, uint64> uint128;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-inline uint64 Uint128Low64(const uint128& x) { return x.first; }
-inline uint64 Uint128High64(const uint128& x) { return x.second; }
-
-// Hash function for a byte array.
-uint64 CityHash64(const char *buf, size_t len);
-// Hash function for a byte array.  For convenience, a 64-bit seed is also
-// hashed into the result.
-uint64 CityHash64WithSeed(const char *buf, size_t len, uint64 seed);
-
-// Hash function for a byte array.  For convenience, two seeds are also
-// hashed into the result.
-uint64 CityHash64WithSeeds(const char *buf, size_t len,
-                           uint64 seed0, uint64 seed1);
-
-// Hash function for a byte array.
-uint128 CityHash128(const char *s, size_t len);
-
-// Hash function for a byte array.  For convenience, a 128-bit seed is also
-// hashed into the result.
-uint128 CityHash128WithSeed(const char *s, size_t len, uint128 seed);
-
-// Hash 128 input bits down to 64 bits of output.
-// This is intended to be a reasonably good hash function.
-inline uint64 Hash128to64(const uint128& x) {
-  // Murmur-inspired hashing.
-  const uint64 kMul = 0x9ddfea08eb382d69ULL;
-  uint64 a = (Uint128Low64(x) ^ Uint128High64(x)) * kMul;
-  a ^= (a >> 47);
-  uint64 b = (Uint128High64(x) ^ a) * kMul;
-  b ^= (b >> 47);
-  b *= kMul;
-  return b;
-}
-
-#ifdef __cplusplus
-}
-#endif
-#endif  // CITY_HASH_H_
--- a/dev-libs/eio/Manifest
+++ b/dev-libs/eio/Manifest
@ -1,2 +1 @@
-DIST eio-1.7.1.tar.bz2 335047 SHA256 ec4bdc64b61d031cf6eb8762ee9e39031215e79c0839cd08ff446624e0cdf44b SHA512 4ec0c0f7c675d34490e452cc67c4f08ca0d8dd63e060d6dfb60dab6ba6d662d5b3d7fa0fcffaadb4c4102cf7562fb4f96cbfd1cabfe7f0cddecc8b6645a834ed WHIRLPOOL a1cbcf70db5b701e188e50a84613fda70e2d746f5aeb58ab7709c55deda0926b8ddb69e420298c3d64c963f3f5cbe68bc93338fc337a0d65c92e25bf1c2d8f35
-DIST eio-1.7.3.tar.bz2 356498 SHA256 dcdd9ff1b2e8a0f9ab7e8dc2f57d1f5ba6bb227062e6a81a41319b00a5b2b1eb SHA512 8fcf617a3d1ca073f6b8fecf0f95f730f5e2c1190422611ec8c6cc3dd0f4aaf319b011b5f7b6db82b5771c0455659104f566034ad95755b77e079e53b11826c0 WHIRLPOOL 52fbfb4dc6b6e16a2e995d6480005417247a83f9c7c175b85886fe6f02e6f78e34acd7e3f1996826da965ade9e9639a4128d26130903a24e635b444cb26c141b
+DIST eio-1.7.4.tar.bz2 355980 SHA256 ec762fdc27779e774b6144d8aaea0127694f43a3dfb9809130429e191c7b4063 SHA512 744414d8394063d57b5073e2e55324c9d6c98f3a88b3cef606f83d5819a979ea86a76c1787a0c9d9f2889be131df1d71112e80d05ea85c79912eea2dadb51a70 WHIRLPOOL 0ecd3165ead25d115f4822a9768d51d9a34ec46f90f430b67c579620b0c7fb338394f903838afc230467bb7a6554988bfdd0aad90a489966857b8e9b3424c726
--- a/dev-libs/eio/eio-1.7.3.ebuild
+++ b/dev-libs/eio/eio-1.7.3.ebuild
@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/eio/eio-1.7.3.ebuild,v 1.1 2012/12/08 14:04:29 tommy Exp $
-
-EAPI=2
-
-inherit enlightenment
-
-DESCRIPTION="Enlightenment's integration to IO"
-HOMEPAGE="http://trac.enlightenment.org/e/wiki/EIO"
-
-SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-LICENSE="BSD"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="examples static-libs"
-
-RDEPEND=">=dev-libs/ecore-1.7.0"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	MY_ECONF="--enable-posix-threads
-		$(use_enable doc)
-		$(use_enable examples build-examples)
-		$(use_enable examples install-examples)"
-	enlightenment_src_configure
-}
--- a/dev-libs/eio/eio-1.7.4.ebuild
+++ b/dev-libs/eio/eio-1.7.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/eio/eio-1.7.1.ebuild,v 1.1 2012/11/09 16:44:48 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/eio/eio-1.7.4.ebuild,v 1.1 2012/12/21 20:15:57 tommy Exp $

 EAPI=2

@ -10,7 +10,7 @@ DESCRIPTION="Enlightenment's integration to IO"
 HOMEPAGE="http://trac.enlightenment.org/e/wiki/EIO"

 SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-LICENSE="BSD"
+LICENSE="LGPL-2"

 KEYWORDS="~amd64 ~x86"
 IUSE="examples static-libs"
--- a/dev-libs/embryo/Manifest
+++ b/dev-libs/embryo/Manifest
@ -1,2 +1 @@
-DIST embryo-1.2.0.tar.bz2 440135 SHA256 cf530e703e812ab4444c516977b21dfc24212938d36ad587ec9b40056a52d583 SHA512 8d5164102a754f8bc40c4cef50bb4afe03f3d2a825cd515d139d3af262df740055ef6115962e1db0d92671c811d5ff1a8e45c65fa85b14ddcfaa5fd66b7e8a29 WHIRLPOOL 83b88b5da6913f9e4d2fa6181cd97f6257ddadb3e44ba446ae6b2b8681911462bb859635dd287133ace6970d29a3d836354abfc32ea3a811d3a5bbfff6ea9f4a
-DIST embryo-1.7.0.tar.bz2 440504 SHA256 95125651f1a3edbf0ef4fac40ecaec03d31cb383ae7dba7708b547a419f9e10e SHA512 be77ca7be44df8e4bc86ff7ecaf7d40b0b93ceba372404d310877debac40459c1c2ead133752fb0490116b4a6dd07e7a878e06c73cfcc00da60e35eb29e7ed55 WHIRLPOOL 4f0b7b1553dc2d2bf0062ffaa70295e7ac6fe664d602d8755c5d109c4995d4210bf940fb4791cdf6fbd01f4751476e1622ca481430145afc73beb767d5d7ff45
+DIST embryo-1.7.4.tar.bz2 459454 SHA256 c8886dd5df2948cdb1463f627c2ce92faf642f29e38f0692f80f51ad3495ee67 SHA512 31d13593e46d947f41d0973b6866ba2e0c8838f0391317aeccf9ffffd97b83978c4caa8f5f5c147cba70231ce742e691b985995e13bff2e9ba5bfb5daa8f1222 WHIRLPOOL d6d2951fd2dc901bb1fa3b5b117a0b712a354f8ecddf8ce3035f9c766cad156acdfdc4529aebb2d4e955896b78dfc29adf90004ca0ac1a9953a62c3d61f4cd42
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST expedite-1.7.4.tar.bz2 5792836 SHA256 8d547b2cae69045c01765ea5903be17f7174c31133b3309ffc2a9a8409f8c330 SHA512 9085b409e21bb6c9d5d4335c30aad4ffba0bcadacc05c630e6f9719db76d3c2ebfe0e16d7a6ab7da8fd4c5128c8d3b9031f06ef23e3f62ebf9b7a28d28ef3167 WHIRLPOOL 9a23abd516f18f140cb9358028349f4edbe859ff9a5f5d8b2612434498aaaddd89271e5fc7f3556646bc65adc6b2b48c7c64ad2df34aeabf6cf22e74976b8361`